From 893f645dafa46b818a2edb9fa40337af0c3598d6 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 06 Nov 2020 19:57:10 +0800
Subject: [PATCH] 修改买塔规则 爱心破碎特效 基地血条不掉问题
---
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_buff.json | 2
GemBattle/宝石塔防_Data/Managed/UnityEngine.UI.dll | 0
GemBattle/宝石塔防_Data/StreamingAssets/Table/skilllevelinfo.json | 2
Assets/00000/package/Prefab/Effect_XinSui.prefab | 10
GemBattle/宝石塔防_Data/Managed/Unity.TextMeshPro.dll | 0
GemBattle/宝石塔防_Data/resources.assets | 0
GemBattle/宝石塔防_Data/level3 | 0
GemBattle/宝石塔防_Data/level2 | 0
Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs | 64 +-
Assets/Scenes/Levels/Battle/Endless.unity | 1042 +++++++++++++++++++++++++++---------------
GemBattle/宝石塔防_Data/StreamingAssets/Table/battle.json | 2
GemBattle/宝石塔防_Data/globalgamemanagers.assets | 0
Assets/Prefabs/UI/Heart.prefab.meta | 7
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs | 15
GemBattle/宝石塔防_Data/globalgamemanagers | 0
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 20
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Demos.dll | 0
GemBattle/宝石塔防_Data/level1 | 0
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp.dll | 0
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.dll | 0
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs | 4
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_port.json | 2
GemBattle/宝石塔防_Data/sharedassets2.assets | 0
GemBattle/宝石塔防_Data/StreamingAssets/Table/gemcost.json | 2
GemBattle/宝石塔防_Data/StreamingAssets/Table/boss_skill.json | 2
GemBattle/宝石塔防_Data/Managed/Assembly-CSharp-firstpass.dll | 0
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 1
Assets/Prefabs/UI/Heart.prefab | 203 ++++++++
GemBattle/宝石塔防_Data/sharedassets3.assets | 0
GemBattle.zip | 0
GemBattle/宝石塔防_Data/sharedassets2.assets.resS | 0
GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_enemy.json | 2
GemBattle/宝石塔防_Data/sharedassets3.assets.resS | 0
GemBattle/宝石塔防_Data/Managed/Unity.Timeline.dll | 0
Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs | 18
GemBattle/宝石塔防_Data/Managed/MoreMountains.NiceVibrations.Haptics.dll | 0
36 files changed, 940 insertions(+), 458 deletions(-)
diff --git a/Assets/00000/package/Prefab/Effect_XinSui.prefab b/Assets/00000/package/Prefab/Effect_XinSui.prefab
index 85ea6c2..eb1a21f 100644
--- a/Assets/00000/package/Prefab/Effect_XinSui.prefab
+++ b/Assets/00000/package/Prefab/Effect_XinSui.prefab
@@ -48,7 +48,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -4918,7 +4918,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
@@ -9792,7 +9792,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -14689,7 +14689,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
useRigidbodyForVelocity: 1
@@ -19559,7 +19559,7 @@
ringBufferLoopRange: {x: 0, y: 1}
looping: 0
prewarm: 0
- playOnAwake: 1
+ playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 0
useRigidbodyForVelocity: 1
diff --git a/Assets/Prefabs/UI/Heart.prefab b/Assets/Prefabs/UI/Heart.prefab
new file mode 100644
index 0000000..31284e3
--- /dev/null
+++ b/Assets/Prefabs/UI/Heart.prefab
@@ -0,0 +1,203 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7193677034299007581
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7193677034299007580}
+ - component: {fileID: 7193677034299007578}
+ - component: {fileID: 7193677034299007579}
+ m_Layer: 5
+ m_Name: Heart
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7193677034299007580
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7193677034299007581}
+ 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: 7405384424106249945}
+ 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: 0, y: 0}
+ m_SizeDelta: {x: 39, y: 31}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7193677034299007578
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7193677034299007581}
+ m_CullTransparentMesh: 0
+--- !u!114 &7193677034299007579
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7193677034299007581}
+ 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: 186567664ada48e499ee68c2657454ac, 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!1001 &5317628814761686032
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 7193677034299007580}
+ m_Modifications:
+ - target: {fileID: 3389300521755215609, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300522021803450, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300522131408960, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300522798179401, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300522800260022, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741960, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Name
+ value: Effect_XinSui
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741960, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741960, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 11
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 296dddd14ba103e4aa483333fe748c6f, type: 3}
+--- !u!4 &7405384424106249945 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3389300523282741961, guid: 296dddd14ba103e4aa483333fe748c6f,
+ type: 3}
+ m_PrefabInstance: {fileID: 5317628814761686032}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/UI/Heart.prefab.meta b/Assets/Prefabs/UI/Heart.prefab.meta
new file mode 100644
index 0000000..40cd9ef
--- /dev/null
+++ b/Assets/Prefabs/UI/Heart.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5bac711eb8890f244b4146b3339516ff
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index f24f0d3..7f124fe 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -2519,81 +2519,6 @@
m_Father: {fileID: 1071673243}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &283460866
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 283460867}
- - component: {fileID: 283460869}
- - component: {fileID: 283460868}
- m_Layer: 5
- m_Name: hh4
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &283460867
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 283460866}
- 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: 1646752539}
- 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: 0, y: -108}
- m_SizeDelta: {x: 38, y: 32}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &283460868
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 283460866}
- 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: 186567664ada48e499ee68c2657454ac, 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 &283460869
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 283460866}
- m_CullTransparentMesh: 0
--- !u!1 &283606402
GameObject:
m_ObjectHideFlags: 0
@@ -5755,81 +5680,6 @@
offset: 0
size: 0
path:
---- !u!1 &706480667
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 706480668}
- - component: {fileID: 706480670}
- - component: {fileID: 706480669}
- m_Layer: 5
- m_Name: hh5
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &706480668
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 706480667}
- 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: 1646752539}
- 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: 0, y: -144}
- m_SizeDelta: {x: 38, y: 32}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &706480669
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 706480667}
- 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: 186567664ada48e499ee68c2657454ac, 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 &706480670
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 706480667}
- m_CullTransparentMesh: 0
--- !u!1 &748467610
GameObject:
m_ObjectHideFlags: 0
@@ -8057,6 +7907,137 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &1010617647
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1646752539}
+ m_Modifications:
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -36
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 39
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 31
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Name
+ value: hh2
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
+--- !u!224 &1010617648 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 1010617647}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1010617649 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 1010617647}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1011378015
GameObject:
m_ObjectHideFlags: 0
@@ -9077,81 +9058,6 @@
m_Father: {fileID: 1578069729}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1093352500
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1093352501}
- - component: {fileID: 1093352503}
- - component: {fileID: 1093352502}
- m_Layer: 5
- m_Name: hh3
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1093352501
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1093352500}
- 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: 1646752539}
- 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: -72}
- m_SizeDelta: {x: 38, y: 32}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1093352502
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1093352500}
- 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: 186567664ada48e499ee68c2657454ac, 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 &1093352503
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1093352500}
- m_CullTransparentMesh: 0
--- !u!1 &1097197702
GameObject:
m_ObjectHideFlags: 0
@@ -10305,81 +10211,6 @@
m_Father: {fileID: 208884800}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1225992027
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1225992028}
- - component: {fileID: 1225992030}
- - component: {fileID: 1225992029}
- m_Layer: 5
- m_Name: hh2
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1225992028
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1225992027}
- 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: 1646752539}
- 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: 0, y: -36}
- m_SizeDelta: {x: 38, y: 32}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1225992029
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1225992027}
- 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: 186567664ada48e499ee68c2657454ac, 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 &1225992030
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1225992027}
- m_CullTransparentMesh: 0
--- !u!1 &1232389498
GameObject:
m_ObjectHideFlags: 0
@@ -11234,7 +11065,7 @@
type: 3}
TowerAppearEffectPrefab: {fileID: 7075300226719811381, guid: a3ffad0742f1416499458b12a1b8187c,
type: 3}
- MinLevelArr: 0000000000000000
+ MinLevel: 0
--- !u!114 &1340671926
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11546,6 +11377,137 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346638856}
m_CullTransparentMesh: 0
+--- !u!1001 &1367615651
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1646752539}
+ m_Modifications:
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -144
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 39
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 31
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Name
+ value: hh5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
+--- !u!224 &1367615652 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 1367615651}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1367615653 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 1367615651}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1376011634
GameObject:
m_ObjectHideFlags: 0
@@ -13433,6 +13395,137 @@
m_Father: {fileID: 1071673243}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1637200639
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1646752539}
+ m_Modifications:
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -108
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 39
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 31
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Name
+ value: hh4
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
+--- !u!224 &1637200640 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 1637200639}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1637200641 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 1637200639}
+ m_PrefabAsset: {fileID: 0}
--- !u!43 &1638733324
Mesh:
m_ObjectHideFlags: 0
@@ -13725,10 +13818,10 @@
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children:
- {fileID: 1967754587}
- - {fileID: 1225992028}
- - {fileID: 1093352501}
- - {fileID: 283460867}
- - {fileID: 706480668}
+ - {fileID: 1010617648}
+ - {fileID: 2096303031}
+ - {fileID: 1637200640}
+ - {fileID: 1367615652}
m_Father: {fileID: 1747414114}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13810,11 +13903,11 @@
m_Name:
m_EditorClassIdentifier:
HeartList:
- - {fileID: 1967754588}
- - {fileID: 1225992029}
- - {fileID: 1093352502}
- - {fileID: 283460868}
- - {fileID: 706480669}
+ - {fileID: 1967754586}
+ - {fileID: 1010617649}
+ - {fileID: 2096303032}
+ - {fileID: 1637200641}
+ - {fileID: 1367615653}
--- !u!1 &1660142624
GameObject:
m_ObjectHideFlags: 0
@@ -16589,81 +16682,18 @@
m_Script: {fileID: 11500000, guid: 8d007d681010e374cada07c014f0d4e7, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &1967754586
+--- !u!1 &1967754586 stripped
GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 7193677035184500487}
m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1967754587}
- - component: {fileID: 1967754589}
- - component: {fileID: 1967754588}
- m_Layer: 5
- m_Name: hh1
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1967754587
+--- !u!224 &1967754587 stripped
RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 7193677035184500487}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1967754586}
- 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: 1646752539}
- 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: 39, y: 31}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1967754588
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1967754586}
- 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: 186567664ada48e499ee68c2657454ac, 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 &1967754589
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1967754586}
- m_CullTransparentMesh: 0
--- !u!1 &1967975859
GameObject:
m_ObjectHideFlags: 0
@@ -18455,6 +18485,137 @@
m_Father: {fileID: 1410659829}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2096303030
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1646752539}
+ m_Modifications:
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -72
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 39
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 31
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Name
+ value: hh3
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
+--- !u!224 &2096303031 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 2096303030}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &2096303032 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ m_PrefabInstance: {fileID: 2096303030}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2103359308
GameObject:
m_ObjectHideFlags: 0
@@ -18736,3 +18897,122 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2132913252}
m_CullTransparentMesh: 0
+--- !u!1001 &7193677035184500487
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1646752539}
+ m_Modifications:
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 39
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 31
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff,
+ type: 3}
+ propertyPath: m_Name
+ value: hh1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3}
diff --git a/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs b/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
index 8f442a6..26e0f0e 100644
--- a/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
+++ b/Assets/Scripts/TowerDefense/Agents/HomeBaseAttacker.cs
@@ -51,51 +51,47 @@
var damager = GetComponent<Damager>();
if (damager != null)
{
- m_FinalDestinationDamageableBehaviour.TakeDamage(damager.finalDamage, transform.position, agent.configuration.alignmentProvider);
-
- PlayerHomeBase homebase = m_FinalDestinationDamageableBehaviour.GetComponent<PlayerHomeBase>();
- if (homebase && (!homebase.isDead))
+ if (!EndlessLevelManager.instanceExists)
{
- // 显示塔位血条
- float hscale = homebase.healthVal / homebase.configuration.maxHealth;
- if (hscale < 1.0)
+ m_FinalDestinationDamageableBehaviour.TakeDamage(damager.finalDamage, transform.position, agent.configuration.alignmentProvider);
+ PlayerHomeBase homebase = m_FinalDestinationDamageableBehaviour.GetComponent<PlayerHomeBase>();
+ if (homebase && (!homebase.isDead))
{
- if (homebase.opponent)
- OpponentMgr.instance.m_CurrentArea.setTowerPosHealth(homebase.homebaseIdx, hscale);
- else
+ // 显示塔位血条
+ float hscale = homebase.healthVal / homebase.configuration.maxHealth;
+ if (hscale < 1.0)
{
- if (GameUI.instanceExists)
+ if (homebase.opponent)
+ OpponentMgr.instance.m_CurrentArea.setTowerPosHealth(homebase.homebaseIdx, hscale);
+ else
{
if (null != GameUI.instance.selfTowerPlaceArea)
GameUI.instance.selfTowerPlaceArea.setTowerPosHealth(homebase.homebaseIdx, hscale);
}
- else if (EndlessGameUI.instanceExists)
- {
- if (EndlessGameUI.instance.selfTowerPlaceArea != null)
- {
- if (GameConfig.IsNewbie)
- {
- if (GameConfig.TowerFirstTakeDamage)
- {
- GameConfig.TowerFirstTakeDamage = false;
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 1);
- EndlessLevelManager.instance.StopSecondWave();
- }
- else
- {
- if (GameConfig.TowerCanTakeDamage)
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 1);
- }
- }
- else
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 1);
- }
- }
}
-
}
}
+ else
+ {
+ if (GameConfig.IsNewbie)
+ {
+ if (GameConfig.TowerFirstTakeDamage)
+ {
+ GameConfig.TowerFirstTakeDamage = false;
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 1);
+ EndlessLevelManager.instance.StopSecondWave();
+ }
+ else
+ {
+ if (GameConfig.TowerCanTakeDamage)
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 1);
+ }
+ }
+ else
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 1);
+ }
}
+
agent.Remove();
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
index fdf0bc1..c459c66 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/BossSkillBubbleBomb.cs
@@ -4,8 +4,6 @@
using UnityEngine;
using TowerDefense.Agents;
using TowerDefense.Level;
-using DG.Tweening;
-using MoreMountains.NiceVibrations;
/**
* 泡泡炸弹
@@ -435,8 +433,6 @@
if (config.AttackTime <= 0)
{
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLoseHeart, 3);
- ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
- MMVibrationManager.Haptic(HapticTypes.HeavyImpact);
config.IsAttack = false;
}
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
index 5856b0f..96b418d 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessHomeBaseHPManager.cs
@@ -3,6 +3,8 @@
using UnityEngine;
using UnityEngine.UI;
using Core.Utilities;
+using DG.Tweening;
+using MoreMountains.NiceVibrations;
/**
* 无尽模式玩家基地血量管理器
@@ -26,7 +28,7 @@
/// <summary>
/// 爱心列表
/// </summary>
- public List<Image> HeartList;
+ public List<GameObject> HeartList;
// Start is called before the first frame update
private void Start()
@@ -57,12 +59,20 @@
while (i < end)
{
- Color c = HeartList[i].color;
- c.a = 0.27f;
- HeartList[i].color = c;
+ Image img = HeartList[i].GetComponent<Image>();
+ Color c = img.color;
+ c.a = 0.17f;
+ img.color = c;
+
+ GameObject psObj = HeartList[i].transform.GetChild(0).gameObject;
+ ParticleSystem ps = psObj.transform.GetChild(0).GetComponent<ParticleSystem>();
+ ps.Play();
++i;
}
+ ViewPortAdj.instance.cachedCamera.DOShakePosition(0.25f, 1.5f, 4);
+ MMVibrationManager.Haptic(HapticTypes.HeavyImpact);
+
if (CurrentHP == 0)
EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessHeartAllLose);
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index 45fa4ea..41cc01c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -80,7 +80,6 @@
RefreshFinalWave();
RefreshPropList();
- EndlessMaskUI.instance.Show();
SettlementUI.SetActive(true);
PlayEffect();
}
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 7f9fa31..81fec58 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -250,7 +250,7 @@
/// 保存所有生成或合成的塔的最小等级，索引0 -> 火木水塔 索引1 -> 技能塔
/// </summary>
/// <value></value>
- public int[] MinLevelArr = { 0, 0 };
+ public int MinLevel;
public IPlacementArea selfTowerPlaceArea
{
@@ -268,25 +268,15 @@
private void UpdateMinLevelArr()
{
- int min1 = -1;
- int min2 = -1;
+ int min = -1;
for (int i = 0; i < m_listTower.Count; ++i)
{
- if (m_listTower[i].towerFeature == EFeatureTower.NULL)
- {
- if (min1 == -1 || m_listTower[i].currentLevel < min1)
- min1 = m_listTower[i].currentLevel;
- }
- else
- {
- if (min2 == -1 || m_listTower[i].currentLevel < min2)
- min2 = m_listTower[i].currentLevel;
- }
+ if (min == -1 || m_listTower[i].currentLevel < min)
+ min = m_listTower[i].currentLevel;
}
- MinLevelArr[0] = Mathf.Max(min1, 0);
- MinLevelArr[1] = Mathf.Max(min2, 0);
+ MinLevel = Mathf.Max(min, 0);
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
index e7f5178..b8ab7d7 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -327,14 +327,15 @@
if (gameUI.isBuilding)
gameUI.CancelGhostPlacement();
- if (level == -1)
+ if (EndlessUIStart.instance.GameStartTime >= LEVELUP_TOWER_TIME)
{
- int[] minLevelArr = EndlessGameUI.instance.MinLevelArr;
-
- if (tower.towerFeature == EFeatureTower.NULL)
- level = Mathf.Min(minLevelArr[0], 1);
- else
- level = Mathf.Min(minLevelArr[1], 1);
+ if (level == -1)
+ level = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
+ }
+ else
+ {
+ if (level == -1)
+ level = 0;
}
return gameUI.RandomPlaceTower(tower, posx, posy, level, cost);
diff --git a/GemBattle.zip b/GemBattle.zip
index bc6133c..0f2ed0c 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 e649149..b38c9ea 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 1166531..cb15144 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 ce404b6..414c3c8 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 615ea42..b77cc9b 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 5b24179..0aa1c4c 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 f3a05b9..b94fd69 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 94b3ccf..67ff46a 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 9552246..75a7aa6 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/battle.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json"
index 9a3a3fc..c199eb5 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/battle.json"
@@ -1 +1 @@
-[[1,"skilltime",30,[],"","生成技能宝石的时间（秒）"],[2,"initialgold",500,[],"","战斗内初始金币"],[3,"doublegem",99999999,[],"","购买宝石直接获得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",650,[],"","战斗内初始金币"],[3,"doublegem",99999999,[],"","购买宝石直接获得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
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 ade472e..a713e81 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,[15,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[15,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[20,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],[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
diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_buff.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_buff.json"
index 636068c..2d64de6 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_buff.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_buff.json"
@@ -1 +1 @@
-[[1,"低级火灵之力",[2,1],[1,2,0],-1,"增加全体火精灵2%攻击力",0,99,10001,1],[2,"低级水灵之力",[2,2],[1,2,0],-1,"增加全体水精灵2%攻击力",0,99,10002,1],[3,"低级木灵之力",[2,3],[1,2,0],-1,"增加全体木精灵2%攻击力",0,99,10003,1],[4,"火灵之力",[2,1],[1,4,0],-1,"增加全体火精灵4%攻击力",3,99,10001,2],[5,"水灵之力",[2,2],[1,4,0],-1,"增加全体水精灵4%攻击力",3,99,10002,2],[6,"木灵之力",[2,3],[1,4,0],-1,"增加全体木精灵4%攻击力",3,99,10003,2],[7,"高级火灵之力",[2,1],[1,6,0],-1,"增加全体火精灵6%攻击力",5,99,10001,3],[8,"高级水灵之力",[2,2],[1,6,0],-1,"增加全体水精灵6%攻击力",5,99,10002,3],[9,"高级木灵之力",[2,3],[1,6,0],-1,"增加全体木精灵6%攻击力",5,99,10003,3],[10,"精灵之力",[1,0],[1,10,0],3,"3波增加全体精灵10%攻击力",2,99,10004,2],[11,"时空宝石",[1,0],[1,20,0],3,"3波内增加全体精灵20%攻击力",2,99,10005,3],[12,"飞来横财",[0],[2,300,0],0,"增加300金币",0,99,10007,1],[13,"中大奖!",[0],[2,800,0],0,"增加800金币",3,99,10007,3],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",0,99,10006,2],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",3,99,10006,3]]
\ No newline at end of file
+[[1,"低级火灵之力",[2,1],[1,2,0],-1,"增加全体火精灵2%攻击力",0,99,10001,1],[2,"低级水灵之力",[2,2],[1,2,0],-1,"增加全体水精灵2%攻击力",0,99,10002,1],[3,"低级木灵之力",[2,3],[1,2,0],-1,"增加全体木精灵2%攻击力",0,99,10003,1],[4,"火灵之力",[2,1],[1,4,0],-1,"增加全体火精灵4%攻击力",4,99,10001,2],[5,"水灵之力",[2,2],[1,4,0],-1,"增加全体水精灵4%攻击力",4,99,10002,2],[6,"木灵之力",[2,3],[1,4,0],-1,"增加全体木精灵4%攻击力",4,99,10003,2],[7,"高级火灵之力",[2,1],[1,6,0],-1,"增加全体火精灵6%攻击力",6,99,10001,3],[8,"高级水灵之力",[2,2],[1,6,0],-1,"增加全体水精灵6%攻击力",6,99,10002,3],[9,"高级木灵之力",[2,3],[1,6,0],-1,"增加全体木精灵6%攻击力",6,99,10003,3],[10,"精灵之力",[1,0],[1,10,0],3,"3波增加全体精灵10%攻击力",3,99,10004,2],[11,"时空宝石",[1,0],[1,20,0],3,"3波内增加全体精灵20%攻击力",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级精灵",0,99,10006,2],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",4,99,10006,3]]
\ 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 f6183ba..360f0b3 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.5,2,1,101],[2,"小怪_水",1,5.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],[2,"小怪_水",1,5,1,3,102],[3,"小怪_木",1,0.8,1.2,1,103]]
\ 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 070e1e3..1e1c8df 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"],[500,9500],0],[12,1,"史莱姆大王",1,1,2,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[13,1,"史莱姆大王",1,1,3,2,"4","6000",250,1.5,5,3000,["gold:1"],[500,9500],2],[14,1,"史莱姆大王",1,1,4,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[15,1,"史莱姆大王",1,1,5,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[16,1,"史莱姆大王",1,2,1,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[17,1,"史莱姆大王",1,2,2,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[18,1,"史莱姆大王",1,2,3,3,"12","2000",250,1.5,5,3000,["gold:1"],[500,9500],3],[19,1,"史莱姆大王",1,2,4,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[20,1,"史莱姆大王",1,2,5,0,"0","0",250,1.5,5,3000,["box:1:1"],[500,9500],0],[21,1,"拿破仑",2,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[500,9500],0],[22,2,"拿破仑",2,1,2,2,"4","7000",285,1.5,5,3000,["gold:1"],[500,9500],2],[23,2,"拿破仑",2,1,3,0,"0","0",320,1.5,5,3000,["gold:1"],[500,9500],0],[24,2,"拿破仑",2,1,4,2,"4","7000",355,1.5,5,3000,["gold:1"],[500,9500],2],[25,2,"拿破仑",2,1,5,0,"0","0",390,1.5,5,3000,["gold:1"],[500,9500],0],[26,2,"拿破仑",2,2,1,0,"0","0",425,1.5,5,3000,["gold:1"],[500,9500],0],[27,2,"拿破仑",2,2,2,3,"12","2000",460,1.5,5,3000,["gold:1"],[500,9500],3],[28,2,"拿破仑",2,2,3,1,"12","2000",495,1.5,5,3000,["gold:1"],[500,9500],1],[29,2,"拿破仑",2,2,4,3,"12","2000",530,1.5,5,3000,["gold:1"],[500,9500],3],[30,2,"拿破仑",2,2,5,0,"0","0",565,1.5,5,3000,["box:1:1"],[500,9500],0],[31,3,"凯撒",2,1,1,3,"12","2000",600,1.5,5,3000,["gold:1"],[500,9500],3],[32,3,"凯撒",2,1,2,0,"0","0",635,1.5,5,3000,["gold:1"],[500,9500],0],[33,3,"凯撒",2,1,3,1,"12","2000",670,1.5,5,3000,["gold:1"],[500,9500],1],[34,3,"凯撒",2,1,4,0,"0","0",705,1.5,5,3000,["gold:1"],[500,9500],0],[35,3,"凯撒",2,1,5,3,"12","2000",740,1.5,5,3000,["gold:1"],[500,9500],3],[36,3,"凯撒",2,2,1,0,"0","0",775,1.5,5,3000,["gold:1"],[500,9500],0],[37,3,"凯撒",2,2,2,2,"4","7000",810,1.5,5,3000,["gold:1"],[500,9500],2],[38,3,"凯撒",2,2,3,3,"12","2000",845,1.5,5,3000,["gold:1"],[500,9500],3],[39,3,"凯撒",2,2,4,2,"4","7000",880,1.5,5,3000,["gold:1"],[500,9500],2],[40,3,"凯撒",2,2,5,0,"0","0",915,1.5,5,3000,["gold:1"],[500,9500],0],[41,3,"凯撒",2,3,1,3,"12","2000",950,1.5,5,3000,["box:2:1"],[500,9500],3],[42,3,"凯撒",2,3,2,2,"4","7000",985,1.5,5,3000,["box:2:1"],[500,9500],2],[43,3,"凯撒",2,3,3,1,"12","2000",1020,1.5,5,3000,["box:2:1"],[500,9500],1],[44,3,"凯撒",2,3,4,2,"4","7000",1055,1.5,5,3000,["box:2:1"],[500,9500],2],[45,3,"凯撒",2,3,5,3,"12","2000",1090,1.5,5,3000,["box:2:1"],[500,9500],3],[46,4,"克伦威尔",2,1,1,3,"12","2000",1125,1.5,5,3000,["gold:1"],[500,9500],3],[47,4,"克伦威尔",2,1,2,1,"12","2000",1160,1.5,5,3000,["gold:1"],[500,9500],1],[48,4,"克伦威尔",2,1,3,0,"0","0",1195,1.5,5,3000,["gold:1"],[500,9500],0],[49,4,"克伦威尔",2,1,4,1,"12","2000",1230,1.5,5,3000,["gold:1"],[500,9500],1],[50,4,"克伦威尔",2,1,5,3,"12","2000",1265,1.5,5,3000,["gold:1"],[500,9500],3],[51,4,"克伦威尔",2,2,1,2,"4","7000",1300,1.5,5,3000,["gold:1"],[500,9500],2],[52,4,"克伦威尔",2,2,2,1,"12","2000",1335,1.5,5,3000,["gold:1"],[500,9500],1],[53,4,"克伦威尔",2,2,3,0,"0","0",1370,1.5,5,3000,["gold:1"],[500,9500],0],[54,4,"克伦威尔",2,2,4,1,"12","2000",1405,1.5,5,3000,["gold:1"],[500,9500],1],[55,4,"克伦威尔",2,2,5,2,"4","7000",1440,1.5,5,3000,["gold:1"],[500,9500],2],[56,4,"克伦威尔",2,3,1,3,"12","2000",1475,1.5,5,3000,["box:2:1"],[500,9500],3],[57,4,"克伦威尔",2,3,2,3,"12","2000",1510,1.5,5,3000,["box:2:1"],[500,9500],3],[58,4,"克伦威尔",2,3,3,1,"12","2000",1545,1.5,5,3000,["box:2:1"],[500,9500],1],[59,4,"克伦威尔",2,3,4,2,"4","7000",1580,1.5,5,3000,["box:2:1"],[500,9500],2],[60,4,"克伦威尔",2,3,5,2,"4","7000",1615,1.5,5,3000,["box:2:1"],[500,9500],2],[61,5,"尼克松",3,1,1,1,"12","2000",1650,1.5,5,3000,["gold:1"],[500,9500],1],[62,5,"尼克松",3,1,2,1,"12","2000",1685,1.5,5,3000,["gold:1"],[500,9500],1],[63,5,"尼克松",3,1,3,1,"12","2000",1720,1.5,5,3000,["gold:1"],[500,9500],1],[64,5,"尼克松",3,1,4,1,"12","2000",1755,1.5,5,3000,["gold:1"],[500,9500],1],[65,5,"尼克松",3,1,5,1,"12","2000",1790,1.5,5,3000,["gold:1"],[500,9500],1],[66,5,"尼克松",3,2,1,2,"4","7000",1825,1.5,5,3000,["gold:1"],[500,9500],2],[67,5,"尼克松",3,2,2,2,"4","7000",1860,1.5,5,3000,["gold:1"],[500,9500],2],[68,5,"尼克松",3,2,3,2,"4","7000",1895,1.5,5,3000,["gold:1"],[500,9500],2],[69,5,"尼克松",3,2,4,2,"4","7000",1930,1.5,5,3000,["gold:1"],[500,9500],2],[70,5,"尼克松",3,2,5,2,"4","7000",1965,1.5,5,3000,["gold:1"],[500,9500],2],[71,5,"尼克松",3,3,1,3,"12","2000",2000,1.5,5,3000,["gold:1"],[500,9500],3],[72,5,"尼克松",3,3,2,3,"12","2000",2035,1.5,5,3000,["gold:1"],[500,9500],3],[73,5,"尼克松",3,3,3,3,"12","2000",2070,1.5,5,3000,["gold:1"],[500,9500],3],[74,5,"尼克松",3,3,4,3,"12","2000",2105,1.5,5,3000,["gold:1"],[500,9500],3],[75,5,"尼克松",3,3,5,3,"12","2000",2140,1.5,5,3000,["gold:1"],[500,9500],3],[76,5,"尼克松",3,4,1,-1,"8","3000",2175,1.5,5,3000,["box:2:1"],[500,9500],4],[77,5,"尼克松",3,4,2,-1,"8","3000",2210,1.5,5,3000,["box:2:1"],[500,9500],4],[78,5,"尼克松",3,4,3,-1,"8","3000",2245,1.5,5,3000,["box:2:1"],[500,9500],4],[79,5,"尼克松",3,4,4,-1,"8","3000",2280,1.5,5,3000,["box:2:1"],[500,9500],4],[80,5,"尼克松",3,4,5,-1,"8","3000",2315,1.5,5,3000,["box:2:1"],[500,9500],4],[81,6,"李存勖",3,1,1,1,"15","2000",2355,1.5,5,3000,["gold:1"],[500,9500],1],[82,6,"李存勖",3,1,2,1,"15","2000",2395,1.5,5,3000,["gold:1"],[500,9500],1],[83,6,"李存勖",3,1,3,2,"5","7000",2435,1.5,5,3000,["gold:1"],[500,9500],2],[84,6,"李存勖",3,1,4,1,"15","2000",2475,1.5,5,3000,["gold:1"],[500,9500],1],[85,6,"李存勖",3,1,5,1,"15","2000",2515,1.5,5,3000,["gold:1"],[500,9500],1],[86,6,"李存勖",3,2,1,2,"5","7000",2555,1.5,5,3000,["gold:1"],[500,9500],2],[87,6,"李存勖",3,2,2,2,"5","7000",2595,1.5,5,3000,["gold:1"],[500,9500],2],[88,6,"李存勖",3,2,3,3,"15","2000",2635,1.5,5,3000,["gold:1"],[500,9500],3],[89,6,"李存勖",3,2,4,2,"5","7000",2675,1.5,5,3000,["gold:1"],[500,9500],2],[90,6,"李存勖",3,2,5,2,"5","7000",2715,1.5,5,3000,["gold:1"],[500,9500],2],[91,6,"李存勖",3,3,1,1,"15","2000",2755,1.5,5,3000,["gold:1"],[500,9500],1],[92,6,"李存勖",3,3,2,2,"5","7000",2795,1.5,5,3000,["gold:1"],[500,9500],2],[93,6,"李存勖",3,3,3,3,"15","2000",2835,1.5,5,3000,["gold:1"],[500,9500],3],[94,6,"李存勖",3,3,4,2,"5","7000",2875,1.5,5,3000,["gold:1"],[500,9500],2],[95,6,"李存勖",3,3,5,1,"15","2000",2915,1.5,5,3000,["gold:1"],[500,9500],1],[96,6,"李存勖",3,4,1,2,"5","7000",2955,1.5,5,3000,["box:3:1"],[500,9500],2],[97,6,"李存勖",3,4,2,1,"15","2000",2995,1.5,5,3000,["box:3:1"],[500,9500],1],[98,6,"李存勖",3,4,3,-1,"8","3000",3035,1.5,5,3000,["box:3:1"],[500,9500],4],[99,6,"李存勖",3,4,4,1,"15","2000",3075,1.5,5,3000,["box:3:1"],[500,9500],1],[100,6,"李存勖",3,4,5,2,"5","7000",3115,1.5,5,3000,["box:3:1"],[500,9500],2],[101,7,"AA_12",3,1,1,3,"15","2000",3155,1.5,5,3000,["gold:1"],[500,9500],3],[102,7,"AA_12",3,1,2,3,"15","2000",3195,1.5,5,3000,["gold:1"],[500,9500],3],[103,7,"AA_12",3,1,3,1,"15","2000",3235,1.5,5,3000,["gold:1"],[500,9500],1],[104,7,"AA_12",3,1,4,3,"15","2000",3275,1.5,5,3000,["gold:1"],[500,9500],3],[105,7,"AA_12",3,1,5,3,"15","2000",3315,1.5,5,3000,["gold:1"],[500,9500],3],[106,7,"AA_12",3,2,1,1,"15","2000",3355,1.5,5,3000,["gold:1"],[500,9500],1],[107,7,"AA_12",3,2,2,2,"5","7000",3395,1.5,5,3000,["gold:1"],[500,9500],2],[108,7,"AA_12",3,2,3,3,"15","2000",3435,1.5,5,3000,["gold:1"],[500,9500],3],[109,7,"AA_12",3,2,4,2,"5","7000",3475,1.5,5,3000,["gold:1"],[500,9500],2],[110,7,"AA_12",3,2,5,1,"15","2000",3515,1.5,5,3000,["gold:1"],[500,9500],1],[111,7,"AA_12",3,3,1,2,"5","7000",3555,1.5,5,3000,["gold:1"],[500,9500],2],[112,7,"AA_12",3,3,2,1,"15","2000",3595,1.5,5,3000,["gold:1"],[500,9500],1],[113,7,"AA_12",3,3,3,3,"15","2000",3635,1.5,5,3000,["gold:1"],[500,9500],3],[114,7,"AA_12",3,3,4,1,"15","2000",3675,1.5,5,3000,["gold:1"],[500,9500],1],[115,7,"AA_12",3,3,5,2,"5","7000",3715,1.5,5,3000,["gold:1"],[500,9500],2],[116,7,"AA_12",3,4,1,2,"5","7000",3755,1.5,5,3000,["box:3:1"],[500,9500],2],[117,7,"AA_12",3,4,2,2,"5","7000",3795,1.5,5,3000,["box:3:1"],[500,9500],2],[118,7,"AA_12",3,4,3,-1,"8","3000",3835,1.5,5,3000,["box:3:1"],[500,9500],4],[119,7,"AA_12",3,4,4,3,"15","2000",3875,1.5,5,3000,["box:3:1"],[500,9500],3],[120,7,"AA_12",3,4,5,3,"15","2000",3915,1.5,5,3000,["box:3:1"],[500,9500],3],[121,8,"米高扬",3,1,1,1,"15","2000",3955,1.5,5,3000,["gold:1"],[500,9500],1],[122,8,"米高扬",3,1,2,1,"15","2000",3995,1.5,5,3000,["gold:1"],[500,9500],1],[123,8,"米高扬",3,1,3,1,"15","2000",4035,1.5,5,3000,["gold:1"],[500,9500],1],[124,8,"米高扬",3,1,4,1,"15","2000",4075,1.5,5,3000,["gold:1"],[500,9500],1],[125,8,"米高扬",3,1,5,1,"15","2000",4115,1.5,5,3000,["gold:1"],[500,9500],1],[126,8,"米高扬",3,2,1,2,"5","7000",4155,1.5,5,3000,["gold:1"],[500,9500],2],[127,8,"米高扬",3,2,2,2,"5","7000",4195,1.5,5,3000,["gold:1"],[500,9500],2],[128,8,"米高扬",3,2,3,2,"5","7000",4235,1.5,5,3000,["gold:1"],[500,9500],2],[129,8,"米高扬",3,2,4,2,"5","7000",4275,1.5,5,3000,["gold:1"],[500,9500],2],[130,8,"米高扬",3,2,5,2,"5","7000",4315,1.5,5,3000,["gold:1"],[500,9500],2],[131,8,"米高扬",3,3,1,3,"15","2000",4355,1.5,5,3000,["gold:1"],[500,9500],3],[132,8,"米高扬",3,3,2,3,"15","2000",4395,1.5,5,3000,["gold:1"],[500,9500],3],[133,8,"米高扬",3,3,3,3,"15","2000",4435,1.5,5,3000,["gold:1"],[500,9500],3],[134,8,"米高扬",3,3,4,3,"15","2000",4475,1.5,5,3000,["gold:1"],[500,9500],3],[135,8,"米高扬",3,3,5,3,"15","2000",4515,1.5,5,3000,["gold:1"],[500,9500],3],[136,8,"米高扬",3,4,1,-1,"8","3000",4555,1.5,5,3000,["box:3:1"],[500,9500],4],[137,8,"米高扬",3,4,2,-1,"8","3000",4595,1.5,5,3000,["box:3:1"],[500,9500],4],[138,8,"米高扬",3,4,3,-1,"8","3000",4635,1.5,5,3000,["box:3:1"],[500,9500],4],[139,8,"米高扬",3,4,4,-1,"8","3000",4675,1.5,5,3000,["box:3:1"],[500,9500],4],[140,8,"米高扬",3,4,5,-1,"8","3000",4715,1.5,5,3000,["box:3:1"],[500,9500],4],[141,9,"安德罗波夫",4,1,1,2,"5","7000",4755,1.5,5,3000,["gold:1"],[500,9500],2],[142,9,"安德罗波夫",4,1,2,2,"5","7000",4795,1.5,5,3000,["gold:1"],[500,9500],2],[143,9,"安德罗波夫",4,1,3,1,"15","2000",4835,1.5,5,3000,["gold:1"],[500,9500],1],[144,9,"安德罗波夫",4,1,4,2,"5","7000",4875,1.5,5,3000,["gold:1"],[500,9500],2],[145,9,"安德罗波夫",4,1,5,2,"5","7000",4915,1.5,5,3000,["gold:1"],[500,9500],2],[146,9,"安德罗波夫",4,2,1,3,"15","2000",4955,1.5,5,3000,["gold:1"],[500,9500],3],[147,9,"安德罗波夫",4,2,2,3,"15","2000",4995,1.5,5,3000,["gold:1"],[500,9500],3],[148,9,"安德罗波夫",4,2,3,2,"5","7000",5035,1.5,5,3000,["gold:1"],[500,9500],2],[149,9,"安德罗波夫",4,2,4,3,"15","2000",5075,1.5,5,3000,["gold:1"],[500,9500],3],[150,9,"安德罗波夫",4,2,5,3,"15","2000",5115,1.5,5,3000,["gold:1"],[500,9500],3],[151,9,"安德罗波夫",4,3,1,1,"15","2000",5155,1.5,5,3000,["gold:1"],[500,9500],1],[152,9,"安德罗波夫",4,3,2,1,"15","2000",5195,1.5,5,3000,["gold:1"],[500,9500],1],[153,9,"安德罗波夫",4,3,3,1,"15","2000",5235,1.5,5,3000,["gold:1"],[500,9500],1],[154,9,"安德罗波夫",4,3,4,1,"15","2000",5275,1.5,5,3000,["gold:1"],[500,9500],1],[155,9,"安德罗波夫",4,3,5,1,"15","2000",5315,1.5,5,3000,["gold:1"],[500,9500],1],[156,9,"安德罗波夫",4,4,1,2,"5","7000",5355,1.5,5,3000,["box:3:1"],[500,9500],2],[157,9,"安德罗波夫",4,4,2,-1,"8","3000",5395,1.5,5,3000,["box:3:1"],[500,9500],4],[158,9,"安德罗波夫",4,4,3,-1,"8","3000",5435,1.5,5,3000,["box:3:1"],[500,9500],4],[159,9,"安德罗波夫",4,4,4,-1,"8","3000",5475,1.5,5,3000,["box:3:1"],[500,9500],4],[160,9,"安德罗波夫",4,4,5,2,"5","7000",5515,1.5,5,3000,["box:3:1"],[500,9500],2],[161,10,"腓特烈",4,1,1,2,"5","7000",5555,1.5,5,3000,["gold:1"],[500,9500],2],[162,10,"腓特烈",4,1,2,2,"5","7000",5595,1.5,5,3000,["gold:1"],[500,9500],2],[163,10,"腓特烈",4,1,3,2,"5","7000",5635,1.5,5,3000,["gold:1"],[500,9500],2],[164,10,"腓特烈",4,1,4,2,"5","7000",5675,1.5,5,3000,["gold:1"],[500,9500],2],[165,10,"腓特烈",4,1,5,2,"5","7000",5715,1.5,5,3000,["gold:1"],[500,9500],2],[166,10,"腓特烈",4,2,1,3,"15","2000",5755,1.5,5,3000,["gold:1"],[500,9500],3],[167,10,"腓特烈",4,2,2,3,"15","2000",5795,1.5,5,3000,["gold:1"],[500,9500],3],[168,10,"腓特烈",4,2,3,3,"15","2000",5835,1.5,5,3000,["gold:1"],[500,9500],3],[169,10,"腓特烈",4,2,4,3,"15","2000",5875,1.5,5,3000,["gold:1"],[500,9500],3],[170,10,"腓特烈",4,2,5,3,"15","2000",5915,1.5,5,3000,["gold:1"],[500,9500],3],[171,10,"腓特烈",4,3,1,1,"15","2000",5955,1.5,5,3000,["gold:1"],[500,9500],1],[172,10,"腓特烈",4,3,2,1,"15","2000",5995,1.5,5,3000,["gold:1"],[500,9500],1],[173,10,"腓特烈",4,3,3,1,"15","2000",6035,1.5,5,3000,["gold:1"],[500,9500],1],[174,10,"腓特烈",4,3,4,1,"15","2000",6075,1.5,5,3000,["gold:1"],[500,9500],1],[175,10,"腓特烈",4,3,5,1,"15","2000",6115,1.5,5,3000,["gold:1"],[500,9500],1],[176,10,"腓特烈",4,4,1,1,"15","2000",6155,1.5,5,3000,["box:3:1"],[500,9500],1],[177,10,"腓特烈",4,4,2,2,"5","7000",6195,1.5,5,3000,["box:3:1"],[500,9500],4],[178,10,"腓特烈",4,4,3,3,"15","2000",6235,1.5,5,3000,["box:3:1"],[500,9500],4],[179,10,"腓特烈",4,4,4,2,"5","7000",6275,1.5,5,3000,["box:3:1"],[500,9500],4],[180,10,"腓特烈",4,4,5,1,"15","2000",6315,1.5,5,3000,["box:3:1"],[500,9500],1],[181,11,"林肯",4,1,1,2,"5","7000",6360,1.5,5,3000,["gold:1"],[500,9500],2],[182,11,"林肯",4,1,2,2,"5","7000",6405,1.5,5,3000,["gold:1"],[500,9500],2],[183,11,"林肯",4,1,3,1,"15","2000",6450,1.5,5,3000,["gold:1"],[500,9500],1],[184,11,"林肯",4,1,4,2,"5","7000",6495,1.5,5,3000,["gold:1"],[500,9500],2],[185,11,"林肯",4,1,5,2,"5","7000",6540,1.5,5,3000,["gold:1"],[500,9500],2],[186,11,"林肯",4,2,1,3,"15","2000",6585,1.5,5,3000,["gold:1"],[500,9500],3],[187,11,"林肯",4,2,2,3,"15","2000",6630,1.5,5,3000,["gold:1"],[500,9500],3],[188,11,"林肯",4,2,3,2,"5","7000",6675,1.5,5,3000,["gold:1"],[500,9500],2],[189,11,"林肯",4,2,4,3,"15","2000",6720,1.5,5,3000,["gold:1"],[500,9500],3],[190,11,"林肯",4,2,5,3,"15","2000",6765,1.5,5,3000,["gold:1"],[500,9500],3],[191,11,"林肯",4,3,1,1,"15","2000",6810,1.5,5,3000,["gold:1"],[500,9500],1],[192,11,"林肯",4,3,2,1,"15","2000",6855,1.5,5,3000,["gold:1"],[500,9500],1],[193,11,"林肯",4,3,3,1,"15","2000",6900,1.5,5,3000,["gold:1"],[500,9500],1],[194,11,"林肯",4,3,4,1,"15","2000",6945,1.5,5,3000,["gold:1"],[500,9500],1],[195,11,"林肯",4,3,5,1,"15","2000",6990,1.5,5,3000,["gold:1"],[500,9500],1],[196,11,"林肯",4,4,1,2,"5","7000",7035,1.5,5,3000,["box:3:1"],[500,9500],2],[197,11,"林肯",4,4,2,2,"5","7000",7080,1.5,5,3000,["box:3:1"],[500,9500],4],[198,11,"林肯",4,4,3,2,"5","7000",7125,1.5,5,3000,["box:3:1"],[500,9500],4],[199,11,"林肯",4,4,4,2,"5","7000",7170,1.5,5,3000,["box:3:1"],[500,9500],4],[200,11,"林肯",4,4,5,2,"5","7000",7215,1.5,5,3000,["box:3:1"],[500,9500],2],[201,12,"腓特烈",4,1,1,2,"5","7000",7260,1.5,5,3000,["gold:1"],[500,9500],2],[202,12,"腓特烈",4,1,2,2,"5","7000",7305,1.5,5,3000,["gold:1"],[500,9500],2],[203,12,"腓特烈",4,1,3,2,"5","7000",7350,1.5,5,3000,["gold:1"],[500,9500],2],[204,12,"腓特烈",4,1,4,2,"5","7000",7395,1.5,5,3000,["gold:1"],[500,9500],2],[205,12,"腓特烈",4,1,5,2,"5","7000",7440,1.5,5,3000,["gold:1"],[500,9500],2],[206,12,"腓特烈",4,2,1,3,"15","2000",7485,1.5,5,3000,["gold:1"],[500,9500],3],[207,12,"腓特烈",4,2,2,3,"15","2000",7530,1.5,5,3000,["gold:1"],[500,9500],3],[208,12,"腓特烈",4,2,3,3,"15","2000",7575,1.5,5,3000,["gold:1"],[500,9500],3],[209,12,"腓特烈",4,2,4,3,"15","2000",7620,1.5,5,3000,["gold:1"],[500,9500],3],[210,12,"腓特烈",4,2,5,3,"15","2000",7665,1.5,5,3000,["gold:1"],[500,9500],3],[211,12,"腓特烈",4,3,1,1,"15","2000",7710,1.5,5,3000,["gold:1"],[500,9500],1],[212,12,"腓特烈",4,3,2,1,"15","2000",7755,1.5,5,3000,["gold:1"],[500,9500],1],[213,12,"腓特烈",4,3,3,1,"15","2000",7800,1.5,5,3000,["gold:1"],[500,9500],1],[214,12,"腓特烈",4,3,4,1,"15","2000",7845,1.5,5,3000,["gold:1"],[500,9500],1],[215,12,"腓特烈",4,3,5,1,"15","2000",7890,1.5,5,3000,["gold:1"],[500,9500],1],[216,12,"腓特烈",4,4,1,1,"15","2000",7935,1.5,5,3000,["box:3:1"],[500,9500],1],[217,12,"腓特烈",4,4,2,2,"5","7000",7980,1.5,5,3000,["box:3:1"],[500,9500],4],[218,12,"腓特烈",4,4,3,3,"15","2000",8025,1.5,5,3000,["box:3:1"],[500,9500],4],[219,12,"腓特烈",4,4,4,2,"5","7000",8070,1.5,5,3000,["box:3:1"],[500,9500],4],[220,12,"腓特烈",4,4,5,1,"15","2000",8115,1.5,5,3000,["box:3:1"],[500,9500],1],[221,12,"卡扎菲",4,5,1,2,"5","7000",8160,1.5,5,3000,["gold:1"],[500,9500],2],[222,12,"卡扎菲",4,5,2,2,"5","7000",8205,1.5,5,3000,["gold:1"],[500,9500],2],[223,12,"卡扎菲",4,5,3,1,"15","2000",8250,1.5,5,3000,["gold:1"],[500,9500],1],[224,12,"卡扎菲",4,5,4,2,"5","7000",8295,1.5,5,3000,["gold:1"],[500,9500],2],[225,12,"卡扎菲",4,5,5,2,"5","7000",8340,1.5,5,3000,["gold:1"],[500,9500],2],[226,12,"卡扎菲",4,6,1,3,"15","2000",8385,1.5,5,3000,["gold:1"],[500,9500],3],[227,12,"卡扎菲",4,6,2,3,"15","2000",8430,1.5,5,3000,["gold:1"],[500,9500],3],[228,12,"卡扎菲",4,6,3,2,"5","7000",8475,1.5,5,3000,["gold:1"],[500,9500],2],[229,12,"卡扎菲",4,6,4,3,"15","2000",8520,1.5,5,3000,["gold:1"],[500,9500],3],[230,12,"卡扎菲",4,6,5,3,"15","2000",8565,1.5,5,3000,["gold:1"],[500,9500],3],[231,12,"卡扎菲",4,7,1,1,"15","2000",8610,1.5,5,3000,["gold:1"],[500,9500],1],[232,12,"卡扎菲",4,7,2,1,"15","2000",8655,1.5,5,3000,["gold:1"],[500,9500],1],[233,12,"卡扎菲",4,7,3,1,"15","2000",8700,1.5,5,3000,["gold:1"],[500,9500],1],[234,12,"卡扎菲",4,7,4,1,"15","2000",8745,1.5,5,3000,["gold:1"],[500,9500],1],[235,12,"卡扎菲",4,7,5,1,"15","2000",8790,1.5,5,3000,["gold:1"],[500,9500],1],[236,12,"卡扎菲",4,8,1,2,"5","7000",8835,1.5,5,3000,["box:3:1"],[500,9500],2],[237,12,"卡扎菲",4,8,2,-1,"8","3000",8880,1.5,5,3000,["box:3:1"],[500,9500],4],[238,12,"卡扎菲",4,8,3,-1,"8","3000",8925,1.5,5,3000,["box:3:1"],[500,9500],4],[239,12,"卡扎菲",4,8,4,-1,"8","3000",8970,1.5,5,3000,["box:3:1"],[500,9500],4],[240,12,"卡扎菲",4,8,5,2,"5","7000",9015,1.5,5,3000,["box:3:1"],[500,9500],2]]
\ No newline at end of file
+[[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,"4","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,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[18,1,"史莱姆大王",1,2,3,3,"12","2000",250,1.5,5,3000,["gold:1"],[200,9800],3],[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,2,"拿破仑",1,1,1,0,"0","0",250,1.5,5,3000,["gold:1"],[200,9800],0],[22,2,"拿破仑",1,1,2,2,"4","6000",285,1.5,5,3000,["gold:1"],[200,9800],2],[23,2,"拿破仑",1,1,3,0,"0","0",320,1.5,5,3000,["gold:1"],[200,9800],0],[24,2,"拿破仑",1,1,4,2,"4","6000",355,1.5,5,3000,["gold:1"],[200,9800],2],[25,2,"拿破仑",1,1,5,0,"0","0",390,1.5,5,3000,["gold:1"],[200,9800],0],[26,2,"拿破仑",1,2,1,0,"0","0",425,1.5,5,3000,["gold:1"],[200,9800],0],[27,2,"拿破仑",1,2,2,3,"12","2000",460,1.5,5,3000,["gold:1"],[200,9800],3],[28,2,"拿破仑",1,2,3,1,"10","2400",495,1.5,5,3000,["gold:1"],[200,9800],1],[29,2,"拿破仑",1,2,4,3,"12","2000",530,1.5,5,3000,["gold:1"],[200,9800],3],[30,2,"拿破仑",1,2,5,0,"0","0",565,1.5,5,3000,["box:1:1"],[200,9800],0],[31,3,"凯撒",1,1,1,3,"12","2000",600,1.5,5,3000,["gold:1"],[200,9800],3],[32,3,"凯撒",1,1,2,0,"0","0",635,1.5,5,3000,["gold:1"],[200,9800],0],[33,3,"凯撒",1,1,3,1,"10","2400",670,1.5,5,3000,["gold:1"],[200,9800],1],[34,3,"凯撒",1,1,4,0,"0","0",705,1.5,5,3000,["gold:1"],[200,9800],0],[35,3,"凯撒",1,1,5,3,"12","2000",740,1.5,5,3000,["gold:1"],[200,9800],3],[36,3,"凯撒",1,2,1,0,"0","0",775,1.5,5,3000,["gold:1"],[200,9800],0],[37,3,"凯撒",1,2,2,2,"4","6000",810,1.5,5,3000,["gold:1"],[200,9800],2],[38,3,"凯撒",1,2,3,3,"12","2000",845,1.5,5,3000,["gold:1"],[200,9800],3],[39,3,"凯撒",1,2,4,2,"4","6000",880,1.5,5,3000,["gold:1"],[200,9800],2],[40,3,"凯撒",1,2,5,0,"0","0",915,1.5,5,3000,["gold:1"],[200,9800],0],[41,3,"凯撒",1,3,1,3,"12","2000",950,1.5,5,3000,["box:2:1"],[200,9800],3],[42,3,"凯撒",1,3,2,2,"4","6000",985,1.5,5,3000,["box:2:1"],[200,9800],2],[43,3,"凯撒",1,3,3,1,"10","2400",1020,1.5,5,3000,["box:2:1"],[200,9800],1],[44,3,"凯撒",1,3,4,2,"4","6000",1055,1.5,5,3000,["box:2:1"],[200,9800],2],[45,3,"凯撒",1,3,5,3,"12","2000",1090,1.5,5,3000,["box:2:1"],[200,9800],3],[46,4,"克伦威尔",1,1,1,3,"12","2000",1125,1.5,5,3000,["gold:1"],[200,9800],3],[47,4,"克伦威尔",1,1,2,1,"10","2400",1160,1.5,5,3000,["gold:1"],[200,9800],1],[48,4,"克伦威尔",1,1,3,0,"0","0",1195,1.5,5,3000,["gold:1"],[200,9800],0],[49,4,"克伦威尔",1,1,4,1,"10","2400",1230,1.5,5,3000,["gold:1"],[200,9800],1],[50,4,"克伦威尔",1,1,5,3,"12","2000",1265,1.5,5,3000,["gold:1"],[200,9800],3],[51,4,"克伦威尔",1,2,1,2,"4","6000",1300,1.5,5,3000,["gold:1"],[200,9800],2],[52,4,"克伦威尔",1,2,2,1,"10","2400",1335,1.5,5,3000,["gold:1"],[200,9800],1],[53,4,"克伦威尔",1,2,3,0,"0","0",1370,1.5,5,3000,["gold:1"],[200,9800],0],[54,4,"克伦威尔",1,2,4,1,"10","2400",1405,1.5,5,3000,["gold:1"],[200,9800],1],[55,4,"克伦威尔",1,2,5,2,"4","6000",1440,1.5,5,3000,["gold:1"],[200,9800],2],[56,4,"克伦威尔",1,3,1,3,"12","2000",1475,1.5,5,3000,["box:2:1"],[200,9800],3],[57,4,"克伦威尔",1,3,2,3,"12","2000",1510,1.5,5,3000,["box:2:1"],[200,9800],3],[58,4,"克伦威尔",1,3,3,1,"10","2400",1545,1.5,5,3000,["box:2:1"],[200,9800],1],[59,4,"克伦威尔",1,3,4,2,"4","6000",1580,1.5,5,3000,["box:2:1"],[200,9800],2],[60,4,"克伦威尔",1,3,5,2,"4","6000",1615,1.5,5,3000,["box:2:1"],[200,9800],2],[61,5,"尼克松",1,1,1,1,"10","2400",1650,1.5,5,3000,["gold:1"],[200,9800],1],[62,5,"尼克松",1,1,2,1,"10","2400",1685,1.5,5,3000,["gold:1"],[200,9800],1],[63,5,"尼克松",1,1,3,1,"10","2400",1720,1.5,5,3000,["gold:1"],[200,9800],1],[64,5,"尼克松",1,1,4,1,"10","2400",1755,1.5,5,3000,["gold:1"],[200,9800],1],[65,5,"尼克松",1,1,5,1,"10","2400",1790,1.5,5,3000,["gold:1"],[200,9800],1],[66,5,"尼克松",1,2,1,2,"4","6000",1825,1.5,5,3000,["gold:1"],[200,9800],2],[67,5,"尼克松",1,2,2,2,"4","6000",1860,1.5,5,3000,["gold:1"],[200,9800],2],[68,5,"尼克松",1,2,3,2,"4","6000",1895,1.5,5,3000,["gold:1"],[200,9800],2],[69,5,"尼克松",1,2,4,2,"4","6000",1930,1.5,5,3000,["gold:1"],[200,9800],2],[70,5,"尼克松",1,2,5,2,"4","6000",1965,1.5,5,3000,["gold:1"],[200,9800],2],[71,5,"尼克松",1,3,1,3,"12","2000",2000,1.5,5,3000,["gold:1"],[200,9800],3],[72,5,"尼克松",1,3,2,3,"12","2000",2035,1.5,5,3000,["gold:1"],[200,9800],3],[73,5,"尼克松",1,3,3,3,"12","2000",2070,1.5,5,3000,["gold:1"],[200,9800],3],[74,5,"尼克松",1,3,4,3,"12","2000",2105,1.5,5,3000,["gold:1"],[200,9800],3],[75,5,"尼克松",1,3,5,3,"12","2000",2140,1.5,5,3000,["gold:1"],[200,9800],3],[76,5,"尼克松",1,4,1,-1,"8","3000",2175,1.5,5,3000,["box:2:1"],[200,9800],4],[77,5,"尼克松",1,4,2,-1,"8","3000",2210,1.5,5,3000,["box:2:1"],[200,9800],4],[78,5,"尼克松",1,4,3,-1,"8","3000",2245,1.5,5,3000,["box:2:1"],[200,9800],4],[79,5,"尼克松",1,4,4,-1,"8","3000",2280,1.5,5,3000,["box:2:1"],[200,9800],4],[80,5,"尼克松",1,4,5,-1,"8","3000",2315,1.5,5,3000,["box:2:1"],[200,9800],4],[81,6,"李存勖",1,1,1,1,"12","2500",2355,1.5,5,3000,["gold:1"],[200,9800],1],[82,6,"李存勖",1,1,2,1,"12","2500",2395,1.5,5,3000,["gold:1"],[200,9800],1],[83,6,"李存勖",1,1,3,2,"5","7000",2435,1.5,5,3000,["gold:1"],[200,9800],2],[84,6,"李存勖",1,1,4,1,"12","2500",2475,1.5,5,3000,["gold:1"],[200,9800],1],[85,6,"李存勖",1,1,5,1,"12","2500",2515,1.5,5,3000,["gold:1"],[200,9800],1],[86,6,"李存勖",1,2,1,2,"5","7000",2555,1.5,5,3000,["gold:1"],[200,9800],2],[87,6,"李存勖",1,2,2,2,"5","7000",2595,1.5,5,3000,["gold:1"],[200,9800],2],[88,6,"李存勖",1,2,3,3,"15","2000",2635,1.5,5,3000,["gold:1"],[200,9800],3],[89,6,"李存勖",1,2,4,2,"5","7000",2675,1.5,5,3000,["gold:1"],[200,9800],2],[90,6,"李存勖",1,2,5,2,"5","7000",2715,1.5,5,3000,["gold:1"],[200,9800],2],[91,6,"李存勖",1,3,1,1,"12","2500",2755,1.5,5,3000,["gold:1"],[200,9800],1],[92,6,"李存勖",1,3,2,2,"5","7000",2795,1.5,5,3000,["gold:1"],[200,9800],2],[93,6,"李存勖",1,3,3,3,"15","2000",2835,1.5,5,3000,["gold:1"],[200,9800],3],[94,6,"李存勖",1,3,4,2,"5","7000",2875,1.5,5,3000,["gold:1"],[200,9800],2],[95,6,"李存勖",1,3,5,1,"12","2500",2915,1.5,5,3000,["gold:1"],[200,9800],1],[96,6,"李存勖",1,4,1,2,"5","7000",2955,1.5,5,3000,["box:3:1"],[200,9800],2],[97,6,"李存勖",1,4,2,1,"12","2500",2995,1.5,5,3000,["box:3:1"],[200,9800],1],[98,6,"李存勖",1,4,3,-1,"8","3000",3035,1.5,5,3000,["box:3:1"],[200,9800],4],[99,6,"李存勖",1,4,4,1,"12","2500",3075,1.5,5,3000,["box:3:1"],[200,9800],1],[100,6,"李存勖",1,4,5,2,"5","7000",3115,1.5,5,3000,["box:3:1"],[200,9800],2],[101,7,"AA_12",1,1,1,3,"15","2000",3155,1.5,5,3000,["gold:1"],[200,9800],3],[102,7,"AA_12",1,1,2,3,"15","2000",3195,1.5,5,3000,["gold:1"],[200,9800],3],[103,7,"AA_12",1,1,3,1,"12","2500",3235,1.5,5,3000,["gold:1"],[200,9800],1],[104,7,"AA_12",1,1,4,3,"15","2000",3275,1.5,5,3000,["gold:1"],[200,9800],3],[105,7,"AA_12",1,1,5,3,"15","2000",3315,1.5,5,3000,["gold:1"],[200,9800],3],[106,7,"AA_12",1,2,1,1,"12","2500",3355,1.5,5,3000,["gold:1"],[200,9800],1],[107,7,"AA_12",1,2,2,2,"5","7000",3395,1.5,5,3000,["gold:1"],[200,9800],2],[108,7,"AA_12",1,2,3,3,"15","2000",3435,1.5,5,3000,["gold:1"],[200,9800],3],[109,7,"AA_12",1,2,4,2,"5","7000",3475,1.5,5,3000,["gold:1"],[200,9800],2],[110,7,"AA_12",1,2,5,1,"12","2500",3515,1.5,5,3000,["gold:1"],[200,9800],1],[111,7,"AA_12",1,3,1,2,"5","7000",3555,1.5,5,3000,["gold:1"],[200,9800],2],[112,7,"AA_12",1,3,2,1,"12","2500",3595,1.5,5,3000,["gold:1"],[200,9800],1],[113,7,"AA_12",1,3,3,3,"15","2000",3635,1.5,5,3000,["gold:1"],[200,9800],3],[114,7,"AA_12",1,3,4,1,"12","2500",3675,1.5,5,3000,["gold:1"],[200,9800],1],[115,7,"AA_12",1,3,5,2,"5","7000",3715,1.5,5,3000,["gold:1"],[200,9800],2],[116,7,"AA_12",1,4,1,2,"5","7000",3755,1.5,5,3000,["box:3:1"],[200,9800],2],[117,7,"AA_12",1,4,2,2,"5","7000",3795,1.5,5,3000,["box:3:1"],[200,9800],2],[118,7,"AA_12",1,4,3,-1,"8","3000",3835,1.5,5,3000,["box:3:1"],[200,9800],4],[119,7,"AA_12",1,4,4,3,"15","2000",3875,1.5,5,3000,["box:3:1"],[200,9800],3],[120,7,"AA_12",1,4,5,3,"15","2000",3915,1.5,5,3000,["box:3:1"],[200,9800],3],[121,8,"米高扬",1,1,1,1,"12","2500",3955,1.5,5,3000,["gold:1"],[200,9800],1],[122,8,"米高扬",1,1,2,1,"12","2500",3995,1.5,5,3000,["gold:1"],[200,9800],1],[123,8,"米高扬",1,1,3,1,"12","2500",4035,1.5,5,3000,["gold:1"],[200,9800],1],[124,8,"米高扬",1,1,4,1,"12","2500",4075,1.5,5,3000,["gold:1"],[200,9800],1],[125,8,"米高扬",1,1,5,1,"12","2500",4115,1.5,5,3000,["gold:1"],[200,9800],1],[126,8,"米高扬",1,2,1,2,"5","7000",4155,1.5,5,3000,["gold:1"],[200,9800],2],[127,8,"米高扬",1,2,2,2,"5","7000",4195,1.5,5,3000,["gold:1"],[200,9800],2],[128,8,"米高扬",1,2,3,2,"5","7000",4235,1.5,5,3000,["gold:1"],[200,9800],2],[129,8,"米高扬",1,2,4,2,"5","7000",4275,1.5,5,3000,["gold:1"],[200,9800],2],[130,8,"米高扬",1,2,5,2,"5","7000",4315,1.5,5,3000,["gold:1"],[200,9800],2],[131,8,"米高扬",1,3,1,3,"15","2000",4355,1.5,5,3000,["gold:1"],[200,9800],3],[132,8,"米高扬",1,3,2,3,"15","2000",4395,1.5,5,3000,["gold:1"],[200,9800],3],[133,8,"米高扬",1,3,3,3,"15","2000",4435,1.5,5,3000,["gold:1"],[200,9800],3],[134,8,"米高扬",1,3,4,3,"15","2000",4475,1.5,5,3000,["gold:1"],[200,9800],3],[135,8,"米高扬",1,3,5,3,"15","2000",4515,1.5,5,3000,["gold:1"],[200,9800],3],[136,8,"米高扬",1,4,1,-1,"8","3000",4555,1.5,5,3000,["box:3:1"],[200,9800],4],[137,8,"米高扬",1,4,2,-1,"8","3000",4595,1.5,5,3000,["box:3:1"],[200,9800],4],[138,8,"米高扬",1,4,3,-1,"8","3000",4635,1.5,5,3000,["box:3:1"],[200,9800],4],[139,8,"米高扬",1,4,4,-1,"8","3000",4675,1.5,5,3000,["box:3:1"],[200,9800],4],[140,8,"米高扬",1,4,5,-1,"8","3000",4715,1.5,5,3000,["box:3:1"],[200,9800],4],[141,9,"安德罗波夫",1,1,1,2,"5","7000",4755,1.5,5,3000,["gold:1"],[200,9800],2],[142,9,"安德罗波夫",1,1,2,2,"5","7000",4795,1.5,5,3000,["gold:1"],[200,9800],2],[143,9,"安德罗波夫",1,1,3,1,"12","2500",4835,1.5,5,3000,["gold:1"],[200,9800],1],[144,9,"安德罗波夫",1,1,4,2,"5","7000",4875,1.5,5,3000,["gold:1"],[200,9800],2],[145,9,"安德罗波夫",1,1,5,2,"5","7000",4915,1.5,5,3000,["gold:1"],[200,9800],2],[146,9,"安德罗波夫",1,2,1,3,"15","2000",4955,1.5,5,3000,["gold:1"],[200,9800],3],[147,9,"安德罗波夫",1,2,2,3,"15","2000",4995,1.5,5,3000,["gold:1"],[200,9800],3],[148,9,"安德罗波夫",1,2,3,2,"5","7000",5035,1.5,5,3000,["gold:1"],[200,9800],2],[149,9,"安德罗波夫",1,2,4,3,"15","2000",5075,1.5,5,3000,["gold:1"],[200,9800],3],[150,9,"安德罗波夫",1,2,5,3,"15","2000",5115,1.5,5,3000,["gold:1"],[200,9800],3],[151,9,"安德罗波夫",1,3,1,1,"12","2500",5155,1.5,5,3000,["gold:1"],[200,9800],1],[152,9,"安德罗波夫",1,3,2,1,"12","2500",5195,1.5,5,3000,["gold:1"],[200,9800],1],[153,9,"安德罗波夫",1,3,3,1,"12","2500",5235,1.5,5,3000,["gold:1"],[200,9800],1],[154,9,"安德罗波夫",1,3,4,1,"12","2500",5275,1.5,5,3000,["gold:1"],[200,9800],1],[155,9,"安德罗波夫",1,3,5,1,"12","2500",5315,1.5,5,3000,["gold:1"],[200,9800],1],[156,9,"安德罗波夫",1,4,1,2,"5","7000",5355,1.5,5,3000,["box:3:1"],[200,9800],2],[157,9,"安德罗波夫",1,4,2,-1,"8","3000",5395,1.5,5,3000,["box:3:1"],[200,9800],4],[158,9,"安德罗波夫",1,4,3,-1,"8","3000",5435,1.5,5,3000,["box:3:1"],[200,9800],4],[159,9,"安德罗波夫",1,4,4,-1,"8","3000",5475,1.5,5,3000,["box:3:1"],[200,9800],4],[160,9,"安德罗波夫",1,4,5,2,"5","7000",5515,1.5,5,3000,["box:3:1"],[200,9800],2],[161,10,"腓特烈",1,1,1,2,"5","7000",5555,1.5,5,3000,["gold:1"],[200,9800],2],[162,10,"腓特烈",1,1,2,2,"5","7000",5595,1.5,5,3000,["gold:1"],[200,9800],2],[163,10,"腓特烈",1,1,3,2,"5","7000",5635,1.5,5,3000,["gold:1"],[200,9800],2],[164,10,"腓特烈",1,1,4,2,"5","7000",5675,1.5,5,3000,["gold:1"],[200,9800],2],[165,10,"腓特烈",1,1,5,2,"5","7000",5715,1.5,5,3000,["gold:1"],[200,9800],2],[166,10,"腓特烈",1,2,1,3,"15","2000",5755,1.5,5,3000,["gold:1"],[200,9800],3],[167,10,"腓特烈",1,2,2,3,"15","2000",5795,1.5,5,3000,["gold:1"],[200,9800],3],[168,10,"腓特烈",1,2,3,3,"15","2000",5835,1.5,5,3000,["gold:1"],[200,9800],3],[169,10,"腓特烈",1,2,4,3,"15","2000",5875,1.5,5,3000,["gold:1"],[200,9800],3],[170,10,"腓特烈",1,2,5,3,"15","2000",5915,1.5,5,3000,["gold:1"],[200,9800],3],[171,10,"腓特烈",1,3,1,1,"12","2500",5955,1.5,5,3000,["gold:1"],[200,9800],1],[172,10,"腓特烈",1,3,2,1,"12","2500",5995,1.5,5,3000,["gold:1"],[200,9800],1],[173,10,"腓特烈",1,3,3,1,"12","2500",6035,1.5,5,3000,["gold:1"],[200,9800],1],[174,10,"腓特烈",1,3,4,1,"12","2500",6075,1.5,5,3000,["gold:1"],[200,9800],1],[175,10,"腓特烈",1,3,5,1,"12","2500",6115,1.5,5,3000,["gold:1"],[200,9800],1],[176,10,"腓特烈",1,4,1,1,"12","2500",6155,1.5,5,3000,["box:3:1"],[200,9800],1],[177,10,"腓特烈",1,4,2,2,"5","7000",6195,1.5,5,3000,["box:3:1"],[200,9800],4],[178,10,"腓特烈",1,4,3,3,"15","2000",6235,1.5,5,3000,["box:3:1"],[200,9800],4],[179,10,"腓特烈",1,4,4,2,"5","7000",6275,1.5,5,3000,["box:3:1"],[200,9800],4],[180,10,"腓特烈",1,4,5,1,"12","2500",6315,1.5,5,3000,["box:3:1"],[200,9800],1],[181,11,"林肯",1,1,1,2,"5","7000",6360,1.5,5,3000,["gold:1"],[200,9800],2],[182,11,"林肯",1,1,2,2,"5","7000",6405,1.5,5,3000,["gold:1"],[200,9800],2],[183,11,"林肯",1,1,3,1,"12","2500",6450,1.5,5,3000,["gold:1"],[200,9800],1],[184,11,"林肯",1,1,4,2,"5","7000",6495,1.5,5,3000,["gold:1"],[200,9800],2],[185,11,"林肯",1,1,5,2,"5","7000",6540,1.5,5,3000,["gold:1"],[200,9800],2],[186,11,"林肯",1,2,1,3,"15","2000",6585,1.5,5,3000,["gold:1"],[200,9800],3],[187,11,"林肯",1,2,2,3,"15","2000",6630,1.5,5,3000,["gold:1"],[200,9800],3],[188,11,"林肯",1,2,3,2,"5","7000",6675,1.5,5,3000,["gold:1"],[200,9800],2],[189,11,"林肯",1,2,4,3,"15","2000",6720,1.5,5,3000,["gold:1"],[200,9800],3],[190,11,"林肯",1,2,5,3,"15","2000",6765,1.5,5,3000,["gold:1"],[200,9800],3],[191,11,"林肯",1,3,1,1,"12","2500",6810,1.5,5,3000,["gold:1"],[200,9800],1],[192,11,"林肯",1,3,2,1,"12","2500",6855,1.5,5,3000,["gold:1"],[200,9800],1],[193,11,"林肯",1,3,3,1,"12","2500",6900,1.5,5,3000,["gold:1"],[200,9800],1],[194,11,"林肯",1,3,4,1,"12","2500",6945,1.5,5,3000,["gold:1"],[200,9800],1],[195,11,"林肯",1,3,5,1,"12","2500",6990,1.5,5,3000,["gold:1"],[200,9800],1],[196,11,"林肯",1,4,1,2,"5","7000",7035,1.5,5,3000,["box:3:1"],[200,9800],2],[197,11,"林肯",1,4,2,2,"5","7000",7080,1.5,5,3000,["box:3:1"],[200,9800],4],[198,11,"林肯",1,4,3,2,"5","7000",7125,1.5,5,3000,["box:3:1"],[200,9800],4],[199,11,"林肯",1,4,4,2,"5","7000",7170,1.5,5,3000,["box:3:1"],[200,9800],4],[200,11,"林肯",1,4,5,2,"5","7000",7215,1.5,5,3000,["box:3:1"],[200,9800],2],[201,12,"腓特烈",1,1,1,2,"5","7000",7260,1.5,5,3000,["gold:1"],[200,9800],2],[202,12,"腓特烈",1,1,2,2,"5","7000",7305,1.5,5,3000,["gold:1"],[200,9800],2],[203,12,"腓特烈",1,1,3,2,"5","7000",7350,1.5,5,3000,["gold:1"],[200,9800],2],[204,12,"腓特烈",1,1,4,2,"5","7000",7395,1.5,5,3000,["gold:1"],[200,9800],2],[205,12,"腓特烈",1,1,5,2,"5","7000",7440,1.5,5,3000,["gold:1"],[200,9800],2],[206,12,"腓特烈",1,2,1,3,"15","2000",7485,1.5,5,3000,["gold:1"],[200,9800],3],[207,12,"腓特烈",1,2,2,3,"15","2000",7530,1.5,5,3000,["gold:1"],[200,9800],3],[208,12,"腓特烈",1,2,3,3,"15","2000",7575,1.5,5,3000,["gold:1"],[200,9800],3],[209,12,"腓特烈",1,2,4,3,"15","2000",7620,1.5,5,3000,["gold:1"],[200,9800],3],[210,12,"腓特烈",1,2,5,3,"15","2000",7665,1.5,5,3000,["gold:1"],[200,9800],3],[211,12,"腓特烈",1,3,1,1,"12","2500",7710,1.5,5,3000,["gold:1"],[200,9800],1],[212,12,"腓特烈",1,3,2,1,"12","2500",7755,1.5,5,3000,["gold:1"],[200,9800],1],[213,12,"腓特烈",1,3,3,1,"12","2500",7800,1.5,5,3000,["gold:1"],[200,9800],1],[214,12,"腓特烈",1,3,4,1,"12","2500",7845,1.5,5,3000,["gold:1"],[200,9800],1],[215,12,"腓特烈",1,3,5,1,"12","2500",7890,1.5,5,3000,["gold:1"],[200,9800],1],[216,12,"腓特烈",1,4,1,1,"12","2500",7935,1.5,5,3000,["box:3:1"],[200,9800],1],[217,12,"腓特烈",1,4,2,2,"5","7000",7980,1.5,5,3000,["box:3:1"],[200,9800],4],[218,12,"腓特烈",1,4,3,3,"15","2000",8025,1.5,5,3000,["box:3:1"],[200,9800],4],[219,12,"腓特烈",1,4,4,2,"5","7000",8070,1.5,5,3000,["box:3:1"],[200,9800],4],[220,12,"腓特烈",1,4,5,1,"12","2500",8115,1.5,5,3000,["box:3:1"],[200,9800],1],[221,12,"卡扎菲",1,5,1,2,"5","7000",8160,1.5,5,3000,["gold:1"],[200,9800],2],[222,12,"卡扎菲",1,5,2,2,"5","7000",8205,1.5,5,3000,["gold:1"],[200,9800],2],[223,12,"卡扎菲",1,5,3,1,"12","2500",8250,1.5,5,3000,["gold:1"],[200,9800],1],[224,12,"卡扎菲",1,5,4,2,"5","7000",8295,1.5,5,3000,["gold:1"],[200,9800],2],[225,12,"卡扎菲",1,5,5,2,"5","7000",8340,1.5,5,3000,["gold:1"],[200,9800],2],[226,12,"卡扎菲",1,6,1,3,"15","2000",8385,1.5,5,3000,["gold:1"],[200,9800],3],[227,12,"卡扎菲",1,6,2,3,"15","2000",8430,1.5,5,3000,["gold:1"],[200,9800],3],[228,12,"卡扎菲",1,6,3,2,"5","7000",8475,1.5,5,3000,["gold:1"],[200,9800],2],[229,12,"卡扎菲",1,6,4,3,"15","2000",8520,1.5,5,3000,["gold:1"],[200,9800],3],[230,12,"卡扎菲",1,6,5,3,"15","2000",8565,1.5,5,3000,["gold:1"],[200,9800],3],[231,12,"卡扎菲",1,7,1,1,"12","2500",8610,1.5,5,3000,["gold:1"],[200,9800],1],[232,12,"卡扎菲",1,7,2,1,"12","2500",8655,1.5,5,3000,["gold:1"],[200,9800],1],[233,12,"卡扎菲",1,7,3,1,"12","2500",8700,1.5,5,3000,["gold:1"],[200,9800],1],[234,12,"卡扎菲",1,7,4,1,"12","2500",8745,1.5,5,3000,["gold:1"],[200,9800],1],[235,12,"卡扎菲",1,7,5,1,"12","2500",8790,1.5,5,3000,["gold:1"],[200,9800],1],[236,12,"卡扎菲",1,8,1,2,"5","7000",8835,1.5,5,3000,["box:3:1"],[200,9800],2],[237,12,"卡扎菲",1,8,2,-1,"8","3000",8880,1.5,5,3000,["box:3:1"],[200,9800],4],[238,12,"卡扎菲",1,8,3,-1,"8","3000",8925,1.5,5,3000,["box:3:1"],[200,9800],4],[239,12,"卡扎菲",1,8,4,-1,"8","3000",8970,1.5,5,3000,["box:3:1"],[200,9800],4],[240,12,"卡扎菲",1,8,5,2,"5","7000",9015,1.5,5,3000,["box:3:1"],[200,9800],2]]
\ 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/gemcost.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/gemcost.json"
index 2f363b6..a083118 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/gemcost.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/gemcost.json"
@@ -1 +1 @@
-[[1,25],[2,27],[3,29],[4,31],[5,33],[6,35],[7,37],[8,39],[9,41],[10,43],[11,47],[12,49],[13,51],[14,53],[15,55],[16,57],[17,59],[18,61],[19,63],[20,65],[21,75],[22,85],[23,100],[24,100],[25,100],[26,100],[27,100],[28,100],[29,100],[30,100],[31,100],[32,100],[33,100],[34,100],[35,100],[36,100],[37,100],[38,100],[39,100],[40,100],[41,100],[42,100],[43,100],[44,100],[45,100],[46,100],[47,100],[48,100],[49,100],[50,100],[51,100],[52,100],[53,100],[54,100],[55,100],[56,100],[57,100],[58,100],[59,100],[60,100],[61,100],[62,100],[63,100],[64,100],[65,100],[66,100],[67,100],[68,100],[69,100],[70,100],[71,100],[72,100],[73,100],[74,100],[75,100],[76,100],[77,100],[78,100],[79,100],[80,100],[81,100],[82,100],[83,100],[84,100],[85,100],[86,100],[87,100],[88,100],[89,100],[90,100],[91,100],[92,100],[93,100],[94,100],[95,100],[96,100],[97,100],[98,100],[99,100],[100,100],[101,100],[102,100],[103,100],[104,100],[105,100],[106,100],[107,100],[108,100],[109,100],[110,100],[111,100],[112,100],[113,100],[114,100],[115,100],[116,100],[117,100],[118,100],[119,100],[120,100],[121,100],[122,100],[123,100],[124,100],[125,100],[126,100],[127,100],[128,100],[129,100],[130,100],[131,100],[132,100],[133,100],[134,100],[135,100],[136,100],[137,100],[138,100],[139,100],[140,100],[141,100],[142,100],[143,100],[144,100],[145,100],[146,100],[147,100],[148,100],[149,100],[150,100],[151,100],[152,100],[153,100],[154,100],[155,100],[156,100],[157,100],[158,100],[159,100],[160,100],[161,100],[162,100],[163,100],[164,100],[165,100],[166,100],[167,100],[168,100],[169,100],[170,100],[171,100],[172,100],[173,100],[174,100],[175,100],[176,100],[177,100],[178,100],[179,100],[180,100],[181,100],[182,100],[183,100],[184,100],[185,100],[186,100],[187,100],[188,100],[189,100],[190,100],[191,100],[192,100],[193,100],[194,100],[195,100],[196,100],[197,100],[198,100]]
\ No newline at end of file
+[[1,25],[2,27],[3,29],[4,31],[5,33],[6,35],[7,37],[8,39],[9,41],[10,43],[11,47],[12,49],[13,51],[14,53],[15,55],[16,57],[17,59],[18,61],[19,63],[20,65],[21,75],[22,80],[23,80],[24,80],[25,80],[26,80],[27,80],[28,80],[29,80],[30,80],[31,80],[32,80],[33,80],[34,80],[35,80],[36,80],[37,80],[38,80],[39,80],[40,80],[41,80],[42,80],[43,80],[44,80],[45,80],[46,80],[47,80],[48,80],[49,80],[50,80],[51,80],[52,80],[53,80],[54,80],[55,80],[56,80],[57,80],[58,80],[59,80],[60,80],[61,80],[62,80],[63,80],[64,80],[65,80],[66,80],[67,80],[68,80],[69,80],[70,80],[71,80],[72,80],[73,80],[74,80],[75,80],[76,80],[77,80],[78,80],[79,80],[80,80],[81,80],[82,80],[83,80],[84,80],[85,80],[86,80],[87,80],[88,80],[89,80],[90,80],[91,80],[92,80],[93,80],[94,80],[95,80],[96,80],[97,80],[98,80],[99,80],[100,80],[101,80],[102,80],[103,80],[104,80],[105,80],[106,80],[107,80],[108,80],[109,80],[110,80],[111,80],[112,80],[113,80],[114,80],[115,80],[116,80],[117,80],[118,80],[119,80],[120,80],[121,80],[122,80],[123,80],[124,80],[125,80],[126,80],[127,80],[128,80],[129,80],[130,80],[131,80],[132,80],[133,80],[134,80],[135,80],[136,80],[137,80],[138,80],[139,80],[140,80],[141,80],[142,80],[143,80],[144,80],[145,80],[146,80],[147,80],[148,80],[149,80],[150,80],[151,80],[152,80],[153,80],[154,80],[155,80],[156,80],[157,80],[158,80],[159,80],[160,80],[161,80],[162,80],[163,80],[164,80],[165,80],[166,80],[167,80],[168,80],[169,80],[170,80],[171,80],[172,80],[173,80],[174,80],[175,80],[176,80],[177,80],[178,80],[179,80],[180,80],[181,80],[182,80],[183,80],[184,80],[185,80],[186,80],[187,80],[188,80],[189,80],[190,80],[191,80],[192,80],[193,80],[194,80],[195,80],[196,80],[197,80],[198,80]]
\ 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/skilllevelinfo.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/skilllevelinfo.json"
index c57c937..83e0223 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/skilllevelinfo.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/skilllevelinfo.json"
@@ -1 +1 @@
-[[1,99901,1,[1,7],0,[1,1,100],[0]],[2,99901,2,[1,7],0,[1,2,200],[0]],[3,99901,3,[1,7],0,[1,3,300],[0]],[4,99901,4,[1,7],0,[1,4,400],[0]],[5,99901,5,[1,7],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,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
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 185aa4f..d9a54f5 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 ab8bb50..7cf0a6c 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/level1" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/level1"
index 2432f24..8f8d239 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 ed3a815..6f764ca 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 c73e95a..cb00d98 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 bf3fe9e..1b6358e 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/sharedassets2.assets" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets"
index 8cc5038..cf5c3d3 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/sharedassets2.assets.resS" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS"
index f03cb63..110010d 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/sharedassets2.assets.resS"
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 0455535..a5f076f 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 c10ffd9..8e7cd10 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