From f2f4e1e45981bb294a5221ade7b4646cc3e29d35 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 11 Nov 2020 18:56:44 +0800
Subject: [PATCH] 无尽模式分数
---
Assets/StreamingAssets/Table/donateshop.json | 2
Assets/StreamingAssets/Table/endless_enemy.json | 2
Assets/UI/Final/rank_di_0.png.meta | 4
Assets/UI/Loading/LoadingBg.png.meta | 118 ++
Assets/UI/Fight/score.png.meta | 4
GemBattle/宝石塔防_Data/sharedassets0.assets | 0
GemBattle/宝石塔防_Data/level3 | 0
Assets/UI/Final/rank_icon_2.png.meta | 4
GemBattle/宝石塔防_Data/level2 | 0
Assets/Scenes/Levels/Battle/Endless.unity | 1667 ++++++++++++++++++++++++++++++++
Assets/UI/Fight/buff_1.png.meta | 4
Assets/UI/Loading/按钮1.png.meta | 4
Assets/UI/timeBg.png.meta | 2
Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs | 5
GemBattle/宝石塔防_Data/level0 | 0
Assets/UI/Loading/进度条.png.meta | 4
GemBattle/宝石塔防_Data/level1 | 0
Assets/StreamingAssets/Table/scoreshop.json | 2
Assets/UI/GuideUser/技能释放范围.png.meta | 4
Assets/Scripts/Data/EndlessScoreData.cs.meta | 11
Assets/UI/Final/selfScoreDi.png.meta | 4
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs | 20
Assets/Scripts/Data/EndlessPortData.cs | 121 ++
Assets/UI/Final/role.png.meta | 4
Assets/UI/Final/settleMentTitle.png.meta | 4
GemBattle/宝石塔防_Data/sharedassets1.assets | 0
GemBattle/宝石塔防_Data/sharedassets3.assets | 0
Assets/UI/Loading/文字.png.meta | 4
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll | 0
Assets/UI/Favorite/按钮1.png.meta | 4
Assets/UI/GuideUser/引导效果图01.png.meta | 4
Assets/Scripts/TowerDefense/Agents/Agent.cs | 7
Assets/UI/Loading/文字1.png.meta | 4
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0
Assets/UI/Loading/进度底.png.meta | 4
Assets/UI/Fight/doubleHit.png.meta | 4
Assets/UI/Final/rank_di_1.png.meta | 4
Assets/UI/Favorite/弹出.png.meta | 4
Assets/UI/Final/newRecord.png.meta | 4
Assets/StreamingAssets/Table/boss_skill.json | 2
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 2
Assets/UI/GuideUser/fire.png.meta | 4
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll | 0
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json | 2
Assets/UI/Fight/01效果图-战斗.jpg.meta | 14
Assets/StreamingAssets/Table/endless_buff.json | 2
Assets/UI/Fight/buff_2.png.meta | 4
GemBattle/宝石塔防_Data/StreamingAssets/Table/boss_skill.json | 2
Assets/UI/Final/rank_icon_1.png.meta | 4
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 2
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0
Assets/UI/Fight/文字标注01.jpg.meta | 4
Assets/Prefabs/UI/DoubleHit.prefab | 208 ++++
Assets/UI/GuideUser/数字1.png.meta | 4
Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs | 10
Assets/UI/Favorite/新玩法预告.png.meta | 4
Assets/Scripts/Net/NetExtends/Table.cs | 16
Assets/StreamingAssets/Table/battle.json | 2
Assets/UI/Favorite/按钮2.png.meta | 4
Assets/UI/Final/文字标注02.jpg.meta | 4
Assets/UI/GuideUser/引导效果图03.png.meta | 4
Assets/UI/GuideUser/小话泡1.png.meta | 4
Assets/UI/GuideUser/引导效果图02.png.meta | 4
Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs | 75
Assets/UI/Fight/buffPrompt.png.meta | 4
Assets/UI/GuideUser/半透黑框.png.meta | 4
Assets/UI/Final/rank_di_3.png.meta | 4
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0
GemBattle/宝石塔防_Data/resources.assets | 0
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs | 1
GemBattle/宝石塔防_Data/globalgamemanagers.assets | 0
GemBattle/宝石塔防_Data/globalgamemanagers | 0
Assets/Scripts/Event/EventType.cs | 8
Assets/Scripts/Core/Health/DamageableBehaviour.cs | 6
Assets/UI/Loading/LoadingBg.png | 0
Assets/Scripts/Core/Health/Damageable.cs | 2
Assets/UI/GuideUser/提示.png.meta | 4
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 16
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_boss.json | 2
Assets/StreamingAssets/Table/endless_boss.json | 2
Assets/UI/Fight/buff_0.png.meta | 4
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs | 234 ++++
Assets/UI/Loading/按钮2.png.meta | 4
Assets/Scenes/LoadingScene.unity | 6
GemBattle/宝石塔防_Data/sharedassets2.assets | 0
Assets/StreamingAssets/Table/endless_port.json | 2
Assets/Prefabs/UI/DoubleHit.prefab.meta | 7
Assets/UI/Loading/LOGO.png.meta | 4
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 17
Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs | 14
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 21
Assets/UI/Final/rank_di_2.png.meta | 4
Assets/UI/GuideUser/water.png.meta | 4
Assets/UI/GuideUser/数字2.png.meta | 4
GemBattle/宝石塔防_Data/resources.assets.resS | 0
Assets/UI/Loading/背景.png.meta | 4
Assets/UI/Final/rank_icon_0.png.meta | 4
Assets/StreamingAssets/Table/skilllevelinfo.json | 2
Assets/UI/Fight/buffIcon.png.meta | 4
Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs.meta | 11
Assets/Scripts/TowerDefense/Level/AgentInsManager.cs | 32
Assets/UI/Final/scoreNum.png.meta | 12
Assets/UI/GuideUser/话泡.png.meta | 4
Assets/UI/Loading/开始按钮.png.meta | 4
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0
Assets/UI/Loading/效果图.png.meta | 4
GemBattle/宝石塔防_Data/StreamingAssets/Table/scoreshop.json | 2
Assets/UI/Loading/效果图1.png.meta | 4
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 15
GemBattle/宝石塔防_Data/StreamingAssets/Table/donateshop.json | 2
Assets/UI/GuideUser/拖动指针.png.meta | 4
GemBattle.zip | 0
Assets/Scripts/Data/EndlessScoreData.cs | 52 +
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_enemy.json | 2
Assets/UI/GuideUser/立绘形象.png.meta | 4
Assets/UI/Fight/Hit.png.meta | 4
GemBattle/宝石塔防_Data/sharedassets3.assets.resS | 0
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll | 0
119 files changed, 2,712 insertions(+), 250 deletions(-)
diff --git a/Assets/Prefabs/UI/DoubleHit.prefab b/Assets/Prefabs/UI/DoubleHit.prefab
new file mode 100644
index 0000000..90e764d
--- /dev/null
+++ b/Assets/Prefabs/UI/DoubleHit.prefab
@@ -0,0 +1,208 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3801312133014535296
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2366615777647505734}
+ - component: {fileID: 2952677943606617449}
+ m_Layer: 5
+ m_Name: DoubleHit
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2366615777647505734
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3801312133014535296}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 8933504276029024630}
+ - {fileID: 3076368954518008483}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 459, y: 131}
+ m_SizeDelta: {x: 248.8, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &2952677943606617449
+CanvasGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3801312133014535296}
+ m_Enabled: 1
+ m_Alpha: 1
+ m_Interactable: 1
+ m_BlocksRaycasts: 1
+ m_IgnoreParentGroups: 0
+--- !u!1 &3914008788371172079
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3076368954518008483}
+ - component: {fileID: 8118365266622185306}
+ - component: {fileID: 5789385329819219722}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3076368954518008483
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3914008788371172079}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2366615777647505734}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -155, y: -12}
+ m_SizeDelta: {x: 184.07202, y: 33.366676}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8118365266622185306
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3914008788371172079}
+ m_CullTransparentMesh: 0
+--- !u!114 &5789385329819219722
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3914008788371172079}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 54f8485e958a4ad49a925daf4715be19, type: 2}
+ m_FontSize: 0
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 2
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: '152
+
+'
+--- !u!1 &8735197813634648378
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8933504276029024630}
+ - component: {fileID: 1794794900047380941}
+ - component: {fileID: 7216748601299529846}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8933504276029024630
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8735197813634648378}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2366615777647505734}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 111, y: 47}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1794794900047380941
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8735197813634648378}
+ m_CullTransparentMesh: 0
+--- !u!114 &7216748601299529846
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8735197813634648378}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 15236dd448decfd4f9c78b725f00fc49, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
diff --git a/Assets/Prefabs/UI/DoubleHit.prefab.meta b/Assets/Prefabs/UI/DoubleHit.prefab.meta
new file mode 100644
index 0000000..8312811
--- /dev/null
+++ b/Assets/Prefabs/UI/DoubleHit.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: edd0f54808263644d9740a9c0040b493
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index e95015b..aaa2511 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -123,6 +123,48 @@
debug:
m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: b3ae619b2ef87ff418d9f668af487842, type: 2}
+--- !u!1 &3729488
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3729489}
+ m_Layer: 5
+ m_Name: Panel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3729489
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3729488}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1016334427}
+ - {fileID: 1628010698}
+ - {fileID: 838944089}
+ - {fileID: 962679403}
+ - {fileID: 237911733}
+ - {fileID: 805308297}
+ - {fileID: 798827591}
+ m_Father: {fileID: 1812084105}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &11580651
GameObject:
m_ObjectHideFlags: 0
@@ -250,7 +292,7 @@
- {fileID: 1474449435}
- {fileID: 654889359}
m_Father: {fileID: 561495239}
- m_RootOrder: 8
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -394,7 +436,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 44403928}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 181323909}
@@ -402,7 +444,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 62}
+ m_AnchoredPosition: {x: -103, y: 0}
m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &44403930
@@ -427,18 +469,18 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 50
+ m_FontSize: 35
m_FontStyle: 1
m_BestFit: 0
- m_MinSize: 5
+ m_MinSize: 3
m_MaxSize: 50
- m_Alignment: 4
+ m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u65F6\u8FC1\u5927\u9752\u86D9 Lv 105"
+ m_Text: "\u7B2C1\u5173 \u53F2\u83B1\u59C6\u5927\u738B\n"
--- !u!222 &44403931
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -761,15 +803,15 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114868870}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: []
m_Father: {fileID: 561495239}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 18, y: 590}
+ m_AnchoredPosition: {x: 0, y: 562}
m_SizeDelta: {x: 1080, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &114868872
@@ -1342,21 +1384,22 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 181323908}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2044565605}
- {fileID: 1486810257}
- {fileID: 44403929}
- {fileID: 203833506}
+ - {fileID: 1550012708}
m_Father: {fileID: 561495239}
- m_RootOrder: 4
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 855.00006}
- m_SizeDelta: {x: 1000, y: 400}
+ m_AnchoredPosition: {x: 22, y: 856}
+ m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &181323910
MonoBehaviour:
@@ -1374,9 +1417,9 @@
HPImage2: {fileID: 1486810258}
BossImage: {fileID: 0}
BaseBlood: {fileID: 21300000, guid: f9a15ea7a2090444e88b74ec5ec9a825, type: 3}
- Speed: 0.3
WaveNumText: {fileID: 203833507}
BossInfo: {fileID: 44403930}
+ HPInfoText: {fileID: 1550012709}
--- !u!1 &191237708
GameObject:
m_ObjectHideFlags: 0
@@ -1903,6 +1946,85 @@
area: 0.0987045
completeArea: 0.96590054
outSidePointsParent: {fileID: 1469141976}
+--- !u!1 &237911732
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 237911733}
+ - component: {fileID: 237911735}
+ - component: {fileID: 237911734}
+ m_Layer: 5
+ m_Name: Text_0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &237911733
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 237911732}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -160, y: 228}
+ m_SizeDelta: {x: 337.05624, y: 92.1496}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &237911734
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 237911732}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 32
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u706B\u7CBE\u7075\u653B\u51FB+5%"
+--- !u!222 &237911735
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 237911732}
+ m_CullTransparentMesh: 0
--- !u!1 &238866729
GameObject:
m_ObjectHideFlags: 0
@@ -2102,7 +2224,7 @@
- {fileID: 2031820231}
- {fileID: 1525511251}
m_Father: {fileID: 849284131}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3167,6 +3289,81 @@
m_Father: {fileID: 309006005}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &541657827
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 541657828}
+ - component: {fileID: 541657830}
+ - component: {fileID: 541657829}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &541657828
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 541657827}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1812084105}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 104, y: 104}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &541657829
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 541657827}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 43a55873784ef4e4d9d7f46d7373aebc, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &541657830
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 541657827}
+ m_CullTransparentMesh: 0
--- !u!1 &541755970
GameObject:
m_ObjectHideFlags: 0
@@ -3257,7 +3454,7 @@
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &559457822
RectTransform:
m_ObjectHideFlags: 0
@@ -3266,17 +3463,17 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 559457821}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 909428572}
- {fileID: 1514665750}
m_Father: {fileID: 561495239}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 292, y: -708}
+ m_AnchoredPosition: {x: 292, y: 525}
m_SizeDelta: {x: 500, y: 500}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &561495235
@@ -3373,10 +3570,15 @@
- {fileID: 1953656506}
- {fileID: 526512787}
- {fileID: 1747414114}
- - {fileID: 181323909}
- {fileID: 1570259601}
- {fileID: 559457822}
+ - {fileID: 1812084105}
- {fileID: 114868871}
+ - {fileID: 181323909}
+ - {fileID: 1165137504}
+ - {fileID: 1103719350}
+ - {fileID: 2112238868}
+ - {fileID: 1802457333}
- {fileID: 19764330}
m_Father: {fileID: 0}
m_RootOrder: 8
@@ -4131,6 +4333,103 @@
m_Father: {fileID: 208884800}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &637290730
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 637290731}
+ - component: {fileID: 637290734}
+ - component: {fileID: 637290733}
+ - component: {fileID: 637290732}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &637290731
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 637290730}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1812084105}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 40.6, y: -68.43}
+ m_SizeDelta: {x: 160, y: 37.097298}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &637290732
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 637290730}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 2.9, y: -1.48}
+ m_UseGraphicAlpha: 1
+--- !u!114 &637290733
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 637290730}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 30
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 300
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: 'BUFF
+
+'
+--- !u!222 &637290734
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 637290730}
+ m_CullTransparentMesh: 0
--- !u!1 &653395968
GameObject:
m_ObjectHideFlags: 0
@@ -4657,6 +4956,85 @@
m_Father: {fileID: 430648394}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &750129183
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 750129184}
+ - component: {fileID: 750129186}
+ - component: {fileID: 750129185}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &750129184
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 750129183}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1802457333}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 260.09, y: 58.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &750129185
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 750129183}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 50
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 2
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "8\u8FDE\u6740 +500"
+--- !u!222 &750129186
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 750129183}
+ m_CullTransparentMesh: 0
--- !u!114 &773532417 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3130750578608519141, guid: 49213eb9f84d76e47b6b19e9a246b83c,
@@ -4894,6 +5272,85 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 795048837}
m_CullTransparentMesh: 0
+--- !u!1 &798827590
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 798827591}
+ - component: {fileID: 798827593}
+ - component: {fileID: 798827592}
+ m_Layer: 5
+ m_Name: Text_2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &798827591
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 798827590}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -160, y: 94}
+ m_SizeDelta: {x: 337.05624, y: 92.1496}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &798827592
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 798827590}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 32
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u6728\u7CBE\u7075\u653B\u51FB+5%"
+--- !u!222 &798827593
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 798827590}
+ m_CullTransparentMesh: 0
--- !u!1 &798990854
GameObject:
m_ObjectHideFlags: 0
@@ -4986,6 +5443,85 @@
AllHomeBase:
- {fileID: 11580655}
- {fileID: 0}
+--- !u!1 &805308296
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 805308297}
+ - component: {fileID: 805308299}
+ - component: {fileID: 805308298}
+ m_Layer: 5
+ m_Name: Text_1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &805308297
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 805308296}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -160, y: 161}
+ m_SizeDelta: {x: 337.05624, y: 92.1496}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &805308298
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 805308296}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 32
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u6C34\u7CBE\u7075\u653B\u51FB+5%"
+--- !u!222 &805308299
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 805308296}
+ m_CullTransparentMesh: 0
--- !u!1 &818678410
GameObject:
m_ObjectHideFlags: 0
@@ -5171,6 +5707,81 @@
m_Father: {fileID: 1469141976}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &838944088
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 838944089}
+ - component: {fileID: 838944091}
+ - component: {fileID: 838944090}
+ m_Layer: 5
+ m_Name: Icon_1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &838944089
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 838944088}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -372, y: 192}
+ m_SizeDelta: {x: 50, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &838944090
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 838944088}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: f3623129d6669ac409e70b872494ea35, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &838944091
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 838944088}
+ m_CullTransparentMesh: 0
--- !u!1 &842662608
GameObject:
m_ObjectHideFlags: 0
@@ -5322,8 +5933,8 @@
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1232635865}
- - {fileID: 306286610}
- {fileID: 1730636813}
+ - {fileID: 306286610}
- {fileID: 1172214030}
- {fileID: 1980697784}
m_Father: {fileID: 0}
@@ -6082,6 +6693,81 @@
m_Father: {fileID: 208464362}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &962679402
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 962679403}
+ - component: {fileID: 962679405}
+ - component: {fileID: 962679404}
+ m_Layer: 5
+ m_Name: Icon_2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &962679403
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 962679402}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -372, y: 123}
+ m_SizeDelta: {x: 50, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &962679404
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 962679402}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 55a9d09767bff804595e455d4f2d2f88, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &962679405
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 962679402}
+ m_CullTransparentMesh: 0
--- !u!1 &971348053
GameObject:
m_ObjectHideFlags: 0
@@ -6112,6 +6798,81 @@
m_Father: {fileID: 98103728}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &971959058
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 971959059}
+ - component: {fileID: 971959061}
+ - component: {fileID: 971959060}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &971959059
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 971959058}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1165137504}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -473, y: 16}
+ m_SizeDelta: {x: 123.9, y: 58}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &971959060
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 971959058}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 762031a35316a0040938a3581436f744, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &971959061
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 971959058}
+ m_CullTransparentMesh: 0
--- !u!1 &979083332
GameObject:
m_ObjectHideFlags: 0
@@ -6389,6 +7150,81 @@
m_Father: {fileID: 1466089839}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1016334426
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1016334427}
+ - component: {fileID: 1016334429}
+ - component: {fileID: 1016334428}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1016334427
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1016334426}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -218, y: 168}
+ m_SizeDelta: {x: 397, y: 263}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1016334428
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1016334426}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 1ea68cbc09b6a0b4fbc0450dc3457687, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1016334429
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1016334426}
+ m_CullTransparentMesh: 0
--- !u!1 &1024039178
GameObject:
m_ObjectHideFlags: 0
@@ -7290,6 +8126,18 @@
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
+--- !u!1 &1103719349 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 1709625510}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &1103719350 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 1709625510}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1108718554
GameObject:
m_ObjectHideFlags: 0
@@ -7454,6 +8302,143 @@
m_Father: {fileID: 1435697235}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1130776594
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1130776595}
+ - component: {fileID: 1130776597}
+ - component: {fileID: 1130776596}
+ m_Layer: 5
+ m_Name: TimeText (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1130776595
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1130776594}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1165137504}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -248, y: 19}
+ m_SizeDelta: {x: 279.86725, y: 58}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1130776596
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1130776594}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: '0000000
+
+'
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 572adb1c73f88e441a1bf998ca9f4ea5, type: 2}
+ m_sharedMaterial: {fileID: -3548855653558765056, guid: 572adb1c73f88e441a1bf998ca9f4ea5,
+ type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 50
+ m_fontSizeBase: 50
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: -105.02655, y: -0.34473115, z: -65.74736, w: -1.0477502}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &1130776597
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1130776594}
+ m_CullTransparentMesh: 0
--- !u!1 &1143923415
GameObject:
m_ObjectHideFlags: 0
@@ -7700,6 +8685,62 @@
m_Father: {fileID: 122104236}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!1 &1165137503
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1165137504}
+ - component: {fileID: 1165137505}
+ m_Layer: 5
+ m_Name: Score
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1165137504
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1165137503}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 971959059}
+ - {fileID: 1628198183}
+ - {fileID: 1130776595}
+ m_Father: {fileID: 561495239}
+ m_RootOrder: 9
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 316, y: 903}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1165137505
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1165137503}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 236ecbd0a55bb7249baefcded8b997b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ScoreText: {fileID: 1130776596}
+ DoubleHit: {fileID: 1103719349}
+ DoubleHitText: {fileID: 1205235278}
+ OneTimeKillObj: {fileID: 1802457332}
+ OneTimeKillText: {fileID: 750129185}
--- !u!1 &1172214029
GameObject:
m_ObjectHideFlags: 0
@@ -8059,6 +9100,18 @@
area: 0.05177676
completeArea: 0.70710546
outSidePointsParent: {fileID: 1466089839}
+--- !u!114 &1205235278 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5789385329819219722, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ m_PrefabInstance: {fileID: 1709625510}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1210799404
GameObject:
m_ObjectHideFlags: 0
@@ -10392,6 +11445,85 @@
m_Father: {fileID: 309006005}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1550012707
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1550012708}
+ - component: {fileID: 1550012710}
+ - component: {fileID: 1550012709}
+ m_Layer: 5
+ m_Name: HPInfoText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1550012708
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1550012707}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 181323909}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -265, y: -73}
+ m_SizeDelta: {x: 500, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1550012709
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1550012707}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 35
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "HP\uFF1A3750/3750\n"
+--- !u!222 &1550012710
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1550012707}
+ m_CullTransparentMesh: 0
--- !u!1 &1550999995
GameObject:
m_ObjectHideFlags: 0
@@ -10454,7 +11586,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 561495239}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10926,6 +12058,156 @@
AllHomeBase:
- {fileID: 1776140745}
- {fileID: 0}
+--- !u!1 &1628010697
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1628010698}
+ - component: {fileID: 1628010700}
+ - component: {fileID: 1628010699}
+ m_Layer: 5
+ m_Name: Icon_0
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1628010698
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1628010697}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 3729489}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -372, y: 260}
+ m_SizeDelta: {x: 50, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1628010699
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1628010697}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: f0632c3f4fadc4d4e9842e204937a76e, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1628010700
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1628010697}
+ m_CullTransparentMesh: 0
+--- !u!1 &1628198182
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1628198183}
+ - component: {fileID: 1628198185}
+ - component: {fileID: 1628198184}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1628198183
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1628198182}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1165137504}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -474, y: 17}
+ m_SizeDelta: {x: 99, y: 45}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1628198184
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1628198182}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 7950587c71e164e4c8a2b1ac57c35698, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1628198185
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1628198182}
+ m_CullTransparentMesh: 0
--- !u!1 &1628887323
GameObject:
m_ObjectHideFlags: 0
@@ -11465,7 +12747,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -465, y: 746}
+ m_AnchoredPosition: {x: -465, y: -468}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1646752540
@@ -11805,6 +13087,137 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1709580639}
m_CullTransparentMesh: 0
+--- !u!1001 &1709625510
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 561495239}
+ m_Modifications:
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 459
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 131
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 248.8
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 100
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_Name
+ value: DoubleHit
+ objectReference: {fileID: 0}
+ - target: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5789385329819219722, guid: edd0f54808263644d9740a9c0040b493,
+ type: 3}
+ propertyPath: m_Text
+ value: '1
+
+'
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: edd0f54808263644d9740a9c0040b493, type: 3}
--- !u!1 &1711417025
GameObject:
m_ObjectHideFlags: 0
@@ -11963,7 +13376,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849284131}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12317,6 +13730,55 @@
m_Father: {fileID: 309006005}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1802457332
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1802457333}
+ - component: {fileID: 1802457334}
+ m_Layer: 5
+ m_Name: OneTimeKill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1802457333
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1802457332}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 750129184}
+ m_Father: {fileID: 561495239}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 386, y: -17.4}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &1802457334
+CanvasGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1802457332}
+ m_Enabled: 1
+ m_Alpha: 1
+ m_Interactable: 1
+ m_BlocksRaycasts: 1
+ m_IgnoreParentGroups: 0
--- !u!1 &1803686614
GameObject:
m_ObjectHideFlags: 0
@@ -12377,6 +13839,44 @@
m_Father: {fileID: 208884800}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1812084104
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1812084105}
+ m_Layer: 5
+ m_Name: BuffPreview
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1812084105
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1812084104}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 541657828}
+ - {fileID: 637290731}
+ - {fileID: 3729489}
+ m_Father: {fileID: 561495239}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 455, y: -864}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1813750110
GameObject:
m_ObjectHideFlags: 0
@@ -14754,6 +16254,85 @@
m_Father: {fileID: 1469141976}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2031011152
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2031011153}
+ - component: {fileID: 2031011155}
+ - component: {fileID: 2031011154}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2031011153
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2031011152}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2112238868}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 260.09, y: 58.1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2031011154
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2031011152}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 50
+ m_FontStyle: 1
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 2
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "50\u8FDE\u51FB +500"
+--- !u!222 &2031011155
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2031011152}
+ m_CullTransparentMesh: 0
--- !u!1001 &2031820230
PrefabInstance:
m_ObjectHideFlags: 0
@@ -15565,6 +17144,42 @@
m_Father: {fileID: 1745145611}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2112238867
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2112238868}
+ m_Layer: 5
+ m_Name: DoubleHitReward
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &2112238868
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2112238867}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 2031011153}
+ m_Father: {fileID: 561495239}
+ m_RootOrder: 11
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 386, y: 47}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2120056005
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity
index 5e742ff..86fe95b 100644
--- a/Assets/Scenes/LoadingScene.unity
+++ b/Assets/Scenes/LoadingScene.unity
@@ -157,7 +157,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -118.4, y: -20.7}
+ m_AnchoredPosition: {x: -118.400024, y: -20.699951}
m_SizeDelta: {x: 220.91876, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &63699121
@@ -302,7 +302,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 0870d68b9c9b1384bb8186c43e2b7a6d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: e187cb70474cf834fb08574deefcb084, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1570,7 +1570,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 162.57, y: -20.7}
+ m_AnchoredPosition: {x: 162.57, y: -20.699951}
m_SizeDelta: {x: 286.04895, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019698822
diff --git a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
index 87cf356..d7aee7a 100644
--- a/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
+++ b/Assets/Scripts/ActionGameFramework/Health/DamageCollider.cs
@@ -52,18 +52,10 @@
// 非Agent不参与碰撞:
var agent = this.gameObject.GetComponent<Agent>();
- if (agent == null)
+ if (agent == null || agent.isDead)
return;
BallisticProjectile ballistic = c.gameObject.GetComponent<BallisticProjectile>();
-
- if (ballistic.IsHitEnemy)
- {
- Debug.Log("--------------------- 已发生过碰撞 ---------------------");
- return;
- }
-
- ballistic.IsHitEnemy = true;
LazyLoad();
diff --git a/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs b/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
index e1b243d..9856e5e 100644
--- a/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
+++ b/Assets/Scripts/ActionGameFramework/Projectiles/BallisticProjectile.cs
@@ -36,8 +36,6 @@
/// </summary>
protected Collider[] m_Colliders;
- public bool IsHitEnemy { get; set; }
-
public event Action fired;
/// <summary>
@@ -164,8 +162,7 @@
m_Fired = true;
m_CollidersIgnoring.Clear();
-
- IsHitEnemy = false;
+
// 因为炮弹没有模型，本身就是一个带碰撞体的粒子特效
ParticleSystem ps = GetComponent<ParticleSystem>();
if (ps == null)
diff --git a/Assets/Scripts/Core/Health/Damageable.cs b/Assets/Scripts/Core/Health/Damageable.cs
index 59f64da..4b762fd 100644
--- a/Assets/Scripts/Core/Health/Damageable.cs
+++ b/Assets/Scripts/Core/Health/Damageable.cs
@@ -112,7 +112,7 @@
/// </summary>
public bool isDead
{
- get { return currentHealth < 1.0f; }
+ get { return currentHealth < 0.00001f; }
}
/// <summary>
diff --git a/Assets/Scripts/Core/Health/DamageableBehaviour.cs b/Assets/Scripts/Core/Health/DamageableBehaviour.cs
index 02f73a4..771d3a0 100644
--- a/Assets/Scripts/Core/Health/DamageableBehaviour.cs
+++ b/Assets/Scripts/Core/Health/DamageableBehaviour.cs
@@ -1,5 +1,7 @@
using System;
using UnityEngine;
+using KTGMGemClient;
+using TowerDefense.Agents;
namespace Core.Health
{
@@ -67,6 +69,10 @@
info.attributeId = attributeId;
configuration.TakeDamage(damageValue, alignment, ref info);
var damageInfo = new HitInfo(info, damagePoint);
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, damageInfo.healthChangeInfo.absHealthDifference);
+ if (attributeId == 0)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneHit);
+
if (hit != null)
{
hit(damageInfo);
diff --git a/Assets/Scripts/Data/EndlessPortData.cs b/Assets/Scripts/Data/EndlessPortData.cs
index 6a8c4cf..6d45576 100644
--- a/Assets/Scripts/Data/EndlessPortData.cs
+++ b/Assets/Scripts/Data/EndlessPortData.cs
@@ -17,9 +17,14 @@
public endless_port Config;
/// <summary>
- /// 预先随机好的敌人数据，spawnAgent时直接取这个数据，不再动态随机
+ /// 预先随机好的敌人数据，spawnAgent时直接取这个数据，不再动态随机，
+ /// id > 0：获取指定id的小怪，
+ /// id = -1：从类型为1（小怪）随机，
+ /// id = -2：从类型为2（精英怪）随机
+ /// id = -3：从所有小怪中随机
+ /// 当前 id = -1, id = -2, id = -3时，EnemyDataList列表的数量就是敌人数量， id > 0 时因为是指定id所以敌人是重复的，EnemyDataList长度为1
/// </summary>
- public endless_enemy EnemyData;
+ public List<endless_enemy> EnemyDataList;
/// <summary>
/// 掉落概率总权重，即：表中掉落概率那一项全部加起来
@@ -46,6 +51,11 @@
/// </summary>
private static Dictionary<int, List<EndlessPortConfig>> portDic;
+ /// <summary>
+ /// 关卡每波次敌人总血量字典
+ /// </summary>
+ private static Dictionary<int, List<float>> portEnemiesTotalHPDic;
+
private static System.Random random;
/// <summary>
@@ -53,6 +63,7 @@
/// </summary>
/// <value></value>
private static int maxLevel { get; set; }
+
public static int MaxLevel
{
get { return maxLevel; }
@@ -68,10 +79,12 @@
portConfigList = new List<EndlessPortConfig>();
portDic = new Dictionary<int, List<EndlessPortConfig>>();
InitPortList();
+ InitPortEnemiesTotalHP();
+ int score = GetLevelScore(1);
}
/// <summary>
- /// 更新关卡数据的时候也重新初始化一次
+ /// 初始化关卡数据
/// </summary>
public static void InitPortList()
{
@@ -92,7 +105,18 @@
EndlessPortConfig param = new EndlessPortConfig();
param.Config = data;
- param.EnemyData = EndlessEnemyData.GetDataById(data.enemy_id);
+ param.EnemyDataList = new List<endless_enemy>();
+
+ if (param.Config.id > 0)
+ param.EnemyDataList.Add(EndlessEnemyData.GetDataById(data.enemy_id));
+ else
+ {
+ for (int i = 0; i < data.amount; ++i)
+ {
+ param.EnemyDataList.Add(EndlessEnemyData.GetDataById(data.enemy_id));
+ }
+ }
+
param.PortLevel = maxLevel;
int totalWeight = 0;
@@ -112,6 +136,69 @@
}
/// <summary>
+ /// 初始化关卡每波次敌人总血量
+ /// </summary>
+ private static void InitPortEnemiesTotalHP()
+ {
+ portEnemiesTotalHPDic = new Dictionary<int, List<float>>();
+
+ for (int i = 1; i <= MaxLevel; ++i)
+ {
+ List<List<EndlessPortConfig>> levelData = GetLevelWaveData(i);
+
+ if (levelData.Count == 0) continue;
+
+ portEnemiesTotalHPDic.Add(i, new List<float>());
+
+ // levelData.Count 就是 i关卡的总波次数
+ for (int j = 0; j < levelData.Count; ++j)
+ {
+ float total = 0;
+
+ // levelData[j].Count 是这一波的所有可出怪的赛道数量
+ for (int k = 0; k < levelData[j].Count; ++k)
+ {
+ // > 0，生成的敌人是重复的，直接 × 数量就行
+ if (levelData[j][k].Config.enemy_id > 0)
+ {
+ float add = levelData[j][k].Config.amount * levelData[j][k].Config.b_hp * levelData[j][k].EnemyDataList[0].hp_rate;
+
+ // 木属性小怪一次性生成两个
+ if (levelData[j][k].EnemyDataList[0].resource == 103)
+ total += 2 * add;
+ else
+ total += add;
+ }
+ else
+ {
+ for (int n = 0; n < levelData[j][k].EnemyDataList.Count; ++n)
+ {
+ float add = levelData[j][k].Config.b_hp * levelData[j][k].EnemyDataList[n].hp_rate;
+
+ if (levelData[j][k].EnemyDataList[n].resource == 103)
+ total += 2 * add;
+ else
+ total += add;
+ }
+ }
+ }
+
+ portEnemiesTotalHPDic[i].Add(total);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 根据关卡，波次获得该波次敌人总血量
+ /// </summary>
+ /// <param name="level"></param>
+ /// <param name="wave"></param>
+ public static float GetWaveEnemiesTotalHP(int level, int wave)
+ {
+ return portEnemiesTotalHPDic[level][wave];
+ }
+
+ /// <summary>
/// 根据关卡等级获取关卡的所有波数据，如果本波次敌人数量为0，直接忽略掉
/// </summary>
/// <param name="level">关卡等级</param>
@@ -119,17 +206,18 @@
public static List<List<EndlessPortConfig>> GetLevelWaveData(int level)
{
List<List<EndlessPortConfig>> ret = new List<List<EndlessPortConfig>>();
-
- for (int i = 0; i < 5; ++i)
- {
- ret.Add(new List<EndlessPortConfig>());
- }
-
List<EndlessPortConfig> allLevelData = portDic[level];
+ int wave = 0;
foreach (EndlessPortConfig data in allLevelData)
{
if (data.Config.amount == 0) continue;
+
+ if (data.Config.wave != wave)
+ {
+ ret.Add(new List<EndlessPortConfig>());
+ wave = data.Config.wave;
+ }
ret[data.Config.wave - 1].Add(data);
}
@@ -239,5 +327,18 @@
return ret;
}
+
+ /// <summary>
+ /// 根据关卡获得关卡奖励分数
+ /// </summary>
+ /// <param name="level"></param>
+ public static int GetLevelScore(int level)
+ {
+ List<List<EndlessPortConfig>> list = GetLevelWaveData(level);
+
+ if (list.Count == 0) return 0;
+
+ return list[0][0].Config.bonus;
+ }
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/Data/EndlessScoreData.cs b/Assets/Scripts/Data/EndlessScoreData.cs
new file mode 100644
index 0000000..c963c0c
--- /dev/null
+++ b/Assets/Scripts/Data/EndlessScoreData.cs
@@ -0,0 +1,52 @@
+using UnityEngine;
+using System;
+
+/**
+ * 无尽模式分数数据
+ * @Author: chenxin
+ * @Date: 2020-11-10 13:55:10
+ */
+namespace KTGMGemClient
+{
+ public class EndlessScoreData
+ {
+ private static int preScore;
+
+ /// <summary>
+ /// 上一次的分数
+ /// </summary>
+ public static int PreScore
+ {
+ get { return preScore; }
+ }
+
+ private static int currentScore;
+
+ /// <summary>
+ /// 当前获得分数
+ /// </summary>
+ public static int CurrentSocre
+ {
+ get { return currentScore; }
+ set
+ {
+ if (value > 9999999) value = 9999999;
+ else if (value < 0) value = 0;
+
+ preScore = currentScore;
+ currentScore = value;
+ formatScore = currentScore.ToString().PadLeft(7, '0');
+ }
+ }
+
+ private static string formatScore = "0000000";
+
+ /// <summary>
+ /// 格式化的分数显示，7位数显示
+ /// </summary>
+ public static string FormatScore
+ {
+ get { return formatScore; }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Data/EndlessScoreData.cs.meta b/Assets/Scripts/Data/EndlessScoreData.cs.meta
new file mode 100644
index 0000000..02f57c6
--- /dev/null
+++ b/Assets/Scripts/Data/EndlessScoreData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: deaf6b6f9e182ef4dafe8108a055a5f6
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Event/EventType.cs b/Assets/Scripts/Event/EventType.cs
index 8574ff5..b9f47e7 100644
--- a/Assets/Scripts/Event/EventType.cs
+++ b/Assets/Scripts/Event/EventType.cs
@@ -69,6 +69,14 @@
EndlessHeartAllLose,
// 木桩墙壁被打死
EndlessWoodPileBeKilled,
+ // 无尽模式Agent掉血
+ EndlessAgentTaskDamage,
+ // 无尽模式小怪死亡
+ EndlessAgentDead,
+ // 无尽模式连击的一次攻击
+ EndlessOneHit,
+ // 无尽模式一次性击杀小怪次数
+ EndlessOneTimeKillCount,
}
}
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 8f15510..485f741 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -1027,6 +1027,9 @@
// 资源id
public int resource;
+ // 击杀得分
+ public int point;
+
public static endless_enemy CreateFromJson(JsonData item)
@@ -1041,6 +1044,7 @@
_endless_enemy.speed_rate = float.Parse(GameUtils.GetString(item[index++].ToString()));
_endless_enemy.coin_rate = int.Parse(GameUtils.GetString(item[index++].ToString()));
_endless_enemy.resource = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _endless_enemy.point = int.Parse(GameUtils.GetString(item[index++].ToString()));
return _endless_enemy;
}
@@ -1101,6 +1105,9 @@
// 法阵图片
public int tunel_bg;
+ // 过关得分
+ public int bonus;
+
public static endless_port CreateFromJson(JsonData item)
@@ -1124,6 +1131,7 @@
_endless_port.drop = GameUtils.GetRewardList(item[index++]);
_endless_port.drop_rate = GameUtils.GetIntList(item[index++]);
_endless_port.tunel_bg = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _endless_port.bonus = int.Parse(GameUtils.GetString(item[index++].ToString()));
return _endless_port;
}
@@ -1198,6 +1206,9 @@
// 限购次数
public int purchaselimit;
+ // 图片资源编号
+ public string img;
+
public static scoreshop CreateFromJson(JsonData item)
@@ -1214,6 +1225,7 @@
_scoreshop.price = int.Parse(GameUtils.GetString(item[index++].ToString()));
_scoreshop.rewardlimit = int.Parse(GameUtils.GetString(item[index++].ToString()));
_scoreshop.purchaselimit = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _scoreshop.img = GameUtils.GetString(item[index++].ToString());
return _scoreshop;
}
@@ -1241,6 +1253,9 @@
// 限购次数
public int purchaselimit;
+ // 商品描述
+ public string info;
+
public static donateshop CreateFromJson(JsonData item)
@@ -1253,6 +1268,7 @@
_donateshop.reward = GameUtils.GetRewardList(item[index++]);
_donateshop.price = int.Parse(GameUtils.GetString(item[index++].ToString()));
_donateshop.purchaselimit = int.Parse(GameUtils.GetString(item[index++].ToString()));
+ _donateshop.info = GameUtils.GetString(item[index++].ToString());
return _donateshop;
}
diff --git a/Assets/Scripts/TowerDefense/Agents/Agent.cs b/Assets/Scripts/TowerDefense/Agents/Agent.cs
index 19c9003..ff67574 100644
--- a/Assets/Scripts/TowerDefense/Agents/Agent.cs
+++ b/Assets/Scripts/TowerDefense/Agents/Agent.cs
@@ -250,6 +250,11 @@
public SpawnAgentType AgentType { get; set; } = SpawnAgentType.Normal;
/// <summary>
+ /// 无尽模式小怪对应 endless_enemy表中数据
+ /// </summary>
+ public endless_enemy EnemyData { get; set; }
+
+ /// <summary>
/// Accessor to <see cref="m_NavMeshAgent"/>
/// </summary>
public NavMeshAgent navMeshNavMeshAgent
@@ -445,7 +450,7 @@
{
// 统一管理器内删除当前的Agent:
AgentInsManager.instance.removeAgent(this);
-
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessAgentDead, this);
base.Remove();
if (m_LevelManager) m_LevelManager.DecrementNumberOfEnemies();
diff --git a/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs b/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
index 26e0f0e..b760e95 100644
--- a/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
+++ b/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
@@ -92,6 +92,7 @@
}
}
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, agent.configuration.currentHealth);
agent.Remove();
}
diff --git a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
index a45f46f..eb2c66e 100644
--- a/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/AgentInsManager.cs
@@ -676,6 +676,7 @@
if (slinfo.atcmod.Count < 2) return;
float radius = slinfo.atcmod[1];
+ int deathCount = 0;
for (int ti = 0; ti < mgrList.Length; ti++)
{
@@ -683,6 +684,7 @@
for (int idx = 0; idx < mgr.listAgent.Count; idx++)
{
Agent eag = mgr.listAgent[idx];
+ bool isDeath = eag.isDead;
if (eag.AgentType == SpawnAgentType.BubbleBomb)
{
@@ -714,6 +716,9 @@
EndlessGameUI.instance.generateBloodText(fpos, damage, false, false);
}
+ if (!isDeath && eag.isDead)
+ ++deathCount;
+
if (eag.isDead)
continue;
else
@@ -722,6 +727,8 @@
}
}
+ if (deathCount > 1)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount);
return;
}
@@ -749,13 +756,21 @@
if (wavelineIns == null) return;
List<Agent> listAg = wavelineIns.listAgent;
+ // 统计被火技能直接烧死的数量
+ int deathCount = 0;
for (int ti = listAg.Count - 1; ti >= 0; ti--)
{
Agent eag = listAg[ti];
+
+ if (eag.isDead) continue;
if (eag.AgentType == SpawnAgentType.BubbleBomb)
+ {
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessFireSkillKillBubbleBomb, (eag as BubbleBombAgent).Id);
+ // 泡泡炸弹是直接就被火技能秒杀的
+ ++deathCount;
+ }
else
{
Vector3 fpos = eag.transform.position;
@@ -771,8 +786,14 @@
else if (EndlessGameUI.instanceExists)
EndlessGameUI.instance.generateBloodText(fpos, damage, false, false);
}
+
+ if (eag.isDead)
+ ++deathCount;
}
+
}
+ if (deathCount > 1)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount);
}
/// <summary>
@@ -823,7 +844,7 @@
/// 对当前Agent同一列内一定区域内的怪物进行攻击:
/// </summary>
/// <param name="ag"></param>
- public void StartExplodeAttack(Agent ag, float damage)
+ public int StartExplodeAttack(Agent ag, float damage)
{
WaveLineAgentInsMgr tmgr;
if (!ag.opponentAgent)
@@ -831,11 +852,13 @@
else
tmgr = this.oppoAgentWaveLineArray[ag.waveLineID];
- if (tmgr.getAgentInsNum() <= 1) return;
+ if (tmgr.getAgentInsNum() <= 1) return 0;
List<Agent> listAg = tmgr.listAgent;
Vector3 tpos = ag.transform.position;
+ int deathCount = 0;
+
for (int ti = listAg.Count - 1; ti >= 0; ti--)
{
Agent eag = listAg[ti];
@@ -853,8 +876,13 @@
else if (EndlessGameUI.instanceExists)
EndlessGameUI.instance.generateBloodText(fpos, damage, false, false);
}
+ if (eag.isDead)
+ ++deathCount;
}
}
+
+ return deathCount;
+
/* foreach (Agent eag in listAg)
{
if (eag == ag) continue;
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
index e70bf07..2a7504b 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
@@ -69,7 +69,7 @@
if (AllDropList[i].ElapsedTime >= AllDropList[i].AutoPickupTime)
{
EndlessDropReward dropReward = DropObjDic[AllDropList[i].Id].GetComponent<EndlessDropReward>();
- dropReward?.OnClick();
+ // dropReward?.OnClick();
//AllDropList[i].IsPickupCompleted = true;
//SafelyCallObtainDrop(AllDropList[i]);
@@ -104,15 +104,15 @@
/// <param name="pos">小怪的世界坐标</param>
public void AddDrop(List<reward> list, Vector3 pos)
{
- for (int i = 0; i < list.Count; ++i)
- {
- EndlessDrop drop = new EndlessDrop();
- drop.Reward = list[i];
- drop.Id = GetDropId();
- drop.AutoPickupTime = AutoPickupTime;
- CreateDrop(drop, pos, list.Count > 0);
- AllDropList.Add(drop);
- }
+ // for (int i = 0; i < list.Count; ++i)
+ // {
+ // EndlessDrop drop = new EndlessDrop();
+ // drop.Reward = list[i];
+ // drop.Id = GetDropId();
+ // drop.AutoPickupTime = AutoPickupTime;
+ // CreateDrop(drop, pos, list.Count > 0);
+ // AllDropList.Add(drop);
+ // }
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index 7d3c634..1b382f2 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -6,7 +6,6 @@
using TowerDefense.Towers.Data;
using TowerDefense.Towers.Placement;
using UnityEngine;
-using UnityEngine.UI;
using KTGMGemClient;
using System.Collections;
using System.Collections.Generic;
@@ -330,12 +329,6 @@
// Iterate through home bases and subscribe
NumberOfHomeBases = HomeBases.Length;
NumberOfHomeBasesLeft = NumberOfHomeBases;
-
- // for (int i = 0; i < NumberOfHomeBases; i++)
- // {
- // HomeBases[i].homebaseIdx = i % MAX_TOWER;
- // HomeBases[i].died += OnHomeBaseDestroyed;
- // }
}
private void Start()
@@ -406,12 +399,6 @@
if (WaveManager != null)
WaveManager.AllWaveCompleted -= AllWaveCompleted;
-
- // Iterate through home bases and unsubscribe
- // for (int i = 0; i < NumberOfHomeBases; i++)
- // {
- // HomeBases[i].died -= OnHomeBaseDestroyed;
- // }
}
/// <summary>
@@ -420,6 +407,10 @@
protected virtual void AllWaveCompleted()
{
IsAllWaveCompleted = true;
+ int score = EndlessPortData.GetLevelScore(CurrentLevel);
+ Debug.Log($"--------------------- 通过第{CurrentLevel}关，+{score}分 ---------------------");
+ // 关卡通过，加分
+ EndlessScoreManager.instance.AddScore(score);
EndlessBossSkillManager.instance.ClearSkillList();
EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Death);
}
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index 294f232..f566fd5 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -143,12 +143,16 @@
/// <returns>Agent</returns>
protected virtual void SpawnAgent()
{
- int index = GetIndexByResId(waveData.EnemyData.resource);
+ endless_enemy enemyData = waveData.EnemyDataList[waveData.Config.enemy_id > 0 ? 0 : spawnedEnemies];
+
+ int index = GetIndexByResId(enemyData.resource);
+
// 木属性小怪需要同时生成两个，先这么写吧（WTF）
- bool isDouble = waveData.EnemyData.resource == 103;
+ bool isDouble = enemyData.resource == 103;
Poolable agentPoolable = Poolable.TryGetPoolable<Poolable>(AgentConfigurationList[index].agentPrefab.gameObject);
Agent newAgent = agentPoolable.GetComponent<Agent>();
+ newAgent.EnemyData = enemyData;
newAgent.transform.position = StartingNode.transform.position;
if (isDouble)
@@ -164,9 +168,9 @@
newAgent.Initialize();
// 最终血量 = 基础血量 * 血量增幅，速度和金币都是一个公式
- float hp = waveData.Config.b_hp * waveData.EnemyData.hp_rate;
- float speed = waveData.Config.b_speed * waveData.EnemyData.speed_rate;
- int gold = waveData.Config.b_coin * waveData.EnemyData.coin_rate;
+ float hp = waveData.Config.b_hp * enemyData.hp_rate;
+ float speed = waveData.Config.b_speed * enemyData.speed_rate;
+ int gold = waveData.Config.b_coin * enemyData.coin_rate;
newAgent.SetAgentData(hp, speed, gold);
// todo 这里先填1级后面需要修改
@@ -178,6 +182,7 @@
{
Poolable agentPoolable2 = Poolable.TryGetPoolable<Poolable>(AgentConfigurationList[index].agentPrefab.gameObject);
Agent doubleAgent = agentPoolable2.GetComponent<Agent>();
+ doubleAgent.EnemyData = enemyData;
doubleAgent.transform.position = StartingNode.transform.position;
Vector3 pos = doubleAgent.transform.position;
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index 83dcced..d53e250 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using TowerDefense.UI.HUD;
using Core.Utilities;
+using Core.Health;
namespace TowerDefense.Level
{
@@ -104,6 +105,17 @@
private void Start()
{
HideTunel();
+ EventCenter.Ins.Add<float>((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, OnHit);
+ }
+
+ /// <summary>
+ /// Agent掉血，不管是中毒还是乱七八糟的掉血，只要掉血就会接收到
+ /// </summary>
+ /// <param name="value"></param>
+ private void OnHit(float value)
+ {
+ float nowHP = EndlessBossHPManager.instance.CurrentHP - value;
+ EndlessBossHPManager.instance.SetCurrentHP(nowHP);
}
/// <summary>
@@ -168,7 +180,7 @@
LevelData = EndlessPortData.GetLevelWaveData(level);
TotalWaves = LevelData.Count;
CurrentWaveIndex = 0;
- EndlessBossHPManager.instance.InitHP();
+ EndlessBossHPManager.instance.Init();
EndlessLevelManager.instance.DecrementEnemies -= DecrementEnemies;
EndlessLevelManager.instance.DecrementEnemies += DecrementEnemies;
@@ -234,8 +246,6 @@
public void DecrementEnemies(int count)
{
RemainEnemies -= count;
- // 改变血条的进度
- EndlessBossHPManager.instance.SetCurrentProgress(RemainEnemies * 1f / TotalEnemies);
}
/// <summary>
@@ -252,10 +262,11 @@
{
if (CurrentWaveIndex > 0 || TotalWaves == 1)
EndlessBossHPManager.instance.SwitchHP(CurrentWaveIndex == TotalWaves - 1);
- EndlessBossHPManager.instance.SetBossInfo($"{waveData[0].Config.boss_name} Lv.{Level}");
+ EndlessBossHPManager.instance.InitHP(EndlessPortData.GetWaveEnemiesTotalHP(Level, CurrentWaveIndex));
+ EndlessBossHPManager.instance.SetBossInfo($"第{Level}关 {waveData[0].Config.boss_name}");
EndlessBossHPManager.instance.UpdateWave(TotalWaves - CurrentWaveIndex);
- EndlessBossHPManager.instance.SetBossImage(waveData[0].Config.resource);
EndlessBossHPManager.instance.ShowHP();
+ EndlessScoreManager.instance.ShowScore();
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs b/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
index 089f629..4f2a959 100644
--- a/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
+++ b/Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs
@@ -110,15 +110,25 @@
// 处理PVE无尽模式，buff增加的伤害
finalDamage += ProcessEndlessBuffAttack(finalDamage);
+ int deathCount = 0;
+
// 提前处理非当前Enemy的爆炸攻击:
if (chainAttackRate > 0)
- AgentInsManager.instance.StartExplodeAttack((Agent)enemy, finalDamage);
+ deathCount = AgentInsManager.instance.StartExplodeAttack((Agent)enemy, finalDamage);
int tid = enemy.liveID;
Vector3 backPos = enemy.position;
// 这里也可以把碰撞点传进来
- enemy.TakeDamage(finalDamage, enemy.position, damager.alignmentProvider);
+ enemy.TakeDamage(finalDamage, enemy.position, damager.alignmentProvider, 0);
+
+ if (chainAttackRate > 0)
+ {
+ if (enemy.isDead)
+ ++deathCount;
+ if (deathCount > 1)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, deathCount);
+ }
// 处理塔位的技能攻击:
ProcessTowerAttributeAttack(enemy, finalDamage, attributeId);
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
index 30d83a6..8eefc28 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
@@ -41,16 +41,9 @@
private float target;
/// <summary>
- /// 血条消失速度
- /// </summary>
- public float Speed = 50f;
-
- /// <summary>
/// 当前颜色索引
/// </summary>
private int index;
-
- private Tween tween;
public TextMeshProUGUI WaveNumText;
@@ -64,10 +57,39 @@
/// </summary>
public Text BossInfo;
+ private Sequence progressSequence;
+
+ public Text HPInfoText;
+
+ private float totalHP;
+
+ /// <summary>
+ /// boss总血量
+ /// </summary>
+ /// <value></value>
+ private float TotalHP { get; set; }
+
+ private float hp;
+
+ /// <summary>
+ /// 当前血量
+ /// </summary>
+ /// <value></value>
+ public float CurrentHP
+ {
+ get { return hp; }
+ private set
+ {
+ hp = value;
+
+ if (hp < 0.00001f) hp = 0;
+ }
+ }
+
// Start is called before the first frame update
private void Start()
{
- InitHP();
+ Init();
}
/// <summary>
@@ -87,14 +109,15 @@
}
/// <summary>
- /// 设置当前进度百分比
+ /// 设置boss的当前血量
/// </summary>
- /// <param name="progress"></param>
- public void SetCurrentProgress(float progress)
+ /// <param name="hp"></param>
+ public void SetCurrentHP(float hp)
{
- target = progress;
- tween = DOTween.To(() => HPImage2.fillAmount, (v) => HPImage2.fillAmount = v, target, 0.3f);
- tween.Play();
+ CurrentHP = hp;
+ target = CurrentHP / TotalHP;
+ HPInfoText.text = $"HP：{Mathf.Floor(CurrentHP)}/{Mathf.Floor(TotalHP)}";
+ DOTween.To(() => HPImage2.fillAmount, (float v) => HPImage2.fillAmount = v, target, 0.2f);
}
/// <summary>
@@ -114,7 +137,6 @@
/// <param name="end"></param>
public void SwitchHP(bool end = false)
{
- tween.Pause();
HPImage2.fillAmount = 0;
index = ++index % count;
ChangeHPImageIndex();
@@ -125,11 +147,21 @@
/// <summary>
/// 初始化血条
/// </summary>
- public void InitHP()
+ public void Init()
{
index = 0;
ResetProgress();
SetHPColor();
+ }
+
+ /// <summary>
+ /// 初始化血量数据
+ /// </summary>
+ /// <param name="totalHP"></param>
+ public void InitHP(float totalHP)
+ {
+ CurrentHP = TotalHP = totalHP;
+ HPInfoText.text = $"HP：{Mathf.Floor(CurrentHP)}/{Mathf.Floor(TotalHP)}";
}
/// <summary>
@@ -194,17 +226,6 @@
private Sprite GetSprite(int index)
{
return Resources.Load($"{path}{index}", typeof(Sprite)) as Sprite;
- }
-
- /// <summary>
- /// 设置boss形象
- /// </summary>
- /// <param name="resId"></param>
- public void SetBossImage(int resId)
- {
- resId = (resId + 1) % 2 + 1;
- // BossImage.sprite = Resources.Load<Sprite>($"{bossPath}{resId}");
- // BossImage.SetNativeSize();
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
new file mode 100644
index 0000000..20b0c90
--- /dev/null
+++ b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs
@@ -0,0 +1,234 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Core.Utilities;
+using UnityEngine.UI;
+using TMPro;
+using DG.Tweening;
+using TowerDefense.Agents;
+using TowerDefense.UI.HUD;
+
+/**
+ * 无尽模式分数管理器
+ * @Author: chenxin
+ * @Date: 2020-11-10 13:43:54
+ */
+namespace KTGMGemClient
+{
+ public class EndlessScoreManager : Singleton<EndlessScoreManager>
+ {
+ public TextMeshProUGUI ScoreText;
+
+ private int score;
+
+ /// <summary>
+ /// 数字滚动时间
+ /// </summary>
+ public float RollTime { get; set; } = 0.4f;
+
+ public GameObject DoubleHit;
+
+ public Text DoubleHitText;
+
+ public GameObject OneTimeKillObj;
+
+ public Text OneTimeKillText;
+
+ /// <summary>
+ /// 连击的CD时间
+ /// </summary>
+ private float doubleHitCD = 3f;
+
+ private float remainTime;
+
+ /// <summary>
+ /// 连击次数
+ /// </summary>
+ public int DoubleHitCount { get; private set; }
+
+ /// <summary>
+ /// 连击是否开启
+ /// </summary>
+ private bool openDoubleHit;
+
+ private CanvasGroup canvasGroup;
+
+ private int CurrentScore
+ {
+ get { return score; }
+ set
+ {
+ score = value;
+ ScoreText.text = score.ToString().PadLeft(7, '0');
+ }
+ }
+
+ // Start is called before the first frame update
+ private void Start()
+ {
+ Init();
+ EventCenter.Ins.Add<Agent>((int)KTGMGemClient.EventType.EndlessAgentDead, AgentDead);
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessOneHit, OnHit);
+ EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.EndlessOneTimeKillCount, OnTimeKill);
+ canvasGroup = DoubleHit.GetComponent<CanvasGroup>();
+ }
+
+ /// <summary>
+ /// 一次性击杀
+ /// </summary>
+ /// <param name="count"></param>
+ private void OnTimeKill(int count)
+ {
+ Debug.Log($"--------------------- 一次性击杀个数：{count} ---------------------");
+ if (count >= 10)
+ {
+ AddScore(500);
+ ShowOneTimeKill(10, 500);
+ }
+ else if (count >= 8)
+ {
+ AddScore(200);
+ ShowOneTimeKill(8, 200);
+ }
+ else if (count >= 5)
+ {
+ AddScore(100);
+ ShowOneTimeKill(5, 100);
+ }
+ }
+
+ private void AgentDead(Agent agent)
+ {
+ if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
+ AddScore(agent.EnemyData.point);
+ }
+
+ // Update is called once per frame
+ private void Update()
+ {
+ if (openDoubleHit)
+ {
+ if (remainTime <= 0)
+ {
+ openDoubleHit = false;
+ DoubleHitCount = 0;
+ HideDoubleHit();
+ }
+ else
+ remainTime -= Time.deltaTime;
+ }
+ }
+
+ /// <summary>
+ /// 一次击打
+ /// </summary>
+ private void OnHit()
+ {
+ ++DoubleHitCount;
+ openDoubleHit = true;
+ DoubleHitText.text = $"{DoubleHitCount}";
+ ShowDoubleHit();
+ remainTime = doubleHitCD;
+
+ // 策划说先写死吧
+ if (DoubleHitCount == 50)
+ {
+ AddScore(200);
+ FloatDoubleHitReward(200);
+ }
+ else if (DoubleHitCount == 100)
+ {
+ AddScore(500);
+ FloatDoubleHitReward(500);
+ }
+ else if (DoubleHitCount == 200)
+ {
+ AddScore(1500);
+ FloatDoubleHitReward(1500);
+ }
+ }
+
+ private void ShowDoubleHit()
+ {
+ canvasGroup.alpha = 1;
+ if (!DoubleHit.activeInHierarchy)
+ {
+ DoubleHit.SetActive(true);
+ DoubleHit.transform.localScale = Vector3.zero;
+ DOTween.To(() => DoubleHit.transform.localScale, (Vector3 v) => DoubleHit.transform.localScale = v, Vector3.one, 0.15f)
+ .SetEase(Ease.OutBack);
+ }
+ else
+ {
+ Sequence sequence = DOTween.Sequence();
+ sequence.Append(DOTween.To(() => DoubleHit.transform.localScale, (Vector3 v) => DoubleHit.transform.localScale = v, new Vector3(1.2f, 1.2f, 1.2f), 0.08f));
+ sequence.Append(DOTween.To(() => DoubleHit.transform.localScale, (Vector3 v) => DoubleHit.transform.localScale = v, Vector3.one, 0.05f));
+ }
+ }
+
+ private void HideDoubleHit()
+ {
+ if (!DoubleHit.activeInHierarchy) return;
+
+ DOTween.To(() => canvasGroup.alpha, (float v) => canvasGroup.alpha = v, 0, 0.3f);
+ }
+
+ /// <summary>
+ /// 显示一次性击杀飘字
+ /// </summary>
+ /// <param name="count"></param>
+ /// <param name="score"></param>
+ private void ShowOneTimeKill(int count, int score)
+ {
+ OneTimeKillText.text = $"{count}连杀 +{score}";
+ OneTimeKillObj.transform.localScale = Vector3.zero;
+ OneTimeKillObj.SetActive(true);
+ CanvasGroup cg = OneTimeKillObj.GetComponent<CanvasGroup>();
+ DOTween.To(() => OneTimeKillObj.transform.localScale, (Vector3 v) => OneTimeKillObj.transform.localScale = v, Vector3.one, 0.2f);
+ Tween t1 = DOTween.To(() => cg.alpha, (float v) => cg.alpha = v, 0f, 0.2f).SetDelay(2f);
+ t1.OnComplete(OnShowOneTimeKillComplete);
+ }
+
+ private void OnShowOneTimeKillComplete()
+ {
+ OneTimeKillObj.SetActive(false);
+ }
+
+ /// <summary>
+ /// 飘连击奖励分数
+ /// </summary>
+ /// <param name="score"></param>
+ private void FloatDoubleHitReward(int score)
+ {
+
+ }
+
+ public void ShowScore()
+ {
+ gameObject.SetActive(true);
+ }
+
+ public void HideScore()
+ {
+ gameObject.SetActive(false);
+ }
+
+ public void Init()
+ {
+ EndlessScoreData.CurrentSocre = 0;
+ score = 0;
+ ScoreText.text = EndlessScoreData.FormatScore;
+ HideDoubleHit();
+ }
+
+ /// <summary>
+ /// 增加分数
+ /// </summary>
+ /// <param name="score"></param>
+ public void AddScore(int score)
+ {
+ EndlessScoreData.CurrentSocre += score;
+ DOTween.To(() => CurrentScore, (int v) => CurrentScore = v, EndlessScoreData.CurrentSocre, RollTime).SetEase(Ease.Linear);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs.meta b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs.meta
new file mode 100644
index 0000000..6a8e1f3
--- /dev/null
+++ b/Assets/Scripts/TowerDefense/UI/EndlessScoreManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 236ecbd0a55bb7249baefcded8b997b4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index 52f4d9d..778941f 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -80,7 +80,7 @@
GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("MainUI").transform);
FinalPanel panelUI = go.GetComponent<FinalPanel>();
- panelUI.SetData("成绩 5关 2波", 777777);
+ panelUI.SetData($"成绩 {EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);
GameObject.Find("BottomUI").GetComponent<Canvas>().enabled = false;
return;
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 06fb925..7b65c0c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -56,6 +56,8 @@
{
InitSDK();
+ bGameStart = false;
+ bFirstLoaded = false;
darkGroundImg = transform.Find("Image_DarkGround").gameObject;
darkGroundImg.SetActive(false);
bVibrate = new bool[4];
@@ -69,6 +71,7 @@
SettlementUI.SetActive(false);
EndlessMaskUI.instance.Hide();
EndlessBossHPManager.instance.HideHP();
+ EndlessScoreManager.instance.HideScore();
//查询是否已经做过了新手引导
int guide = PlayerPrefs.GetInt("GemBattleGuide");
@@ -78,7 +81,7 @@
{
Debug.Log("开始新手引导");
Pause();
- uiStartMssk.gameObject.SetActive(false);
+ HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
@@ -111,7 +114,16 @@
if (AudioSourceManager.Ins == null)
gameObject.AddComponent<AudioSourceManager>();
+ }
+ public void ShowUIMask()
+ {
+ uiStartMssk.gameObject.SetActive(true);
+ }
+
+ public void HideUIMask()
+ {
+ uiStartMssk.gameObject.SetActive(false);
}
/// <summary>
@@ -361,7 +373,7 @@
// 开启游戏，且隐藏中间的数字.
if (secToDo <= 0)
{
- uiStartMssk.gameObject.SetActive(false);
+ HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
bGameStart = true;
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index b5ebcab..e656eec 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -813,6 +813,8 @@
{
// 清理技能
EndlessBossSkillManager.instance.ClearSkillList();
+ EndlessBossHPManager.instance.SwitchHP(true);
+ EndlessBossHPManager.instance.SetCurrentHP(0);
// 停止所有兵线的出兵
for (int i = 0; i < TotalWaveLines; ++i)
diff --git a/Assets/StreamingAssets/Table/battle.json b/Assets/StreamingAssets/Table/battle.json
index ad1c97b..f374f62 100644
--- a/Assets/StreamingAssets/Table/battle.json
+++ b/Assets/StreamingAssets/Table/battle.json
@@ -1 +1 @@
-[[1,"skilltime",30,[],"","生成技能宝石的时间（秒）"],[2,"initialgold",800,[],"","战斗内初始金币"],[3,"doublegem",120,[],"","购买宝石直接获得2级宝石的时间（秒）"],[4,"initialmoney",500,[],"","初始金币"],[5,"initialgems","",["101:1:100","102:3:200","103:6:200","104:9:200","105:1:200","106:3:200","107:9:200","109:1:200"],"","宝石id:等级:个数 三个一组，每组用逗号分隔"],[6,"initialdeck","",["101","102","103","105","109"],"","上阵的宝石id列表.必须是初始宝石里面的"],[7,"buildtime",0,[],"","解锁塔位所需时间（秒）"],[8,"gemcountdown",10,[],"","购买获得2级宝石倒计时（秒）"],[9,"skillchance",20,[],"","购买获得技能宝石的概率（百分比）"],[10,"changenameprice",100,[],"","非首次改名的花费（100钻石）"],[11,"gemlevelup",30,[],"","塔防区宝石升级时变换类型的概率"],[12,"familymaxcount",50,[],"","工会最大人数"],[13,"scoreShopRefreshTime",7,[],"","工会积分商城刷新时间7天，从创建开始算"],[14,"SpeedUpFrist","",["180:0.75:1.5"],"","第一次提速时间，间隔倍率，移速倍率"],[15,"SpeedUpSecond","",["300:0.5:2"],"","第二次提速时间，间隔倍率，移速倍率"],[16,"donateShopRefreshTime",7,[],"","工会捐赠商城刷新时间7天，从创建开始算"],[17,"guildRankRequest","",["0","300","600","900","1200","1500","1800","2100","2400","2700","3000"],"","加入公会的排位分数限制（超过该值才能进入）"],[18,"guildNameDay",7,[],"","修改公会名：间隔7天1次"],[19,"guildNameCost",500,[],"","修改公会名：每次花费500金币（money）"],[20,"guildicon",30,[],"","修改公会图标：间隔30天1次"],[21,"guildCreateMinLevel",5,[],"","工会创建最小等级"]]
\ No newline at end of file
+[[1,"skilltime",30,[],"","生成技能宝石的时间（秒）"],[2,"initialgold",900,[],"","战斗内初始金币"],[3,"doublegem",120,[],"","购买宝石直接获得2级宝石的时间（秒）"],[4,"initialmoney",500,[],"","初始金币"],[5,"initialgems","",["101:1:100","102:3:200","103:6:200","104:9:200","105:1:200","106:3:200","107:9:200","109:1:200"],"","宝石id:等级:个数 三个一组，每组用逗号分隔"],[6,"initialdeck","",["101","102","103","105","109"],"","上阵的宝石id列表.必须是初始宝石里面的"],[7,"buildtime",0,[],"","解锁塔位所需时间（秒）"],[8,"gemcountdown",0,[],"","购买获得2级宝石倒计时（秒）"],[9,"skillchance",20,[],"","购买获得技能宝石的概率（百分比）"],[10,"changenameprice",100,[],"","非首次改名的花费（100钻石）"],[11,"gemlevelup",30,[],"","塔防区宝石升级时变换类型的概率"],[12,"familymaxcount",50,[],"","工会最大人数"],[13,"scoreShopRefreshTime",7,[],"","工会积分商城刷新时间7天，从创建开始算"],[14,"SpeedUpFrist","",["180:0.75:1.5"],"","第一次提速时间，间隔倍率，移速倍率"],[15,"SpeedUpSecond","",["300:0.5:2"],"","第二次提速时间，间隔倍率，移速倍率"],[16,"donateShopRefreshTime",7,[],"","工会捐赠商城刷新时间7天，从创建开始算"],[17,"guildRankRequest","",["0","300","600","900","1200","1500","1800","2100","2400","2700","3000"],"","加入公会的排位分数限制（超过该值才能进入）"],[18,"guildNameDay",7,[],"","修改公会名：间隔7天1次"],[19,"guildNameCost",500,[],"","修改公会名：每次花费500金币（money）"],[20,"guildicon",30,[],"","修改公会图标：间隔30天1次"],[21,"guildCreateMinLevel",5,[],"","工会创建最小等级"]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/boss_skill.json b/Assets/StreamingAssets/Table/boss_skill.json
index a713e81..06859f2 100644
--- a/Assets/StreamingAssets/Table/boss_skill.json
+++ b/Assets/StreamingAssets/Table/boss_skill.json
@@ -1 +1 @@
-[[10001,"泡泡炸弹",10002,15000,[3,1],[2],10001,2,[10,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[10,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[12,2]],[20001,"魔法护盾",10001,20000,[2,1],[1],10001,1,[0.3,0]],[30001,"召唤木桩",10003,20000,[3,1],[3],10001,3,[3,2.5]]]
\ No newline at end of file
+[[10001,"泡泡炸弹",10002,15000,[3,1],[3],10001,2,[10,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[10,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[12,2]],[20001,"魔法护盾",10001,20000,[2,1],[3],10001,1,[0.1,10]],[20002,"魔法护盾",10001,20000,[2,1],[2,4],10001,1,[0.2,10]],[20003,"魔法护盾",10001,20000,[2,1],[1,3,5],10001,1,[0.3,10]],[30001,"召唤木桩",10003,20000,[3,1],[3],10001,3,[2,2.5]],[30002,"召唤木桩",10003,20000,[3,1],[2,4],10001,3,[5,2.5]],[30003,"召唤木桩",10003,20000,[3,1],[1,3,5],10001,3,[8,2.5]]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/donateshop.json b/Assets/StreamingAssets/Table/donateshop.json
index 5c6b660..7164b4f 100644
--- a/Assets/StreamingAssets/Table/donateshop.json
+++ b/Assets/StreamingAssets/Table/donateshop.json
@@ -1 +1 @@
-[[1,"红龙",["gem:104:1"],3000,3],[2,"知识古树",["gem:111:1"],1800,5],[3,"捐赠宝箱",["box:4:1"],4800,5],[4,"金币",["gold:1000"],1000,10]]
\ No newline at end of file
+[[1,"红龙",["gem:104:1"],3000,3,"一段文字描述，是物品的说明文字。字符超过行宽后将会换行。"],[2,"知识古树",["gem:111:1"],1800,5,"一段文字描述，是物品的说明文字。字符超过行宽后将会换行。"],[3,"捐赠宝箱",["box:4:1"],4800,5,"蕴含魔力的宝箱，使用后便能获得大量奖励。"],[4,"金币",["gold:1000"],1000,10,"有着极高价值的金币，可以用来购买道具。"]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/endless_boss.json b/Assets/StreamingAssets/Table/endless_boss.json
index 61382b8..e8481c6 100644
--- a/Assets/StreamingAssets/Table/endless_boss.json
+++ b/Assets/StreamingAssets/Table/endless_boss.json
@@ -1 +1 @@
-[[1,"1_3",1,1,[]],[2,"4_7",1,1,[10001]],[3,"8_10",1,1,[10002]],[4,"11_15",1,1,[10003]]]
\ No newline at end of file
+[[1,"鲨鱼lv1",1,1,[]],[2,"鲨鱼lv2",1,1,[10001]],[3,"鲨鱼lv3",1,1,[10002]],[4,"鲨鱼lv4",1,1,[10003]],[5,"木妖lv1",1,1,[]],[6,"木妖lv2",1,1,[10001]],[7,"木妖lv3",1,1,[10002]],[8,"木妖lv4",1,1,[10003]]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/endless_buff.json b/Assets/StreamingAssets/Table/endless_buff.json
index 65350e1..b0ac8b5 100644
--- a/Assets/StreamingAssets/Table/endless_buff.json
+++ b/Assets/StreamingAssets/Table/endless_buff.json
@@ -1 +1 @@
-[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1],[4,"火灵之力",[2,1],[1,12,0],-1,"增加全体火精灵12%攻击力",4,99,10001,2],[5,"水灵之力",[2,2],[1,12,0],-1,"增加全体水精灵12%攻击力",4,99,10002,2],[6,"木灵之力",[2,3],[1,12,0],-1,"增加全体木精灵12%攻击力",4,99,10003,2],[7,"高级火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",6,99,10001,3],[8,"高级水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",6,99,10002,3],[9,"高级木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",6,99,10003,3],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2],[11,"时空宝石",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3]]
\ No newline at end of file
+[[1,"低级火灵之力",[2,1],[1,10,0],-1,"增加全体火精灵10%攻击力",0,99,10001,1],[2,"低级水灵之力",[2,2],[1,10,0],-1,"增加全体水精灵10%攻击力",0,99,10002,1],[3,"低级木灵之力",[2,3],[1,10,0],-1,"增加全体木精灵10%攻击力",0,99,10003,1],[4,"火灵之力",[2,1],[1,15,0],-1,"增加全体火精灵15%攻击力",4,99,10001,2],[5,"水灵之力",[2,2],[1,15,0],-1,"增加全体水精灵15%攻击力",4,99,10002,2],[6,"木灵之力",[2,3],[1,15,0],-1,"增加全体木精灵15%攻击力",4,99,10003,2],[7,"高级火灵之力",[2,1],[1,20,0],-1,"增加全体火精灵20%攻击力",7,99,10001,3],[8,"高级水灵之力",[2,2],[1,20,0],-1,"增加全体水精灵20%攻击力",7,99,10002,3],[9,"高级木灵之力",[2,3],[1,20,0],-1,"增加全体木精灵20%攻击力",7,99,10003,3],[10,"精灵之力",[1,0],[1,50,0],2,"2波增加全体精灵50%攻击力",3,99,10004,2],[11,"时空宝石",[1,0],[1,65,0],2,"2波内增加全体精灵65%攻击力",3,99,10005,3],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",4,99,10007,3],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",99,99,10006,2],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",99,99,10006,3]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/endless_enemy.json b/Assets/StreamingAssets/Table/endless_enemy.json
index 0f4b520..e3012f5 100644
--- a/Assets/StreamingAssets/Table/endless_enemy.json
+++ b/Assets/StreamingAssets/Table/endless_enemy.json
@@ -1 +1 @@
-[[1,"小怪_火",1,1.1,1.8,1,101],[2,"小怪_水",1,5,1,3,102],[3,"小怪_木",1,0.8,1.2,1,103]]
\ No newline at end of file
+[[1,"小怪_火",1,1,1.8,1,101,20],[2,"小怪_水",1,4.5,1,3,102,40],[3,"小怪_木",1,0.8,1.2,1,103,10]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/endless_port.json b/Assets/StreamingAssets/Table/endless_port.json
index b3bc06a..8848861 100644
--- a/Assets/StreamingAssets/Table/endless_port.json
+++ b/Assets/StreamingAssets/Table/endless_port.json
@@ -1 +1 @@
-[[1,-2,"史莱姆大王",1,1,1,0,0,"0",400,1.5,5,3000,["0"],[0],0],[2,-2,"史莱姆大王",1,1,2,0,0,"0",400,1.5,5,3000,["0"],[0],0],[3,-2,"史莱姆大王",1,1,3,3,10,"2000",400,1.5,5,3000,["0"],[0],3],[4,-2,"史莱姆大王",1,1,4,0,0,"0",400,1.5,5,3000,["0"],[0],0],[5,-2,"史莱姆大王",1,1,5,0,0,"0",400,1.5,5,3000,["0"],[0],0],[6,-1,"史莱姆大王",1,2,1,0,0,"0",800,1.5,5,3000,["0"],[0],0],[7,-1,"史莱姆大王",1,2,2,1,10,"2000",800,1.5,5,3000,["0"],[0],1],[8,-1,"史莱姆大王",1,2,3,0,0,"0",800,1.5,5,3000,["0"],[0],0],[9,-1,"史莱姆大王",1,2,4,0,0,"0",800,1.5,5,3000,["0"],[0],0],[10,-1,"史莱姆大王",1,2,5,0,0,"0",800,1.5,5,3000,["0"],[0],0],[11,1,"史莱姆大王",1,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[12,1,"史莱姆大王",1,1,2,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[13,1,"史莱姆大王",1,1,3,2,3,"6000",250,1.5,5,3000,["gold:1"],[200,9800],2],[14,1,"史莱姆大王",1,1,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[15,1,"史莱姆大王",1,1,5,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[16,1,"史莱姆大王",1,2,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[17,1,"史莱姆大王",1,2,2,3,7,"2000",250,1.5,5,3000,["gold:1"],[200,9800],3],[18,1,"史莱姆大王",1,2,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0],[19,1,"史莱姆大王",1,2,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[20,1,"史莱姆大王",1,2,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0],[21,1,"史莱姆大王",1,3,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[22,1,"史莱姆大王",1,3,2,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0],[23,1,"史莱姆大王",1,3,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0],[24,1,"史莱姆大王",1,3,4,1,6,"2500",250,1.5,5,3000,["gold:1"],[200,9800],1],[25,1,"史莱姆大王",1,3,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0],[26,2,"拿破仑",2,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[27,2,"拿破仑",2,1,2,2,"4","6000",285,1.5,5,3000,["gold:1"],[200,9800],2],[28,2,"拿破仑",2,1,3,0,"0","0",320,1.5,5,3000,["gold:1"],[200,9800],0],[29,2,"拿破仑",2,1,4,2,"4","6000",355,1.5,5,3000,["gold:1"],[200,9800],2],[30,2,"拿破仑",2,1,5,0,"0","0",390,1.5,5,3000,["gold:1"],[200,9800],0],[31,2,"拿破仑",2,2,1,1,"7","2500",425,1.5,5,3000,["gold:1"],[200,9800],1],[32,2,"拿破仑",2,2,2,0,"0","0",460,1.5,5,3000,["gold:1"],[200,9800],0],[33,2,"拿破仑",2,2,3,0,"0","0",495,1.5,5,3000,["gold:1"],[200,9800],0],[34,2,"拿破仑",2,2,4,0,"0","0",530,1.5,5,3000,["gold:1"],[200,9800],0],[35,2,"拿破仑",2,2,5,3,"8","2000",565,1.5,5,3000,["box:1:1"],[200,9800],3],[36,2,"拿破仑",2,3,1,0,"0","0",600,1.5,5,3000,["gold:1"],[200,9800],0],[37,2,"拿破仑",2,3,2,1,"7","2500",635,1.5,5,3000,["gold:1"],[200,9800],1],[38,2,"拿破仑",2,3,3,0,"0","0",670,1.5,5,3000,["gold:1"],[200,9800],0],[39,2,"拿破仑",2,3,4,2,"4","6000",705,1.5,5,3000,["gold:1"],[200,9800],2],[40,2,"拿破仑",2,3,5,0,"0","0",740,1.5,5,3000,["box:1:1"],[200,9800],0],[41,3,"凯撒",2,1,1,3,"8","2000",600,1.5,5,3000,["gold:1"],[200,9800],3],[42,3,"凯撒",2,1,2,0,"0","0",635,1.5,5,3000,["gold:1"],[200,9800],0],[43,3,"凯撒",2,1,3,1,"7","2500",670,1.5,5,3000,["gold:1"],[200,9800],1],[44,3,"凯撒",2,1,4,0,"0","0",705,1.5,5,3000,["gold:1"],[200,9800],0],[45,3,"凯撒",2,1,5,3,"8","2000",740,1.5,5,3000,["gold:1"],[200,9800],3],[46,3,"凯撒",2,2,1,0,"0","0",775,1.5,5,3000,["gold:1"],[200,9800],0],[47,3,"凯撒",2,2,2,1,"7","2500",810,1.5,5,3000,["gold:1"],[200,9800],1],[48,3,"凯撒",2,2,3,2,"4","6000",845,1.5,5,3000,["gold:1"],[200,9800],2],[49,3,"凯撒",2,2,4,1,"7","2500",880,1.5,5,3000,["gold:1"],[200,9800],1],[50,3,"凯撒",2,2,5,0,"0","0",915,1.5,5,3000,["gold:1"],[200,9800],0],[51,3,"凯撒",2,3,1,2,"4","6000",950,1.5,5,3000,["box:2:1"],[200,9800],2],[52,3,"凯撒",2,3,2,0,"0","0",985,1.5,5,3000,["box:2:1"],[200,9800],0],[53,3,"凯撒",2,3,3,3,"8","2000",1020,1.5,5,3000,["box:2:1"],[200,9800],3],[54,3,"凯撒",2,3,4,0,"0","0",1055,1.5,5,3000,["box:2:1"],[200,9800],0],[55,3,"凯撒",2,3,5,2,"4","6000",1090,1.5,5,3000,["box:2:1"],[200,9800],2],[56,4,"克伦威尔",2,1,1,2,"4","6000",1125,1.5,5,3000,["gold:1"],[200,9800],2],[57,4,"克伦威尔",2,1,2,0,"0","0",1160,1.5,5,3000,["gold:1"],[200,9800],0],[58,4,"克伦威尔",2,1,3,1,"7","2500",1195,1.5,5,3000,["gold:1"],[200,9800],1],[59,4,"克伦威尔",2,1,4,0,"0","0",1230,1.5,5,3000,["gold:1"],[200,9800],0],[60,4,"克伦威尔",2,1,5,2,"4","6000",1265,1.5,5,3000,["gold:1"],[200,9800],2],[61,4,"克伦威尔",2,2,1,0,"0","0",1300,1.5,5,3000,["gold:1"],[200,9800],0],[62,4,"克伦威尔",2,2,2,3,"8","2000",1335,1.5,5,3000,["gold:1"],[200,9800],3],[63,4,"克伦威尔",2,2,3,2,"4","6000",1370,1.5,5,3000,["gold:1"],[200,9800],2],[64,4,"克伦威尔",2,2,4,3,"8","2000",1405,1.5,5,3000,["gold:1"],[200,9800],3],[65,4,"克伦威尔",2,2,5,0,"0","0",1440,1.5,5,3000,["gold:1"],[200,9800],0],[66,4,"克伦威尔",2,3,1,2,"4","6000",1475,1.5,5,3000,["box:2:1"],[200,9800],2],[67,4,"克伦威尔",2,3,2,0,"0","0",1510,1.5,5,3000,["box:2:1"],[200,9800],0],[68,4,"克伦威尔",2,3,3,3,"8","2000",1545,1.5,5,3000,["box:2:1"],[200,9800],3],[69,4,"克伦威尔",2,3,4,0,"0","0",1580,1.5,5,3000,["box:2:1"],[200,9800],0],[70,4,"克伦威尔",2,3,5,2,"4","6000",1615,1.5,5,3000,["box:2:1"],[200,9800],2],[71,4,"克伦威尔",2,4,1,3,"8","2000",1650,1.5,5,3000,["box:2:1"],[200,9800],3],[72,4,"克伦威尔",2,4,2,1,"7","2500",1685,1.5,5,3000,["box:2:1"],[200,9800],1],[73,4,"克伦威尔",2,4,3,2,"4","6000",1720,1.5,5,3000,["box:2:1"],[200,9800],2],[74,4,"克伦威尔",2,4,4,1,"7","2500",1755,1.5,5,3000,["box:2:1"],[200,9800],1],[75,4,"克伦威尔",2,4,5,3,"8","2000",1790,1.5,5,3000,["box:2:1"],[200,9800],3],[76,5,"尼克松",3,1,1,1,"7","2500",1650,1.5,5,3000,["gold:1"],[200,9800],1],[77,5,"尼克松",3,1,2,1,"7","2500",1685,1.5,5,3000,["gold:1"],[200,9800],1],[78,5,"尼克松",3,1,3,2,"4","6000",1720,1.5,5,3000,["gold:1"],[200,9800],2],[79,5,"尼克松",3,1,4,2,"4","6000",1755,1.5,5,3000,["gold:1"],[200,9800],2],[80,5,"尼克松",3,1,5,0,"0","0",1790,1.5,5,3000,["gold:1"],[200,9800],0],[81,5,"尼克松",3,2,1,0,"0","0",1825,1.5,5,3000,["gold:1"],[200,9800],0],[82,5,"尼克松",3,2,2,2,"4","6000",1860,1.5,5,3000,["gold:1"],[200,9800],2],[83,5,"尼克松",3,2,3,2,"4","6000",1895,1.5,5,3000,["gold:1"],[200,9800],2],[84,5,"尼克松",3,2,4,3,"8","2000",1930,1.5,5,3000,["gold:1"],[200,9800],3],[85,5,"尼克松",3,2,5,3,"8","2000",1965,1.5,5,3000,["gold:1"],[200,9800],3],[86,5,"尼克松",3,3,1,2,"4","6000",2000,1.5,5,3000,["gold:1"],[200,9800],2],[87,5,"尼克松",3,3,2,3,"8","2000",2035,1.5,5,3000,["gold:1"],[200,9800],3],[88,5,"尼克松",3,3,3,0,"0","0",2070,1.5,5,3000,["gold:1"],[200,9800],0],[89,5,"尼克松",3,3,4,3,"8","2000",2105,1.5,5,3000,["gold:1"],[200,9800],3],[90,5,"尼克松",3,3,5,2,"4","6000",2140,1.5,5,3000,["gold:1"],[200,9800],2],[91,5,"尼克松",3,4,1,1,"7","2500",2175,1.5,5,3000,["box:2:1"],[200,9800],1],[92,5,"尼克松",3,4,2,2,"4","6000",2210,1.5,5,3000,["box:2:1"],[200,9800],2],[93,5,"尼克松",3,4,3,3,"8","2000",2245,1.5,5,3000,["box:2:1"],[200,9800],3],[94,5,"尼克松",3,4,4,2,"4","6000",2280,1.5,5,3000,["box:2:1"],[200,9800],2],[95,5,"尼克松",3,4,5,1,"7","2500",2315,1.5,5,3000,["box:2:1"],[200,9800],1],[96,6,"李存勖",3,1,1,2,"5","6000",2355,1.5,5,3000,["gold:1"],[200,9800],2],[97,6,"李存勖",3,1,2,2,"5","6000",2395,1.5,8,3000,["gold:1"],[200,9800],2],[98,6,"李存勖",3,1,3,0,"0","0",2435,1.5,8,3000,["gold:1"],[200,9800],0],[99,6,"李存勖",3,1,4,1,"10","2500",2475,1.5,8,3000,["gold:1"],[200,9800],1],[100,6,"李存勖",3,1,5,1,"10","2500",2515,1.5,8,3000,["gold:1"],[200,9800],1],[101,6,"李存勖",3,2,1,0,"0","0",2555,1.5,8,3000,["gold:1"],[200,9800],0],[102,6,"李存勖",3,2,2,2,"5","6000",2595,1.5,8,3000,["gold:1"],[200,9800],2],[103,6,"李存勖",3,2,3,3,"12","2000",2635,1.5,8,3000,["gold:1"],[200,9800],3],[104,6,"李存勖",3,2,4,2,"5","6000",2675,1.5,8,3000,["gold:1"],[200,9800],2],[105,6,"李存勖",3,2,5,0,"0","0",2715,1.5,8,3000,["gold:1"],[200,9800],0],[106,6,"李存勖",3,3,1,2,"5","6000",2755,1.5,8,3000,["gold:1"],[200,9800],2],[107,6,"李存勖",3,3,2,2,"5","6000",2795,1.5,8,3000,["gold:1"],[200,9800],2],[108,6,"李存勖",3,3,3,0,"0","0",2835,1.5,8,3000,["gold:1"],[200,9800],0],[109,6,"李存勖",3,3,4,3,"12","2000",2875,1.5,8,3000,["gold:1"],[200,9800],3],[110,6,"李存勖",3,3,5,3,"12","2000",2915,1.5,8,3000,["gold:1"],[200,9800],3],[111,6,"李存勖",3,4,1,3,"12","2000",2955,1.5,8,3000,["box:3:1"],[200,9800],3],[112,6,"李存勖",3,4,2,3,"12","2000",2995,1.5,8,3000,["box:3:1"],[200,9800],3],[113,6,"李存勖",3,4,3,2,"5","6000",3035,1.5,8,3000,["box:3:1"],[200,9800],2],[114,6,"李存勖",3,4,4,1,"10","2500",3075,1.5,8,3000,["box:3:1"],[200,9800],1],[115,6,"李存勖",3,4,5,1,"10","2500",3115,1.5,8,3000,["box:3:1"],[200,9800],1],[116,7,"AA_12",3,1,1,1,"10","2500",3155,1.5,8,3000,["gold:1"],[200,9800],1],[117,7,"AA_12",3,1,2,0,"0","0",3195,1.5,8,3000,["gold:1"],[200,9800],0],[118,7,"AA_12",3,1,3,3,"12","2000",3235,1.5,8,3000,["gold:1"],[200,9800],3],[119,7,"AA_12",3,1,4,0,"0","0",3275,1.5,8,3000,["gold:1"],[200,9800],0],[120,7,"AA_12",3,1,5,1,"10","2500",3315,1.5,8,3000,["gold:1"],[200,9800],1],[121,7,"AA_12",3,2,1,0,"0","0",3355,1.5,8,3000,["gold:1"],[200,9800],0],[122,7,"AA_12",3,2,2,2,"5","6000",3395,1.5,8,3000,["gold:1"],[200,9800],2],[123,7,"AA_12",3,2,3,3,"12","2000",3435,1.5,8,3000,["gold:1"],[200,9800],3],[124,7,"AA_12",3,2,4,2,"5","6000",3475,1.5,8,3000,["gold:1"],[200,9800],2],[125,7,"AA_12",3,2,5,0,"0","0",3515,1.5,8,3000,["gold:1"],[200,9800],0],[126,7,"AA_12",3,3,1,2,"5","6000",3555,1.5,8,3000,["gold:1"],[200,9800],2],[127,7,"AA_12",3,3,2,1,"10","2500",3595,1.5,8,3000,["gold:1"],[200,9800],1],[128,7,"AA_12",3,3,3,3,"12","2000",3635,1.5,8,3000,["gold:1"],[200,9800],3],[129,7,"AA_12",3,3,4,1,"10","2500",3675,1.5,8,3000,["gold:1"],[200,9800],1],[130,7,"AA_12",3,3,5,2,"5","6000",3715,1.5,8,3000,["gold:1"],[200,9800],2],[131,7,"AA_12",3,4,1,3,"12","2000",3755,1.5,8,3000,["box:3:1"],[200,9800],3],[132,7,"AA_12",3,4,2,2,"5","6000",3795,1.5,8,3000,["box:3:1"],[200,9800],2],[133,7,"AA_12",3,4,3,1,"10","2500",3835,1.5,8,3000,["box:3:1"],[200,9800],1],[134,7,"AA_12",3,4,4,2,"5","6000",3875,1.5,8,3000,["box:3:1"],[200,9800],2],[135,7,"AA_12",3,4,5,3,"12","2000",3915,1.5,8,3000,["box:3:1"],[200,9800],3],[136,8,"米高扬",3,1,1,0,"0","0",3955,1.5,8,3000,["gold:1"],[200,9800],0],[137,8,"米高扬",3,1,2,1,"10","2500",3995,1.5,8,3000,["gold:1"],[200,9800],1],[138,8,"米高扬",3,1,3,1,"10","2500",4035,1.5,8,3000,["gold:1"],[200,9800],1],[139,8,"米高扬",3,1,4,1,"10","2500",4075,1.5,8,3000,["gold:1"],[200,9800],1],[140,8,"米高扬",3,1,5,0,"0","0",4115,1.5,8,3000,["gold:1"],[200,9800],0],[141,8,"米高扬",3,2,1,2,"5","6000",4155,1.5,8,3000,["gold:1"],[200,9800],2],[142,8,"米高扬",3,2,2,0,"0","0",4195,1.5,8,3000,["gold:1"],[200,9800],0],[143,8,"米高扬",3,2,3,2,"5","6000",4235,1.5,8,3000,["gold:1"],[200,9800],2],[144,8,"米高扬",3,2,4,0,"0","0",4275,1.5,8,3000,["gold:1"],[200,9800],0],[145,8,"米高扬",3,2,5,2,"5","6000",4315,1.5,8,3000,["gold:1"],[200,9800],2],[146,8,"米高扬",3,3,1,0,"0","0",4355,1.5,8,3000,["gold:1"],[200,9800],0],[147,8,"米高扬",3,3,2,3,"12","2000",4395,1.5,8,3000,["gold:1"],[200,9800],3],[148,8,"米高扬",3,3,3,3,"12","2000",4435,1.5,8,3000,["gold:1"],[200,9800],3],[149,8,"米高扬",3,3,4,3,"12","2000",4475,1.5,8,3000,["gold:1"],[200,9800],3],[150,8,"米高扬",3,3,5,0,"0","0",4515,1.5,8,3000,["gold:1"],[200,9800],0],[151,8,"米高扬",3,4,1,2,"5","6000",4555,1.5,8,3000,["box:3:1"],[200,9800],2],[152,8,"米高扬",3,4,2,2,"5","6000",4595,1.5,8,3000,["box:3:1"],[200,9800],2],[153,8,"米高扬",3,4,3,3,"12","2000",4635,1.5,8,3000,["box:3:1"],[200,9800],3],[154,8,"米高扬",3,4,4,3,"12","2000",4675,1.5,8,3000,["box:3:1"],[200,9800],3],[155,8,"米高扬",3,4,5,3,"12","2000",4715,1.5,8,3000,["box:3:1"],[200,9800],3],[156,9,"安德罗波夫",4,1,1,0,"0","0",4755,1.5,8,3000,["gold:1"],[200,9800],0],[157,9,"安德罗波夫",4,1,2,2,"5","6000",4795,1.5,8,3000,["gold:1"],[200,9800],2],[158,9,"安德罗波夫",4,1,3,1,"10","2500",4835,1.5,8,3000,["gold:1"],[200,9800],1],[159,9,"安德罗波夫",4,1,4,2,"5","6000",4875,1.5,8,3000,["gold:1"],[200,9800],2],[160,9,"安德罗波夫",4,1,5,0,"0","0",4915,1.5,8,3000,["gold:1"],[200,9800],0],[161,9,"安德罗波夫",4,2,1,3,"12","2000",4955,1.5,8,3000,["gold:1"],[200,9800],3],[162,9,"安德罗波夫",4,2,2,0,"0","0",4995,1.5,8,3000,["gold:1"],[200,9800],0],[163,9,"安德罗波夫",4,2,3,2,"5","6000",5035,1.5,8,3000,["gold:1"],[200,9800],2],[164,9,"安德罗波夫",4,2,4,0,"0","0",5075,1.5,8,3000,["gold:1"],[200,9800],0],[165,9,"安德罗波夫",4,2,5,3,"12","2000",5115,1.5,8,3000,["gold:1"],[200,9800],3],[166,9,"安德罗波夫",4,3,1,0,"0","0",5155,1.5,8,3000,["gold:1"],[200,9800],0],[167,9,"安德罗波夫",4,3,2,1,"10","2500",5195,1.5,8,3000,["gold:1"],[200,9800],1],[168,9,"安德罗波夫",4,3,3,1,"10","2500",5235,1.5,8,3000,["gold:1"],[200,9800],1],[169,9,"安德罗波夫",4,3,4,1,"10","2500",5275,1.5,8,3000,["gold:1"],[200,9800],1],[170,9,"安德罗波夫",4,3,5,1,"10","2500",5315,1.5,8,3000,["gold:1"],[200,9800],1],[171,9,"安德罗波夫",4,4,1,2,"5","6000",5355,1.5,8,3000,["box:3:1"],[200,9800],2],[172,9,"安德罗波夫",4,4,2,2,"5","6000",5395,1.5,8,3000,["box:3:1"],[200,9800],2],[173,9,"安德罗波夫",4,4,3,1,"10","2500",5435,1.5,8,3000,["box:3:1"],[200,9800],1],[174,9,"安德罗波夫",4,4,4,3,"12","2000",5475,1.5,8,3000,["box:3:1"],[200,9800],3],[175,9,"安德罗波夫",4,4,5,0,"0","0",5515,1.5,8,3000,["box:3:1"],[200,9800],0],[176,10,"腓特烈",4,1,1,1,"10","2500",5555,1.5,8,3000,["gold:1"],[200,9800],1],[177,10,"腓特烈",4,1,2,3,"12","2000",5595,1.5,8,3000,["gold:1"],[200,9800],3],[178,10,"腓特烈",4,1,3,3,"12","2000",5635,1.5,8,3000,["gold:1"],[200,9800],3],[179,10,"腓特烈",4,1,4,2,"5","6000",5675,1.5,8,3000,["gold:1"],[200,9800],2],[180,10,"腓特烈",4,1,5,2,"5","6000",5715,1.5,8,3000,["gold:1"],[200,9800],2],[181,10,"腓特烈",4,2,1,3,"12","2000",5755,1.5,8,3000,["gold:1"],[200,9800],3],[182,10,"腓特烈",4,2,2,2,"5","6000",5795,1.5,8,3000,["gold:1"],[200,9800],2],[183,10,"腓特烈",4,2,3,3,"12","2000",5835,1.5,8,3000,["gold:1"],[200,9800],3],[184,10,"腓特烈",4,2,4,3,"12","2000",5875,1.5,8,3000,["gold:1"],[200,9800],3],[185,10,"腓特烈",4,2,5,2,"5","6000",5915,1.5,8,3000,["gold:1"],[200,9800],2],[186,10,"腓特烈",4,3,1,1,"10","2500",5955,1.5,8,3000,["gold:1"],[200,9800],1],[187,10,"腓特烈",4,3,2,2,"5","6000",5995,1.5,8,3000,["gold:1"],[200,9800],2],[188,10,"腓特烈",4,3,3,1,"10","2500",6035,1.5,8,3000,["gold:1"],[200,9800],1],[189,10,"腓特烈",4,3,4,3,"12","2000",6075,1.5,8,3000,["gold:1"],[200,9800],3],[190,10,"腓特烈",4,3,5,1,"10","2500",6115,1.5,8,3000,["gold:1"],[200,9800],1],[191,10,"腓特烈",4,4,1,3,"12","2000",6155,1.5,8,3000,["box:3:1"],[200,9800],3],[192,10,"腓特烈",4,4,2,2,"5","6000",6195,1.5,8,3000,["box:3:1"],[200,9800],2],[193,10,"腓特烈",4,4,3,3,"12","2000",6235,1.5,8,3000,["box:3:1"],[200,9800],3],[194,10,"腓特烈",4,4,4,2,"5","6000",6275,1.5,8,3000,["box:3:1"],[200,9800],2],[195,10,"腓特烈",4,4,5,1,"10","2500",6315,1.5,8,3000,["box:3:1"],[200,9800],1],[196,11,"林肯",4,1,1,2,"5","6000",6360,1.5,8,3000,["gold:1"],[200,9800],2],[197,11,"林肯",4,1,2,2,"5","6000",6405,1.5,8,3000,["gold:1"],[200,9800],2],[198,11,"林肯",4,1,3,1,"10","2500",6450,1.5,8,3000,["gold:1"],[200,9800],1],[199,11,"林肯",4,1,4,2,"5","6000",6495,1.5,8,3000,["gold:1"],[200,9800],2],[200,11,"林肯",4,1,5,2,"5","6000",6540,1.5,8,3000,["gold:1"],[200,9800],2],[201,11,"林肯",4,2,1,3,"12","2000",6585,1.5,8,3000,["gold:1"],[200,9800],3],[202,11,"林肯",4,2,2,3,"12","2000",6630,1.5,8,3000,["gold:1"],[200,9800],3],[203,11,"林肯",4,2,3,2,"5","6000",6675,1.5,8,3000,["gold:1"],[200,9800],2],[204,11,"林肯",4,2,4,3,"12","2000",6720,1.5,8,3000,["gold:1"],[200,9800],3],[205,11,"林肯",4,2,5,3,"12","2000",6765,1.5,8,3000,["gold:1"],[200,9800],3],[206,11,"林肯",4,3,1,1,"10","2500",6810,1.5,8,3000,["gold:1"],[200,9800],1],[207,11,"林肯",4,3,2,2,"5","6000",6855,1.5,8,3000,["gold:1"],[200,9800],2],[208,11,"林肯",4,3,3,2,"5","6000",6900,1.5,8,3000,["gold:1"],[200,9800],2],[209,11,"林肯",4,3,4,1,"10","2500",6945,1.5,8,3000,["gold:1"],[200,9800],1],[210,11,"林肯",4,3,5,1,"10","2500",6990,1.5,8,3000,["gold:1"],[200,9800],1],[211,11,"林肯",4,4,1,2,"5","6000",7035,1.5,8,3000,["box:3:1"],[200,9800],2],[212,11,"林肯",4,4,2,2,"5","6000",7080,1.5,8,3000,["box:3:1"],[200,9800],2],[213,11,"林肯",4,4,3,2,"5","6000",7125,1.5,8,3000,["box:3:1"],[200,9800],2],[214,11,"林肯",4,4,4,2,"5","6000",7170,1.5,8,3000,["box:3:1"],[200,9800],2],[215,11,"林肯",4,4,5,2,"5","6000",7215,1.5,8,3000,["box:3:1"],[200,9800],2],[216,12,"腓特烈",4,1,1,2,"5","6000",7260,1.5,8,3000,["gold:1"],[200,9800],2],[217,12,"腓特烈",4,1,2,2,"5","6000",7305,1.5,8,3000,["gold:1"],[200,9800],2],[218,12,"腓特烈",4,1,3,3,"12","2000",7350,1.5,8,3000,["gold:1"],[200,9800],3],[219,12,"腓特烈",4,1,4,3,"12","2000",7395,1.5,8,3000,["gold:1"],[200,9800],3],[220,12,"腓特烈",4,1,5,2,"5","6000",7440,1.5,8,3000,["gold:1"],[200,9800],2],[221,12,"腓特烈",4,2,1,3,"12","2000",7485,1.5,8,3000,["gold:1"],[200,9800],3],[222,12,"腓特烈",4,2,2,3,"12","2000",7530,1.5,8,3000,["gold:1"],[200,9800],3],[223,12,"腓特烈",4,2,3,3,"12","2000",7575,1.5,8,3000,["gold:1"],[200,9800],3],[224,12,"腓特烈",4,2,4,3,"12","2000",7620,1.5,8,3000,["gold:1"],[200,9800],3],[225,12,"腓特烈",4,2,5,3,"12","2000",7665,1.5,8,3000,["gold:1"],[200,9800],3],[226,12,"腓特烈",4,3,1,1,"10","2500",7710,1.5,8,3000,["gold:1"],[200,9800],1],[227,12,"腓特烈",4,3,2,2,"5","6000",7755,1.5,8,3000,["gold:1"],[200,9800],2],[228,12,"腓特烈",4,3,3,2,"5","6000",7800,1.5,8,3000,["gold:1"],[200,9800],2],[229,12,"腓特烈",4,3,4,1,"10","2500",7845,1.5,8,3000,["gold:1"],[200,9800],1],[230,12,"腓特烈",4,3,5,1,"10","2500",7890,1.5,8,3000,["gold:1"],[200,9800],1],[231,12,"腓特烈",4,4,1,1,"10","2500",7935,1.5,8,3000,["box:3:1"],[200,9800],1],[232,12,"腓特烈",4,4,2,2,"5","6000",7980,1.5,8,3000,["box:3:1"],[200,9800],2],[233,12,"腓特烈",4,4,3,3,"12","2000",8025,1.5,8,3000,["box:3:1"],[200,9800],3],[234,12,"腓特烈",4,4,4,2,"5","6000",8070,1.5,8,3000,["box:3:1"],[200,9800],2],[235,12,"腓特烈",4,4,5,1,"10","2500",8115,1.5,8,3000,["box:3:1"],[200,9800],1],[236,12,"腓特烈",4,5,1,2,"5","6000",8160,1.5,8,3000,["gold:1"],[200,9800],2],[237,12,"腓特烈",4,5,2,2,"5","6000",8205,1.5,8,3000,["gold:1"],[200,9800],2],[238,12,"腓特烈",4,5,3,1,"10","2500",8250,1.5,8,3000,["gold:1"],[200,9800],1],[239,12,"腓特烈",4,5,4,2,"5","6000",8295,1.5,8,3000,["gold:1"],[200,9800],2],[240,12,"腓特烈",4,5,5,2,"5","6000",8340,1.5,8,3000,["gold:1"],[200,9800],2],[241,12,"腓特烈",4,6,1,2,"5","6000",8385,1.5,8,3000,["gold:1"],[200,9800],2],[242,12,"腓特烈",4,6,2,3,"12","2000",8430,1.5,8,3000,["gold:1"],[200,9800],3],[243,12,"腓特烈",4,6,3,2,"5","6000",8475,1.5,8,3000,["gold:1"],[200,9800],2],[244,12,"腓特烈",4,6,4,3,"12","2000",8520,1.5,8,3000,["gold:1"],[200,9800],3],[245,12,"腓特烈",4,6,5,3,"12","2000",8565,1.5,8,3000,["gold:1"],[200,9800],3],[246,12,"腓特烈",4,7,1,1,"10","2500",8610,1.5,8,3000,["gold:1"],[200,9800],1],[247,12,"腓特烈",4,7,2,1,"10","2500",8655,1.5,8,3000,["gold:1"],[200,9800],1],[248,12,"腓特烈",4,7,3,1,"10","2500",8700,1.5,8,3000,["gold:1"],[200,9800],1],[249,12,"腓特烈",4,7,4,1,"10","2500",8745,1.5,8,3000,["gold:1"],[200,9800],1],[250,12,"腓特烈",4,7,5,1,"10","2500",8790,1.5,8,3000,["gold:1"],[200,9800],1],[251,12,"腓特烈",4,8,1,2,"5","6000",8835,1.5,8,3000,["box:3:1"],[200,9800],2],[252,12,"腓特烈",4,8,2,2,"5","6000",8880,1.5,8,3000,["box:3:1"],[200,9800],2],[253,12,"腓特烈",4,8,3,3,"12","2000",8925,1.5,8,3000,["box:3:1"],[200,9800],3],[254,12,"腓特烈",4,8,4,1,"10","2500",8970,1.5,8,3000,["box:3:1"],[200,9800],1],[255,12,"腓特烈",4,8,5,2,"5","6000",9015,1.5,8,3000,["box:3:1"],[200,9800],2],[256,13,"CHRIS",4,1,1,2,"6","6000",9060,1.5,8,3000,["gold:1"],[200,9800],2],[257,13,"CHRIS",4,1,2,2,"6","6000",9105,1.5,8,3000,["gold:1"],[200,9800],2],[258,13,"CHRIS",4,1,3,3,"14","2000",9150,1.5,8,3000,["gold:1"],[200,9800],3],[259,13,"CHRIS",4,1,4,3,"14","2000",9195,1.5,8,3000,["gold:1"],[200,9800],3],[260,13,"CHRIS",4,1,5,2,"6","6000",9240,1.5,8,3000,["gold:1"],[200,9800],2],[261,13,"CHRIS",4,2,1,3,"14","2000",9285,1.5,8,3000,["gold:1"],[200,9800],3],[262,13,"CHRIS",4,2,2,3,"14","2000",9330,1.5,8,3000,["gold:1"],[200,9800],3],[263,13,"CHRIS",4,2,3,3,"14","2000",9375,1.5,8,3000,["gold:1"],[200,9800],3],[264,13,"CHRIS",4,2,4,3,"14","2000",9420,1.5,8,3000,["gold:1"],[200,9800],3],[265,13,"CHRIS",4,2,5,3,"14","2000",9465,1.5,8,3000,["gold:1"],[200,9800],3],[266,13,"CHRIS",4,3,1,1,"12","2500",9510,1.5,8,3000,["gold:1"],[200,9800],1],[267,13,"CHRIS",4,3,2,2,"6","6000",9555,1.5,8,3000,["gold:1"],[200,9800],2],[268,13,"CHRIS",4,3,3,2,"6","6000",9600,1.5,8,3000,["gold:1"],[200,9800],2],[269,13,"CHRIS",4,3,4,1,"12","2500",9645,1.5,8,3000,["gold:1"],[200,9800],1],[270,13,"CHRIS",4,3,5,1,"12","2500",9690,1.5,8,3000,["gold:1"],[200,9800],1],[271,13,"CHRIS",4,4,1,1,"12","2500",9735,1.5,8,3000,["box:3:1"],[200,9800],1],[272,13,"CHRIS",4,4,2,2,"6","6000",9780,1.5,8,3000,["box:3:1"],[200,9800],2],[273,13,"CHRIS",4,4,3,3,"14","2000",9825,1.5,8,3000,["box:3:1"],[200,9800],3],[274,13,"CHRIS",4,4,4,2,"6","6000",9870,1.5,8,3000,["box:3:1"],[200,9800],2],[275,13,"CHRIS",4,4,5,1,"12","2500",9915,1.5,8,3000,["box:3:1"],[200,9800],1],[276,13,"CHRIS",4,5,1,2,"6","6000",9960,1.5,8,3000,["gold:1"],[200,9800],2],[277,13,"CHRIS",4,5,2,2,"6","6000",10005,1.5,8,3000,["gold:1"],[200,9800],2],[278,13,"CHRIS",4,5,3,1,"12","2500",10050,1.5,8,3000,["gold:1"],[200,9800],1],[279,13,"CHRIS",4,5,4,2,"6","6000",10095,1.5,8,3000,["gold:1"],[200,9800],2],[280,13,"CHRIS",4,5,5,2,"6","6000",10140,1.5,8,3000,["gold:1"],[200,9800],2],[281,13,"CHRIS",4,6,1,2,"6","6000",10185,1.5,8,3000,["gold:1"],[200,9800],2],[282,13,"CHRIS",4,6,2,3,"14","2000",10230,1.5,8,3000,["gold:1"],[200,9800],3],[283,13,"CHRIS",4,6,3,2,"6","6000",10275,1.5,8,3000,["gold:1"],[200,9800],2],[284,13,"CHRIS",4,6,4,3,"14","2000",10320,1.5,8,3000,["gold:1"],[200,9800],3],[285,13,"CHRIS",4,6,5,3,"14","2000",10365,1.5,8,3000,["gold:1"],[200,9800],3],[286,13,"CHRIS",4,7,1,1,"12","2500",10410,1.5,8,3000,["gold:1"],[200,9800],1],[287,13,"CHRIS",4,7,2,1,"12","2500",10455,1.5,8,3000,["gold:1"],[200,9800],1],[288,13,"CHRIS",4,7,3,1,"12","2500",10500,1.5,8,3000,["gold:1"],[200,9800],1],[289,13,"CHRIS",4,7,4,1,"12","2500",10545,1.5,8,3000,["gold:1"],[200,9800],1],[290,13,"CHRIS",4,7,5,1,"12","2500",10590,1.5,8,3000,["gold:1"],[200,9800],1],[291,13,"CHRIS",4,8,1,2,"6","6000",10635,1.5,8,3000,["box:3:1"],[200,9800],2],[292,13,"CHRIS",4,8,2,2,"6","6000",10680,1.5,8,3000,["box:3:1"],[200,9800],2],[293,13,"CHRIS",4,8,3,3,"14","2000",10725,1.5,8,3000,["box:3:1"],[200,9800],3],[294,13,"CHRIS",4,8,4,1,"12","2500",10770,1.5,8,3000,["box:3:1"],[200,9800],1],[295,13,"CHRIS",4,8,5,2,"6","6000",10815,1.5,8,3000,["box:3:1"],[200,9800],2],[296,14,"ZARD",4,1,1,2,"6","6000",10860,1.5,8,3000,["gold:1"],[200,9800],2],[297,14,"ZARD",4,1,2,2,"6","6000",10905,1.5,8,3000,["gold:1"],[200,9800],2],[298,14,"ZARD",4,1,3,3,"14","2000",10950,1.5,8,3000,["gold:1"],[200,9800],3],[299,14,"ZARD",4,1,4,3,"14","2000",10995,1.5,8,3000,["gold:1"],[200,9800],3],[300,14,"ZARD",4,1,5,2,"6","6000",11040,1.5,8,3000,["gold:1"],[200,9800],2],[301,14,"ZARD",4,2,1,3,"14","2000",11085,1.5,8,3000,["gold:1"],[200,9800],3],[302,14,"ZARD",4,2,2,3,"14","2000",11130,1.5,8,3000,["gold:1"],[200,9800],3],[303,14,"ZARD",4,2,3,3,"14","2000",11175,1.5,8,3000,["gold:1"],[200,9800],3],[304,14,"ZARD",4,2,4,3,"14","2000",11220,1.5,8,3000,["gold:1"],[200,9800],3],[305,14,"ZARD",4,2,5,3,"14","2000",11265,1.5,8,3000,["gold:1"],[200,9800],3],[306,14,"ZARD",4,3,1,1,"12","2500",11310,1.5,8,3000,["gold:1"],[200,9800],1],[307,14,"ZARD",4,3,2,2,"6","6000",11355,1.5,8,3000,["gold:1"],[200,9800],2],[308,14,"ZARD",4,3,3,2,"6","6000",11400,1.5,8,3000,["gold:1"],[200,9800],2],[309,14,"ZARD",4,3,4,1,"12","2500",11445,1.5,8,3000,["gold:1"],[200,9800],1],[310,14,"ZARD",4,3,5,1,"12","2500",11490,1.5,8,3000,["gold:1"],[200,9800],1],[311,14,"ZARD",4,4,1,1,"12","2500",11535,1.5,8,3000,["box:3:1"],[200,9800],1],[312,14,"ZARD",4,4,2,2,"6","6000",11580,1.5,8,3000,["box:3:1"],[200,9800],2],[313,14,"ZARD",4,4,3,3,"14","2000",11625,1.5,8,3000,["box:3:1"],[200,9800],3],[314,14,"ZARD",4,4,4,2,"6","6000",11670,1.5,8,3000,["box:3:1"],[200,9800],2],[315,14,"ZARD",4,4,5,1,"12","2500",11715,1.5,8,3000,["box:3:1"],[200,9800],1],[316,14,"ZARD",4,5,1,2,"6","6000",11760,1.5,8,3000,["gold:1"],[200,9800],2],[317,14,"ZARD",4,5,2,2,"6","6000",11805,1.5,8,3000,["gold:1"],[200,9800],2],[318,14,"ZARD",4,5,3,1,"12","2500",11850,1.5,8,3000,["gold:1"],[200,9800],1],[319,14,"ZARD",4,5,4,2,"6","6000",11895,1.5,8,3000,["gold:1"],[200,9800],2],[320,14,"ZARD",4,5,5,2,"6","6000",11940,1.5,8,3000,["gold:1"],[200,9800],2],[321,14,"ZARD",4,6,1,2,"6","6000",11985,1.5,8,3000,["gold:1"],[200,9800],2],[322,14,"ZARD",4,6,2,3,"14","2000",12030,1.5,8,3000,["gold:1"],[200,9800],3],[323,14,"ZARD",4,6,3,2,"6","6000",12075,1.5,8,3000,["gold:1"],[200,9800],2],[324,14,"ZARD",4,6,4,3,"14","2000",12120,1.5,8,3000,["gold:1"],[200,9800],3],[325,14,"ZARD",4,6,5,3,"14","2000",12165,1.5,8,3000,["gold:1"],[200,9800],3],[326,14,"ZARD",4,7,1,1,"12","2500",12210,1.5,8,3000,["gold:1"],[200,9800],1],[327,14,"ZARD",4,7,2,1,"12","2500",12255,1.5,8,3000,["gold:1"],[200,9800],1],[328,14,"ZARD",4,7,3,1,"12","2500",12300,1.5,8,3000,["gold:1"],[200,9800],1],[329,14,"ZARD",4,7,4,1,"12","2500",12345,1.5,8,3000,["gold:1"],[200,9800],1],[330,14,"ZARD",4,7,5,1,"12","2500",12390,1.5,8,3000,["gold:1"],[200,9800],1],[331,14,"ZARD",4,8,1,2,"6","6000",12435,1.5,8,3000,["box:3:1"],[200,9800],2],[332,14,"ZARD",4,8,2,2,"6","6000",12480,1.5,8,3000,["box:3:1"],[200,9800],2],[333,14,"ZARD",4,8,3,3,"14","2000",12525,1.5,8,3000,["box:3:1"],[200,9800],3],[334,14,"ZARD",4,8,4,1,"12","2500",12570,1.5,8,3000,["box:3:1"],[200,9800],1],[335,14,"ZARD",4,8,5,2,"6","6000",12615,1.5,8,3000,["box:3:1"],[200,9800],2]]
\ No newline at end of file
+[[1,-2,"史莱姆大王",1,1,1,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[2,-2,"史莱姆大王",1,1,2,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[3,-2,"史莱姆大王",1,1,3,3,10,"2000",400,1.5,5,3000,["0"],[0],3,0],[4,-2,"史莱姆大王",1,1,4,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[5,-2,"史莱姆大王",1,1,5,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[6,-1,"史莱姆大王",1,1,1,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[7,-1,"史莱姆大王",1,1,2,1,10,"2000",800,1.5,5,3000,["0"],[0],1,0],[8,-1,"史莱姆大王",1,1,3,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[9,-1,"史莱姆大王",1,1,4,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[10,-1,"史莱姆大王",1,1,5,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[11,1,"史莱姆大王",1,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[12,1,"史莱姆大王",1,1,2,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[13,1,"史莱姆大王",1,1,3,2,3,"6000",250,1.5,5,3000,["gold:1"],[200,9800],2,1500],[14,1,"史莱姆大王",1,1,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[15,1,"史莱姆大王",1,1,5,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[16,1,"史莱姆大王",1,2,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[17,1,"史莱姆大王",1,2,2,3,7,"2000",250,1.5,5,3000,["gold:1"],[200,9800],3,1500],[18,1,"史莱姆大王",1,2,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[19,1,"史莱姆大王",1,2,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[20,1,"史莱姆大王",1,2,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0,1500],[21,1,"史莱姆大王",1,3,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[22,1,"史莱姆大王",1,3,2,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[23,1,"史莱姆大王",1,3,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[24,1,"史莱姆大王",1,3,4,1,6,"2500",250,1.5,5,3000,["gold:1"],[200,9800],1,1500],[25,1,"史莱姆大王",1,3,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0,1500],[26,2,"拿破仑",2,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,3000],[27,2,"拿破仑",2,1,2,2,"4","6000",285,1.5,5,3000,["gold:1"],[200,9800],2,3000],[28,2,"拿破仑",2,1,3,0,"0","0",320,1.5,5,3000,["gold:1"],[200,9800],0,3000],[29,2,"拿破仑",2,1,4,2,"4","6000",355,1.5,5,3000,["gold:1"],[200,9800],2,3000],[30,2,"拿破仑",2,1,5,0,"0","0",390,1.5,5,3000,["gold:1"],[200,9800],0,3000],[31,2,"拿破仑",2,2,1,1,"7","2500",425,1.5,5,3000,["gold:1"],[200,9800],1,3000],[32,2,"拿破仑",2,2,2,0,"0","0",460,1.5,5,3000,["gold:1"],[200,9800],0,3000],[33,2,"拿破仑",2,2,3,0,"0","0",495,1.5,5,3000,["gold:1"],[200,9800],0,3000],[34,2,"拿破仑",2,2,4,0,"0","0",530,1.5,5,3000,["gold:1"],[200,9800],0,3000],[35,2,"拿破仑",2,2,5,3,"8","2000",565,1.5,5,3000,["box:1:1"],[200,9800],3,3000],[36,2,"拿破仑",2,3,1,0,"0","0",600,1.5,5,3000,["gold:1"],[200,9800],0,3000],[37,2,"拿破仑",2,3,2,1,"7","2500",635,1.5,5,3000,["gold:1"],[200,9800],1,3000],[38,2,"拿破仑",2,3,3,0,"0","0",670,1.5,5,3000,["gold:1"],[200,9800],0,3000],[39,2,"拿破仑",2,3,4,2,"4","6000",705,1.5,5,3000,["gold:1"],[200,9800],2,3000],[40,2,"拿破仑",2,3,5,0,"0","0",740,1.5,5,3000,["box:1:1"],[200,9800],0,3000],[41,3,"凯撒",2,1,1,3,"8","2000",600,1.5,5,3000,["gold:1"],[200,9800],3,4500],[42,3,"凯撒",2,1,2,0,"0","0",635,1.5,5,3000,["gold:1"],[200,9800],0,4500],[43,3,"凯撒",2,1,3,1,"7","2500",670,1.5,5,3000,["gold:1"],[200,9800],1,4500],[44,3,"凯撒",2,1,4,0,"0","0",705,1.5,5,3000,["gold:1"],[200,9800],0,4500],[45,3,"凯撒",2,1,5,3,"8","2000",740,1.5,5,3000,["gold:1"],[200,9800],3,4500],[46,3,"凯撒",2,2,1,0,"0","0",775,1.5,5,3000,["gold:1"],[200,9800],0,4500],[47,3,"凯撒",2,2,2,1,"7","2500",810,1.5,5,3000,["gold:1"],[200,9800],1,4500],[48,3,"凯撒",2,2,3,2,"4","6000",845,1.5,5,3000,["gold:1"],[200,9800],2,4500],[49,3,"凯撒",2,2,4,1,"7","2500",880,1.5,5,3000,["gold:1"],[200,9800],1,4500],[50,3,"凯撒",2,2,5,0,"0","0",915,1.5,5,3000,["gold:1"],[200,9800],0,4500],[51,3,"凯撒",2,3,1,2,"4","6000",950,1.5,5,3000,["box:2:1"],[200,9800],2,4500],[52,3,"凯撒",2,3,2,0,"0","0",985,1.5,5,3000,["box:2:1"],[200,9800],0,4500],[53,3,"凯撒",2,3,3,3,"8","2000",1020,1.5,5,3000,["box:2:1"],[200,9800],3,4500],[54,3,"凯撒",2,3,4,0,"0","0",1055,1.5,5,3000,["box:2:1"],[200,9800],0,4500],[55,3,"凯撒",2,3,5,2,"4","6000",1090,1.5,5,3000,["box:2:1"],[200,9800],2,4500],[56,4,"克伦威尔",2,1,1,2,"4","6000",1125,1.5,5,3000,["gold:1"],[200,9800],2,6000],[57,4,"克伦威尔",2,1,2,0,"0","0",1160,1.5,5,3000,["gold:1"],[200,9800],0,6000],[58,4,"克伦威尔",2,1,3,1,"7","2500",1195,1.5,5,3000,["gold:1"],[200,9800],1,6000],[59,4,"克伦威尔",2,1,4,0,"0","0",1230,1.5,5,3000,["gold:1"],[200,9800],0,6000],[60,4,"克伦威尔",2,1,5,2,"4","6000",1265,1.5,5,3000,["gold:1"],[200,9800],2,6000],[61,4,"克伦威尔",2,2,1,0,"0","0",1300,1.5,5,3000,["gold:1"],[200,9800],0,6000],[62,4,"克伦威尔",2,2,2,3,"8","2000",1335,1.5,5,3000,["gold:1"],[200,9800],3,6000],[63,4,"克伦威尔",2,2,3,2,"4","6000",1370,1.5,5,3000,["gold:1"],[200,9800],2,6000],[64,4,"克伦威尔",2,2,4,3,"8","2000",1405,1.5,5,3000,["gold:1"],[200,9800],3,6000],[65,4,"克伦威尔",2,2,5,0,"0","0",1440,1.5,5,3000,["gold:1"],[200,9800],0,6000],[66,4,"克伦威尔",2,3,1,2,"4","6000",1475,1.5,5,3000,["box:2:1"],[200,9800],2,6000],[67,4,"克伦威尔",2,3,2,0,"0","0",1510,1.5,5,3000,["box:2:1"],[200,9800],0,6000],[68,4,"克伦威尔",2,3,3,3,"8","2000",1545,1.5,5,3000,["box:2:1"],[200,9800],3,6000],[69,4,"克伦威尔",2,3,4,0,"0","0",1580,1.5,5,3000,["box:2:1"],[200,9800],0,6000],[70,4,"克伦威尔",2,3,5,2,"4","6000",1615,1.5,5,3000,["box:2:1"],[200,9800],2,6000],[71,4,"克伦威尔",2,4,1,3,"8","2000",1650,1.5,5,3000,["box:2:1"],[200,9800],3,6000],[72,4,"克伦威尔",2,4,2,1,"7","2500",1685,1.5,5,3000,["box:2:1"],[200,9800],1,6000],[73,4,"克伦威尔",2,4,3,2,"4","6000",1720,1.5,5,3000,["box:2:1"],[200,9800],2,6000],[74,4,"克伦威尔",2,4,4,1,"7","2500",1755,1.5,5,3000,["box:2:1"],[200,9800],1,6000],[75,4,"克伦威尔",2,4,5,3,"8","2000",1790,1.5,5,3000,["box:2:1"],[200,9800],3,6000],[76,5,"尼克松",3,1,1,1,"7","2500",1650,1.5,5,3000,["gold:1"],[200,9800],1,7500],[77,5,"尼克松",3,1,2,1,"7","2500",1685,1.5,5,3000,["gold:1"],[200,9800],1,7500],[78,5,"尼克松",3,1,3,2,"4","6000",1720,1.5,5,3000,["gold:1"],[200,9800],2,7500],[79,5,"尼克松",3,1,4,2,"4","6000",1755,1.5,5,3000,["gold:1"],[200,9800],2,7500],[80,5,"尼克松",3,1,5,0,"0","0",1790,1.5,5,3000,["gold:1"],[200,9800],0,7500],[81,5,"尼克松",3,2,1,0,"0","0",1825,1.5,5,3000,["gold:1"],[200,9800],0,7500],[82,5,"尼克松",3,2,2,2,"4","6000",1860,1.5,5,3000,["gold:1"],[200,9800],2,7500],[83,5,"尼克松",3,2,3,2,"4","6000",1895,1.5,5,3000,["gold:1"],[200,9800],2,7500],[84,5,"尼克松",3,2,4,3,"8","2000",1930,1.5,5,3000,["gold:1"],[200,9800],3,7500],[85,5,"尼克松",3,2,5,3,"8","2000",1965,1.5,5,3000,["gold:1"],[200,9800],3,7500],[86,5,"尼克松",3,3,1,2,"4","6000",2000,1.5,5,3000,["gold:1"],[200,9800],2,7500],[87,5,"尼克松",3,3,2,3,"8","2000",2035,1.5,5,3000,["gold:1"],[200,9800],3,7500],[88,5,"尼克松",3,3,3,0,"0","0",2070,1.5,5,3000,["gold:1"],[200,9800],0,7500],[89,5,"尼克松",3,3,4,3,"8","2000",2105,1.5,5,3000,["gold:1"],[200,9800],3,7500],[90,5,"尼克松",3,3,5,2,"4","6000",2140,1.5,5,3000,["gold:1"],[200,9800],2,7500],[91,5,"尼克松",3,4,1,1,"7","2500",2175,1.5,5,3000,["box:2:1"],[200,9800],1,7500],[92,5,"尼克松",3,4,2,2,"4","6000",2210,1.5,5,3000,["box:2:1"],[200,9800],2,7500],[93,5,"尼克松",3,4,3,3,"8","2000",2245,1.5,5,3000,["box:2:1"],[200,9800],3,7500],[94,5,"尼克松",3,4,4,2,"4","6000",2280,1.5,5,3000,["box:2:1"],[200,9800],2,7500],[95,5,"尼克松",3,4,5,1,"7","2500",2315,1.5,5,3000,["box:2:1"],[200,9800],1,7500],[96,6,"李存勖",3,1,1,2,"5","6000",2355,1.5,5,3000,["gold:1"],[200,9800],2,9000],[97,6,"李存勖",3,1,2,2,"5","6000",2395,1.5,5,3000,["gold:1"],[200,9800],2,9000],[98,6,"李存勖",3,1,3,0,"0","0",2435,1.5,5,3000,["gold:1"],[200,9800],0,9000],[99,6,"李存勖",3,1,4,1,"10","2500",2475,1.5,5,3000,["gold:1"],[200,9800],1,9000],[100,6,"李存勖",3,1,5,1,"10","2500",2515,1.5,5,3000,["gold:1"],[200,9800],1,9000],[101,6,"李存勖",3,2,1,0,"0","0",2555,1.5,5,3000,["gold:1"],[200,9800],0,9000],[102,6,"李存勖",3,2,2,2,"5","6000",2595,1.5,5,3000,["gold:1"],[200,9800],2,9000],[103,6,"李存勖",3,2,3,3,"12","2000",2635,1.5,5,3000,["gold:1"],[200,9800],3,9000],[104,6,"李存勖",3,2,4,2,"5","6000",2675,1.5,5,3000,["gold:1"],[200,9800],2,9000],[105,6,"李存勖",3,2,5,0,"0","0",2715,1.5,5,3000,["gold:1"],[200,9800],0,9000],[106,6,"李存勖",3,3,1,2,"5","6000",2755,1.5,5,3000,["gold:1"],[200,9800],2,9000],[107,6,"李存勖",3,3,2,2,"5","6000",2795,1.5,5,3000,["gold:1"],[200,9800],2,9000],[108,6,"李存勖",3,3,3,0,"0","0",2835,1.5,5,3000,["gold:1"],[200,9800],0,9000],[109,6,"李存勖",3,3,4,3,"12","2000",2875,1.5,5,3000,["gold:1"],[200,9800],3,9000],[110,6,"李存勖",3,3,5,3,"12","2000",2915,1.5,5,3000,["gold:1"],[200,9800],3,9000],[111,6,"李存勖",3,4,1,3,"12","2000",2955,1.5,5,3000,["box:3:1"],[200,9800],3,9000],[112,6,"李存勖",3,4,2,3,"12","2000",2995,1.5,5,3000,["box:3:1"],[200,9800],3,9000],[113,6,"李存勖",3,4,3,2,"5","6000",3035,1.5,5,3000,["box:3:1"],[200,9800],2,9000],[114,6,"李存勖",3,4,4,1,"10","2500",3075,1.5,5,3000,["box:3:1"],[200,9800],1,9000],[115,6,"李存勖",3,4,5,1,"10","2500",3115,1.5,5,3000,["box:3:1"],[200,9800],1,9000],[116,7,"AA_12",3,1,1,1,"10","2500",3155,1.5,5,3000,["gold:1"],[200,9800],1,10500],[117,7,"AA_12",3,1,2,0,"0","0",3195,1.5,5,3000,["gold:1"],[200,9800],0,10500],[118,7,"AA_12",3,1,3,3,"12","2000",3235,1.5,5,3000,["gold:1"],[200,9800],3,10500],[119,7,"AA_12",3,1,4,0,"0","0",3275,1.5,5,3000,["gold:1"],[200,9800],0,10500],[120,7,"AA_12",3,1,5,1,"10","2500",3315,1.5,5,3000,["gold:1"],[200,9800],1,10500],[121,7,"AA_12",3,2,1,0,"0","0",3355,1.5,5,3000,["gold:1"],[200,9800],0,10500],[122,7,"AA_12",3,2,2,2,"5","6000",3395,1.5,5,3000,["gold:1"],[200,9800],2,10500],[123,7,"AA_12",3,2,3,3,"12","2000",3435,1.5,5,3000,["gold:1"],[200,9800],3,10500],[124,7,"AA_12",3,2,4,2,"5","6000",3475,1.5,5,3000,["gold:1"],[200,9800],2,10500],[125,7,"AA_12",3,2,5,0,"0","0",3515,1.5,5,3000,["gold:1"],[200,9800],0,10500],[126,7,"AA_12",3,3,1,2,"5","6000",3555,1.5,5,3000,["gold:1"],[200,9800],2,10500],[127,7,"AA_12",3,3,2,1,"10","2500",3595,1.5,5,3000,["gold:1"],[200,9800],1,10500],[128,7,"AA_12",3,3,3,3,"12","2000",3635,1.5,5,3000,["gold:1"],[200,9800],3,10500],[129,7,"AA_12",3,3,4,1,"10","2500",3675,1.5,5,3000,["gold:1"],[200,9800],1,10500],[130,7,"AA_12",3,3,5,2,"5","6000",3715,1.5,5,3000,["gold:1"],[200,9800],2,10500],[131,7,"AA_12",3,4,1,3,"12","2000",3755,1.5,5,3000,["box:3:1"],[200,9800],3,10500],[132,7,"AA_12",3,4,2,2,"5","6000",3795,1.5,5,3000,["box:3:1"],[200,9800],2,10500],[133,7,"AA_12",3,4,3,1,"10","2500",3835,1.5,5,3000,["box:3:1"],[200,9800],1,10500],[134,7,"AA_12",3,4,4,2,"5","6000",3875,1.5,5,3000,["box:3:1"],[200,9800],2,10500],[135,7,"AA_12",3,4,5,3,"12","2000",3915,1.5,5,3000,["box:3:1"],[200,9800],3,10500],[136,8,"米高扬",3,1,1,0,"0","0",3955,1.5,5,3000,["gold:1"],[200,9800],0,12000],[137,8,"米高扬",3,1,2,1,"10","2500",3995,1.5,5,3000,["gold:1"],[200,9800],1,12000],[138,8,"米高扬",3,1,3,1,"10","2500",4035,1.5,5,3000,["gold:1"],[200,9800],1,12000],[139,8,"米高扬",3,1,4,1,"10","2500",4075,1.5,5,3000,["gold:1"],[200,9800],1,12000],[140,8,"米高扬",3,1,5,0,"0","0",4115,1.5,5,3000,["gold:1"],[200,9800],0,12000],[141,8,"米高扬",3,2,1,2,"5","6000",4155,1.5,5,3000,["gold:1"],[200,9800],2,12000],[142,8,"米高扬",3,2,2,0,"0","0",4195,1.5,5,3000,["gold:1"],[200,9800],0,12000],[143,8,"米高扬",3,2,3,2,"5","6000",4235,1.5,5,3000,["gold:1"],[200,9800],2,12000],[144,8,"米高扬",3,2,4,0,"0","0",4275,1.5,5,3000,["gold:1"],[200,9800],0,12000],[145,8,"米高扬",3,2,5,2,"5","6000",4315,1.5,5,3000,["gold:1"],[200,9800],2,12000],[146,8,"米高扬",3,3,1,0,"0","0",4355,1.5,5,3000,["gold:1"],[200,9800],0,12000],[147,8,"米高扬",3,3,2,3,"12","2000",4395,1.5,5,3000,["gold:1"],[200,9800],3,12000],[148,8,"米高扬",3,3,3,3,"12","2000",4435,1.5,5,3000,["gold:1"],[200,9800],3,12000],[149,8,"米高扬",3,3,4,3,"12","2000",4475,1.5,5,3000,["gold:1"],[200,9800],3,12000],[150,8,"米高扬",3,3,5,0,"0","0",4515,1.5,5,3000,["gold:1"],[200,9800],0,12000],[151,8,"米高扬",3,4,1,2,"5","6000",4555,1.5,5,3000,["box:3:1"],[200,9800],2,12000],[152,8,"米高扬",3,4,2,2,"5","6000",4595,1.5,5,3000,["box:3:1"],[200,9800],2,12000],[153,8,"米高扬",3,4,3,3,"12","2000",4635,1.5,5,3000,["box:3:1"],[200,9800],3,12000],[154,8,"米高扬",3,4,4,3,"12","2000",4675,1.5,5,3000,["box:3:1"],[200,9800],3,12000],[155,8,"米高扬",3,4,5,3,"12","2000",4715,1.5,5,3000,["box:3:1"],[200,9800],3,12000],[156,9,"安德罗波夫",4,1,1,0,"0","0",4755,1.5,5,3000,["gold:1"],[200,9800],0,13500],[157,9,"安德罗波夫",4,1,2,2,"5","6000",4795,1.5,5,3000,["gold:1"],[200,9800],2,13500],[158,9,"安德罗波夫",4,1,3,1,"10","2500",4835,1.5,5,3000,["gold:1"],[200,9800],1,13500],[159,9,"安德罗波夫",4,1,4,2,"5","6000",4875,1.5,5,3000,["gold:1"],[200,9800],2,13500],[160,9,"安德罗波夫",4,1,5,0,"0","0",4915,1.5,5,3000,["gold:1"],[200,9800],0,13500],[161,9,"安德罗波夫",4,2,1,3,"12","2000",4955,1.5,5,3000,["gold:1"],[200,9800],3,13500],[162,9,"安德罗波夫",4,2,2,0,"0","0",4995,1.5,5,3000,["gold:1"],[200,9800],0,13500],[163,9,"安德罗波夫",4,2,3,2,"5","6000",5035,1.5,5,3000,["gold:1"],[200,9800],2,13500],[164,9,"安德罗波夫",4,2,4,0,"0","0",5075,1.5,5,3000,["gold:1"],[200,9800],0,13500],[165,9,"安德罗波夫",4,2,5,3,"12","2000",5115,1.5,5,3000,["gold:1"],[200,9800],3,13500],[166,9,"安德罗波夫",4,3,1,0,"0","0",5155,1.5,5,3000,["gold:1"],[200,9800],0,13500],[167,9,"安德罗波夫",4,3,2,1,"10","2500",5195,1.5,5,3000,["gold:1"],[200,9800],1,13500],[168,9,"安德罗波夫",4,3,3,1,"10","2500",5235,1.5,5,3000,["gold:1"],[200,9800],1,13500],[169,9,"安德罗波夫",4,3,4,1,"10","2500",5275,1.5,5,3000,["gold:1"],[200,9800],1,13500],[170,9,"安德罗波夫",4,3,5,1,"10","2500",5315,1.5,5,3000,["gold:1"],[200,9800],1,13500],[171,9,"安德罗波夫",4,4,1,2,"5","6000",5355,1.5,5,3000,["box:3:1"],[200,9800],2,13500],[172,9,"安德罗波夫",4,4,2,2,"5","6000",5395,1.5,5,3000,["box:3:1"],[200,9800],2,13500],[173,9,"安德罗波夫",4,4,3,1,"10","2500",5435,1.5,5,3000,["box:3:1"],[200,9800],1,13500],[174,9,"安德罗波夫",4,4,4,3,"12","2000",5475,1.5,5,3000,["box:3:1"],[200,9800],3,13500],[175,9,"安德罗波夫",4,4,5,0,"0","0",5515,1.5,5,3000,["box:3:1"],[200,9800],0,13500],[176,10,"腓特烈",4,1,1,1,"10","2500",5555,1.5,5,3000,["gold:1"],[200,9800],1,15000],[177,10,"腓特烈",4,1,2,3,"12","2000",5595,1.5,5,3000,["gold:1"],[200,9800],3,15000],[178,10,"腓特烈",4,1,3,3,"12","2000",5635,1.5,5,3000,["gold:1"],[200,9800],3,15000],[179,10,"腓特烈",4,1,4,2,"5","6000",5675,1.5,5,3000,["gold:1"],[200,9800],2,15000],[180,10,"腓特烈",4,1,5,2,"5","6000",5715,1.5,5,3000,["gold:1"],[200,9800],2,15000],[181,10,"腓特烈",4,2,1,3,"12","2000",5755,1.5,5,3000,["gold:1"],[200,9800],3,15000],[182,10,"腓特烈",4,2,2,2,"5","6000",5795,1.5,5,3000,["gold:1"],[200,9800],2,15000],[183,10,"腓特烈",4,2,3,3,"12","2000",5835,1.5,5,3000,["gold:1"],[200,9800],3,15000],[184,10,"腓特烈",4,2,4,3,"12","2000",5875,1.5,5,3000,["gold:1"],[200,9800],3,15000],[185,10,"腓特烈",4,2,5,2,"5","6000",5915,1.5,5,3000,["gold:1"],[200,9800],2,15000],[186,10,"腓特烈",4,3,1,1,"10","2500",5955,1.5,5,3000,["gold:1"],[200,9800],1,15000],[187,10,"腓特烈",4,3,2,2,"5","6000",5995,1.5,5,3000,["gold:1"],[200,9800],2,15000],[188,10,"腓特烈",4,3,3,1,"10","2500",6035,1.5,5,3000,["gold:1"],[200,9800],1,15000],[189,10,"腓特烈",4,3,4,3,"12","2000",6075,1.5,5,3000,["gold:1"],[200,9800],3,15000],[190,10,"腓特烈",4,3,5,1,"10","2500",6115,1.5,5,3000,["gold:1"],[200,9800],1,15000],[191,10,"腓特烈",4,4,1,3,"12","2000",6155,1.5,5,3000,["box:3:1"],[200,9800],3,15000],[192,10,"腓特烈",4,4,2,2,"5","6000",6195,1.5,5,3000,["box:3:1"],[200,9800],2,15000],[193,10,"腓特烈",4,4,3,3,"12","2000",6235,1.5,5,3000,["box:3:1"],[200,9800],3,15000],[194,10,"腓特烈",4,4,4,2,"5","6000",6275,1.5,5,3000,["box:3:1"],[200,9800],2,15000],[195,10,"腓特烈",4,4,5,1,"10","2500",6315,1.5,5,3000,["box:3:1"],[200,9800],1,15000],[196,11,"林肯",4,1,1,2,"5","6000",6360,1.5,5,3000,["gold:1"],[200,9800],2,16500],[197,11,"林肯",4,1,2,2,"5","6000",6405,1.5,5,3000,["gold:1"],[200,9800],2,16500],[198,11,"林肯",4,1,3,1,"10","2500",6450,1.5,5,3000,["gold:1"],[200,9800],1,16500],[199,11,"林肯",4,1,4,2,"5","6000",6495,1.5,5,3000,["gold:1"],[200,9800],2,16500],[200,11,"林肯",4,1,5,2,"5","6000",6540,1.5,5,3000,["gold:1"],[200,9800],2,16500],[201,11,"林肯",4,2,1,3,"12","2000",6585,1.5,5,3000,["gold:1"],[200,9800],3,16500],[202,11,"林肯",4,2,2,3,"12","2000",6630,1.5,5,3000,["gold:1"],[200,9800],3,16500],[203,11,"林肯",4,2,3,2,"5","6000",6675,1.5,5,3000,["gold:1"],[200,9800],2,16500],[204,11,"林肯",4,2,4,3,"12","2000",6720,1.5,5,3000,["gold:1"],[200,9800],3,16500],[205,11,"林肯",4,2,5,3,"12","2000",6765,1.5,5,3000,["gold:1"],[200,9800],3,16500],[206,11,"林肯",4,3,1,1,"10","2500",6810,1.5,5,3000,["gold:1"],[200,9800],1,16500],[207,11,"林肯",4,3,2,2,"5","6000",6855,1.5,5,3000,["gold:1"],[200,9800],2,16500],[208,11,"林肯",4,3,3,2,"5","6000",6900,1.5,5,3000,["gold:1"],[200,9800],2,16500],[209,11,"林肯",4,3,4,1,"10","2500",6945,1.5,5,3000,["gold:1"],[200,9800],1,16500],[210,11,"林肯",4,3,5,1,"10","2500",6990,1.5,5,3000,["gold:1"],[200,9800],1,16500],[211,11,"林肯",4,4,1,2,"5","6000",7035,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[212,11,"林肯",4,4,2,2,"5","6000",7080,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[213,11,"林肯",4,4,3,2,"5","6000",7125,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[214,11,"林肯",4,4,4,2,"5","6000",7170,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[215,11,"林肯",4,4,5,2,"5","6000",7215,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[216,12,"腓特烈",4,1,1,2,"5","6000",7260,1.5,5,3000,["gold:1"],[200,9800],2,18000],[217,12,"腓特烈",4,1,2,2,"5","6000",7305,1.5,5,3000,["gold:1"],[200,9800],2,18000],[218,12,"腓特烈",4,1,3,3,"12","2000",7350,1.5,5,3000,["gold:1"],[200,9800],3,18000],[219,12,"腓特烈",4,1,4,3,"12","2000",7395,1.5,5,3000,["gold:1"],[200,9800],3,18000],[220,12,"腓特烈",4,1,5,2,"5","6000",7440,1.5,5,3000,["gold:1"],[200,9800],2,18000],[221,12,"腓特烈",4,2,1,3,"12","2000",7485,1.5,5,3000,["gold:1"],[200,9800],3,18000],[222,12,"腓特烈",4,2,2,3,"12","2000",7530,1.5,5,3000,["gold:1"],[200,9800],3,18000],[223,12,"腓特烈",4,2,3,3,"12","2000",7575,1.5,5,3000,["gold:1"],[200,9800],3,18000],[224,12,"腓特烈",4,2,4,3,"12","2000",7620,1.5,5,3000,["gold:1"],[200,9800],3,18000],[225,12,"腓特烈",4,2,5,3,"12","2000",7665,1.5,5,3000,["gold:1"],[200,9800],3,18000],[226,12,"腓特烈",4,3,1,1,"10","2500",7710,1.5,5,3000,["gold:1"],[200,9800],1,18000],[227,12,"腓特烈",4,3,2,2,"5","6000",7755,1.5,5,3000,["gold:1"],[200,9800],2,18000],[228,12,"腓特烈",4,3,3,2,"5","6000",7800,1.5,5,3000,["gold:1"],[200,9800],2,18000],[229,12,"腓特烈",4,3,4,1,"10","2500",7845,1.5,5,3000,["gold:1"],[200,9800],1,18000],[230,12,"腓特烈",4,3,5,1,"10","2500",7890,1.5,5,3000,["gold:1"],[200,9800],1,18000],[231,12,"腓特烈",4,4,1,1,"10","2500",7935,1.5,5,3000,["box:3:1"],[200,9800],1,18000],[232,12,"腓特烈",4,4,2,2,"5","6000",7980,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[233,12,"腓特烈",4,4,3,3,"12","2000",8025,1.5,5,3000,["box:3:1"],[200,9800],3,18000],[234,12,"腓特烈",4,4,4,2,"5","6000",8070,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[235,12,"腓特烈",4,4,5,1,"10","2500",8115,1.5,5,3000,["box:3:1"],[200,9800],1,18000],[236,12,"腓特烈",4,5,1,2,"5","6000",8160,1.5,5,3000,["gold:1"],[200,9800],2,18000],[237,12,"腓特烈",4,5,2,2,"5","6000",8205,1.5,5,3000,["gold:1"],[200,9800],2,18000],[238,12,"腓特烈",4,5,3,1,"10","2500",8250,1.5,5,3000,["gold:1"],[200,9800],1,18000],[239,12,"腓特烈",4,5,4,2,"5","6000",8295,1.5,5,3000,["gold:1"],[200,9800],2,18000],[240,12,"腓特烈",4,5,5,2,"5","6000",8340,1.5,5,3000,["gold:1"],[200,9800],2,18000],[241,12,"腓特烈",4,6,1,2,"5","6000",8385,1.5,5,3000,["gold:1"],[200,9800],2,18000],[242,12,"腓特烈",4,6,2,3,"12","2000",8430,1.5,5,3000,["gold:1"],[200,9800],3,18000],[243,12,"腓特烈",4,6,3,2,"5","6000",8475,1.5,5,3000,["gold:1"],[200,9800],2,18000],[244,12,"腓特烈",4,6,4,3,"12","2000",8520,1.5,5,3000,["gold:1"],[200,9800],3,18000],[245,12,"腓特烈",4,6,5,3,"12","2000",8565,1.5,5,3000,["gold:1"],[200,9800],3,18000],[246,12,"腓特烈",4,7,1,1,"10","2500",8610,1.5,5,3000,["gold:1"],[200,9800],1,18000],[247,12,"腓特烈",4,7,2,1,"10","2500",8655,1.5,5,3000,["gold:1"],[200,9800],1,18000],[248,12,"腓特烈",4,7,3,1,"10","2500",8700,1.5,5,3000,["gold:1"],[200,9800],1,18000],[249,12,"腓特烈",4,7,4,1,"10","2500",8745,1.5,5,3000,["gold:1"],[200,9800],1,18000],[250,12,"腓特烈",4,7,5,1,"10","2500",8790,1.5,5,3000,["gold:1"],[200,9800],1,18000],[251,12,"腓特烈",4,8,1,2,"5","6000",8835,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[252,12,"腓特烈",4,8,2,2,"5","6000",8880,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[253,12,"腓特烈",4,8,3,3,"12","2000",8925,1.5,5,3000,["box:3:1"],[200,9800],3,18000],[254,12,"腓特烈",4,8,4,1,"10","2500",8970,1.5,5,3000,["box:3:1"],[200,9800],1,18000],[255,12,"腓特烈",4,8,5,2,"5","6000",9015,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[256,13,"CHRIS",4,1,1,2,"6","6000",9060,1.5,5,3000,["gold:1"],[200,9800],2,19500],[257,13,"CHRIS",4,1,2,2,"6","6000",9105,1.5,5,3000,["gold:1"],[200,9800],2,19500],[258,13,"CHRIS",4,1,3,3,"14","2000",9150,1.5,5,3000,["gold:1"],[200,9800],3,19500],[259,13,"CHRIS",4,1,4,3,"14","2000",9195,1.5,5,3000,["gold:1"],[200,9800],3,19500],[260,13,"CHRIS",4,1,5,2,"6","6000",9240,1.5,5,3000,["gold:1"],[200,9800],2,19500],[261,13,"CHRIS",4,2,1,3,"14","2000",9285,1.5,5,3000,["gold:1"],[200,9800],3,19500],[262,13,"CHRIS",4,2,2,3,"14","2000",9330,1.5,5,3000,["gold:1"],[200,9800],3,19500],[263,13,"CHRIS",4,2,3,3,"14","2000",9375,1.5,5,3000,["gold:1"],[200,9800],3,19500],[264,13,"CHRIS",4,2,4,3,"14","2000",9420,1.5,5,3000,["gold:1"],[200,9800],3,19500],[265,13,"CHRIS",4,2,5,3,"14","2000",9465,1.5,5,3000,["gold:1"],[200,9800],3,19500],[266,13,"CHRIS",4,3,1,1,"12","2500",9510,1.5,5,3000,["gold:1"],[200,9800],1,19500],[267,13,"CHRIS",4,3,2,2,"6","6000",9555,1.5,5,3000,["gold:1"],[200,9800],2,19500],[268,13,"CHRIS",4,3,3,2,"6","6000",9600,1.5,5,3000,["gold:1"],[200,9800],2,19500],[269,13,"CHRIS",4,3,4,1,"12","2500",9645,1.5,5,3000,["gold:1"],[200,9800],1,19500],[270,13,"CHRIS",4,3,5,1,"12","2500",9690,1.5,5,3000,["gold:1"],[200,9800],1,19500],[271,13,"CHRIS",4,4,1,1,"12","2500",9735,1.5,5,3000,["box:3:1"],[200,9800],1,19500],[272,13,"CHRIS",4,4,2,2,"6","6000",9780,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[273,13,"CHRIS",4,4,3,3,"14","2000",9825,1.5,5,3000,["box:3:1"],[200,9800],3,19500],[274,13,"CHRIS",4,4,4,2,"6","6000",9870,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[275,13,"CHRIS",4,4,5,1,"12","2500",9915,1.5,5,3000,["box:3:1"],[200,9800],1,19500],[276,13,"CHRIS",4,5,1,2,"6","6000",9960,1.5,5,3000,["gold:1"],[200,9800],2,19500],[277,13,"CHRIS",4,5,2,2,"6","6000",10005,1.5,5,3000,["gold:1"],[200,9800],2,19500],[278,13,"CHRIS",4,5,3,1,"12","2500",10050,1.5,5,3000,["gold:1"],[200,9800],1,19500],[279,13,"CHRIS",4,5,4,2,"6","6000",10095,1.5,5,3000,["gold:1"],[200,9800],2,19500],[280,13,"CHRIS",4,5,5,2,"6","6000",10140,1.5,5,3000,["gold:1"],[200,9800],2,19500],[281,13,"CHRIS",4,6,1,2,"6","6000",10185,1.5,5,3000,["gold:1"],[200,9800],2,19500],[282,13,"CHRIS",4,6,2,3,"14","2000",10230,1.5,5,3000,["gold:1"],[200,9800],3,19500],[283,13,"CHRIS",4,6,3,2,"6","6000",10275,1.5,5,3000,["gold:1"],[200,9800],2,19500],[284,13,"CHRIS",4,6,4,3,"14","2000",10320,1.5,5,3000,["gold:1"],[200,9800],3,19500],[285,13,"CHRIS",4,6,5,3,"14","2000",10365,1.5,5,3000,["gold:1"],[200,9800],3,19500],[286,13,"CHRIS",4,7,1,1,"12","2500",10410,1.5,5,3000,["gold:1"],[200,9800],1,19500],[287,13,"CHRIS",4,7,2,1,"12","2500",10455,1.5,5,3000,["gold:1"],[200,9800],1,19500],[288,13,"CHRIS",4,7,3,1,"12","2500",10500,1.5,5,3000,["gold:1"],[200,9800],1,19500],[289,13,"CHRIS",4,7,4,1,"12","2500",10545,1.5,5,3000,["gold:1"],[200,9800],1,19500],[290,13,"CHRIS",4,7,5,1,"12","2500",10590,1.5,5,3000,["gold:1"],[200,9800],1,19500],[291,13,"CHRIS",4,8,1,2,"6","6000",10635,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[292,13,"CHRIS",4,8,2,2,"6","6000",10680,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[293,13,"CHRIS",4,8,3,3,"14","2000",10725,1.5,5,3000,["box:3:1"],[200,9800],3,19500],[294,13,"CHRIS",4,8,4,1,"12","2500",10770,1.5,5,3000,["box:3:1"],[200,9800],1,19500],[295,13,"CHRIS",4,8,5,2,"6","6000",10815,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[296,14,"ZARD",4,1,1,2,"6","6000",10860,1.5,5,3000,["gold:1"],[200,9800],2,21000],[297,14,"ZARD",4,1,2,2,"6","6000",10905,1.5,5,3000,["gold:1"],[200,9800],2,21000],[298,14,"ZARD",4,1,3,3,"14","2000",10950,1.5,5,3000,["gold:1"],[200,9800],3,21000],[299,14,"ZARD",4,1,4,3,"14","2000",10995,1.5,5,3000,["gold:1"],[200,9800],3,21000],[300,14,"ZARD",4,1,5,2,"6","6000",11040,1.5,5,3000,["gold:1"],[200,9800],2,21000],[301,14,"ZARD",4,2,1,3,"14","2000",11085,1.5,5,3000,["gold:1"],[200,9800],3,21000],[302,14,"ZARD",4,2,2,3,"14","2000",11130,1.5,5,3000,["gold:1"],[200,9800],3,21000],[303,14,"ZARD",4,2,3,3,"14","2000",11175,1.5,5,3000,["gold:1"],[200,9800],3,21000],[304,14,"ZARD",4,2,4,3,"14","2000",11220,1.5,5,3000,["gold:1"],[200,9800],3,21000],[305,14,"ZARD",4,2,5,3,"14","2000",11265,1.5,5,3000,["gold:1"],[200,9800],3,21000],[306,14,"ZARD",4,3,1,1,"12","2500",11310,1.5,5,3000,["gold:1"],[200,9800],1,21000],[307,14,"ZARD",4,3,2,2,"6","6000",11355,1.5,5,3000,["gold:1"],[200,9800],2,21000],[308,14,"ZARD",4,3,3,2,"6","6000",11400,1.5,5,3000,["gold:1"],[200,9800],2,21000],[309,14,"ZARD",4,3,4,1,"12","2500",11445,1.5,5,3000,["gold:1"],[200,9800],1,21000],[310,14,"ZARD",4,3,5,1,"12","2500",11490,1.5,5,3000,["gold:1"],[200,9800],1,21000],[311,14,"ZARD",4,4,1,1,"12","2500",11535,1.5,5,3000,["box:3:1"],[200,9800],1,21000],[312,14,"ZARD",4,4,2,2,"6","6000",11580,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[313,14,"ZARD",4,4,3,3,"14","2000",11625,1.5,5,3000,["box:3:1"],[200,9800],3,21000],[314,14,"ZARD",4,4,4,2,"6","6000",11670,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[315,14,"ZARD",4,4,5,1,"12","2500",11715,1.5,5,3000,["box:3:1"],[200,9800],1,21000],[316,14,"ZARD",4,5,1,2,"6","6000",11760,1.5,5,3000,["gold:1"],[200,9800],2,21000],[317,14,"ZARD",4,5,2,2,"6","6000",11805,1.5,5,3000,["gold:1"],[200,9800],2,21000],[318,14,"ZARD",4,5,3,1,"12","2500",11850,1.5,5,3000,["gold:1"],[200,9800],1,21000],[319,14,"ZARD",4,5,4,2,"6","6000",11895,1.5,5,3000,["gold:1"],[200,9800],2,21000],[320,14,"ZARD",4,5,5,2,"6","6000",11940,1.5,5,3000,["gold:1"],[200,9800],2,21000],[321,14,"ZARD",4,6,1,2,"6","6000",11985,1.5,5,3000,["gold:1"],[200,9800],2,21000],[322,14,"ZARD",4,6,2,3,"14","2000",12030,1.5,5,3000,["gold:1"],[200,9800],3,21000],[323,14,"ZARD",4,6,3,2,"6","6000",12075,1.5,5,3000,["gold:1"],[200,9800],2,21000],[324,14,"ZARD",4,6,4,3,"14","2000",12120,1.5,5,3000,["gold:1"],[200,9800],3,21000],[325,14,"ZARD",4,6,5,3,"14","2000",12165,1.5,5,3000,["gold:1"],[200,9800],3,21000],[326,14,"ZARD",4,7,1,1,"12","2500",12210,1.5,5,3000,["gold:1"],[200,9800],1,21000],[327,14,"ZARD",4,7,2,1,"12","2500",12255,1.5,5,3000,["gold:1"],[200,9800],1,21000],[328,14,"ZARD",4,7,3,1,"12","2500",12300,1.5,5,3000,["gold:1"],[200,9800],1,21000],[329,14,"ZARD",4,7,4,1,"12","2500",12345,1.5,5,3000,["gold:1"],[200,9800],1,21000],[330,14,"ZARD",4,7,5,1,"12","2500",12390,1.5,5,3000,["gold:1"],[200,9800],1,21000],[331,14,"ZARD",4,8,1,2,"6","6000",12435,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[332,14,"ZARD",4,8,2,2,"6","6000",12480,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[333,14,"ZARD",4,8,3,3,"14","2000",12525,1.5,5,3000,["box:3:1"],[200,9800],3,21000],[334,14,"ZARD",4,8,4,1,"12","2500",12570,1.5,5,3000,["box:3:1"],[200,9800],1,21000],[335,14,"ZARD",4,8,5,2,"6","6000",12615,1.5,5,3000,["box:3:1"],[200,9800],2,21000]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/scoreshop.json b/Assets/StreamingAssets/Table/scoreshop.json
index b2362a2..f71d049 100644
--- a/Assets/StreamingAssets/Table/scoreshop.json
+++ b/Assets/StreamingAssets/Table/scoreshop.json
@@ -1 +1 @@
-[[1,"1级金币获取增加","18小时内对战结算金币量+10%",64800,1,1.1,10000,5000,2],[2,"2级金币获取增加","18小时内对战结算金币量+15%",64800,1,1.5,15000,5000,2],[3,"通行证经验增加","18小时每次对战可获得100点通行证经验",64800,2,100,8000,2000,2]]
\ No newline at end of file
+[[1,"1级金币获取增加","18小时内对战结算金币量+10%",64800,1,1.1,10000,5000,2,"scoreshopgold1"],[2,"2级金币获取增加","18小时内对战结算金币量+15%",64800,1,1.5,15000,5000,2,"scoreshopgold2"],[3,"通行证经验增加","18小时每次对战可获得100点通行证经验",64800,2,100,8000,2000,2,"scoreexp1"]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/skilllevelinfo.json b/Assets/StreamingAssets/Table/skilllevelinfo.json
index 83e0223..d5eb108 100644
--- a/Assets/StreamingAssets/Table/skilllevelinfo.json
+++ b/Assets/StreamingAssets/Table/skilllevelinfo.json
@@ -1 +1 @@
-[[1,99901,1,[1,12],0,[1,1,100],[0]],[2,99901,2,[1,12],0,[1,2,200],[0]],[3,99901,3,[1,12],0,[1,3,300],[0]],[4,99901,4,[1,12],0,[1,4,400],[0]],[5,99901,5,[1,12],0,[1,5,500],[0]],[6,99902,1,[2],0,[1,2,2000],[0]],[7,99902,2,[2],0,[1,4,4000],[0]],[8,99902,3,[2],0,[1,6,6000],[0]],[9,99902,4,[2],0,[1,8,8000],[0]],[10,99902,5,[2],0,[1,10,10000],[0]],[11,10101,1,[1,20],1000,[1,10000,0],[1,10000]],[12,10101,2,[1,20],1000,[1,10000,0],[1,10000]],[13,10101,3,[1,20],1000,[1,10000,0],[1,10000]],[14,10101,4,[1,20],1000,[1,10000,0],[1,10000]],[15,10101,5,[1,20],1000,[1,10000,0],[1,10000]],[16,10101,6,[1,20],1000,[1,10000,0],[1,10000]],[17,10101,7,[1,20],1000,[1,10000,0],[1,10000]],[18,10101,8,[1,20],1000,[1,10000,0],[1,10000]],[19,10101,9,[1,20],1000,[1,10000,0],[1,10000]],[20,10101,10,[1,20],1000,[1,10000,0],[1,10000]],[21,10101,11,[1,20],1000,[1,10000,0],[1,10000]],[22,10101,12,[1,20],1000,[1,10000,0],[1,10000]],[23,10101,13,[1,20],1000,[1,10000,0],[1,10000]],[24,10201,1,[0],1000,[1,10000,0],[1,10000]],[25,10201,2,[0],1000,[1,10000,0],[1,10000]],[26,10201,3,[0],1000,[1,10000,0],[1,10000]],[27,10201,4,[0],1000,[1,10000,0],[1,10000]],[28,10201,5,[0],1000,[1,10000,0],[1,10000]],[29,10201,6,[0],1000,[1,10000,0],[1,10000]],[30,10201,7,[0],1000,[1,10000,0],[1,10000]],[31,10201,8,[0],1000,[1,10000,0],[1,10000]],[32,10201,9,[0],1000,[1,10000,0],[1,10000]],[33,10201,10,[0],1000,[1,10000,0],[1,10000]],[34,10201,11,[0],1000,[1,10000,0],[1,10000]],[35,10202,1,[1,30],0,[1,10000,0],[]],[36,10202,2,[1,30],0,[1,11000,0],[]],[37,10202,3,[1,30],0,[1,12000,0],[]],[38,10202,4,[1,30],0,[1,13000,0],[]],[39,10202,5,[1,30],0,[1,14000,0],[]],[40,10202,6,[1,30],0,[1,15000,0],[]],[41,10202,7,[1,30],0,[1,16000,0],[]],[42,10202,8,[1,30],0,[1,17000,0],[]],[43,10202,9,[1,30],0,[1,18000,0],[]],[44,10202,10,[1,30],0,[1,19000,0],[]],[45,10202,11,[1,30],0,[1,20000,0],[]],[46,10301,1,[1,30],1000,[1,10000,0],[]],[47,10301,2,[1,30],1000,[1,10000,0],[]],[48,10301,3,[1,30],1000,[1,10000,0],[]],[49,10301,4,[1,30],1000,[1,10000,0],[]],[50,10301,5,[1,30],1000,[1,10000,0],[]],[51,10301,6,[1,30],1000,[1,10000,0],[]],[52,10301,7,[1,30],1000,[1,10000,0],[]],[53,10301,8,[1,30],1000,[1,10000,0],[]],[54,10302,1,[1,35],0,[4,35],[]],[55,10302,2,[1,40],0,[4,40],[]],[56,10302,3,[1,45],0,[4,45],[]],[57,10302,4,[1,50],0,[4,50],[]],[58,10302,5,[1,55],0,[4,55],[]],[59,10302,6,[1,60],0,[4,60],[]],[60,10302,7,[1,65],0,[4,65],[]],[61,10302,8,[1,70],0,[4,70],[]],[62,10401,1,[1,40],1000,[1,10000,0],[10,10000]],[63,10401,2,[1,40],1000,[1,10000,0],[10,10000]],[64,10401,3,[1,40],1000,[1,10000,0],[10,10000]],[65,10401,4,[1,40],1000,[1,10000,0],[10,10000]],[66,10401,5,[1,40],1000,[1,10000,0],[10,10000]],[67,20101,1,[0],1000,[1,10000,0],[2,10000]],[68,20101,2,[0],1000,[1,10000,0],[2,10000]],[69,20101,3,[0],1000,[1,10000,0],[2,10000]],[70,20101,4,[0],1000,[1,10000,0],[2,10000]],[71,20101,5,[0],1000,[1,10000,0],[2,10000]],[72,20101,6,[0],1000,[1,10000,0],[2,10000]],[73,20101,7,[0],1000,[1,10000,0],[2,10000]],[74,20101,8,[0],1000,[1,10000,0],[2,10000]],[75,20101,9,[0],1000,[1,10000,0],[2,10000]],[76,20101,10,[0],1000,[1,10000,0],[2,10000]],[77,20101,11,[0],1000,[1,10000,0],[2,10000]],[78,20101,12,[0],1000,[1,10000,0],[2,10000]],[79,20101,13,[0],1000,[1,10000,0],[2,10000]],[80,20201,1,[0],1000,[1,10000,0],[]],[81,20201,2,[0],1000,[1,10000,0],[]],[82,20201,3,[0],1000,[1,10000,0],[]],[83,20201,4,[0],1000,[1,10000,0],[]],[84,20201,5,[0],1000,[1,10000,0],[]],[85,20201,6,[0],1000,[1,10000,0],[]],[86,20201,7,[0],1000,[1,10000,0],[]],[87,20201,8,[0],1000,[1,10000,0],[]],[88,20201,9,[0],1000,[1,10000,0],[]],[89,20201,10,[0],1000,[1,10000,0],[]],[90,20201,11,[0],1000,[1,10000,0],[]],[91,20202,1,[1,40],5000,[1,10500,0],[3,10000]],[92,20202,2,[1,40],5000,[1,11000,0],[3,10000]],[93,20202,3,[1,40],5000,[1,11500,0],[3,10000]],[94,20202,4,[1,40],5000,[1,12000,0],[3,10000]],[95,20202,5,[1,40],5000,[1,12500,0],[3,10000]],[96,20202,6,[1,40],5000,[1,13000,0],[3,10000]],[97,20202,7,[1,40],5000,[1,13500,0],[3,10000]],[98,20202,8,[1,40],5000,[1,14000,0],[3,10000]],[99,20202,9,[1,40],5000,[1,14500,0],[3,10000]],[100,20202,10,[1,40],5000,[1,15000,0],[3,10000]],[101,20202,11,[1,40],5000,[1,15500,0],[3,10000]],[102,20301,1,[1,30],1000,[1,10000,0],[3,1500]],[103,20301,2,[1,30],1000,[1,10000,0],[3,1700]],[104,20301,3,[1,30],1000,[1,10000,0],[3,1900]],[105,20301,4,[1,30],1000,[1,10000,0],[3,2100]],[106,20301,5,[1,30],1000,[1,10000,0],[3,2300]],[107,20401,1,[1,30],1000,[1,10000,0],[]],[108,20401,2,[1,30],1000,[1,10000,0],[]],[109,20401,3,[1,30],1000,[1,10000,0],[]],[110,20401,4,[1,30],1000,[1,10000,0],[]],[111,20401,5,[1,30],1000,[1,10000,0],[]],[112,20402,1,[0],5000,[1,5000,0],[1,10000]],[113,20402,2,[0],5000,[1,6000,0],[1,10000]],[114,20402,3,[0],5000,[1,7000,0],[1,10000]],[115,20402,4,[0],5000,[1,8000,0],[1,10000]],[116,20402,5,[0],5000,[1,9000,0],[1,10000]],[117,30101,1,[0],1000,[1,10000,0],[4,10000]],[118,30101,2,[0],1000,[1,10000,0],[4,10000]],[119,30101,3,[0],1000,[1,10000,0],[4,10000]],[120,30101,4,[0],1000,[1,10000,0],[4,10000]],[121,30101,5,[0],1000,[1,10000,0],[4,10000]],[122,30101,6,[0],1000,[1,10000,0],[4,10000]],[123,30101,7,[0],1000,[1,10000,0],[4,10000]],[124,30101,8,[0],1000,[1,10000,0],[4,10000]],[125,30101,9,[0],1000,[1,10000,0],[4,10000]],[126,30101,10,[0],1000,[1,10000,0],[4,10000]],[127,30101,11,[0],1000,[1,10000,0],[4,10000]],[128,30101,12,[0],1000,[1,10000,0],[4,10000]],[129,30101,13,[0],1000,[1,10000,0],[4,10000]],[130,30201,1,[0],1000,[1,10000,0],[]],[131,30201,2,[0],1000,[1,10000,0],[]],[132,30201,3,[0],1000,[1,10000,0],[]],[133,30201,4,[0],1000,[1,10000,0],[]],[134,30201,5,[0],1000,[1,10000,0],[]],[135,30201,6,[0],1000,[1,10000,0],[]],[136,30201,7,[0],1000,[1,10000,0],[]],[137,30201,8,[0],1000,[1,10000,0],[]],[138,30201,9,[0],1000,[1,10000,0],[]],[139,30201,10,[0],1000,[1,10000,0],[]],[140,30201,11,[0],1000,[1,10000,0],[]],[141,30202,1,[1,40],0,[1,10000,0],[4,10000]],[142,30202,2,[1,40],0,[1,10000,0],[4,10000]],[143,30202,3,[1,40],0,[1,10000,0],[4,10000]],[144,30202,4,[1,40],0,[1,10000,0],[4,10000]],[145,30202,5,[1,40],0,[1,10000,0],[4,10000]],[146,30202,6,[1,40],0,[1,10000,0],[4,10000]],[147,30202,7,[1,40],0,[1,10000,0],[4,10000]],[148,30202,8,[1,40],0,[1,10000,0],[4,10000]],[149,30202,9,[1,40],0,[1,10000,0],[4,10000]],[150,30202,10,[1,40],0,[1,10000,0],[4,10000]],[151,30202,11,[1,40],0,[1,10000,0],[4,10000]],[152,30301,1,[0],1000,[1,10000,0],[11,1500]],[153,30301,2,[0],1000,[1,10000,0],[11,1600]],[154,30301,3,[0],1000,[1,10000,0],[11,1700]],[155,30301,4,[0],1000,[1,10000,0],[11,1800]],[156,30301,5,[0],1000,[1,10000,0],[11,1900]],[157,30301,6,[0],1000,[1,10000,0],[11,2000]],[158,30301,7,[0],1000,[1,10000,0],[11,2100]],[159,30301,8,[0],1000,[1,10000,0],[11,2200]],[160,30401,1,[1,40],1000,[1,10000,0],[]],[161,30401,2,[1,40],1000,[1,10000,0],[]],[162,30401,3,[1,40],1000,[1,10000,0],[]],[163,30401,4,[1,40],1000,[1,10000,0],[]],[164,30401,5,[1,40],1000,[1,10000,0],[]],[165,30402,1,[0],15000,[5,1,7,0,1],[]],[166,30402,2,[0],14000,[5,1,7,0,1],[]],[167,30402,3,[0],13000,[5,1,7,0,1],[]],[168,30402,4,[0],12000,[5,1,7,0,1],[]],[169,30402,5,[0],11000,[5,1,7,0,1],[]],[170,40101,1,[0],1000,[1,10000,0],[]],[171,40102,1,[0],0,[5,1,4,1000,0],[]],[172,40201,1,[0],1000,[1,10000,0],[]],[173,40202,1,[0],0,[2,160,320,640,1280],[]],[174,40301,1,[0],1000,[1,10000,0],[]],[175,40302,1,[0],0,[3,1],[]],[176,40401,1,[0],1000,[1,10000,0],[]],[177,40402,1,[0],4000,[5,1,4,5000,0],[]],[178,50101,1,[0],1000,[1,10000,0],[5,10000]],[179,50201,1,[0],1000,[1,10000,0],[]],[180,50202,1,[0],5000,[1,10000,0],[2,10000]],[181,50301,1,[0],1000,[1,10000,0],[]],[182,50302,1,[0],0,[5,1,6,1000,0],[]],[183,50401,1,[1,30],1000,[1,10000,0],[]],[184,50402,1,[0],0,[1,10000,0],[]]]
\ No newline at end of file
+[[1,99901,1,[1,12],0,[1,0,0],[0]],[2,99901,2,[1,12],0,[1,0,0],[0]],[3,99901,3,[1,12],0,[1,0,0],[0]],[4,99901,4,[1,12],0,[1,0,0],[0]],[5,99901,5,[1,12],0,[1,0,0],[0]],[6,99902,1,[2],0,[1,10,1000],[0]],[7,99902,2,[2],0,[1,20,2000],[0]],[8,99902,3,[2],0,[1,35,4500],[0]],[9,99902,4,[2],0,[1,45,10000],[0]],[10,99902,5,[2],0,[1,65,20000],[0]],[11,10101,1,[1,20],1000,[1,10000,0],[1,10000]],[12,10101,2,[1,20],1000,[1,10000,0],[1,10000]],[13,10101,3,[1,20],1000,[1,10000,0],[1,10000]],[14,10101,4,[1,20],1000,[1,10000,0],[1,10000]],[15,10101,5,[1,20],1000,[1,10000,0],[1,10000]],[16,10101,6,[1,20],1000,[1,10000,0],[1,10000]],[17,10101,7,[1,20],1000,[1,10000,0],[1,10000]],[18,10101,8,[1,20],1000,[1,10000,0],[1,10000]],[19,10101,9,[1,20],1000,[1,10000,0],[1,10000]],[20,10101,10,[1,20],1000,[1,10000,0],[1,10000]],[21,10101,11,[1,20],1000,[1,10000,0],[1,10000]],[22,10101,12,[1,20],1000,[1,10000,0],[1,10000]],[23,10101,13,[1,20],1000,[1,10000,0],[1,10000]],[24,10201,1,[0],1000,[1,10000,0],[1,10000]],[25,10201,2,[0],1000,[1,10000,0],[1,10000]],[26,10201,3,[0],1000,[1,10000,0],[1,10000]],[27,10201,4,[0],1000,[1,10000,0],[1,10000]],[28,10201,5,[0],1000,[1,10000,0],[1,10000]],[29,10201,6,[0],1000,[1,10000,0],[1,10000]],[30,10201,7,[0],1000,[1,10000,0],[1,10000]],[31,10201,8,[0],1000,[1,10000,0],[1,10000]],[32,10201,9,[0],1000,[1,10000,0],[1,10000]],[33,10201,10,[0],1000,[1,10000,0],[1,10000]],[34,10201,11,[0],1000,[1,10000,0],[1,10000]],[35,10202,1,[1,30],0,[1,10000,0],[]],[36,10202,2,[1,30],0,[1,11000,0],[]],[37,10202,3,[1,30],0,[1,12000,0],[]],[38,10202,4,[1,30],0,[1,13000,0],[]],[39,10202,5,[1,30],0,[1,14000,0],[]],[40,10202,6,[1,30],0,[1,15000,0],[]],[41,10202,7,[1,30],0,[1,16000,0],[]],[42,10202,8,[1,30],0,[1,17000,0],[]],[43,10202,9,[1,30],0,[1,18000,0],[]],[44,10202,10,[1,30],0,[1,19000,0],[]],[45,10202,11,[1,30],0,[1,20000,0],[]],[46,10301,1,[1,30],1000,[1,10000,0],[]],[47,10301,2,[1,30],1000,[1,10000,0],[]],[48,10301,3,[1,30],1000,[1,10000,0],[]],[49,10301,4,[1,30],1000,[1,10000,0],[]],[50,10301,5,[1,30],1000,[1,10000,0],[]],[51,10301,6,[1,30],1000,[1,10000,0],[]],[52,10301,7,[1,30],1000,[1,10000,0],[]],[53,10301,8,[1,30],1000,[1,10000,0],[]],[54,10302,1,[1,35],0,[4,35],[]],[55,10302,2,[1,40],0,[4,40],[]],[56,10302,3,[1,45],0,[4,45],[]],[57,10302,4,[1,50],0,[4,50],[]],[58,10302,5,[1,55],0,[4,55],[]],[59,10302,6,[1,60],0,[4,60],[]],[60,10302,7,[1,65],0,[4,65],[]],[61,10302,8,[1,70],0,[4,70],[]],[62,10401,1,[1,40],1000,[1,10000,0],[10,10000]],[63,10401,2,[1,40],1000,[1,10000,0],[10,10000]],[64,10401,3,[1,40],1000,[1,10000,0],[10,10000]],[65,10401,4,[1,40],1000,[1,10000,0],[10,10000]],[66,10401,5,[1,40],1000,[1,10000,0],[10,10000]],[67,20101,1,[0],1000,[1,10000,0],[2,10000]],[68,20101,2,[0],1000,[1,10000,0],[2,10000]],[69,20101,3,[0],1000,[1,10000,0],[2,10000]],[70,20101,4,[0],1000,[1,10000,0],[2,10000]],[71,20101,5,[0],1000,[1,10000,0],[2,10000]],[72,20101,6,[0],1000,[1,10000,0],[2,10000]],[73,20101,7,[0],1000,[1,10000,0],[2,10000]],[74,20101,8,[0],1000,[1,10000,0],[2,10000]],[75,20101,9,[0],1000,[1,10000,0],[2,10000]],[76,20101,10,[0],1000,[1,10000,0],[2,10000]],[77,20101,11,[0],1000,[1,10000,0],[2,10000]],[78,20101,12,[0],1000,[1,10000,0],[2,10000]],[79,20101,13,[0],1000,[1,10000,0],[2,10000]],[80,20201,1,[0],1000,[1,10000,0],[]],[81,20201,2,[0],1000,[1,10000,0],[]],[82,20201,3,[0],1000,[1,10000,0],[]],[83,20201,4,[0],1000,[1,10000,0],[]],[84,20201,5,[0],1000,[1,10000,0],[]],[85,20201,6,[0],1000,[1,10000,0],[]],[86,20201,7,[0],1000,[1,10000,0],[]],[87,20201,8,[0],1000,[1,10000,0],[]],[88,20201,9,[0],1000,[1,10000,0],[]],[89,20201,10,[0],1000,[1,10000,0],[]],[90,20201,11,[0],1000,[1,10000,0],[]],[91,20202,1,[1,40],5000,[1,10500,0],[3,10000]],[92,20202,2,[1,40],5000,[1,11000,0],[3,10000]],[93,20202,3,[1,40],5000,[1,11500,0],[3,10000]],[94,20202,4,[1,40],5000,[1,12000,0],[3,10000]],[95,20202,5,[1,40],5000,[1,12500,0],[3,10000]],[96,20202,6,[1,40],5000,[1,13000,0],[3,10000]],[97,20202,7,[1,40],5000,[1,13500,0],[3,10000]],[98,20202,8,[1,40],5000,[1,14000,0],[3,10000]],[99,20202,9,[1,40],5000,[1,14500,0],[3,10000]],[100,20202,10,[1,40],5000,[1,15000,0],[3,10000]],[101,20202,11,[1,40],5000,[1,15500,0],[3,10000]],[102,20301,1,[1,30],1000,[1,10000,0],[3,1500]],[103,20301,2,[1,30],1000,[1,10000,0],[3,1700]],[104,20301,3,[1,30],1000,[1,10000,0],[3,1900]],[105,20301,4,[1,30],1000,[1,10000,0],[3,2100]],[106,20301,5,[1,30],1000,[1,10000,0],[3,2300]],[107,20401,1,[1,30],1000,[1,10000,0],[]],[108,20401,2,[1,30],1000,[1,10000,0],[]],[109,20401,3,[1,30],1000,[1,10000,0],[]],[110,20401,4,[1,30],1000,[1,10000,0],[]],[111,20401,5,[1,30],1000,[1,10000,0],[]],[112,20402,1,[0],5000,[1,5000,0],[1,10000]],[113,20402,2,[0],5000,[1,6000,0],[1,10000]],[114,20402,3,[0],5000,[1,7000,0],[1,10000]],[115,20402,4,[0],5000,[1,8000,0],[1,10000]],[116,20402,5,[0],5000,[1,9000,0],[1,10000]],[117,30101,1,[0],1000,[1,10000,0],[4,10000]],[118,30101,2,[0],1000,[1,10000,0],[4,10000]],[119,30101,3,[0],1000,[1,10000,0],[4,10000]],[120,30101,4,[0],1000,[1,10000,0],[4,10000]],[121,30101,5,[0],1000,[1,10000,0],[4,10000]],[122,30101,6,[0],1000,[1,10000,0],[4,10000]],[123,30101,7,[0],1000,[1,10000,0],[4,10000]],[124,30101,8,[0],1000,[1,10000,0],[4,10000]],[125,30101,9,[0],1000,[1,10000,0],[4,10000]],[126,30101,10,[0],1000,[1,10000,0],[4,10000]],[127,30101,11,[0],1000,[1,10000,0],[4,10000]],[128,30101,12,[0],1000,[1,10000,0],[4,10000]],[129,30101,13,[0],1000,[1,10000,0],[4,10000]],[130,30201,1,[0],1000,[1,10000,0],[]],[131,30201,2,[0],1000,[1,10000,0],[]],[132,30201,3,[0],1000,[1,10000,0],[]],[133,30201,4,[0],1000,[1,10000,0],[]],[134,30201,5,[0],1000,[1,10000,0],[]],[135,30201,6,[0],1000,[1,10000,0],[]],[136,30201,7,[0],1000,[1,10000,0],[]],[137,30201,8,[0],1000,[1,10000,0],[]],[138,30201,9,[0],1000,[1,10000,0],[]],[139,30201,10,[0],1000,[1,10000,0],[]],[140,30201,11,[0],1000,[1,10000,0],[]],[141,30202,1,[1,40],0,[1,10000,0],[4,10000]],[142,30202,2,[1,40],0,[1,10000,0],[4,10000]],[143,30202,3,[1,40],0,[1,10000,0],[4,10000]],[144,30202,4,[1,40],0,[1,10000,0],[4,10000]],[145,30202,5,[1,40],0,[1,10000,0],[4,10000]],[146,30202,6,[1,40],0,[1,10000,0],[4,10000]],[147,30202,7,[1,40],0,[1,10000,0],[4,10000]],[148,30202,8,[1,40],0,[1,10000,0],[4,10000]],[149,30202,9,[1,40],0,[1,10000,0],[4,10000]],[150,30202,10,[1,40],0,[1,10000,0],[4,10000]],[151,30202,11,[1,40],0,[1,10000,0],[4,10000]],[152,30301,1,[0],1000,[1,10000,0],[11,1500]],[153,30301,2,[0],1000,[1,10000,0],[11,1600]],[154,30301,3,[0],1000,[1,10000,0],[11,1700]],[155,30301,4,[0],1000,[1,10000,0],[11,1800]],[156,30301,5,[0],1000,[1,10000,0],[11,1900]],[157,30301,6,[0],1000,[1,10000,0],[11,2000]],[158,30301,7,[0],1000,[1,10000,0],[11,2100]],[159,30301,8,[0],1000,[1,10000,0],[11,2200]],[160,30401,1,[1,40],1000,[1,10000,0],[]],[161,30401,2,[1,40],1000,[1,10000,0],[]],[162,30401,3,[1,40],1000,[1,10000,0],[]],[163,30401,4,[1,40],1000,[1,10000,0],[]],[164,30401,5,[1,40],1000,[1,10000,0],[]],[165,30402,1,[0],15000,[5,1,7,0,1],[]],[166,30402,2,[0],14000,[5,1,7,0,1],[]],[167,30402,3,[0],13000,[5,1,7,0,1],[]],[168,30402,4,[0],12000,[5,1,7,0,1],[]],[169,30402,5,[0],11000,[5,1,7,0,1],[]],[170,40101,1,[0],1000,[1,10000,0],[]],[171,40102,1,[0],0,[5,1,4,1000,0],[]],[172,40201,1,[0],1000,[1,10000,0],[]],[173,40202,1,[0],0,[2,160,320,640,1280],[]],[174,40301,1,[0],1000,[1,10000,0],[]],[175,40302,1,[0],0,[3,1],[]],[176,40401,1,[0],1000,[1,10000,0],[]],[177,40402,1,[0],4000,[5,1,4,5000,0],[]],[178,50101,1,[0],1000,[1,10000,0],[5,10000]],[179,50201,1,[0],1000,[1,10000,0],[]],[180,50202,1,[0],5000,[1,10000,0],[2,10000]],[181,50301,1,[0],1000,[1,10000,0],[]],[182,50302,1,[0],0,[5,1,6,1000,0],[]],[183,50401,1,[1,30],1000,[1,10000,0],[]],[184,50402,1,[0],0,[1,10000,0],[]]]
\ No newline at end of file
diff --git "a/Assets/UI/Favorite/\345\274\271\345\207\272.png.meta" "b/Assets/UI/Favorite/\345\274\271\345\207\272.png.meta"
index a2a9bd9..531d798 100644
--- "a/Assets/UI/Favorite/\345\274\271\345\207\272.png.meta"
+++ "b/Assets/UI/Favorite/\345\274\271\345\207\272.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Favorite/\346\214\211\351\222\2561.png.meta" "b/Assets/UI/Favorite/\346\214\211\351\222\2561.png.meta"
index 7c4bff2..9918f45 100644
--- "a/Assets/UI/Favorite/\346\214\211\351\222\2561.png.meta"
+++ "b/Assets/UI/Favorite/\346\214\211\351\222\2561.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Favorite/\346\214\211\351\222\2562.png.meta" "b/Assets/UI/Favorite/\346\214\211\351\222\2562.png.meta"
index 2394daf..6f0eb8f 100644
--- "a/Assets/UI/Favorite/\346\214\211\351\222\2562.png.meta"
+++ "b/Assets/UI/Favorite/\346\214\211\351\222\2562.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Favorite/\346\226\260\347\216\251\346\263\225\351\242\204\345\221\212.png.meta" "b/Assets/UI/Favorite/\346\226\260\347\216\251\346\263\225\351\242\204\345\221\212.png.meta"
index 17df446..e4765b9 100644
--- "a/Assets/UI/Favorite/\346\226\260\347\216\251\346\263\225\351\242\204\345\221\212.png.meta"
+++ "b/Assets/UI/Favorite/\346\226\260\347\216\251\346\263\225\351\242\204\345\221\212.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta" "b/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta"
index 84a8e03..75019fa 100644
--- "a/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta"
+++ "b/Assets/UI/Fight/01\346\225\210\346\236\234\345\233\276-\346\210\230\346\226\227.jpg.meta"
@@ -6,7 +6,7 @@
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -35,8 +35,8 @@
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: 1
- wrapV: 1
+ wrapU: -1
+ wrapV: -1
wrapW: -1
nPOTScale: 0
lightmap: 0
@@ -50,9 +50,9 @@
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 1
+ alphaIsTransparency: 0
spriteTessellationDetail: -1
- textureType: 8
+ textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/Hit.png.meta b/Assets/UI/Fight/Hit.png.meta
index 7b34260..aeeb983 100644
--- a/Assets/UI/Fight/Hit.png.meta
+++ b/Assets/UI/Fight/Hit.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/buffIcon.png.meta b/Assets/UI/Fight/buffIcon.png.meta
index 10caab1..8c87471 100644
--- a/Assets/UI/Fight/buffIcon.png.meta
+++ b/Assets/UI/Fight/buffIcon.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/buffPrompt.png.meta b/Assets/UI/Fight/buffPrompt.png.meta
index 0606a75..f84d5b1 100644
--- a/Assets/UI/Fight/buffPrompt.png.meta
+++ b/Assets/UI/Fight/buffPrompt.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/buff_0.png.meta b/Assets/UI/Fight/buff_0.png.meta
index b2c377f..5c7a693 100644
--- a/Assets/UI/Fight/buff_0.png.meta
+++ b/Assets/UI/Fight/buff_0.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/buff_1.png.meta b/Assets/UI/Fight/buff_1.png.meta
index 25123f8..bc7c5a8 100644
--- a/Assets/UI/Fight/buff_1.png.meta
+++ b/Assets/UI/Fight/buff_1.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/buff_2.png.meta b/Assets/UI/Fight/buff_2.png.meta
index dee1f63..bddcba2 100644
--- a/Assets/UI/Fight/buff_2.png.meta
+++ b/Assets/UI/Fight/buff_2.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/doubleHit.png.meta b/Assets/UI/Fight/doubleHit.png.meta
index 576ea6e..b83451c 100644
--- a/Assets/UI/Fight/doubleHit.png.meta
+++ b/Assets/UI/Fight/doubleHit.png.meta
@@ -119,12 +119,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Fight/score.png.meta b/Assets/UI/Fight/score.png.meta
index 3d537c2..1aac7f6 100644
--- a/Assets/UI/Fight/score.png.meta
+++ b/Assets/UI/Fight/score.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Fight/\346\226\207\345\255\227\346\240\207\346\263\25001.jpg.meta" "b/Assets/UI/Fight/\346\226\207\345\255\227\346\240\207\346\263\25001.jpg.meta"
index 3fac3f9..a7a3c09 100644
--- "a/Assets/UI/Fight/\346\226\207\345\255\227\346\240\207\346\263\25001.jpg.meta"
+++ "b/Assets/UI/Fight/\346\226\207\345\255\227\346\240\207\346\263\25001.jpg.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/newRecord.png.meta b/Assets/UI/Final/newRecord.png.meta
index 682322b..91a363c 100644
--- a/Assets/UI/Final/newRecord.png.meta
+++ b/Assets/UI/Final/newRecord.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_di_0.png.meta b/Assets/UI/Final/rank_di_0.png.meta
index b7a8eee..67c923f 100644
--- a/Assets/UI/Final/rank_di_0.png.meta
+++ b/Assets/UI/Final/rank_di_0.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_di_1.png.meta b/Assets/UI/Final/rank_di_1.png.meta
index 15e815c..229971d 100644
--- a/Assets/UI/Final/rank_di_1.png.meta
+++ b/Assets/UI/Final/rank_di_1.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_di_2.png.meta b/Assets/UI/Final/rank_di_2.png.meta
index 166e073..cfe8692 100644
--- a/Assets/UI/Final/rank_di_2.png.meta
+++ b/Assets/UI/Final/rank_di_2.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_di_3.png.meta b/Assets/UI/Final/rank_di_3.png.meta
index cdc0541..136b4ce 100644
--- a/Assets/UI/Final/rank_di_3.png.meta
+++ b/Assets/UI/Final/rank_di_3.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_icon_0.png.meta b/Assets/UI/Final/rank_icon_0.png.meta
index dc78cae..bf4c381 100644
--- a/Assets/UI/Final/rank_icon_0.png.meta
+++ b/Assets/UI/Final/rank_icon_0.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_icon_1.png.meta b/Assets/UI/Final/rank_icon_1.png.meta
index 1d728bb..f608dc2 100644
--- a/Assets/UI/Final/rank_icon_1.png.meta
+++ b/Assets/UI/Final/rank_icon_1.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/rank_icon_2.png.meta b/Assets/UI/Final/rank_icon_2.png.meta
index b3ca431..835f969 100644
--- a/Assets/UI/Final/rank_icon_2.png.meta
+++ b/Assets/UI/Final/rank_icon_2.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/role.png.meta b/Assets/UI/Final/role.png.meta
index 5729b4b..0db3471 100644
--- a/Assets/UI/Final/role.png.meta
+++ b/Assets/UI/Final/role.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/scoreNum.png.meta b/Assets/UI/Final/scoreNum.png.meta
index d92e811..03845ae 100644
--- a/Assets/UI/Final/scoreNum.png.meta
+++ b/Assets/UI/Final/scoreNum.png.meta
@@ -36,7 +36,7 @@
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -65,9 +65,9 @@
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: -1
- wrapV: -1
- wrapW: -1
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
@@ -119,12 +119,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/selfScoreDi.png.meta b/Assets/UI/Final/selfScoreDi.png.meta
index a08004a..b1b3cf7 100644
--- a/Assets/UI/Final/selfScoreDi.png.meta
+++ b/Assets/UI/Final/selfScoreDi.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Final/settleMentTitle.png.meta b/Assets/UI/Final/settleMentTitle.png.meta
index 64ad774..8a162b6 100644
--- a/Assets/UI/Final/settleMentTitle.png.meta
+++ b/Assets/UI/Final/settleMentTitle.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Final/\346\226\207\345\255\227\346\240\207\346\263\25002.jpg.meta" "b/Assets/UI/Final/\346\226\207\345\255\227\346\240\207\346\263\25002.jpg.meta"
index 87e595a..3e031da 100644
--- "a/Assets/UI/Final/\346\226\207\345\255\227\346\240\207\346\263\25002.jpg.meta"
+++ "b/Assets/UI/Final/\346\226\207\345\255\227\346\240\207\346\263\25002.jpg.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/GuideUser/fire.png.meta b/Assets/UI/GuideUser/fire.png.meta
index bc55358..1dedcc9 100644
--- a/Assets/UI/GuideUser/fire.png.meta
+++ b/Assets/UI/GuideUser/fire.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/GuideUser/water.png.meta b/Assets/UI/GuideUser/water.png.meta
index 25b2f9d..4e00c78 100644
--- a/Assets/UI/GuideUser/water.png.meta
+++ b/Assets/UI/GuideUser/water.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\345\215\212\351\200\217\351\273\221\346\241\206.png.meta" "b/Assets/UI/GuideUser/\345\215\212\351\200\217\351\273\221\346\241\206.png.meta"
index 12d0694..29adc81 100644
--- "a/Assets/UI/GuideUser/\345\215\212\351\200\217\351\273\221\346\241\206.png.meta"
+++ "b/Assets/UI/GuideUser/\345\215\212\351\200\217\351\273\221\346\241\206.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\345\260\217\350\257\235\346\263\2411.png.meta" "b/Assets/UI/GuideUser/\345\260\217\350\257\235\346\263\2411.png.meta"
index 39f5453..f964af5 100644
--- "a/Assets/UI/GuideUser/\345\260\217\350\257\235\346\263\2411.png.meta"
+++ "b/Assets/UI/GuideUser/\345\260\217\350\257\235\346\263\2411.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27601.png.meta" "b/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27601.png.meta"
index 8a405b7..a0abc97 100644
--- "a/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27601.png.meta"
+++ "b/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27601.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27602.png.meta" "b/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27602.png.meta"
index d93ca4c..ef6fcbd 100644
--- "a/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27602.png.meta"
+++ "b/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27602.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27603.png.meta" "b/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27603.png.meta"
index 3adb33c..26cddcb 100644
--- "a/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27603.png.meta"
+++ "b/Assets/UI/GuideUser/\345\274\225\345\257\274\346\225\210\346\236\234\345\233\27603.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\346\212\200\350\203\275\351\207\212\346\224\276\350\214\203\345\233\264.png.meta" "b/Assets/UI/GuideUser/\346\212\200\350\203\275\351\207\212\346\224\276\350\214\203\345\233\264.png.meta"
index da2aa5d..6f883e3 100644
--- "a/Assets/UI/GuideUser/\346\212\200\350\203\275\351\207\212\346\224\276\350\214\203\345\233\264.png.meta"
+++ "b/Assets/UI/GuideUser/\346\212\200\350\203\275\351\207\212\346\224\276\350\214\203\345\233\264.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\346\213\226\345\212\250\346\214\207\351\222\210.png.meta" "b/Assets/UI/GuideUser/\346\213\226\345\212\250\346\214\207\351\222\210.png.meta"
index 6d64de7..1643f1d 100644
--- "a/Assets/UI/GuideUser/\346\213\226\345\212\250\346\214\207\351\222\210.png.meta"
+++ "b/Assets/UI/GuideUser/\346\213\226\345\212\250\346\214\207\351\222\210.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\346\217\220\347\244\272.png.meta" "b/Assets/UI/GuideUser/\346\217\220\347\244\272.png.meta"
index 3cd3b5f..8d9be81 100644
--- "a/Assets/UI/GuideUser/\346\217\220\347\244\272.png.meta"
+++ "b/Assets/UI/GuideUser/\346\217\220\347\244\272.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\346\225\260\345\255\2271.png.meta" "b/Assets/UI/GuideUser/\346\225\260\345\255\2271.png.meta"
index ffc776d..0010801 100644
--- "a/Assets/UI/GuideUser/\346\225\260\345\255\2271.png.meta"
+++ "b/Assets/UI/GuideUser/\346\225\260\345\255\2271.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\346\225\260\345\255\2272.png.meta" "b/Assets/UI/GuideUser/\346\225\260\345\255\2272.png.meta"
index 9c5e8b9..84a1d06 100644
--- "a/Assets/UI/GuideUser/\346\225\260\345\255\2272.png.meta"
+++ "b/Assets/UI/GuideUser/\346\225\260\345\255\2272.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\347\253\213\347\273\230\345\275\242\350\261\241.png.meta" "b/Assets/UI/GuideUser/\347\253\213\347\273\230\345\275\242\350\261\241.png.meta"
index bdc0469..a0ca417 100644
--- "a/Assets/UI/GuideUser/\347\253\213\347\273\230\345\275\242\350\261\241.png.meta"
+++ "b/Assets/UI/GuideUser/\347\253\213\347\273\230\345\275\242\350\261\241.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/GuideUser/\350\257\235\346\263\241.png.meta" "b/Assets/UI/GuideUser/\350\257\235\346\263\241.png.meta"
index a526c34..d285ed4 100644
--- "a/Assets/UI/GuideUser/\350\257\235\346\263\241.png.meta"
+++ "b/Assets/UI/GuideUser/\350\257\235\346\263\241.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Loading/LOGO.png.meta b/Assets/UI/Loading/LOGO.png.meta
index 8458bd1..346e484 100644
--- a/Assets/UI/Loading/LOGO.png.meta
+++ b/Assets/UI/Loading/LOGO.png.meta
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/Loading/LoadingBg.png b/Assets/UI/Loading/LoadingBg.png
new file mode 100644
index 0000000..cbd29f6
--- /dev/null
+++ b/Assets/UI/Loading/LoadingBg.png
Binary files differ
diff --git a/Assets/UI/Loading/LoadingBg.png.meta b/Assets/UI/Loading/LoadingBg.png.meta
new file mode 100644
index 0000000..76da912
--- /dev/null
+++ b/Assets/UI/Loading/LoadingBg.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: e187cb70474cf834fb08574deefcb084
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git "a/Assets/UI/Loading/\345\274\200\345\247\213\346\214\211\351\222\256.png.meta" "b/Assets/UI/Loading/\345\274\200\345\247\213\346\214\211\351\222\256.png.meta"
index 1217b0b..5d6b71c 100644
--- "a/Assets/UI/Loading/\345\274\200\345\247\213\346\214\211\351\222\256.png.meta"
+++ "b/Assets/UI/Loading/\345\274\200\345\247\213\346\214\211\351\222\256.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\346\214\211\351\222\2561.png.meta" "b/Assets/UI/Loading/\346\214\211\351\222\2561.png.meta"
index 8987cbb..2b85f9b 100644
--- "a/Assets/UI/Loading/\346\214\211\351\222\2561.png.meta"
+++ "b/Assets/UI/Loading/\346\214\211\351\222\2561.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\346\214\211\351\222\2562.png.meta" "b/Assets/UI/Loading/\346\214\211\351\222\2562.png.meta"
index b8d981b..1cd8d01 100644
--- "a/Assets/UI/Loading/\346\214\211\351\222\2562.png.meta"
+++ "b/Assets/UI/Loading/\346\214\211\351\222\2562.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/Loading/\346\225\210\346\236\234\345\233\276.png.meta"
index e32cbfd..8e3532a 100644
--- "a/Assets/UI/Loading/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/Loading/\346\225\210\346\236\234\345\233\276.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\346\225\210\346\236\234\345\233\2761.png.meta" "b/Assets/UI/Loading/\346\225\210\346\236\234\345\233\2761.png.meta"
index 73e3f1f..1b17bb0 100644
--- "a/Assets/UI/Loading/\346\225\210\346\236\234\345\233\2761.png.meta"
+++ "b/Assets/UI/Loading/\346\225\210\346\236\234\345\233\2761.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\346\226\207\345\255\227.png.meta" "b/Assets/UI/Loading/\346\226\207\345\255\227.png.meta"
index e32a7e2..1f9b124 100644
--- "a/Assets/UI/Loading/\346\226\207\345\255\227.png.meta"
+++ "b/Assets/UI/Loading/\346\226\207\345\255\227.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\346\226\207\345\255\2271.png.meta" "b/Assets/UI/Loading/\346\226\207\345\255\2271.png.meta"
index 545f25e..bd1e8ce 100644
--- "a/Assets/UI/Loading/\346\226\207\345\255\2271.png.meta"
+++ "b/Assets/UI/Loading/\346\226\207\345\255\2271.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\350\203\214\346\231\257.png.meta" "b/Assets/UI/Loading/\350\203\214\346\231\257.png.meta"
index 534789c..672f43d 100644
--- "a/Assets/UI/Loading/\350\203\214\346\231\257.png.meta"
+++ "b/Assets/UI/Loading/\350\203\214\346\231\257.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\350\277\233\345\272\246\345\272\225.png.meta" "b/Assets/UI/Loading/\350\277\233\345\272\246\345\272\225.png.meta"
index 750d72b..21f5aad 100644
--- "a/Assets/UI/Loading/\350\277\233\345\272\246\345\272\225.png.meta"
+++ "b/Assets/UI/Loading/\350\277\233\345\272\246\345\272\225.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git "a/Assets/UI/Loading/\350\277\233\345\272\246\346\235\241.png.meta" "b/Assets/UI/Loading/\350\277\233\345\272\246\346\235\241.png.meta"
index 9a8bbeb..ba16685 100644
--- "a/Assets/UI/Loading/\350\277\233\345\272\246\346\235\241.png.meta"
+++ "b/Assets/UI/Loading/\350\277\233\345\272\246\346\235\241.png.meta"
@@ -89,12 +89,12 @@
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
- textureFormat: -1
+ textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
- overridden: 0
+ overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
diff --git a/Assets/UI/timeBg.png.meta b/Assets/UI/timeBg.png.meta
index e7b6190..a9789b0 100644
--- a/Assets/UI/timeBg.png.meta
+++ b/Assets/UI/timeBg.png.meta
@@ -47,7 +47,7 @@
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteBorder: {x: 13, y: 13, z: 13, w: 13}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
diff --git a/GemBattle.zip b/GemBattle.zip
index c03197b..a02107d 100644
--- a/GemBattle.zip
+++ b/GemBattle.zip
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
index 260c3fd..4a54d15 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp-firstpass.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
index 4822742..4978ff5 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Assembly-CSharp.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
index cecee68..baad9c4 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Demos.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
index c9f0680..c45c538 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
index bc98a61..fd2f9dd 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/MoreMountains.NiceVibrations.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
index c866684..812836e 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.TextMeshPro.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
index b4ff8cf..f8cb7b6 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/Unity.Timeline.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
index a3ae16e..8e34c34 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/Managed/UnityEngine.UI.dll"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/boss_skill.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/boss_skill.json"
index a713e81..06859f2 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/boss_skill.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/boss_skill.json"
@@ -1 +1 @@
-[[10001,"泡泡炸弹",10002,15000,[3,1],[2],10001,2,[10,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[10,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[12,2]],[20001,"魔法护盾",10001,20000,[2,1],[1],10001,1,[0.3,0]],[30001,"召唤木桩",10003,20000,[3,1],[3],10001,3,[3,2.5]]]
\ No newline at end of file
+[[10001,"泡泡炸弹",10002,15000,[3,1],[3],10001,2,[10,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[10,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[12,2]],[20001,"魔法护盾",10001,20000,[2,1],[3],10001,1,[0.1,10]],[20002,"魔法护盾",10001,20000,[2,1],[2,4],10001,1,[0.2,10]],[20003,"魔法护盾",10001,20000,[2,1],[1,3,5],10001,1,[0.3,10]],[30001,"召唤木桩",10003,20000,[3,1],[3],10001,3,[2,2.5]],[30002,"召唤木桩",10003,20000,[3,1],[2,4],10001,3,[5,2.5]],[30003,"召唤木桩",10003,20000,[3,1],[1,3,5],10001,3,[8,2.5]]]
\ No newline at end of file
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donateshop.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donateshop.json"
index 5c6b660..7164b4f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donateshop.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/donateshop.json"
@@ -1 +1 @@
-[[1,"红龙",["gem:104:1"],3000,3],[2,"知识古树",["gem:111:1"],1800,5],[3,"捐赠宝箱",["box:4:1"],4800,5],[4,"金币",["gold:1000"],1000,10]]
\ No newline at end of file
+[[1,"红龙",["gem:104:1"],3000,3,"一段文字描述，是物品的说明文字。字符超过行宽后将会换行。"],[2,"知识古树",["gem:111:1"],1800,5,"一段文字描述，是物品的说明文字。字符超过行宽后将会换行。"],[3,"捐赠宝箱",["box:4:1"],4800,5,"蕴含魔力的宝箱，使用后便能获得大量奖励。"],[4,"金币",["gold:1000"],1000,10,"有着极高价值的金币，可以用来购买道具。"]]
\ No newline at end of file
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json"
index 61382b8..e8481c6 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json"
@@ -1 +1 @@
-[[1,"1_3",1,1,[]],[2,"4_7",1,1,[10001]],[3,"8_10",1,1,[10002]],[4,"11_15",1,1,[10003]]]
\ No newline at end of file
+[[1,"鲨鱼lv1",1,1,[]],[2,"鲨鱼lv2",1,1,[10001]],[3,"鲨鱼lv3",1,1,[10002]],[4,"鲨鱼lv4",1,1,[10003]],[5,"木妖lv1",1,1,[]],[6,"木妖lv2",1,1,[10001]],[7,"木妖lv3",1,1,[10002]],[8,"木妖lv4",1,1,[10003]]]
\ No newline at end of file
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json"
index 0f4b520..41a760f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json"
@@ -1 +1 @@
-[[1,"小怪_火",1,1.1,1.8,1,101],[2,"小怪_水",1,5,1,3,102],[3,"小怪_木",1,0.8,1.2,1,103]]
\ No newline at end of file
+[[1,"小怪_火",1,1.1,1.8,1,101,10],[2,"小怪_水",1,5,1,3,102,20],[3,"小怪_木",1,0.8,1.2,1,103,5]]
\ No newline at end of file
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json"
index b3bc06a..133f9b2 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_port.json"
@@ -1 +1 @@
-[[1,-2,"史莱姆大王",1,1,1,0,0,"0",400,1.5,5,3000,["0"],[0],0],[2,-2,"史莱姆大王",1,1,2,0,0,"0",400,1.5,5,3000,["0"],[0],0],[3,-2,"史莱姆大王",1,1,3,3,10,"2000",400,1.5,5,3000,["0"],[0],3],[4,-2,"史莱姆大王",1,1,4,0,0,"0",400,1.5,5,3000,["0"],[0],0],[5,-2,"史莱姆大王",1,1,5,0,0,"0",400,1.5,5,3000,["0"],[0],0],[6,-1,"史莱姆大王",1,2,1,0,0,"0",800,1.5,5,3000,["0"],[0],0],[7,-1,"史莱姆大王",1,2,2,1,10,"2000",800,1.5,5,3000,["0"],[0],1],[8,-1,"史莱姆大王",1,2,3,0,0,"0",800,1.5,5,3000,["0"],[0],0],[9,-1,"史莱姆大王",1,2,4,0,0,"0",800,1.5,5,3000,["0"],[0],0],[10,-1,"史莱姆大王",1,2,5,0,0,"0",800,1.5,5,3000,["0"],[0],0],[11,1,"史莱姆大王",1,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[12,1,"史莱姆大王",1,1,2,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[13,1,"史莱姆大王",1,1,3,2,3,"6000",250,1.5,5,3000,["gold:1"],[200,9800],2],[14,1,"史莱姆大王",1,1,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[15,1,"史莱姆大王",1,1,5,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[16,1,"史莱姆大王",1,2,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[17,1,"史莱姆大王",1,2,2,3,7,"2000",250,1.5,5,3000,["gold:1"],[200,9800],3],[18,1,"史莱姆大王",1,2,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0],[19,1,"史莱姆大王",1,2,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[20,1,"史莱姆大王",1,2,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0],[21,1,"史莱姆大王",1,3,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[22,1,"史莱姆大王",1,3,2,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0],[23,1,"史莱姆大王",1,3,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0],[24,1,"史莱姆大王",1,3,4,1,6,"2500",250,1.5,5,3000,["gold:1"],[200,9800],1],[25,1,"史莱姆大王",1,3,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0],[26,2,"拿破仑",2,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[27,2,"拿破仑",2,1,2,2,"4","6000",285,1.5,5,3000,["gold:1"],[200,9800],2],[28,2,"拿破仑",2,1,3,0,"0","0",320,1.5,5,3000,["gold:1"],[200,9800],0],[29,2,"拿破仑",2,1,4,2,"4","6000",355,1.5,5,3000,["gold:1"],[200,9800],2],[30,2,"拿破仑",2,1,5,0,"0","0",390,1.5,5,3000,["gold:1"],[200,9800],0],[31,2,"拿破仑",2,2,1,1,"7","2500",425,1.5,5,3000,["gold:1"],[200,9800],1],[32,2,"拿破仑",2,2,2,0,"0","0",460,1.5,5,3000,["gold:1"],[200,9800],0],[33,2,"拿破仑",2,2,3,0,"0","0",495,1.5,5,3000,["gold:1"],[200,9800],0],[34,2,"拿破仑",2,2,4,0,"0","0",530,1.5,5,3000,["gold:1"],[200,9800],0],[35,2,"拿破仑",2,2,5,3,"8","2000",565,1.5,5,3000,["box:1:1"],[200,9800],3],[36,2,"拿破仑",2,3,1,0,"0","0",600,1.5,5,3000,["gold:1"],[200,9800],0],[37,2,"拿破仑",2,3,2,1,"7","2500",635,1.5,5,3000,["gold:1"],[200,9800],1],[38,2,"拿破仑",2,3,3,0,"0","0",670,1.5,5,3000,["gold:1"],[200,9800],0],[39,2,"拿破仑",2,3,4,2,"4","6000",705,1.5,5,3000,["gold:1"],[200,9800],2],[40,2,"拿破仑",2,3,5,0,"0","0",740,1.5,5,3000,["box:1:1"],[200,9800],0],[41,3,"凯撒",2,1,1,3,"8","2000",600,1.5,5,3000,["gold:1"],[200,9800],3],[42,3,"凯撒",2,1,2,0,"0","0",635,1.5,5,3000,["gold:1"],[200,9800],0],[43,3,"凯撒",2,1,3,1,"7","2500",670,1.5,5,3000,["gold:1"],[200,9800],1],[44,3,"凯撒",2,1,4,0,"0","0",705,1.5,5,3000,["gold:1"],[200,9800],0],[45,3,"凯撒",2,1,5,3,"8","2000",740,1.5,5,3000,["gold:1"],[200,9800],3],[46,3,"凯撒",2,2,1,0,"0","0",775,1.5,5,3000,["gold:1"],[200,9800],0],[47,3,"凯撒",2,2,2,1,"7","2500",810,1.5,5,3000,["gold:1"],[200,9800],1],[48,3,"凯撒",2,2,3,2,"4","6000",845,1.5,5,3000,["gold:1"],[200,9800],2],[49,3,"凯撒",2,2,4,1,"7","2500",880,1.5,5,3000,["gold:1"],[200,9800],1],[50,3,"凯撒",2,2,5,0,"0","0",915,1.5,5,3000,["gold:1"],[200,9800],0],[51,3,"凯撒",2,3,1,2,"4","6000",950,1.5,5,3000,["box:2:1"],[200,9800],2],[52,3,"凯撒",2,3,2,0,"0","0",985,1.5,5,3000,["box:2:1"],[200,9800],0],[53,3,"凯撒",2,3,3,3,"8","2000",1020,1.5,5,3000,["box:2:1"],[200,9800],3],[54,3,"凯撒",2,3,4,0,"0","0",1055,1.5,5,3000,["box:2:1"],[200,9800],0],[55,3,"凯撒",2,3,5,2,"4","6000",1090,1.5,5,3000,["box:2:1"],[200,9800],2],[56,4,"克伦威尔",2,1,1,2,"4","6000",1125,1.5,5,3000,["gold:1"],[200,9800],2],[57,4,"克伦威尔",2,1,2,0,"0","0",1160,1.5,5,3000,["gold:1"],[200,9800],0],[58,4,"克伦威尔",2,1,3,1,"7","2500",1195,1.5,5,3000,["gold:1"],[200,9800],1],[59,4,"克伦威尔",2,1,4,0,"0","0",1230,1.5,5,3000,["gold:1"],[200,9800],0],[60,4,"克伦威尔",2,1,5,2,"4","6000",1265,1.5,5,3000,["gold:1"],[200,9800],2],[61,4,"克伦威尔",2,2,1,0,"0","0",1300,1.5,5,3000,["gold:1"],[200,9800],0],[62,4,"克伦威尔",2,2,2,3,"8","2000",1335,1.5,5,3000,["gold:1"],[200,9800],3],[63,4,"克伦威尔",2,2,3,2,"4","6000",1370,1.5,5,3000,["gold:1"],[200,9800],2],[64,4,"克伦威尔",2,2,4,3,"8","2000",1405,1.5,5,3000,["gold:1"],[200,9800],3],[65,4,"克伦威尔",2,2,5,0,"0","0",1440,1.5,5,3000,["gold:1"],[200,9800],0],[66,4,"克伦威尔",2,3,1,2,"4","6000",1475,1.5,5,3000,["box:2:1"],[200,9800],2],[67,4,"克伦威尔",2,3,2,0,"0","0",1510,1.5,5,3000,["box:2:1"],[200,9800],0],[68,4,"克伦威尔",2,3,3,3,"8","2000",1545,1.5,5,3000,["box:2:1"],[200,9800],3],[69,4,"克伦威尔",2,3,4,0,"0","0",1580,1.5,5,3000,["box:2:1"],[200,9800],0],[70,4,"克伦威尔",2,3,5,2,"4","6000",1615,1.5,5,3000,["box:2:1"],[200,9800],2],[71,4,"克伦威尔",2,4,1,3,"8","2000",1650,1.5,5,3000,["box:2:1"],[200,9800],3],[72,4,"克伦威尔",2,4,2,1,"7","2500",1685,1.5,5,3000,["box:2:1"],[200,9800],1],[73,4,"克伦威尔",2,4,3,2,"4","6000",1720,1.5,5,3000,["box:2:1"],[200,9800],2],[74,4,"克伦威尔",2,4,4,1,"7","2500",1755,1.5,5,3000,["box:2:1"],[200,9800],1],[75,4,"克伦威尔",2,4,5,3,"8","2000",1790,1.5,5,3000,["box:2:1"],[200,9800],3],[76,5,"尼克松",3,1,1,1,"7","2500",1650,1.5,5,3000,["gold:1"],[200,9800],1],[77,5,"尼克松",3,1,2,1,"7","2500",1685,1.5,5,3000,["gold:1"],[200,9800],1],[78,5,"尼克松",3,1,3,2,"4","6000",1720,1.5,5,3000,["gold:1"],[200,9800],2],[79,5,"尼克松",3,1,4,2,"4","6000",1755,1.5,5,3000,["gold:1"],[200,9800],2],[80,5,"尼克松",3,1,5,0,"0","0",1790,1.5,5,3000,["gold:1"],[200,9800],0],[81,5,"尼克松",3,2,1,0,"0","0",1825,1.5,5,3000,["gold:1"],[200,9800],0],[82,5,"尼克松",3,2,2,2,"4","6000",1860,1.5,5,3000,["gold:1"],[200,9800],2],[83,5,"尼克松",3,2,3,2,"4","6000",1895,1.5,5,3000,["gold:1"],[200,9800],2],[84,5,"尼克松",3,2,4,3,"8","2000",1930,1.5,5,3000,["gold:1"],[200,9800],3],[85,5,"尼克松",3,2,5,3,"8","2000",1965,1.5,5,3000,["gold:1"],[200,9800],3],[86,5,"尼克松",3,3,1,2,"4","6000",2000,1.5,5,3000,["gold:1"],[200,9800],2],[87,5,"尼克松",3,3,2,3,"8","2000",2035,1.5,5,3000,["gold:1"],[200,9800],3],[88,5,"尼克松",3,3,3,0,"0","0",2070,1.5,5,3000,["gold:1"],[200,9800],0],[89,5,"尼克松",3,3,4,3,"8","2000",2105,1.5,5,3000,["gold:1"],[200,9800],3],[90,5,"尼克松",3,3,5,2,"4","6000",2140,1.5,5,3000,["gold:1"],[200,9800],2],[91,5,"尼克松",3,4,1,1,"7","2500",2175,1.5,5,3000,["box:2:1"],[200,9800],1],[92,5,"尼克松",3,4,2,2,"4","6000",2210,1.5,5,3000,["box:2:1"],[200,9800],2],[93,5,"尼克松",3,4,3,3,"8","2000",2245,1.5,5,3000,["box:2:1"],[200,9800],3],[94,5,"尼克松",3,4,4,2,"4","6000",2280,1.5,5,3000,["box:2:1"],[200,9800],2],[95,5,"尼克松",3,4,5,1,"7","2500",2315,1.5,5,3000,["box:2:1"],[200,9800],1],[96,6,"李存勖",3,1,1,2,"5","6000",2355,1.5,5,3000,["gold:1"],[200,9800],2],[97,6,"李存勖",3,1,2,2,"5","6000",2395,1.5,8,3000,["gold:1"],[200,9800],2],[98,6,"李存勖",3,1,3,0,"0","0",2435,1.5,8,3000,["gold:1"],[200,9800],0],[99,6,"李存勖",3,1,4,1,"10","2500",2475,1.5,8,3000,["gold:1"],[200,9800],1],[100,6,"李存勖",3,1,5,1,"10","2500",2515,1.5,8,3000,["gold:1"],[200,9800],1],[101,6,"李存勖",3,2,1,0,"0","0",2555,1.5,8,3000,["gold:1"],[200,9800],0],[102,6,"李存勖",3,2,2,2,"5","6000",2595,1.5,8,3000,["gold:1"],[200,9800],2],[103,6,"李存勖",3,2,3,3,"12","2000",2635,1.5,8,3000,["gold:1"],[200,9800],3],[104,6,"李存勖",3,2,4,2,"5","6000",2675,1.5,8,3000,["gold:1"],[200,9800],2],[105,6,"李存勖",3,2,5,0,"0","0",2715,1.5,8,3000,["gold:1"],[200,9800],0],[106,6,"李存勖",3,3,1,2,"5","6000",2755,1.5,8,3000,["gold:1"],[200,9800],2],[107,6,"李存勖",3,3,2,2,"5","6000",2795,1.5,8,3000,["gold:1"],[200,9800],2],[108,6,"李存勖",3,3,3,0,"0","0",2835,1.5,8,3000,["gold:1"],[200,9800],0],[109,6,"李存勖",3,3,4,3,"12","2000",2875,1.5,8,3000,["gold:1"],[200,9800],3],[110,6,"李存勖",3,3,5,3,"12","2000",2915,1.5,8,3000,["gold:1"],[200,9800],3],[111,6,"李存勖",3,4,1,3,"12","2000",2955,1.5,8,3000,["box:3:1"],[200,9800],3],[112,6,"李存勖",3,4,2,3,"12","2000",2995,1.5,8,3000,["box:3:1"],[200,9800],3],[113,6,"李存勖",3,4,3,2,"5","6000",3035,1.5,8,3000,["box:3:1"],[200,9800],2],[114,6,"李存勖",3,4,4,1,"10","2500",3075,1.5,8,3000,["box:3:1"],[200,9800],1],[115,6,"李存勖",3,4,5,1,"10","2500",3115,1.5,8,3000,["box:3:1"],[200,9800],1],[116,7,"AA_12",3,1,1,1,"10","2500",3155,1.5,8,3000,["gold:1"],[200,9800],1],[117,7,"AA_12",3,1,2,0,"0","0",3195,1.5,8,3000,["gold:1"],[200,9800],0],[118,7,"AA_12",3,1,3,3,"12","2000",3235,1.5,8,3000,["gold:1"],[200,9800],3],[119,7,"AA_12",3,1,4,0,"0","0",3275,1.5,8,3000,["gold:1"],[200,9800],0],[120,7,"AA_12",3,1,5,1,"10","2500",3315,1.5,8,3000,["gold:1"],[200,9800],1],[121,7,"AA_12",3,2,1,0,"0","0",3355,1.5,8,3000,["gold:1"],[200,9800],0],[122,7,"AA_12",3,2,2,2,"5","6000",3395,1.5,8,3000,["gold:1"],[200,9800],2],[123,7,"AA_12",3,2,3,3,"12","2000",3435,1.5,8,3000,["gold:1"],[200,9800],3],[124,7,"AA_12",3,2,4,2,"5","6000",3475,1.5,8,3000,["gold:1"],[200,9800],2],[125,7,"AA_12",3,2,5,0,"0","0",3515,1.5,8,3000,["gold:1"],[200,9800],0],[126,7,"AA_12",3,3,1,2,"5","6000",3555,1.5,8,3000,["gold:1"],[200,9800],2],[127,7,"AA_12",3,3,2,1,"10","2500",3595,1.5,8,3000,["gold:1"],[200,9800],1],[128,7,"AA_12",3,3,3,3,"12","2000",3635,1.5,8,3000,["gold:1"],[200,9800],3],[129,7,"AA_12",3,3,4,1,"10","2500",3675,1.5,8,3000,["gold:1"],[200,9800],1],[130,7,"AA_12",3,3,5,2,"5","6000",3715,1.5,8,3000,["gold:1"],[200,9800],2],[131,7,"AA_12",3,4,1,3,"12","2000",3755,1.5,8,3000,["box:3:1"],[200,9800],3],[132,7,"AA_12",3,4,2,2,"5","6000",3795,1.5,8,3000,["box:3:1"],[200,9800],2],[133,7,"AA_12",3,4,3,1,"10","2500",3835,1.5,8,3000,["box:3:1"],[200,9800],1],[134,7,"AA_12",3,4,4,2,"5","6000",3875,1.5,8,3000,["box:3:1"],[200,9800],2],[135,7,"AA_12",3,4,5,3,"12","2000",3915,1.5,8,3000,["box:3:1"],[200,9800],3],[136,8,"米高扬",3,1,1,0,"0","0",3955,1.5,8,3000,["gold:1"],[200,9800],0],[137,8,"米高扬",3,1,2,1,"10","2500",3995,1.5,8,3000,["gold:1"],[200,9800],1],[138,8,"米高扬",3,1,3,1,"10","2500",4035,1.5,8,3000,["gold:1"],[200,9800],1],[139,8,"米高扬",3,1,4,1,"10","2500",4075,1.5,8,3000,["gold:1"],[200,9800],1],[140,8,"米高扬",3,1,5,0,"0","0",4115,1.5,8,3000,["gold:1"],[200,9800],0],[141,8,"米高扬",3,2,1,2,"5","6000",4155,1.5,8,3000,["gold:1"],[200,9800],2],[142,8,"米高扬",3,2,2,0,"0","0",4195,1.5,8,3000,["gold:1"],[200,9800],0],[143,8,"米高扬",3,2,3,2,"5","6000",4235,1.5,8,3000,["gold:1"],[200,9800],2],[144,8,"米高扬",3,2,4,0,"0","0",4275,1.5,8,3000,["gold:1"],[200,9800],0],[145,8,"米高扬",3,2,5,2,"5","6000",4315,1.5,8,3000,["gold:1"],[200,9800],2],[146,8,"米高扬",3,3,1,0,"0","0",4355,1.5,8,3000,["gold:1"],[200,9800],0],[147,8,"米高扬",3,3,2,3,"12","2000",4395,1.5,8,3000,["gold:1"],[200,9800],3],[148,8,"米高扬",3,3,3,3,"12","2000",4435,1.5,8,3000,["gold:1"],[200,9800],3],[149,8,"米高扬",3,3,4,3,"12","2000",4475,1.5,8,3000,["gold:1"],[200,9800],3],[150,8,"米高扬",3,3,5,0,"0","0",4515,1.5,8,3000,["gold:1"],[200,9800],0],[151,8,"米高扬",3,4,1,2,"5","6000",4555,1.5,8,3000,["box:3:1"],[200,9800],2],[152,8,"米高扬",3,4,2,2,"5","6000",4595,1.5,8,3000,["box:3:1"],[200,9800],2],[153,8,"米高扬",3,4,3,3,"12","2000",4635,1.5,8,3000,["box:3:1"],[200,9800],3],[154,8,"米高扬",3,4,4,3,"12","2000",4675,1.5,8,3000,["box:3:1"],[200,9800],3],[155,8,"米高扬",3,4,5,3,"12","2000",4715,1.5,8,3000,["box:3:1"],[200,9800],3],[156,9,"安德罗波夫",4,1,1,0,"0","0",4755,1.5,8,3000,["gold:1"],[200,9800],0],[157,9,"安德罗波夫",4,1,2,2,"5","6000",4795,1.5,8,3000,["gold:1"],[200,9800],2],[158,9,"安德罗波夫",4,1,3,1,"10","2500",4835,1.5,8,3000,["gold:1"],[200,9800],1],[159,9,"安德罗波夫",4,1,4,2,"5","6000",4875,1.5,8,3000,["gold:1"],[200,9800],2],[160,9,"安德罗波夫",4,1,5,0,"0","0",4915,1.5,8,3000,["gold:1"],[200,9800],0],[161,9,"安德罗波夫",4,2,1,3,"12","2000",4955,1.5,8,3000,["gold:1"],[200,9800],3],[162,9,"安德罗波夫",4,2,2,0,"0","0",4995,1.5,8,3000,["gold:1"],[200,9800],0],[163,9,"安德罗波夫",4,2,3,2,"5","6000",5035,1.5,8,3000,["gold:1"],[200,9800],2],[164,9,"安德罗波夫",4,2,4,0,"0","0",5075,1.5,8,3000,["gold:1"],[200,9800],0],[165,9,"安德罗波夫",4,2,5,3,"12","2000",5115,1.5,8,3000,["gold:1"],[200,9800],3],[166,9,"安德罗波夫",4,3,1,0,"0","0",5155,1.5,8,3000,["gold:1"],[200,9800],0],[167,9,"安德罗波夫",4,3,2,1,"10","2500",5195,1.5,8,3000,["gold:1"],[200,9800],1],[168,9,"安德罗波夫",4,3,3,1,"10","2500",5235,1.5,8,3000,["gold:1"],[200,9800],1],[169,9,"安德罗波夫",4,3,4,1,"10","2500",5275,1.5,8,3000,["gold:1"],[200,9800],1],[170,9,"安德罗波夫",4,3,5,1,"10","2500",5315,1.5,8,3000,["gold:1"],[200,9800],1],[171,9,"安德罗波夫",4,4,1,2,"5","6000",5355,1.5,8,3000,["box:3:1"],[200,9800],2],[172,9,"安德罗波夫",4,4,2,2,"5","6000",5395,1.5,8,3000,["box:3:1"],[200,9800],2],[173,9,"安德罗波夫",4,4,3,1,"10","2500",5435,1.5,8,3000,["box:3:1"],[200,9800],1],[174,9,"安德罗波夫",4,4,4,3,"12","2000",5475,1.5,8,3000,["box:3:1"],[200,9800],3],[175,9,"安德罗波夫",4,4,5,0,"0","0",5515,1.5,8,3000,["box:3:1"],[200,9800],0],[176,10,"腓特烈",4,1,1,1,"10","2500",5555,1.5,8,3000,["gold:1"],[200,9800],1],[177,10,"腓特烈",4,1,2,3,"12","2000",5595,1.5,8,3000,["gold:1"],[200,9800],3],[178,10,"腓特烈",4,1,3,3,"12","2000",5635,1.5,8,3000,["gold:1"],[200,9800],3],[179,10,"腓特烈",4,1,4,2,"5","6000",5675,1.5,8,3000,["gold:1"],[200,9800],2],[180,10,"腓特烈",4,1,5,2,"5","6000",5715,1.5,8,3000,["gold:1"],[200,9800],2],[181,10,"腓特烈",4,2,1,3,"12","2000",5755,1.5,8,3000,["gold:1"],[200,9800],3],[182,10,"腓特烈",4,2,2,2,"5","6000",5795,1.5,8,3000,["gold:1"],[200,9800],2],[183,10,"腓特烈",4,2,3,3,"12","2000",5835,1.5,8,3000,["gold:1"],[200,9800],3],[184,10,"腓特烈",4,2,4,3,"12","2000",5875,1.5,8,3000,["gold:1"],[200,9800],3],[185,10,"腓特烈",4,2,5,2,"5","6000",5915,1.5,8,3000,["gold:1"],[200,9800],2],[186,10,"腓特烈",4,3,1,1,"10","2500",5955,1.5,8,3000,["gold:1"],[200,9800],1],[187,10,"腓特烈",4,3,2,2,"5","6000",5995,1.5,8,3000,["gold:1"],[200,9800],2],[188,10,"腓特烈",4,3,3,1,"10","2500",6035,1.5,8,3000,["gold:1"],[200,9800],1],[189,10,"腓特烈",4,3,4,3,"12","2000",6075,1.5,8,3000,["gold:1"],[200,9800],3],[190,10,"腓特烈",4,3,5,1,"10","2500",6115,1.5,8,3000,["gold:1"],[200,9800],1],[191,10,"腓特烈",4,4,1,3,"12","2000",6155,1.5,8,3000,["box:3:1"],[200,9800],3],[192,10,"腓特烈",4,4,2,2,"5","6000",6195,1.5,8,3000,["box:3:1"],[200,9800],2],[193,10,"腓特烈",4,4,3,3,"12","2000",6235,1.5,8,3000,["box:3:1"],[200,9800],3],[194,10,"腓特烈",4,4,4,2,"5","6000",6275,1.5,8,3000,["box:3:1"],[200,9800],2],[195,10,"腓特烈",4,4,5,1,"10","2500",6315,1.5,8,3000,["box:3:1"],[200,9800],1],[196,11,"林肯",4,1,1,2,"5","6000",6360,1.5,8,3000,["gold:1"],[200,9800],2],[197,11,"林肯",4,1,2,2,"5","6000",6405,1.5,8,3000,["gold:1"],[200,9800],2],[198,11,"林肯",4,1,3,1,"10","2500",6450,1.5,8,3000,["gold:1"],[200,9800],1],[199,11,"林肯",4,1,4,2,"5","6000",6495,1.5,8,3000,["gold:1"],[200,9800],2],[200,11,"林肯",4,1,5,2,"5","6000",6540,1.5,8,3000,["gold:1"],[200,9800],2],[201,11,"林肯",4,2,1,3,"12","2000",6585,1.5,8,3000,["gold:1"],[200,9800],3],[202,11,"林肯",4,2,2,3,"12","2000",6630,1.5,8,3000,["gold:1"],[200,9800],3],[203,11,"林肯",4,2,3,2,"5","6000",6675,1.5,8,3000,["gold:1"],[200,9800],2],[204,11,"林肯",4,2,4,3,"12","2000",6720,1.5,8,3000,["gold:1"],[200,9800],3],[205,11,"林肯",4,2,5,3,"12","2000",6765,1.5,8,3000,["gold:1"],[200,9800],3],[206,11,"林肯",4,3,1,1,"10","2500",6810,1.5,8,3000,["gold:1"],[200,9800],1],[207,11,"林肯",4,3,2,2,"5","6000",6855,1.5,8,3000,["gold:1"],[200,9800],2],[208,11,"林肯",4,3,3,2,"5","6000",6900,1.5,8,3000,["gold:1"],[200,9800],2],[209,11,"林肯",4,3,4,1,"10","2500",6945,1.5,8,3000,["gold:1"],[200,9800],1],[210,11,"林肯",4,3,5,1,"10","2500",6990,1.5,8,3000,["gold:1"],[200,9800],1],[211,11,"林肯",4,4,1,2,"5","6000",7035,1.5,8,3000,["box:3:1"],[200,9800],2],[212,11,"林肯",4,4,2,2,"5","6000",7080,1.5,8,3000,["box:3:1"],[200,9800],2],[213,11,"林肯",4,4,3,2,"5","6000",7125,1.5,8,3000,["box:3:1"],[200,9800],2],[214,11,"林肯",4,4,4,2,"5","6000",7170,1.5,8,3000,["box:3:1"],[200,9800],2],[215,11,"林肯",4,4,5,2,"5","6000",7215,1.5,8,3000,["box:3:1"],[200,9800],2],[216,12,"腓特烈",4,1,1,2,"5","6000",7260,1.5,8,3000,["gold:1"],[200,9800],2],[217,12,"腓特烈",4,1,2,2,"5","6000",7305,1.5,8,3000,["gold:1"],[200,9800],2],[218,12,"腓特烈",4,1,3,3,"12","2000",7350,1.5,8,3000,["gold:1"],[200,9800],3],[219,12,"腓特烈",4,1,4,3,"12","2000",7395,1.5,8,3000,["gold:1"],[200,9800],3],[220,12,"腓特烈",4,1,5,2,"5","6000",7440,1.5,8,3000,["gold:1"],[200,9800],2],[221,12,"腓特烈",4,2,1,3,"12","2000",7485,1.5,8,3000,["gold:1"],[200,9800],3],[222,12,"腓特烈",4,2,2,3,"12","2000",7530,1.5,8,3000,["gold:1"],[200,9800],3],[223,12,"腓特烈",4,2,3,3,"12","2000",7575,1.5,8,3000,["gold:1"],[200,9800],3],[224,12,"腓特烈",4,2,4,3,"12","2000",7620,1.5,8,3000,["gold:1"],[200,9800],3],[225,12,"腓特烈",4,2,5,3,"12","2000",7665,1.5,8,3000,["gold:1"],[200,9800],3],[226,12,"腓特烈",4,3,1,1,"10","2500",7710,1.5,8,3000,["gold:1"],[200,9800],1],[227,12,"腓特烈",4,3,2,2,"5","6000",7755,1.5,8,3000,["gold:1"],[200,9800],2],[228,12,"腓特烈",4,3,3,2,"5","6000",7800,1.5,8,3000,["gold:1"],[200,9800],2],[229,12,"腓特烈",4,3,4,1,"10","2500",7845,1.5,8,3000,["gold:1"],[200,9800],1],[230,12,"腓特烈",4,3,5,1,"10","2500",7890,1.5,8,3000,["gold:1"],[200,9800],1],[231,12,"腓特烈",4,4,1,1,"10","2500",7935,1.5,8,3000,["box:3:1"],[200,9800],1],[232,12,"腓特烈",4,4,2,2,"5","6000",7980,1.5,8,3000,["box:3:1"],[200,9800],2],[233,12,"腓特烈",4,4,3,3,"12","2000",8025,1.5,8,3000,["box:3:1"],[200,9800],3],[234,12,"腓特烈",4,4,4,2,"5","6000",8070,1.5,8,3000,["box:3:1"],[200,9800],2],[235,12,"腓特烈",4,4,5,1,"10","2500",8115,1.5,8,3000,["box:3:1"],[200,9800],1],[236,12,"腓特烈",4,5,1,2,"5","6000",8160,1.5,8,3000,["gold:1"],[200,9800],2],[237,12,"腓特烈",4,5,2,2,"5","6000",8205,1.5,8,3000,["gold:1"],[200,9800],2],[238,12,"腓特烈",4,5,3,1,"10","2500",8250,1.5,8,3000,["gold:1"],[200,9800],1],[239,12,"腓特烈",4,5,4,2,"5","6000",8295,1.5,8,3000,["gold:1"],[200,9800],2],[240,12,"腓特烈",4,5,5,2,"5","6000",8340,1.5,8,3000,["gold:1"],[200,9800],2],[241,12,"腓特烈",4,6,1,2,"5","6000",8385,1.5,8,3000,["gold:1"],[200,9800],2],[242,12,"腓特烈",4,6,2,3,"12","2000",8430,1.5,8,3000,["gold:1"],[200,9800],3],[243,12,"腓特烈",4,6,3,2,"5","6000",8475,1.5,8,3000,["gold:1"],[200,9800],2],[244,12,"腓特烈",4,6,4,3,"12","2000",8520,1.5,8,3000,["gold:1"],[200,9800],3],[245,12,"腓特烈",4,6,5,3,"12","2000",8565,1.5,8,3000,["gold:1"],[200,9800],3],[246,12,"腓特烈",4,7,1,1,"10","2500",8610,1.5,8,3000,["gold:1"],[200,9800],1],[247,12,"腓特烈",4,7,2,1,"10","2500",8655,1.5,8,3000,["gold:1"],[200,9800],1],[248,12,"腓特烈",4,7,3,1,"10","2500",8700,1.5,8,3000,["gold:1"],[200,9800],1],[249,12,"腓特烈",4,7,4,1,"10","2500",8745,1.5,8,3000,["gold:1"],[200,9800],1],[250,12,"腓特烈",4,7,5,1,"10","2500",8790,1.5,8,3000,["gold:1"],[200,9800],1],[251,12,"腓特烈",4,8,1,2,"5","6000",8835,1.5,8,3000,["box:3:1"],[200,9800],2],[252,12,"腓特烈",4,8,2,2,"5","6000",8880,1.5,8,3000,["box:3:1"],[200,9800],2],[253,12,"腓特烈",4,8,3,3,"12","2000",8925,1.5,8,3000,["box:3:1"],[200,9800],3],[254,12,"腓特烈",4,8,4,1,"10","2500",8970,1.5,8,3000,["box:3:1"],[200,9800],1],[255,12,"腓特烈",4,8,5,2,"5","6000",9015,1.5,8,3000,["box:3:1"],[200,9800],2],[256,13,"CHRIS",4,1,1,2,"6","6000",9060,1.5,8,3000,["gold:1"],[200,9800],2],[257,13,"CHRIS",4,1,2,2,"6","6000",9105,1.5,8,3000,["gold:1"],[200,9800],2],[258,13,"CHRIS",4,1,3,3,"14","2000",9150,1.5,8,3000,["gold:1"],[200,9800],3],[259,13,"CHRIS",4,1,4,3,"14","2000",9195,1.5,8,3000,["gold:1"],[200,9800],3],[260,13,"CHRIS",4,1,5,2,"6","6000",9240,1.5,8,3000,["gold:1"],[200,9800],2],[261,13,"CHRIS",4,2,1,3,"14","2000",9285,1.5,8,3000,["gold:1"],[200,9800],3],[262,13,"CHRIS",4,2,2,3,"14","2000",9330,1.5,8,3000,["gold:1"],[200,9800],3],[263,13,"CHRIS",4,2,3,3,"14","2000",9375,1.5,8,3000,["gold:1"],[200,9800],3],[264,13,"CHRIS",4,2,4,3,"14","2000",9420,1.5,8,3000,["gold:1"],[200,9800],3],[265,13,"CHRIS",4,2,5,3,"14","2000",9465,1.5,8,3000,["gold:1"],[200,9800],3],[266,13,"CHRIS",4,3,1,1,"12","2500",9510,1.5,8,3000,["gold:1"],[200,9800],1],[267,13,"CHRIS",4,3,2,2,"6","6000",9555,1.5,8,3000,["gold:1"],[200,9800],2],[268,13,"CHRIS",4,3,3,2,"6","6000",9600,1.5,8,3000,["gold:1"],[200,9800],2],[269,13,"CHRIS",4,3,4,1,"12","2500",9645,1.5,8,3000,["gold:1"],[200,9800],1],[270,13,"CHRIS",4,3,5,1,"12","2500",9690,1.5,8,3000,["gold:1"],[200,9800],1],[271,13,"CHRIS",4,4,1,1,"12","2500",9735,1.5,8,3000,["box:3:1"],[200,9800],1],[272,13,"CHRIS",4,4,2,2,"6","6000",9780,1.5,8,3000,["box:3:1"],[200,9800],2],[273,13,"CHRIS",4,4,3,3,"14","2000",9825,1.5,8,3000,["box:3:1"],[200,9800],3],[274,13,"CHRIS",4,4,4,2,"6","6000",9870,1.5,8,3000,["box:3:1"],[200,9800],2],[275,13,"CHRIS",4,4,5,1,"12","2500",9915,1.5,8,3000,["box:3:1"],[200,9800],1],[276,13,"CHRIS",4,5,1,2,"6","6000",9960,1.5,8,3000,["gold:1"],[200,9800],2],[277,13,"CHRIS",4,5,2,2,"6","6000",10005,1.5,8,3000,["gold:1"],[200,9800],2],[278,13,"CHRIS",4,5,3,1,"12","2500",10050,1.5,8,3000,["gold:1"],[200,9800],1],[279,13,"CHRIS",4,5,4,2,"6","6000",10095,1.5,8,3000,["gold:1"],[200,9800],2],[280,13,"CHRIS",4,5,5,2,"6","6000",10140,1.5,8,3000,["gold:1"],[200,9800],2],[281,13,"CHRIS",4,6,1,2,"6","6000",10185,1.5,8,3000,["gold:1"],[200,9800],2],[282,13,"CHRIS",4,6,2,3,"14","2000",10230,1.5,8,3000,["gold:1"],[200,9800],3],[283,13,"CHRIS",4,6,3,2,"6","6000",10275,1.5,8,3000,["gold:1"],[200,9800],2],[284,13,"CHRIS",4,6,4,3,"14","2000",10320,1.5,8,3000,["gold:1"],[200,9800],3],[285,13,"CHRIS",4,6,5,3,"14","2000",10365,1.5,8,3000,["gold:1"],[200,9800],3],[286,13,"CHRIS",4,7,1,1,"12","2500",10410,1.5,8,3000,["gold:1"],[200,9800],1],[287,13,"CHRIS",4,7,2,1,"12","2500",10455,1.5,8,3000,["gold:1"],[200,9800],1],[288,13,"CHRIS",4,7,3,1,"12","2500",10500,1.5,8,3000,["gold:1"],[200,9800],1],[289,13,"CHRIS",4,7,4,1,"12","2500",10545,1.5,8,3000,["gold:1"],[200,9800],1],[290,13,"CHRIS",4,7,5,1,"12","2500",10590,1.5,8,3000,["gold:1"],[200,9800],1],[291,13,"CHRIS",4,8,1,2,"6","6000",10635,1.5,8,3000,["box:3:1"],[200,9800],2],[292,13,"CHRIS",4,8,2,2,"6","6000",10680,1.5,8,3000,["box:3:1"],[200,9800],2],[293,13,"CHRIS",4,8,3,3,"14","2000",10725,1.5,8,3000,["box:3:1"],[200,9800],3],[294,13,"CHRIS",4,8,4,1,"12","2500",10770,1.5,8,3000,["box:3:1"],[200,9800],1],[295,13,"CHRIS",4,8,5,2,"6","6000",10815,1.5,8,3000,["box:3:1"],[200,9800],2],[296,14,"ZARD",4,1,1,2,"6","6000",10860,1.5,8,3000,["gold:1"],[200,9800],2],[297,14,"ZARD",4,1,2,2,"6","6000",10905,1.5,8,3000,["gold:1"],[200,9800],2],[298,14,"ZARD",4,1,3,3,"14","2000",10950,1.5,8,3000,["gold:1"],[200,9800],3],[299,14,"ZARD",4,1,4,3,"14","2000",10995,1.5,8,3000,["gold:1"],[200,9800],3],[300,14,"ZARD",4,1,5,2,"6","6000",11040,1.5,8,3000,["gold:1"],[200,9800],2],[301,14,"ZARD",4,2,1,3,"14","2000",11085,1.5,8,3000,["gold:1"],[200,9800],3],[302,14,"ZARD",4,2,2,3,"14","2000",11130,1.5,8,3000,["gold:1"],[200,9800],3],[303,14,"ZARD",4,2,3,3,"14","2000",11175,1.5,8,3000,["gold:1"],[200,9800],3],[304,14,"ZARD",4,2,4,3,"14","2000",11220,1.5,8,3000,["gold:1"],[200,9800],3],[305,14,"ZARD",4,2,5,3,"14","2000",11265,1.5,8,3000,["gold:1"],[200,9800],3],[306,14,"ZARD",4,3,1,1,"12","2500",11310,1.5,8,3000,["gold:1"],[200,9800],1],[307,14,"ZARD",4,3,2,2,"6","6000",11355,1.5,8,3000,["gold:1"],[200,9800],2],[308,14,"ZARD",4,3,3,2,"6","6000",11400,1.5,8,3000,["gold:1"],[200,9800],2],[309,14,"ZARD",4,3,4,1,"12","2500",11445,1.5,8,3000,["gold:1"],[200,9800],1],[310,14,"ZARD",4,3,5,1,"12","2500",11490,1.5,8,3000,["gold:1"],[200,9800],1],[311,14,"ZARD",4,4,1,1,"12","2500",11535,1.5,8,3000,["box:3:1"],[200,9800],1],[312,14,"ZARD",4,4,2,2,"6","6000",11580,1.5,8,3000,["box:3:1"],[200,9800],2],[313,14,"ZARD",4,4,3,3,"14","2000",11625,1.5,8,3000,["box:3:1"],[200,9800],3],[314,14,"ZARD",4,4,4,2,"6","6000",11670,1.5,8,3000,["box:3:1"],[200,9800],2],[315,14,"ZARD",4,4,5,1,"12","2500",11715,1.5,8,3000,["box:3:1"],[200,9800],1],[316,14,"ZARD",4,5,1,2,"6","6000",11760,1.5,8,3000,["gold:1"],[200,9800],2],[317,14,"ZARD",4,5,2,2,"6","6000",11805,1.5,8,3000,["gold:1"],[200,9800],2],[318,14,"ZARD",4,5,3,1,"12","2500",11850,1.5,8,3000,["gold:1"],[200,9800],1],[319,14,"ZARD",4,5,4,2,"6","6000",11895,1.5,8,3000,["gold:1"],[200,9800],2],[320,14,"ZARD",4,5,5,2,"6","6000",11940,1.5,8,3000,["gold:1"],[200,9800],2],[321,14,"ZARD",4,6,1,2,"6","6000",11985,1.5,8,3000,["gold:1"],[200,9800],2],[322,14,"ZARD",4,6,2,3,"14","2000",12030,1.5,8,3000,["gold:1"],[200,9800],3],[323,14,"ZARD",4,6,3,2,"6","6000",12075,1.5,8,3000,["gold:1"],[200,9800],2],[324,14,"ZARD",4,6,4,3,"14","2000",12120,1.5,8,3000,["gold:1"],[200,9800],3],[325,14,"ZARD",4,6,5,3,"14","2000",12165,1.5,8,3000,["gold:1"],[200,9800],3],[326,14,"ZARD",4,7,1,1,"12","2500",12210,1.5,8,3000,["gold:1"],[200,9800],1],[327,14,"ZARD",4,7,2,1,"12","2500",12255,1.5,8,3000,["gold:1"],[200,9800],1],[328,14,"ZARD",4,7,3,1,"12","2500",12300,1.5,8,3000,["gold:1"],[200,9800],1],[329,14,"ZARD",4,7,4,1,"12","2500",12345,1.5,8,3000,["gold:1"],[200,9800],1],[330,14,"ZARD",4,7,5,1,"12","2500",12390,1.5,8,3000,["gold:1"],[200,9800],1],[331,14,"ZARD",4,8,1,2,"6","6000",12435,1.5,8,3000,["box:3:1"],[200,9800],2],[332,14,"ZARD",4,8,2,2,"6","6000",12480,1.5,8,3000,["box:3:1"],[200,9800],2],[333,14,"ZARD",4,8,3,3,"14","2000",12525,1.5,8,3000,["box:3:1"],[200,9800],3],[334,14,"ZARD",4,8,4,1,"12","2500",12570,1.5,8,3000,["box:3:1"],[200,9800],1],[335,14,"ZARD",4,8,5,2,"6","6000",12615,1.5,8,3000,["box:3:1"],[200,9800],2]]
\ No newline at end of file
+[[1,-2,"史莱姆大王",1,1,1,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[2,-2,"史莱姆大王",1,1,2,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[3,-2,"史莱姆大王",1,1,3,3,10,"2000",400,1.5,5,3000,["0"],[0],3,0],[4,-2,"史莱姆大王",1,1,4,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[5,-2,"史莱姆大王",1,1,5,0,0,"0",400,1.5,5,3000,["0"],[0],0,0],[6,-1,"史莱姆大王",1,2,1,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[7,-1,"史莱姆大王",1,2,2,1,10,"2000",800,1.5,5,3000,["0"],[0],1,0],[8,-1,"史莱姆大王",1,2,3,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[9,-1,"史莱姆大王",1,2,4,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[10,-1,"史莱姆大王",1,2,5,0,0,"0",800,1.5,5,3000,["0"],[0],0,0],[11,1,"史莱姆大王",1,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[12,1,"史莱姆大王",1,1,2,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[13,1,"史莱姆大王",1,1,3,2,3,"6000",250,1.5,5,3000,["gold:1"],[200,9800],2,1500],[14,1,"史莱姆大王",1,1,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[15,1,"史莱姆大王",1,1,5,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[16,1,"史莱姆大王",1,2,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[17,1,"史莱姆大王",1,2,2,3,7,"2000",250,1.5,5,3000,["gold:1"],[200,9800],3,1500],[18,1,"史莱姆大王",1,2,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[19,1,"史莱姆大王",1,2,4,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[20,1,"史莱姆大王",1,2,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0,1500],[21,1,"史莱姆大王",1,3,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[22,1,"史莱姆大王",1,3,2,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[23,1,"史莱姆大王",1,3,3,0,0,"0",250,1.5,5,3000,["gold:1"],[200,9800],0,1500],[24,1,"史莱姆大王",1,3,4,1,6,"2500",250,1.5,5,3000,["gold:1"],[200,9800],1,1500],[25,1,"史莱姆大王",1,3,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[200,9800],0,1500],[26,2,"拿破仑",2,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0,3000],[27,2,"拿破仑",2,1,2,2,"4","6000",285,1.5,5,3000,["gold:1"],[200,9800],2,3000],[28,2,"拿破仑",2,1,3,0,"0","0",320,1.5,5,3000,["gold:1"],[200,9800],0,3000],[29,2,"拿破仑",2,1,4,2,"4","6000",355,1.5,5,3000,["gold:1"],[200,9800],2,3000],[30,2,"拿破仑",2,1,5,0,"0","0",390,1.5,5,3000,["gold:1"],[200,9800],0,3000],[31,2,"拿破仑",2,2,1,1,"7","2500",425,1.5,5,3000,["gold:1"],[200,9800],1,3000],[32,2,"拿破仑",2,2,2,0,"0","0",460,1.5,5,3000,["gold:1"],[200,9800],0,3000],[33,2,"拿破仑",2,2,3,0,"0","0",495,1.5,5,3000,["gold:1"],[200,9800],0,3000],[34,2,"拿破仑",2,2,4,0,"0","0",530,1.5,5,3000,["gold:1"],[200,9800],0,3000],[35,2,"拿破仑",2,2,5,3,"8","2000",565,1.5,5,3000,["box:1:1"],[200,9800],3,3000],[36,2,"拿破仑",2,3,1,0,"0","0",600,1.5,5,3000,["gold:1"],[200,9800],0,3000],[37,2,"拿破仑",2,3,2,1,"7","2500",635,1.5,5,3000,["gold:1"],[200,9800],1,3000],[38,2,"拿破仑",2,3,3,0,"0","0",670,1.5,5,3000,["gold:1"],[200,9800],0,3000],[39,2,"拿破仑",2,3,4,2,"4","6000",705,1.5,5,3000,["gold:1"],[200,9800],2,3000],[40,2,"拿破仑",2,3,5,0,"0","0",740,1.5,5,3000,["box:1:1"],[200,9800],0,3000],[41,3,"凯撒",2,1,1,3,"8","2000",600,1.5,5,3000,["gold:1"],[200,9800],3,4500],[42,3,"凯撒",2,1,2,0,"0","0",635,1.5,5,3000,["gold:1"],[200,9800],0,4500],[43,3,"凯撒",2,1,3,1,"7","2500",670,1.5,5,3000,["gold:1"],[200,9800],1,4500],[44,3,"凯撒",2,1,4,0,"0","0",705,1.5,5,3000,["gold:1"],[200,9800],0,4500],[45,3,"凯撒",2,1,5,3,"8","2000",740,1.5,5,3000,["gold:1"],[200,9800],3,4500],[46,3,"凯撒",2,2,1,0,"0","0",775,1.5,5,3000,["gold:1"],[200,9800],0,4500],[47,3,"凯撒",2,2,2,1,"7","2500",810,1.5,5,3000,["gold:1"],[200,9800],1,4500],[48,3,"凯撒",2,2,3,2,"4","6000",845,1.5,5,3000,["gold:1"],[200,9800],2,4500],[49,3,"凯撒",2,2,4,1,"7","2500",880,1.5,5,3000,["gold:1"],[200,9800],1,4500],[50,3,"凯撒",2,2,5,0,"0","0",915,1.5,5,3000,["gold:1"],[200,9800],0,4500],[51,3,"凯撒",2,3,1,2,"4","6000",950,1.5,5,3000,["box:2:1"],[200,9800],2,4500],[52,3,"凯撒",2,3,2,0,"0","0",985,1.5,5,3000,["box:2:1"],[200,9800],0,4500],[53,3,"凯撒",2,3,3,3,"8","2000",1020,1.5,5,3000,["box:2:1"],[200,9800],3,4500],[54,3,"凯撒",2,3,4,0,"0","0",1055,1.5,5,3000,["box:2:1"],[200,9800],0,4500],[55,3,"凯撒",2,3,5,2,"4","6000",1090,1.5,5,3000,["box:2:1"],[200,9800],2,4500],[56,4,"克伦威尔",2,1,1,2,"4","6000",1125,1.5,5,3000,["gold:1"],[200,9800],2,6000],[57,4,"克伦威尔",2,1,2,0,"0","0",1160,1.5,5,3000,["gold:1"],[200,9800],0,6000],[58,4,"克伦威尔",2,1,3,1,"7","2500",1195,1.5,5,3000,["gold:1"],[200,9800],1,6000],[59,4,"克伦威尔",2,1,4,0,"0","0",1230,1.5,5,3000,["gold:1"],[200,9800],0,6000],[60,4,"克伦威尔",2,1,5,2,"4","6000",1265,1.5,5,3000,["gold:1"],[200,9800],2,6000],[61,4,"克伦威尔",2,2,1,0,"0","0",1300,1.5,5,3000,["gold:1"],[200,9800],0,6000],[62,4,"克伦威尔",2,2,2,3,"8","2000",1335,1.5,5,3000,["gold:1"],[200,9800],3,6000],[63,4,"克伦威尔",2,2,3,2,"4","6000",1370,1.5,5,3000,["gold:1"],[200,9800],2,6000],[64,4,"克伦威尔",2,2,4,3,"8","2000",1405,1.5,5,3000,["gold:1"],[200,9800],3,6000],[65,4,"克伦威尔",2,2,5,0,"0","0",1440,1.5,5,3000,["gold:1"],[200,9800],0,6000],[66,4,"克伦威尔",2,3,1,2,"4","6000",1475,1.5,5,3000,["box:2:1"],[200,9800],2,6000],[67,4,"克伦威尔",2,3,2,0,"0","0",1510,1.5,5,3000,["box:2:1"],[200,9800],0,6000],[68,4,"克伦威尔",2,3,3,3,"8","2000",1545,1.5,5,3000,["box:2:1"],[200,9800],3,6000],[69,4,"克伦威尔",2,3,4,0,"0","0",1580,1.5,5,3000,["box:2:1"],[200,9800],0,6000],[70,4,"克伦威尔",2,3,5,2,"4","6000",1615,1.5,5,3000,["box:2:1"],[200,9800],2,6000],[71,4,"克伦威尔",2,4,1,3,"8","2000",1650,1.5,5,3000,["box:2:1"],[200,9800],3,6000],[72,4,"克伦威尔",2,4,2,1,"7","2500",1685,1.5,5,3000,["box:2:1"],[200,9800],1,6000],[73,4,"克伦威尔",2,4,3,2,"4","6000",1720,1.5,5,3000,["box:2:1"],[200,9800],2,6000],[74,4,"克伦威尔",2,4,4,1,"7","2500",1755,1.5,5,3000,["box:2:1"],[200,9800],1,6000],[75,4,"克伦威尔",2,4,5,3,"8","2000",1790,1.5,5,3000,["box:2:1"],[200,9800],3,6000],[76,5,"尼克松",3,1,1,1,"7","2500",1650,1.5,5,3000,["gold:1"],[200,9800],1,7500],[77,5,"尼克松",3,1,2,1,"7","2500",1685,1.5,5,3000,["gold:1"],[200,9800],1,7500],[78,5,"尼克松",3,1,3,2,"4","6000",1720,1.5,5,3000,["gold:1"],[200,9800],2,7500],[79,5,"尼克松",3,1,4,2,"4","6000",1755,1.5,5,3000,["gold:1"],[200,9800],2,7500],[80,5,"尼克松",3,1,5,0,"0","0",1790,1.5,5,3000,["gold:1"],[200,9800],0,7500],[81,5,"尼克松",3,2,1,0,"0","0",1825,1.5,5,3000,["gold:1"],[200,9800],0,7500],[82,5,"尼克松",3,2,2,2,"4","6000",1860,1.5,5,3000,["gold:1"],[200,9800],2,7500],[83,5,"尼克松",3,2,3,2,"4","6000",1895,1.5,5,3000,["gold:1"],[200,9800],2,7500],[84,5,"尼克松",3,2,4,3,"8","2000",1930,1.5,5,3000,["gold:1"],[200,9800],3,7500],[85,5,"尼克松",3,2,5,3,"8","2000",1965,1.5,5,3000,["gold:1"],[200,9800],3,7500],[86,5,"尼克松",3,3,1,2,"4","6000",2000,1.5,5,3000,["gold:1"],[200,9800],2,7500],[87,5,"尼克松",3,3,2,3,"8","2000",2035,1.5,5,3000,["gold:1"],[200,9800],3,7500],[88,5,"尼克松",3,3,3,0,"0","0",2070,1.5,5,3000,["gold:1"],[200,9800],0,7500],[89,5,"尼克松",3,3,4,3,"8","2000",2105,1.5,5,3000,["gold:1"],[200,9800],3,7500],[90,5,"尼克松",3,3,5,2,"4","6000",2140,1.5,5,3000,["gold:1"],[200,9800],2,7500],[91,5,"尼克松",3,4,1,1,"7","2500",2175,1.5,5,3000,["box:2:1"],[200,9800],1,7500],[92,5,"尼克松",3,4,2,2,"4","6000",2210,1.5,5,3000,["box:2:1"],[200,9800],2,7500],[93,5,"尼克松",3,4,3,3,"8","2000",2245,1.5,5,3000,["box:2:1"],[200,9800],3,7500],[94,5,"尼克松",3,4,4,2,"4","6000",2280,1.5,5,3000,["box:2:1"],[200,9800],2,7500],[95,5,"尼克松",3,4,5,1,"7","2500",2315,1.5,5,3000,["box:2:1"],[200,9800],1,7500],[96,6,"李存勖",3,1,1,2,"5","6000",2355,1.5,5,3000,["gold:1"],[200,9800],2,9000],[97,6,"李存勖",3,1,2,2,"5","6000",2395,1.5,5,3000,["gold:1"],[200,9800],2,9000],[98,6,"李存勖",3,1,3,0,"0","0",2435,1.5,5,3000,["gold:1"],[200,9800],0,9000],[99,6,"李存勖",3,1,4,1,"10","2500",2475,1.5,5,3000,["gold:1"],[200,9800],1,9000],[100,6,"李存勖",3,1,5,1,"10","2500",2515,1.5,5,3000,["gold:1"],[200,9800],1,9000],[101,6,"李存勖",3,2,1,0,"0","0",2555,1.5,5,3000,["gold:1"],[200,9800],0,9000],[102,6,"李存勖",3,2,2,2,"5","6000",2595,1.5,5,3000,["gold:1"],[200,9800],2,9000],[103,6,"李存勖",3,2,3,3,"12","2000",2635,1.5,5,3000,["gold:1"],[200,9800],3,9000],[104,6,"李存勖",3,2,4,2,"5","6000",2675,1.5,5,3000,["gold:1"],[200,9800],2,9000],[105,6,"李存勖",3,2,5,0,"0","0",2715,1.5,5,3000,["gold:1"],[200,9800],0,9000],[106,6,"李存勖",3,3,1,2,"5","6000",2755,1.5,5,3000,["gold:1"],[200,9800],2,9000],[107,6,"李存勖",3,3,2,2,"5","6000",2795,1.5,5,3000,["gold:1"],[200,9800],2,9000],[108,6,"李存勖",3,3,3,0,"0","0",2835,1.5,5,3000,["gold:1"],[200,9800],0,9000],[109,6,"李存勖",3,3,4,3,"12","2000",2875,1.5,5,3000,["gold:1"],[200,9800],3,9000],[110,6,"李存勖",3,3,5,3,"12","2000",2915,1.5,5,3000,["gold:1"],[200,9800],3,9000],[111,6,"李存勖",3,4,1,3,"12","2000",2955,1.5,5,3000,["box:3:1"],[200,9800],3,9000],[112,6,"李存勖",3,4,2,3,"12","2000",2995,1.5,5,3000,["box:3:1"],[200,9800],3,9000],[113,6,"李存勖",3,4,3,2,"5","6000",3035,1.5,5,3000,["box:3:1"],[200,9800],2,9000],[114,6,"李存勖",3,4,4,1,"10","2500",3075,1.5,5,3000,["box:3:1"],[200,9800],1,9000],[115,6,"李存勖",3,4,5,1,"10","2500",3115,1.5,5,3000,["box:3:1"],[200,9800],1,9000],[116,7,"AA_12",3,1,1,1,"10","2500",3155,1.5,5,3000,["gold:1"],[200,9800],1,10500],[117,7,"AA_12",3,1,2,0,"0","0",3195,1.5,5,3000,["gold:1"],[200,9800],0,10500],[118,7,"AA_12",3,1,3,3,"12","2000",3235,1.5,5,3000,["gold:1"],[200,9800],3,10500],[119,7,"AA_12",3,1,4,0,"0","0",3275,1.5,5,3000,["gold:1"],[200,9800],0,10500],[120,7,"AA_12",3,1,5,1,"10","2500",3315,1.5,5,3000,["gold:1"],[200,9800],1,10500],[121,7,"AA_12",3,2,1,0,"0","0",3355,1.5,5,3000,["gold:1"],[200,9800],0,10500],[122,7,"AA_12",3,2,2,2,"5","6000",3395,1.5,5,3000,["gold:1"],[200,9800],2,10500],[123,7,"AA_12",3,2,3,3,"12","2000",3435,1.5,5,3000,["gold:1"],[200,9800],3,10500],[124,7,"AA_12",3,2,4,2,"5","6000",3475,1.5,5,3000,["gold:1"],[200,9800],2,10500],[125,7,"AA_12",3,2,5,0,"0","0",3515,1.5,5,3000,["gold:1"],[200,9800],0,10500],[126,7,"AA_12",3,3,1,2,"5","6000",3555,1.5,5,3000,["gold:1"],[200,9800],2,10500],[127,7,"AA_12",3,3,2,1,"10","2500",3595,1.5,5,3000,["gold:1"],[200,9800],1,10500],[128,7,"AA_12",3,3,3,3,"12","2000",3635,1.5,5,3000,["gold:1"],[200,9800],3,10500],[129,7,"AA_12",3,3,4,1,"10","2500",3675,1.5,5,3000,["gold:1"],[200,9800],1,10500],[130,7,"AA_12",3,3,5,2,"5","6000",3715,1.5,5,3000,["gold:1"],[200,9800],2,10500],[131,7,"AA_12",3,4,1,3,"12","2000",3755,1.5,5,3000,["box:3:1"],[200,9800],3,10500],[132,7,"AA_12",3,4,2,2,"5","6000",3795,1.5,5,3000,["box:3:1"],[200,9800],2,10500],[133,7,"AA_12",3,4,3,1,"10","2500",3835,1.5,5,3000,["box:3:1"],[200,9800],1,10500],[134,7,"AA_12",3,4,4,2,"5","6000",3875,1.5,5,3000,["box:3:1"],[200,9800],2,10500],[135,7,"AA_12",3,4,5,3,"12","2000",3915,1.5,5,3000,["box:3:1"],[200,9800],3,10500],[136,8,"米高扬",3,1,1,0,"0","0",3955,1.5,5,3000,["gold:1"],[200,9800],0,12000],[137,8,"米高扬",3,1,2,1,"10","2500",3995,1.5,5,3000,["gold:1"],[200,9800],1,12000],[138,8,"米高扬",3,1,3,1,"10","2500",4035,1.5,5,3000,["gold:1"],[200,9800],1,12000],[139,8,"米高扬",3,1,4,1,"10","2500",4075,1.5,5,3000,["gold:1"],[200,9800],1,12000],[140,8,"米高扬",3,1,5,0,"0","0",4115,1.5,5,3000,["gold:1"],[200,9800],0,12000],[141,8,"米高扬",3,2,1,2,"5","6000",4155,1.5,5,3000,["gold:1"],[200,9800],2,12000],[142,8,"米高扬",3,2,2,0,"0","0",4195,1.5,5,3000,["gold:1"],[200,9800],0,12000],[143,8,"米高扬",3,2,3,2,"5","6000",4235,1.5,5,3000,["gold:1"],[200,9800],2,12000],[144,8,"米高扬",3,2,4,0,"0","0",4275,1.5,5,3000,["gold:1"],[200,9800],0,12000],[145,8,"米高扬",3,2,5,2,"5","6000",4315,1.5,5,3000,["gold:1"],[200,9800],2,12000],[146,8,"米高扬",3,3,1,0,"0","0",4355,1.5,5,3000,["gold:1"],[200,9800],0,12000],[147,8,"米高扬",3,3,2,3,"12","2000",4395,1.5,5,3000,["gold:1"],[200,9800],3,12000],[148,8,"米高扬",3,3,3,3,"12","2000",4435,1.5,5,3000,["gold:1"],[200,9800],3,12000],[149,8,"米高扬",3,3,4,3,"12","2000",4475,1.5,5,3000,["gold:1"],[200,9800],3,12000],[150,8,"米高扬",3,3,5,0,"0","0",4515,1.5,5,3000,["gold:1"],[200,9800],0,12000],[151,8,"米高扬",3,4,1,2,"5","6000",4555,1.5,5,3000,["box:3:1"],[200,9800],2,12000],[152,8,"米高扬",3,4,2,2,"5","6000",4595,1.5,5,3000,["box:3:1"],[200,9800],2,12000],[153,8,"米高扬",3,4,3,3,"12","2000",4635,1.5,5,3000,["box:3:1"],[200,9800],3,12000],[154,8,"米高扬",3,4,4,3,"12","2000",4675,1.5,5,3000,["box:3:1"],[200,9800],3,12000],[155,8,"米高扬",3,4,5,3,"12","2000",4715,1.5,5,3000,["box:3:1"],[200,9800],3,12000],[156,9,"安德罗波夫",4,1,1,0,"0","0",4755,1.5,5,3000,["gold:1"],[200,9800],0,13500],[157,9,"安德罗波夫",4,1,2,2,"5","6000",4795,1.5,5,3000,["gold:1"],[200,9800],2,13500],[158,9,"安德罗波夫",4,1,3,1,"10","2500",4835,1.5,5,3000,["gold:1"],[200,9800],1,13500],[159,9,"安德罗波夫",4,1,4,2,"5","6000",4875,1.5,5,3000,["gold:1"],[200,9800],2,13500],[160,9,"安德罗波夫",4,1,5,0,"0","0",4915,1.5,5,3000,["gold:1"],[200,9800],0,13500],[161,9,"安德罗波夫",4,2,1,3,"12","2000",4955,1.5,5,3000,["gold:1"],[200,9800],3,13500],[162,9,"安德罗波夫",4,2,2,0,"0","0",4995,1.5,5,3000,["gold:1"],[200,9800],0,13500],[163,9,"安德罗波夫",4,2,3,2,"5","6000",5035,1.5,5,3000,["gold:1"],[200,9800],2,13500],[164,9,"安德罗波夫",4,2,4,0,"0","0",5075,1.5,5,3000,["gold:1"],[200,9800],0,13500],[165,9,"安德罗波夫",4,2,5,3,"12","2000",5115,1.5,5,3000,["gold:1"],[200,9800],3,13500],[166,9,"安德罗波夫",4,3,1,0,"0","0",5155,1.5,5,3000,["gold:1"],[200,9800],0,13500],[167,9,"安德罗波夫",4,3,2,1,"10","2500",5195,1.5,5,3000,["gold:1"],[200,9800],1,13500],[168,9,"安德罗波夫",4,3,3,1,"10","2500",5235,1.5,5,3000,["gold:1"],[200,9800],1,13500],[169,9,"安德罗波夫",4,3,4,1,"10","2500",5275,1.5,5,3000,["gold:1"],[200,9800],1,13500],[170,9,"安德罗波夫",4,3,5,1,"10","2500",5315,1.5,5,3000,["gold:1"],[200,9800],1,13500],[171,9,"安德罗波夫",4,4,1,2,"5","6000",5355,1.5,5,3000,["box:3:1"],[200,9800],2,13500],[172,9,"安德罗波夫",4,4,2,2,"5","6000",5395,1.5,5,3000,["box:3:1"],[200,9800],2,13500],[173,9,"安德罗波夫",4,4,3,1,"10","2500",5435,1.5,5,3000,["box:3:1"],[200,9800],1,13500],[174,9,"安德罗波夫",4,4,4,3,"12","2000",5475,1.5,5,3000,["box:3:1"],[200,9800],3,13500],[175,9,"安德罗波夫",4,4,5,0,"0","0",5515,1.5,5,3000,["box:3:1"],[200,9800],0,13500],[176,10,"腓特烈",4,1,1,1,"10","2500",5555,1.5,5,3000,["gold:1"],[200,9800],1,15000],[177,10,"腓特烈",4,1,2,3,"12","2000",5595,1.5,5,3000,["gold:1"],[200,9800],3,15000],[178,10,"腓特烈",4,1,3,3,"12","2000",5635,1.5,5,3000,["gold:1"],[200,9800],3,15000],[179,10,"腓特烈",4,1,4,2,"5","6000",5675,1.5,5,3000,["gold:1"],[200,9800],2,15000],[180,10,"腓特烈",4,1,5,2,"5","6000",5715,1.5,5,3000,["gold:1"],[200,9800],2,15000],[181,10,"腓特烈",4,2,1,3,"12","2000",5755,1.5,5,3000,["gold:1"],[200,9800],3,15000],[182,10,"腓特烈",4,2,2,2,"5","6000",5795,1.5,5,3000,["gold:1"],[200,9800],2,15000],[183,10,"腓特烈",4,2,3,3,"12","2000",5835,1.5,5,3000,["gold:1"],[200,9800],3,15000],[184,10,"腓特烈",4,2,4,3,"12","2000",5875,1.5,5,3000,["gold:1"],[200,9800],3,15000],[185,10,"腓特烈",4,2,5,2,"5","6000",5915,1.5,5,3000,["gold:1"],[200,9800],2,15000],[186,10,"腓特烈",4,3,1,1,"10","2500",5955,1.5,5,3000,["gold:1"],[200,9800],1,15000],[187,10,"腓特烈",4,3,2,2,"5","6000",5995,1.5,5,3000,["gold:1"],[200,9800],2,15000],[188,10,"腓特烈",4,3,3,1,"10","2500",6035,1.5,5,3000,["gold:1"],[200,9800],1,15000],[189,10,"腓特烈",4,3,4,3,"12","2000",6075,1.5,5,3000,["gold:1"],[200,9800],3,15000],[190,10,"腓特烈",4,3,5,1,"10","2500",6115,1.5,5,3000,["gold:1"],[200,9800],1,15000],[191,10,"腓特烈",4,4,1,3,"12","2000",6155,1.5,5,3000,["box:3:1"],[200,9800],3,15000],[192,10,"腓特烈",4,4,2,2,"5","6000",6195,1.5,5,3000,["box:3:1"],[200,9800],2,15000],[193,10,"腓特烈",4,4,3,3,"12","2000",6235,1.5,5,3000,["box:3:1"],[200,9800],3,15000],[194,10,"腓特烈",4,4,4,2,"5","6000",6275,1.5,5,3000,["box:3:1"],[200,9800],2,15000],[195,10,"腓特烈",4,4,5,1,"10","2500",6315,1.5,5,3000,["box:3:1"],[200,9800],1,15000],[196,11,"林肯",4,1,1,2,"5","6000",6360,1.5,5,3000,["gold:1"],[200,9800],2,16500],[197,11,"林肯",4,1,2,2,"5","6000",6405,1.5,5,3000,["gold:1"],[200,9800],2,16500],[198,11,"林肯",4,1,3,1,"10","2500",6450,1.5,5,3000,["gold:1"],[200,9800],1,16500],[199,11,"林肯",4,1,4,2,"5","6000",6495,1.5,5,3000,["gold:1"],[200,9800],2,16500],[200,11,"林肯",4,1,5,2,"5","6000",6540,1.5,5,3000,["gold:1"],[200,9800],2,16500],[201,11,"林肯",4,2,1,3,"12","2000",6585,1.5,5,3000,["gold:1"],[200,9800],3,16500],[202,11,"林肯",4,2,2,3,"12","2000",6630,1.5,5,3000,["gold:1"],[200,9800],3,16500],[203,11,"林肯",4,2,3,2,"5","6000",6675,1.5,5,3000,["gold:1"],[200,9800],2,16500],[204,11,"林肯",4,2,4,3,"12","2000",6720,1.5,5,3000,["gold:1"],[200,9800],3,16500],[205,11,"林肯",4,2,5,3,"12","2000",6765,1.5,5,3000,["gold:1"],[200,9800],3,16500],[206,11,"林肯",4,3,1,1,"10","2500",6810,1.5,5,3000,["gold:1"],[200,9800],1,16500],[207,11,"林肯",4,3,2,2,"5","6000",6855,1.5,5,3000,["gold:1"],[200,9800],2,16500],[208,11,"林肯",4,3,3,2,"5","6000",6900,1.5,5,3000,["gold:1"],[200,9800],2,16500],[209,11,"林肯",4,3,4,1,"10","2500",6945,1.5,5,3000,["gold:1"],[200,9800],1,16500],[210,11,"林肯",4,3,5,1,"10","2500",6990,1.5,5,3000,["gold:1"],[200,9800],1,16500],[211,11,"林肯",4,4,1,2,"5","6000",7035,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[212,11,"林肯",4,4,2,2,"5","6000",7080,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[213,11,"林肯",4,4,3,2,"5","6000",7125,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[214,11,"林肯",4,4,4,2,"5","6000",7170,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[215,11,"林肯",4,4,5,2,"5","6000",7215,1.5,5,3000,["box:3:1"],[200,9800],2,16500],[216,12,"腓特烈",4,1,1,2,"5","6000",7260,1.5,5,3000,["gold:1"],[200,9800],2,18000],[217,12,"腓特烈",4,1,2,2,"5","6000",7305,1.5,5,3000,["gold:1"],[200,9800],2,18000],[218,12,"腓特烈",4,1,3,3,"12","2000",7350,1.5,5,3000,["gold:1"],[200,9800],3,18000],[219,12,"腓特烈",4,1,4,3,"12","2000",7395,1.5,5,3000,["gold:1"],[200,9800],3,18000],[220,12,"腓特烈",4,1,5,2,"5","6000",7440,1.5,5,3000,["gold:1"],[200,9800],2,18000],[221,12,"腓特烈",4,2,1,3,"12","2000",7485,1.5,5,3000,["gold:1"],[200,9800],3,18000],[222,12,"腓特烈",4,2,2,3,"12","2000",7530,1.5,5,3000,["gold:1"],[200,9800],3,18000],[223,12,"腓特烈",4,2,3,3,"12","2000",7575,1.5,5,3000,["gold:1"],[200,9800],3,18000],[224,12,"腓特烈",4,2,4,3,"12","2000",7620,1.5,5,3000,["gold:1"],[200,9800],3,18000],[225,12,"腓特烈",4,2,5,3,"12","2000",7665,1.5,5,3000,["gold:1"],[200,9800],3,18000],[226,12,"腓特烈",4,3,1,1,"10","2500",7710,1.5,5,3000,["gold:1"],[200,9800],1,18000],[227,12,"腓特烈",4,3,2,2,"5","6000",7755,1.5,5,3000,["gold:1"],[200,9800],2,18000],[228,12,"腓特烈",4,3,3,2,"5","6000",7800,1.5,5,3000,["gold:1"],[200,9800],2,18000],[229,12,"腓特烈",4,3,4,1,"10","2500",7845,1.5,5,3000,["gold:1"],[200,9800],1,18000],[230,12,"腓特烈",4,3,5,1,"10","2500",7890,1.5,5,3000,["gold:1"],[200,9800],1,18000],[231,12,"腓特烈",4,4,1,1,"10","2500",7935,1.5,5,3000,["box:3:1"],[200,9800],1,18000],[232,12,"腓特烈",4,4,2,2,"5","6000",7980,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[233,12,"腓特烈",4,4,3,3,"12","2000",8025,1.5,5,3000,["box:3:1"],[200,9800],3,18000],[234,12,"腓特烈",4,4,4,2,"5","6000",8070,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[235,12,"腓特烈",4,4,5,1,"10","2500",8115,1.5,5,3000,["box:3:1"],[200,9800],1,18000],[236,12,"腓特烈",4,5,1,2,"5","6000",8160,1.5,5,3000,["gold:1"],[200,9800],2,18000],[237,12,"腓特烈",4,5,2,2,"5","6000",8205,1.5,5,3000,["gold:1"],[200,9800],2,18000],[238,12,"腓特烈",4,5,3,1,"10","2500",8250,1.5,5,3000,["gold:1"],[200,9800],1,18000],[239,12,"腓特烈",4,5,4,2,"5","6000",8295,1.5,5,3000,["gold:1"],[200,9800],2,18000],[240,12,"腓特烈",4,5,5,2,"5","6000",8340,1.5,5,3000,["gold:1"],[200,9800],2,18000],[241,12,"腓特烈",4,6,1,2,"5","6000",8385,1.5,5,3000,["gold:1"],[200,9800],2,18000],[242,12,"腓特烈",4,6,2,3,"12","2000",8430,1.5,5,3000,["gold:1"],[200,9800],3,18000],[243,12,"腓特烈",4,6,3,2,"5","6000",8475,1.5,5,3000,["gold:1"],[200,9800],2,18000],[244,12,"腓特烈",4,6,4,3,"12","2000",8520,1.5,5,3000,["gold:1"],[200,9800],3,18000],[245,12,"腓特烈",4,6,5,3,"12","2000",8565,1.5,5,3000,["gold:1"],[200,9800],3,18000],[246,12,"腓特烈",4,7,1,1,"10","2500",8610,1.5,5,3000,["gold:1"],[200,9800],1,18000],[247,12,"腓特烈",4,7,2,1,"10","2500",8655,1.5,5,3000,["gold:1"],[200,9800],1,18000],[248,12,"腓特烈",4,7,3,1,"10","2500",8700,1.5,5,3000,["gold:1"],[200,9800],1,18000],[249,12,"腓特烈",4,7,4,1,"10","2500",8745,1.5,5,3000,["gold:1"],[200,9800],1,18000],[250,12,"腓特烈",4,7,5,1,"10","2500",8790,1.5,5,3000,["gold:1"],[200,9800],1,18000],[251,12,"腓特烈",4,8,1,2,"5","6000",8835,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[252,12,"腓特烈",4,8,2,2,"5","6000",8880,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[253,12,"腓特烈",4,8,3,3,"12","2000",8925,1.5,5,3000,["box:3:1"],[200,9800],3,18000],[254,12,"腓特烈",4,8,4,1,"10","2500",8970,1.5,5,3000,["box:3:1"],[200,9800],1,18000],[255,12,"腓特烈",4,8,5,2,"5","6000",9015,1.5,5,3000,["box:3:1"],[200,9800],2,18000],[256,13,"CHRIS",4,1,1,2,"6","6000",9060,1.5,5,3000,["gold:1"],[200,9800],2,19500],[257,13,"CHRIS",4,1,2,2,"6","6000",9105,1.5,5,3000,["gold:1"],[200,9800],2,19500],[258,13,"CHRIS",4,1,3,3,"14","2000",9150,1.5,5,3000,["gold:1"],[200,9800],3,19500],[259,13,"CHRIS",4,1,4,3,"14","2000",9195,1.5,5,3000,["gold:1"],[200,9800],3,19500],[260,13,"CHRIS",4,1,5,2,"6","6000",9240,1.5,5,3000,["gold:1"],[200,9800],2,19500],[261,13,"CHRIS",4,2,1,3,"14","2000",9285,1.5,5,3000,["gold:1"],[200,9800],3,19500],[262,13,"CHRIS",4,2,2,3,"14","2000",9330,1.5,5,3000,["gold:1"],[200,9800],3,19500],[263,13,"CHRIS",4,2,3,3,"14","2000",9375,1.5,5,3000,["gold:1"],[200,9800],3,19500],[264,13,"CHRIS",4,2,4,3,"14","2000",9420,1.5,5,3000,["gold:1"],[200,9800],3,19500],[265,13,"CHRIS",4,2,5,3,"14","2000",9465,1.5,5,3000,["gold:1"],[200,9800],3,19500],[266,13,"CHRIS",4,3,1,1,"12","2500",9510,1.5,5,3000,["gold:1"],[200,9800],1,19500],[267,13,"CHRIS",4,3,2,2,"6","6000",9555,1.5,5,3000,["gold:1"],[200,9800],2,19500],[268,13,"CHRIS",4,3,3,2,"6","6000",9600,1.5,5,3000,["gold:1"],[200,9800],2,19500],[269,13,"CHRIS",4,3,4,1,"12","2500",9645,1.5,5,3000,["gold:1"],[200,9800],1,19500],[270,13,"CHRIS",4,3,5,1,"12","2500",9690,1.5,5,3000,["gold:1"],[200,9800],1,19500],[271,13,"CHRIS",4,4,1,1,"12","2500",9735,1.5,5,3000,["box:3:1"],[200,9800],1,19500],[272,13,"CHRIS",4,4,2,2,"6","6000",9780,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[273,13,"CHRIS",4,4,3,3,"14","2000",9825,1.5,5,3000,["box:3:1"],[200,9800],3,19500],[274,13,"CHRIS",4,4,4,2,"6","6000",9870,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[275,13,"CHRIS",4,4,5,1,"12","2500",9915,1.5,5,3000,["box:3:1"],[200,9800],1,19500],[276,13,"CHRIS",4,5,1,2,"6","6000",9960,1.5,5,3000,["gold:1"],[200,9800],2,19500],[277,13,"CHRIS",4,5,2,2,"6","6000",10005,1.5,5,3000,["gold:1"],[200,9800],2,19500],[278,13,"CHRIS",4,5,3,1,"12","2500",10050,1.5,5,3000,["gold:1"],[200,9800],1,19500],[279,13,"CHRIS",4,5,4,2,"6","6000",10095,1.5,5,3000,["gold:1"],[200,9800],2,19500],[280,13,"CHRIS",4,5,5,2,"6","6000",10140,1.5,5,3000,["gold:1"],[200,9800],2,19500],[281,13,"CHRIS",4,6,1,2,"6","6000",10185,1.5,5,3000,["gold:1"],[200,9800],2,19500],[282,13,"CHRIS",4,6,2,3,"14","2000",10230,1.5,5,3000,["gold:1"],[200,9800],3,19500],[283,13,"CHRIS",4,6,3,2,"6","6000",10275,1.5,5,3000,["gold:1"],[200,9800],2,19500],[284,13,"CHRIS",4,6,4,3,"14","2000",10320,1.5,5,3000,["gold:1"],[200,9800],3,19500],[285,13,"CHRIS",4,6,5,3,"14","2000",10365,1.5,5,3000,["gold:1"],[200,9800],3,19500],[286,13,"CHRIS",4,7,1,1,"12","2500",10410,1.5,5,3000,["gold:1"],[200,9800],1,19500],[287,13,"CHRIS",4,7,2,1,"12","2500",10455,1.5,5,3000,["gold:1"],[200,9800],1,19500],[288,13,"CHRIS",4,7,3,1,"12","2500",10500,1.5,5,3000,["gold:1"],[200,9800],1,19500],[289,13,"CHRIS",4,7,4,1,"12","2500",10545,1.5,5,3000,["gold:1"],[200,9800],1,19500],[290,13,"CHRIS",4,7,5,1,"12","2500",10590,1.5,5,3000,["gold:1"],[200,9800],1,19500],[291,13,"CHRIS",4,8,1,2,"6","6000",10635,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[292,13,"CHRIS",4,8,2,2,"6","6000",10680,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[293,13,"CHRIS",4,8,3,3,"14","2000",10725,1.5,5,3000,["box:3:1"],[200,9800],3,19500],[294,13,"CHRIS",4,8,4,1,"12","2500",10770,1.5,5,3000,["box:3:1"],[200,9800],1,19500],[295,13,"CHRIS",4,8,5,2,"6","6000",10815,1.5,5,3000,["box:3:1"],[200,9800],2,19500],[296,14,"ZARD",4,1,1,2,"6","6000",10860,1.5,5,3000,["gold:1"],[200,9800],2,21000],[297,14,"ZARD",4,1,2,2,"6","6000",10905,1.5,5,3000,["gold:1"],[200,9800],2,21000],[298,14,"ZARD",4,1,3,3,"14","2000",10950,1.5,5,3000,["gold:1"],[200,9800],3,21000],[299,14,"ZARD",4,1,4,3,"14","2000",10995,1.5,5,3000,["gold:1"],[200,9800],3,21000],[300,14,"ZARD",4,1,5,2,"6","6000",11040,1.5,5,3000,["gold:1"],[200,9800],2,21000],[301,14,"ZARD",4,2,1,3,"14","2000",11085,1.5,5,3000,["gold:1"],[200,9800],3,21000],[302,14,"ZARD",4,2,2,3,"14","2000",11130,1.5,5,3000,["gold:1"],[200,9800],3,21000],[303,14,"ZARD",4,2,3,3,"14","2000",11175,1.5,5,3000,["gold:1"],[200,9800],3,21000],[304,14,"ZARD",4,2,4,3,"14","2000",11220,1.5,5,3000,["gold:1"],[200,9800],3,21000],[305,14,"ZARD",4,2,5,3,"14","2000",11265,1.5,5,3000,["gold:1"],[200,9800],3,21000],[306,14,"ZARD",4,3,1,1,"12","2500",11310,1.5,5,3000,["gold:1"],[200,9800],1,21000],[307,14,"ZARD",4,3,2,2,"6","6000",11355,1.5,5,3000,["gold:1"],[200,9800],2,21000],[308,14,"ZARD",4,3,3,2,"6","6000",11400,1.5,5,3000,["gold:1"],[200,9800],2,21000],[309,14,"ZARD",4,3,4,1,"12","2500",11445,1.5,5,3000,["gold:1"],[200,9800],1,21000],[310,14,"ZARD",4,3,5,1,"12","2500",11490,1.5,5,3000,["gold:1"],[200,9800],1,21000],[311,14,"ZARD",4,4,1,1,"12","2500",11535,1.5,5,3000,["box:3:1"],[200,9800],1,21000],[312,14,"ZARD",4,4,2,2,"6","6000",11580,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[313,14,"ZARD",4,4,3,3,"14","2000",11625,1.5,5,3000,["box:3:1"],[200,9800],3,21000],[314,14,"ZARD",4,4,4,2,"6","6000",11670,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[315,14,"ZARD",4,4,5,1,"12","2500",11715,1.5,5,3000,["box:3:1"],[200,9800],1,21000],[316,14,"ZARD",4,5,1,2,"6","6000",11760,1.5,5,3000,["gold:1"],[200,9800],2,21000],[317,14,"ZARD",4,5,2,2,"6","6000",11805,1.5,5,3000,["gold:1"],[200,9800],2,21000],[318,14,"ZARD",4,5,3,1,"12","2500",11850,1.5,5,3000,["gold:1"],[200,9800],1,21000],[319,14,"ZARD",4,5,4,2,"6","6000",11895,1.5,5,3000,["gold:1"],[200,9800],2,21000],[320,14,"ZARD",4,5,5,2,"6","6000",11940,1.5,5,3000,["gold:1"],[200,9800],2,21000],[321,14,"ZARD",4,6,1,2,"6","6000",11985,1.5,5,3000,["gold:1"],[200,9800],2,21000],[322,14,"ZARD",4,6,2,3,"14","2000",12030,1.5,5,3000,["gold:1"],[200,9800],3,21000],[323,14,"ZARD",4,6,3,2,"6","6000",12075,1.5,5,3000,["gold:1"],[200,9800],2,21000],[324,14,"ZARD",4,6,4,3,"14","2000",12120,1.5,5,3000,["gold:1"],[200,9800],3,21000],[325,14,"ZARD",4,6,5,3,"14","2000",12165,1.5,5,3000,["gold:1"],[200,9800],3,21000],[326,14,"ZARD",4,7,1,1,"12","2500",12210,1.5,5,3000,["gold:1"],[200,9800],1,21000],[327,14,"ZARD",4,7,2,1,"12","2500",12255,1.5,5,3000,["gold:1"],[200,9800],1,21000],[328,14,"ZARD",4,7,3,1,"12","2500",12300,1.5,5,3000,["gold:1"],[200,9800],1,21000],[329,14,"ZARD",4,7,4,1,"12","2500",12345,1.5,5,3000,["gold:1"],[200,9800],1,21000],[330,14,"ZARD",4,7,5,1,"12","2500",12390,1.5,5,3000,["gold:1"],[200,9800],1,21000],[331,14,"ZARD",4,8,1,2,"6","6000",12435,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[332,14,"ZARD",4,8,2,2,"6","6000",12480,1.5,5,3000,["box:3:1"],[200,9800],2,21000],[333,14,"ZARD",4,8,3,3,"14","2000",12525,1.5,5,3000,["box:3:1"],[200,9800],3,21000],[334,14,"ZARD",4,8,4,1,"12","2500",12570,1.5,5,3000,["box:3:1"],[200,9800],1,21000],[335,14,"ZARD",4,8,5,2,"6","6000",12615,1.5,5,3000,["box:3:1"],[200,9800],2,21000]]
\ No newline at end of file
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/scoreshop.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/scoreshop.json"
index b2362a2..f71d049 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/scoreshop.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/scoreshop.json"
@@ -1 +1 @@
-[[1,"1级金币获取增加","18小时内对战结算金币量+10%",64800,1,1.1,10000,5000,2],[2,"2级金币获取增加","18小时内对战结算金币量+15%",64800,1,1.5,15000,5000,2],[3,"通行证经验增加","18小时每次对战可获得100点通行证经验",64800,2,100,8000,2000,2]]
\ No newline at end of file
+[[1,"1级金币获取增加","18小时内对战结算金币量+10%",64800,1,1.1,10000,5000,2,"scoreshopgold1"],[2,"2级金币获取增加","18小时内对战结算金币量+15%",64800,1,1.5,15000,5000,2,"scoreshopgold2"],[3,"通行证经验增加","18小时每次对战可获得100点通行证经验",64800,2,100,8000,2000,2,"scoreexp1"]]
\ No newline at end of file
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
index 9ac0982..a560cdd 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
index be4f18a..035e1f9 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/globalgamemanagers.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0"
index cc646f6..e8017ba 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level0"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
index 93e9efc..19e798e 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2"
index fc8289a..9b06248 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level2"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3"
index c72c488..7a17b2c 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level3"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
index 757aedc..b3ec98e 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS"
index bf7a0b5..d050ffb 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/resources.assets.resS"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets"
index 679bbc1..b7c454c 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets0.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
index 149ac4a..78e8c65 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets1.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets"
index 6039fae..6a061dd 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets"
index ac179cf..37d6f6f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets"
Binary files differ
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS"
index c84074d..c5d9414 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets3.assets.resS"
Binary files differ
--
Gitblit v1.9.1