From bc14626b98377c39db4d77029326389bb34484a8 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 16:59:37 +0800
Subject: [PATCH] boss动作、结算特效、选择部分特效，关卡流程的bug
---
Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta | 118 ++
Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs | 12
Assets/StreamingAssets/Table/endless_enemy.json | 2
Assets/Animations/Endless/BossAniCtrl.controller.meta | 8
Assets/UI/Endless/boss/a_4/a_40000_0005.png | 0
Assets/Scenes/Levels/Battle/Endless.unity | 384 +++----
Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs | 2
Assets/Scripts/Event/EventType.cs | 2
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs.meta | 11
Assets/UI/Endless/boss/s_4.meta | 8
Assets/Scripts/Enum/EndlessBossActionState.cs | 19
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs | 41
Assets/Animations/Endless/Boss_Summon.anim | 96 ++
Assets/UI/Endless/boss/a_4/a_40000_0000.png.meta | 118 ++
Assets/UI/Endless/boss/a_4.meta | 8
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 37
Assets/StreamingAssets/Table/goldInfo.json | 2
Assets/Scripts/Enum/EndlessBossActionState.cs.meta | 11
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs | 61 +
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs | 31
Assets/UI/Endless/boss/s_4/s_40000_0010.png.meta | 118 ++
Assets/UI/Endless.meta | 8
Assets/UI/Endless/boss/s_4/s_40000_0008.png | 0
Assets/StreamingAssets/Table/endless_port.json | 2
Assets/Prefabs/Enemies/fire.prefab | 6
Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 14
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 117 +
Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs | 48
Assets/UI/Endless/boss/a_4/a_40000_0000.png | 0
Assets/UI/Endless/boss/s_4/s_40000_0010.png | 0
Assets/UI/Endless/boss/a_4/a_40000_0006.png | 0
Assets/UI/Endless/boss/s_4/s_40000_0011.png | 0
Assets/Scripts/Guide/Mask/RectGuidance.cs | 4
Assets/UI/Endless/boss/a_4/a_40000_0005.png.meta | 118 ++
Assets/UI/Endless/boss/a_4/a_40000_0002.png.meta | 118 ++
Assets/Animations/Endless/Boss_Standing.anim | 77 +
Assets/Animations/Endless/Boss_Death.anim.meta | 8
Assets/Animations/Endless/Boss_Death.anim | 53 +
Assets/UI/Endless/boss/s_4/s_40000_0011.png.meta | 118 ++
Assets/UI/Endless/boss/a_4/a_40000_0007.png | 0
Assets/UI/Endless/boss/s_4/s_40000_0009.png | 0
Assets/UI/Endless/boss/a_4/a_40000_0006.png.meta | 118 ++
Assets/Scripts/Common/CommonDebugHelper.cs | 1
Assets/UI/Endless/boss/a_4/a_40000_0001.png.meta | 118 ++
Assets/Scripts/Guide/GuidePanel.cs | 3
Assets/UI/Endless/boss/a_4/a_40000_0002.png | 0
Assets/StreamingAssets/Table/endless_buff.json | 2
Assets/Scripts/TowerDefense/Level/EndlessWave.cs | 5
Assets/UI/Endless/boss/a_4/a_40000_0004.png | 0
Assets/Materials/Guide/RectGuidance.mat | 6
Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs | 23
Assets/UI/Endless/boss/a_4/a_40000_0007.png.meta | 118 ++
Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta | 118 ++
Assets/UI/Endless/boss.meta | 8
Assets/Animations/Endless/BossAniCtrl.controller | 188 +++
Assets/Animations/Endless/Boss_Summon.anim.meta | 8
Assets/Scripts/Net/NetExtends/Table.cs | 97 --
Assets/UI/Endless/boss/a_4/a_40000_0003.png.meta | 118 ++
Assets/Animations/Endless.meta | 8
Assets/StreamingAssets/Table/battle.json | 2
Assets/UI/Endless/boss/s_4/s_40000_0008.png.meta | 118 ++
Assets/UI/Endless/boss/a_4/a_40000_0001.png | 0
Assets/UI/Endless/boss/a_4/a_40000_0003.png | 0
Assets/Animations/Endless/Boss_Standing.anim.meta | 8
64 files changed, 2,406 insertions(+), 441 deletions(-)
diff --git a/Assets/Animations/Endless.meta b/Assets/Animations/Endless.meta
new file mode 100644
index 0000000..b1fcaed
--- /dev/null
+++ b/Assets/Animations/Endless.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4616f6712f7fdca4ea8f64cb873923f7
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animations/Endless/BossAniCtrl.controller b/Assets/Animations/Endless/BossAniCtrl.controller
new file mode 100644
index 0000000..25b20f5
--- /dev/null
+++ b/Assets/Animations/Endless/BossAniCtrl.controller
@@ -0,0 +1,188 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-5306412402751564557
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Boss_Summon
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 3415644705494399158}
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: b0f54ff7a2f4dcc468f033c1bb6b3e0f, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-5019473085201770094
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Boss_Death
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 1d35ff496165c444bbcb58b2f7a5b0f6, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: BossAniCtrl
+ serializedVersion: 5
+ m_AnimatorParameters:
+ - m_Name: State
+ m_Type: 3
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 5494319997971291351}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1101 &3415644705494399158
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 6
+ m_ConditionEvent: State
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 7540435519779049080}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0.6875
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1107 &5494319997971291351
+AnimatorStateMachine:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 7540435519779049080}
+ m_Position: {x: 0, y: 260, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -5306412402751564557}
+ m_Position: {x: 10, y: 430, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -5019473085201770094}
+ m_Position: {x: 390, y: 290, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 20, y: 130, z: 0}
+ m_ExitPosition: {x: 350, y: 100, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 7540435519779049080}
+--- !u!1101 &7445845012217583020
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 6
+ m_ConditionEvent: State
+ m_EventTreshold: 1
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -5306412402751564557}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0.5
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &7540435519779049080
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Boss_Standing
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 7445845012217583020}
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 078e7c7c311590542aea6b1635470c4e, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Animations/Endless/BossAniCtrl.controller.meta b/Assets/Animations/Endless/BossAniCtrl.controller.meta
new file mode 100644
index 0000000..b1c98b7
--- /dev/null
+++ b/Assets/Animations/Endless/BossAniCtrl.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a8fab1a61bfa8374c836c792c68bd979
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animations/Endless/Boss_Death.anim b/Assets/Animations/Endless/Boss_Death.anim
new file mode 100644
index 0000000..0215242
--- /dev/null
+++ b/Assets/Animations/Endless/Boss_Death.anim
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Boss_Death
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings: []
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Animations/Endless/Boss_Death.anim.meta b/Assets/Animations/Endless/Boss_Death.anim.meta
new file mode 100644
index 0000000..a45039d
--- /dev/null
+++ b/Assets/Animations/Endless/Boss_Death.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d35ff496165c444bbcb58b2f7a5b0f6
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animations/Endless/Boss_Standing.anim b/Assets/Animations/Endless/Boss_Standing.anim
new file mode 100644
index 0000000..0ba7f92
--- /dev/null
+++ b/Assets/Animations/Endless/Boss_Standing.anim
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Boss_Standing
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, type: 3}
+ - time: 0.1
+ value: {fileID: 21300000, guid: 8db35398193affa479065700b24b95c9, type: 3}
+ - time: 0.2
+ value: {fileID: 21300000, guid: bfa3f1d04db2a7849b85c1b9ed44da4b, type: 3}
+ - time: 0.3
+ value: {fileID: 21300000, guid: b20fb97cac43bce438f3e3be77634794, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_SampleRate: 10
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 2015549526
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, type: 3}
+ - {fileID: 21300000, guid: 8db35398193affa479065700b24b95c9, type: 3}
+ - {fileID: 21300000, guid: bfa3f1d04db2a7849b85c1b9ed44da4b, type: 3}
+ - {fileID: 21300000, guid: b20fb97cac43bce438f3e3be77634794, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.4
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Animations/Endless/Boss_Standing.anim.meta b/Assets/Animations/Endless/Boss_Standing.anim.meta
new file mode 100644
index 0000000..ec43dcc
--- /dev/null
+++ b/Assets/Animations/Endless/Boss_Standing.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 078e7c7c311590542aea6b1635470c4e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animations/Endless/Boss_Summon.anim b/Assets/Animations/Endless/Boss_Summon.anim
new file mode 100644
index 0000000..8128c3a
--- /dev/null
+++ b/Assets/Animations/Endless/Boss_Summon.anim
@@ -0,0 +1,96 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Boss_Summon
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
+ - time: 0.1
+ value: {fileID: 21300000, guid: b1c1221f9e98d114796186481b0150c2, type: 3}
+ - time: 0.2
+ value: {fileID: 21300000, guid: ad5b59c89f1bc3b41b9705f02b67eefa, type: 3}
+ - time: 0.3
+ value: {fileID: 21300000, guid: b86aa0b361ce58e42bc3fc746dad7750, type: 3}
+ - time: 0.4
+ value: {fileID: 21300000, guid: d8b657dbab4a60c4e98c4cae98030e4b, type: 3}
+ - time: 0.5
+ value: {fileID: 21300000, guid: 97cf279232a99f24cb0b930520af87af, type: 3}
+ - time: 0.6
+ value: {fileID: 21300000, guid: 6b250b585c8e8294a8b65786e817b97d, type: 3}
+ - time: 0.7
+ value: {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 114
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_SampleRate: 10
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 2015549526
+ script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ typeID: 114
+ customType: 0
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
+ - {fileID: 21300000, guid: b1c1221f9e98d114796186481b0150c2, type: 3}
+ - {fileID: 21300000, guid: ad5b59c89f1bc3b41b9705f02b67eefa, type: 3}
+ - {fileID: 21300000, guid: b86aa0b361ce58e42bc3fc746dad7750, type: 3}
+ - {fileID: 21300000, guid: d8b657dbab4a60c4e98c4cae98030e4b, type: 3}
+ - {fileID: 21300000, guid: 97cf279232a99f24cb0b930520af87af, type: 3}
+ - {fileID: 21300000, guid: 6b250b585c8e8294a8b65786e817b97d, type: 3}
+ - {fileID: 21300000, guid: 027731aa2f988cd48abab44b65628d9e, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.8
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events:
+ - time: 0.7
+ functionName: FireAnimationEvent
+ data: summonEnd
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Animations/Endless/Boss_Summon.anim.meta b/Assets/Animations/Endless/Boss_Summon.anim.meta
new file mode 100644
index 0000000..d297067
--- /dev/null
+++ b/Assets/Animations/Endless/Boss_Summon.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0f54ff7a2f4dcc468f033c1bb6b3e0f
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/Guide/RectGuidance.mat b/Assets/Materials/Guide/RectGuidance.mat
index c945fc2..8e6b1b7 100644
--- a/Assets/Materials/Guide/RectGuidance.mat
+++ b/Assets/Materials/Guide/RectGuidance.mat
@@ -69,8 +69,8 @@
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Slider: 81.39478
- - _SliderX: 189
- - _SliderY: 73.5
+ - _SliderX: 79
+ - _SliderY: 265
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
@@ -83,7 +83,7 @@
- _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
- - _Center: {r: -3, g: -862, b: 0, a: 0}
+ - _Center: {r: -145, g: 155, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Prefabs/Enemies/fire.prefab b/Assets/Prefabs/Enemies/fire.prefab
index 304f4de..5ecea42 100644
--- a/Assets/Prefabs/Enemies/fire.prefab
+++ b/Assets/Prefabs/Enemies/fire.prefab
@@ -24,7 +24,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8434816860007424699}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.5, z: 0}
+ m_LocalPosition: {x: 0, y: 0.5, z: 0.037}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8434816861478773449}
@@ -803,6 +803,10 @@
propertyPath: m_Name
value: Model
objectReference: {fileID: 0}
+ - target: {fileID: 1594767147126006, guid: 33eba0da32885b84ebf38245df0735fa, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4258366756040210, guid: 33eba0da32885b84ebf38245df0735fa, type: 3}
propertyPath: m_LocalPosition.x
value: 0
diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity
index 7b9284f..1d2a70d 100644
--- a/Assets/Scenes/Levels/Battle/Endless.unity
+++ b/Assets/Scenes/Levels/Battle/Endless.unity
@@ -280,7 +280,7 @@
- {fileID: 1474449435}
- {fileID: 654889359}
m_Father: {fileID: 849284131}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -943,6 +943,115 @@
bOpponentSide: 1
areaMesh: {fileID: 122104238}
weight: 1
+--- !u!1 &114868870
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 114868871}
+ - component: {fileID: 114868874}
+ - component: {fileID: 114868873}
+ - component: {fileID: 114868872}
+ - component: {fileID: 114868875}
+ m_Layer: 5
+ m_Name: Boss
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &114868871
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 114868870}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.8, y: 1.8, z: 1.8}
+ m_Children: []
+ m_Father: {fileID: 561495239}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 18, y: 584}
+ m_SizeDelta: {x: 1080, y: 1080}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!95 &114868872
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 114868870}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: a8fab1a61bfa8374c836c792c68bd979, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &114868873
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 114868870}
+ 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: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, 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 &114868874
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 114868870}
+ m_CullTransparentMesh: 0
+--- !u!114 &114868875
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 114868870}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4a9888d9463147846ada342fbc131017, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ BossAnimator: {fileID: 114868872}
--- !u!1 &122104235
GameObject:
m_ObjectHideFlags: 0
@@ -1436,7 +1545,6 @@
- {fileID: 1486810257}
- {fileID: 44403929}
- {fileID: 203833506}
- - {fileID: 386100046}
m_Father: {fileID: 561495239}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1459,7 +1567,7 @@
m_EditorClassIdentifier:
HPImage1: {fileID: 2044565606}
HPImage2: {fileID: 1486810258}
- BossImage: {fileID: 853139038}
+ BossImage: {fileID: 0}
BaseBlood: {fileID: 21300000, guid: f9a15ea7a2090444e88b74ec5ec9a825, type: 3}
Speed: 0.3
WaveNumText: {fileID: 203833507}
@@ -2626,7 +2734,7 @@
- {fileID: 2031820231}
- {fileID: 1525511251}
m_Father: {fileID: 849284131}
- m_RootOrder: 1
+ 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}
@@ -2650,7 +2758,8 @@
- {fileID: 1883569033}
- {fileID: 1310262349}
SelectBtn: {fileID: 1525511252}
- EffectObj: {fileID: 1178370179}
+ EffectPrefabObject: {fileID: 8778242158096956769, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
+ type: 3}
--- !u!1 &309006004
GameObject:
m_ObjectHideFlags: 0
@@ -2946,42 +3055,6 @@
area: 0.05177675
completeArea: 0.70710707
outSidePointsParent: {fileID: 1410659829}
---- !u!1 &386100045
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 386100046}
- m_Layer: 5
- m_Name: Boss
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &386100046
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 386100045}
- 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: 853139037}
- m_Father: {fileID: 181323909}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 2, y: -242.0003}
- m_SizeDelta: {x: 411, y: 438}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &392880631
GameObject:
m_ObjectHideFlags: 0
@@ -4050,7 +4123,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 541755970}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0.000007152557}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 19764330}
@@ -4058,7 +4131,7 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 444}
+ m_AnchoredPosition: {x: 0, y: 528}
m_SizeDelta: {x: 1080, y: 425}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &541755972
@@ -4233,6 +4306,7 @@
- {fileID: 181323909}
- {fileID: 1570259601}
- {fileID: 559457822}
+ - {fileID: 114868871}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6313,10 +6387,10 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 1172214030}
- {fileID: 306286610}
- {fileID: 19764330}
- {fileID: 1730636813}
+ - {fileID: 1172214030}
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6325,81 +6399,6 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
---- !u!1 &853139036
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 853139037}
- - component: {fileID: 853139039}
- - component: {fileID: 853139038}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &853139037
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 853139036}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
- m_Children: []
- m_Father: {fileID: 386100046}
- 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: 1954, y: 1613}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &853139038
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 853139036}
- 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: 075c38bb7e6a0a941ad9dcdf00975081, 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 &853139039
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 853139036}
- m_CullTransparentMesh: 0
--- !u!1 &861002745
GameObject:
m_ObjectHideFlags: 0
@@ -6580,6 +6579,36 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 895529420}
m_CullTransparentMesh: 0
+--- !u!1 &898016331
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 898016332}
+ m_Layer: 0
+ m_Name: ParticleSystemObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &898016332
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 898016331}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 73, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 9
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &902738588
GameObject:
m_ObjectHideFlags: 0
@@ -9545,7 +9574,7 @@
- {fileID: 1108718555}
- {fileID: 1387193656}
m_Father: {fileID: 849284131}
- m_RootOrder: 0
+ 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}
@@ -9608,8 +9637,8 @@
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 100
- m_fontSizeBase: 100
+ m_fontSize: 200
+ m_fontSizeBase: 200
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -9644,7 +9673,7 @@
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_margin: {x: -188.74492, y: 0, z: -207.61734, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@@ -9759,101 +9788,6 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1172845526}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1001 &1178370178
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -21.6
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 73.4
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 5.5
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_RootOrder
- value: 9
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 1.5
- objectReference: {fileID: 0}
- - target: {fileID: 7793989333963163665, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 8778242158096956769, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- propertyPath: m_Name
- value: Effect_xuanze
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, type: 3}
---- !u!1 &1178370179 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 8778242158096956769, guid: 2510c4ef924ab244985ab6e0dd4e0ec6,
- type: 3}
- m_PrefabInstance: {fileID: 1178370178}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1178594625
GameObject:
m_ObjectHideFlags: 0
@@ -11251,7 +11185,7 @@
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 285}
- m_SizeDelta: {x: 300, y: 30}
+ m_SizeDelta: {x: 500, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1346638858
MonoBehaviour:
@@ -11266,7 +11200,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.9622642, g: 0.9338108, b: 0.15795653, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -11275,7 +11209,7 @@
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
- m_FontSize: 24
+ m_FontSize: 40
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 2
@@ -11286,7 +11220,7 @@
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u6700\u7EC8\u6CE2\u6B21\uFF1A\u7B2C500\u5173\u7B2C600\u6CE2"
+ m_Text: "\u7B2C500\u5173\u7B2C600\u6CE2"
--- !u!222 &1346638859
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -14131,7 +14065,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 849284131}
- m_RootOrder: 3
+ 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}
@@ -16516,7 +16450,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -16656,6 +16590,8 @@
FinalWaveText: {fileID: 1346638858}
PropListUI: {fileID: 654889358}
SettlementUI: {fileID: 19764329}
+ EffectPrefabObject: {fileID: 7138521553006750645, guid: dc871e79b125aae4c85ce1a65454d733,
+ type: 3}
--- !u!114 &1967975865
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Common/CommonDebugHelper.cs b/Assets/Scripts/Common/CommonDebugHelper.cs
index 692596e..580e072 100644
--- a/Assets/Scripts/Common/CommonDebugHelper.cs
+++ b/Assets/Scripts/Common/CommonDebugHelper.cs
@@ -155,7 +155,6 @@
break;
}
//UIManager.Instance.ShowWarningWind(log);
-
}
}
}
diff --git a/Assets/Scripts/Enum/EndlessBossActionState.cs b/Assets/Scripts/Enum/EndlessBossActionState.cs
new file mode 100644
index 0000000..a800cf0
--- /dev/null
+++ b/Assets/Scripts/Enum/EndlessBossActionState.cs
@@ -0,0 +1,19 @@
+/**
+ * 无尽模式boss动作状态
+ * @Author: chenxin
+ * @Date: 2020-10-30 16:56:20
+ */
+namespace KTGMGemClient
+{
+ public enum EndlessBossActionState
+ {
+ // 站立
+ Standing,
+
+ // 召唤法阵
+ Summon,
+
+ // 死亡
+ Death
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Enum/EndlessBossActionState.cs.meta b/Assets/Scripts/Enum/EndlessBossActionState.cs.meta
new file mode 100644
index 0000000..2e09a2c
--- /dev/null
+++ b/Assets/Scripts/Enum/EndlessBossActionState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7c38b91b4a2e6ce428e006f283be61f4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Event/EventType.cs b/Assets/Scripts/Event/EventType.cs
index c45ca8f..2433b74 100644
--- a/Assets/Scripts/Event/EventType.cs
+++ b/Assets/Scripts/Event/EventType.cs
@@ -43,6 +43,8 @@
EndlessCompletedPort,
// 无尽模式关卡结束
EndlessLevelCompleted,
+ // 无尽模式boss召唤结束
+ EndlessBossSummonEnd,
}
}
diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index 551a121..2f1a2c5 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -62,7 +62,7 @@
tmpMask.enabled = false;
backgroundImg = transform.Find("Button").GetComponent<Image>();
- towerBuyBtn = GameObject.Find("MainUI/TowerBuyBtn");
+ towerBuyBtn = GameObject.Find("BottomUI/TowerBuyBtn");
tipsUI = transform.Find("Tips").gameObject;
tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -503,7 +503,6 @@
#endregion
#region 拖动效果
- private float dragTimer = 1f;
private void ShowDragPath(Vector2 startP, RectTransform endP)
{
if (!dragHandImg.gameObject.activeSelf)
diff --git a/Assets/Scripts/Guide/Mask/RectGuidance.cs b/Assets/Scripts/Guide/Mask/RectGuidance.cs
index 3c04835..aee1215 100644
--- a/Assets/Scripts/Guide/Mask/RectGuidance.cs
+++ b/Assets/Scripts/Guide/Mask/RectGuidance.cs
@@ -42,10 +42,6 @@
/// </summary>
private float currentOffsetY = 0f;
/// <summary>
- /// 高亮区域缩放的动画时间
- /// </summary>
- private float shrinkTime = 0.5f;
- /// <summary>
/// 事件渗透组件
/// </summary>
private GuidanceEventPenetrate eventPenetrate;
diff --git a/Assets/Scripts/Net/NetExtends/Table.cs b/Assets/Scripts/Net/NetExtends/Table.cs
index 5ba628d..8d4af46 100644
--- a/Assets/Scripts/Net/NetExtends/Table.cs
+++ b/Assets/Scripts/Net/NetExtends/Table.cs
@@ -42,7 +42,6 @@
"endless_buff.json",
"endless_enemy.json",
"endless_port.json",
- "endless_teachport.json",
"donaterule.json",
"scoreshop.json",
"donateshop.json",
@@ -199,17 +198,6 @@
foreach (JsonData item in data)
{
endless_port tmp = endless_port.CreateFromJson(item);
- allData.Add(tmp as tabledata);
- }
- JsonDataCenter.allData.Add(tablename, allData);
- break;
-
-
- case "endless_teachport":
- //allData.Clear();
- foreach (JsonData item in data)
- {
- endless_teachport tmp = endless_teachport.CreateFromJson(item);
allData.Add(tmp as tabledata);
}
JsonDataCenter.allData.Add(tablename, allData);
@@ -986,7 +974,7 @@
// 波次间隔
public int cooldown;
- // 怪物掉落
+ // box:2:1
public List<reward> drop;
// 掉落概率
@@ -1020,89 +1008,6 @@
_endless_port.tunel_bg = int.Parse(GameUtils.GetString(item[index++].ToString()));
return _endless_port;
- }
-
- }
-
- //! 生成文件 endless_teachport（无尽模式新手引导关卡）.xlsx
- public class endless_teachport : tabledata {
- public int getid(){
- return id;
- }
-
- // id
- public int id;
-
- // 关卡等级
- public int level;
-
- // Boss名称
- public string boss_name;
-
- // Boss资源id
- public int resource;
-
- // 波次
- public int wave;
-
- // 赛道
- public int tunel;
-
- // 敌人id
- public int enemy_id;
-
- // 本波次敌人数量
- public int amount;
-
- // 本赛道出怪间隔
- public int interval;
-
- // 怪物基础血量
- public int b_hp;
-
- // 怪物基础速度
- public float b_speed;
-
- // 掉落基础金币
- public int b_coin;
-
- // 波次间隔
- public int cooldown;
-
- // 怪物掉落
- public List<reward> drop;
-
- // 掉落概率
- public List<int> drop_rate;
-
- // 法阵图片
- public int tunel_bg;
-
-
-
- public static endless_teachport CreateFromJson(JsonData item)
- {
- endless_teachport _endless_teachport = new endless_teachport();
-
- int index = 0;
- _endless_teachport.id = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.level = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.boss_name = GameUtils.GetString(item[index++].ToString());
- _endless_teachport.resource = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.wave = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.tunel = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.enemy_id = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.amount = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.interval = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.b_hp = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.b_speed = float.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.b_coin = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.cooldown = int.Parse(GameUtils.GetString(item[index++].ToString()));
- _endless_teachport.drop = GameUtils.GetRewardList(item[index++]);
- _endless_teachport.drop_rate = GameUtils.GetIntList(item[index++]);
- _endless_teachport.tunel_bg = int.Parse(GameUtils.GetString(item[index++].ToString()));
-
- return _endless_teachport;
}
}
diff --git a/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs b/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs
index 92978c7..20a0afb 100644
--- a/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs
+++ b/Assets/Scripts/TowerDefense/Input/TowerDefenseTouchInput.cs
@@ -216,30 +216,30 @@
protected virtual void OnTap(PointerActionInfo pointerActionInfo)
{
return;
- var touchInfo = pointerActionInfo as TouchInfo;
- if (touchInfo != null)
- {
- if (m_GameUI.state == State.Normal && !touchInfo.startedOverUI)
- {
- m_GameUI.TrySelectTower(touchInfo);
- }
- else if (m_GameUI.state == State.Building && !touchInfo.startedOverUI)
- {
- m_GameUI.TryMoveGhost(touchInfo, false);
- if (m_GameUI.IsGhostAtValidPosition() && m_GameUI.IsValidPurchase())
- {
- confirmationButtons.canvasEnabled = true;
- invalidButtons.canvasEnabled = false;
- confirmationButtons.TryMove(touchInfo.currentPosition);
- }
- else
- {
- invalidButtons.canvasEnabled = true;
- invalidButtons.TryMove(touchInfo.currentPosition);
- confirmationButtons.canvasEnabled = false;
- }
- }
- }
+ // var touchInfo = pointerActionInfo as TouchInfo;
+ // if (touchInfo != null)
+ // {
+ // if (m_GameUI.state == State.Normal && !touchInfo.startedOverUI)
+ // {
+ // m_GameUI.TrySelectTower(touchInfo);
+ // }
+ // else if (m_GameUI.state == State.Building && !touchInfo.startedOverUI)
+ // {
+ // m_GameUI.TryMoveGhost(touchInfo, false);
+ // if (m_GameUI.IsGhostAtValidPosition() && m_GameUI.IsValidPurchase())
+ // {
+ // confirmationButtons.canvasEnabled = true;
+ // invalidButtons.canvasEnabled = false;
+ // confirmationButtons.TryMove(touchInfo.currentPosition);
+ // }
+ // else
+ // {
+ // invalidButtons.canvasEnabled = true;
+ // invalidButtons.TryMove(touchInfo.currentPosition);
+ // confirmationButtons.canvasEnabled = false;
+ // }
+ // }
+ // }
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
index 4fbb897..5715502 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
@@ -141,22 +141,29 @@
GameObject mainUI = GameObject.Find("MainUI");
- Transform mainUITransform = mainUI.GetComponent<Transform>();
+ Transform mainUITransform = mainUI.transform;
+ obj.transform.SetParent(mainUITransform, false);
+
+ // Vector3 screenPos = Camera.main.WorldToScreenPoint(worldPos);
+ // Vector2 pos;
+ // RectTransformUtility.ScreenPointToLocalPointInRectangle(mainUITransform as RectTransform, screenPos, Camera.main, out pos);
+ // (obj.transform as RectTransform).anchoredPosition = pos;
+
obj.GetComponent<Transform>().SetParent(mainUITransform, true);
obj.transform.position = worldPos;
- obj.transform.localRotation = Quaternion.identity;
- obj.transform.localScale = Vector3.one;
+ // obj.transform.localRotation = Quaternion.identity;
+ // obj.transform.localScale = Vector3.one;
- if (isRandom)
- {
- Vector2 p = UnityEngine.Random.insideUnitCircle * DropRadius;
- Vector3 pos1 = p.normalized * p.magnitude;
- Vector3 objPos = obj.transform.position;
- objPos.x += pos1.x;
- objPos.z += pos1.y;
- obj.transform.position = objPos;
- }
+ // if (isRandom)
+ // {
+ // Vector2 p = UnityEngine.Random.insideUnitCircle * DropRadius;
+ // Vector3 pos1 = p.normalized * p.magnitude;
+ // Vector3 objPos = obj.transform.position;
+ // objPos.x += pos1.x;
+ // objPos.z += pos1.y;
+ // obj.transform.position = objPos;
+ // }
dropReward.PlayParticle();
DropObjDic.Add(drop.Id, obj);
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
index b0b994f..d534361 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs
@@ -23,6 +23,12 @@
public class EndlessLevelManager : Singleton<EndlessLevelManager>
{
/// <summary>
+ /// 起始关卡
+ /// </summary>
+ /// <value></value>
+ protected int startLevel { get; set; } = 1;
+
+ /// <summary>
/// 当前的关卡等级
/// </summary>
public int CurrentLevel { get; set; } = 1;
@@ -303,11 +309,13 @@
CurrencyGainer.Tick(Time.deltaTime);
}
+ // buff选择完成，开始波次
if (!isBuffSelectCompleted)
{
isBuffSelectCompleted = true;
- WaveManager.StartWaves(CurrentLevel);
+ WaveManager.InitPort(CurrentLevel);
EndlessUIStart.instance.Restart();
+ WaveManager.StartWaves(CurrentLevel);
}
// 本关卡所有波次全部生成完成 && 敌人全部被清理了，然后就去尝试进入下一关
@@ -377,6 +385,7 @@
public void NewbieUpdateLevel()
{
++CurrentLevel;
+ WaveManager.InitPort(CurrentLevel);
IsAllWaveCompleted = false;
EndlessUIStart.instance.Restart();
WaveManager.StartWaves(CurrentLevel);
@@ -399,6 +408,9 @@
{
if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
+ if (CurrentLevel == startLevel)
+ WaveManager.InitPort(CurrentLevel);
+
if (!GameConfig.IsNewbie)
ShowSelectBuffUI();
else
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
index e30e180..024f0b4 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -52,11 +52,6 @@
public event Action SpawnNewAgent;
/// <summary>
- /// 波次发生改变
- /// </summary>
- public event Action WaveChanged;
-
- /// <summary>
/// 怪出生开始节点
/// </summary>
public Node StartingNode;
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index ac02bc4..43d7d9b 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -4,6 +4,7 @@
using KTGMGemClient;
using UnityEngine;
using TowerDefense.UI.HUD;
+using Core.Utilities;
namespace TowerDefense.Level
{
@@ -98,6 +99,8 @@
private string faZhenPath = "UI/Endless/Tunel/EndlessFaZhen";
+ private Timer faZhenRefreshTimer;
+
private void Start()
{
HideTunel();
@@ -132,6 +135,25 @@
///
public virtual void StartWaves(int level)
{
+ SummonFaZhen();
+ }
+
+ /// <summary>
+ /// 关卡开始时首先初始化关卡信息
+ /// </summary>
+ /// <param name="level"></param>
+ public void InitPort(int level)
+ {
+ InitPortData(level);
+ InitWaveData();
+ RefreshBoss();
+ }
+
+ /// <summary>
+ /// 初始化关卡数据
+ /// </summary>
+ private void InitPortData(int level)
+ {
Debug.Log($"--------------------- 开始第 {level} 关 ---------------------");
Level = level;
LevelData = EndlessPortData.GetLevelWaveData(level);
@@ -143,8 +165,58 @@
if (LevelData.Count == 0)
throw new Exception($"当前关卡：{level}, 没有关卡数据");
+ }
- UpdateWave();
+ /// <summary>
+ /// 召唤法阵
+ /// </summary>
+ private void SummonFaZhen()
+ {
+ EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessBossSummonEnd, OnEndlessBossSummonEnd);
+ EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Summon);
+ }
+
+ /// <summary>
+ /// boss召唤动作结束
+ /// </summary>
+ private void OnEndlessBossSummonEnd()
+ {
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.EndlessBossSummonEnd, OnEndlessBossSummonEnd);
+ EndlessBossCtrl.instance.ChangeState(EndlessBossActionState.Standing);
+ HideTunel();
+ RefreshFaZhen();
+ }
+
+ /// <summary>
+ /// 刷新法阵显示
+ /// </summary>
+ private void RefreshFaZhen()
+ {
+ float time = 0;
+
+ // 刷新法阵的显示
+ for (int i = 0; i < waveData.Count; ++i)
+ {
+ int tunel = waveData[i].Config.tunel;
+ int tunelBgId = waveData[i].Config.tunel_bg;
+
+ TunelList[tunel - 1].material = Resources.Load<Material>($"{tunelMaterialPath}{tunelBgId}");
+ GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}");
+ GameObject faZhen = Instantiate(obj);
+
+ faZhen.transform.SetParent(TunelList[tunel - 1].gameObject.transform);
+ faZhen.transform.localPosition = new Vector3(0, 1, 0);
+ faZhen.transform.localScale = new Vector3(2, 2, 2);
+ TunelList[tunel - 1].gameObject.SetActive(true);
+
+ ParticleSystem ps = faZhen.transform.GetChild(0).GetComponent<ParticleSystem>();
+ ps.Play();
+ time = ps.main.duration * 3;
+ Destroy(faZhen, time);
+ }
+
+ if (faZhenRefreshTimer == null)
+ faZhenRefreshTimer = new Timer(time, UpdateWave);
}
/// <summary>
@@ -179,39 +251,25 @@
}
/// <summary>
- /// 更新波
+ /// 初始化波次数据
/// </summary>
- private void UpdateWave()
+ private void InitWaveData()
{
- if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
-
waveData = LevelData[CurrentWaveIndex];
// 直接取第一条就行了
WaveInterval = waveData[0].Config.cooldown / 1000f;
TotalWaveLines = waveData.Count;
CompletedWaveLine = 0;
SpawnedTotalEnemies = 0;
- HideTunel();
+ }
- // 刷新法阵的显示
- for (int i = 0; i < waveData.Count; ++i)
- {
- int tunel = waveData[i].Config.tunel;
- int tunelBgId = waveData[i].Config.tunel_bg;
+ /// <summary>
+ /// 更新波
+ /// </summary>
+ private void UpdateWave()
+ {
+ if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
- TunelList[tunel - 1].material = Resources.Load<Material>($"{tunelMaterialPath}{tunelBgId}");
- GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}");
- GameObject faZhen = Instantiate(obj);
- faZhen.transform.SetParent(TunelList[tunel - 1].gameObject.transform);
- faZhen.transform.localPosition = new Vector3(0, 1, 0);
- faZhen.transform.localScale = new Vector3(2, 2, 2);
- TunelList[tunel - 1].gameObject.SetActive(true);
- ParticleSystem ps = faZhen.transform.GetChild(0).GetComponent<ParticleSystem>();
- ps.Play();
- Destroy(faZhen, ps.main.duration * 3);
- }
-
- RefreshBoss();
TotalEnemies = EndlessPortData.GetWaveEnemiesCount(Level, CurrentWaveIndex);
RemainEnemies = TotalEnemies;
@@ -284,8 +342,15 @@
public void Update()
{
+ if (faZhenRefreshTimer != null)
+ {
+ if (faZhenRefreshTimer.Tick(Time.deltaTime))
+ faZhenRefreshTimer = null;
+ }
+
if (!isWaveStarted) return;
+ // 所有赛道都完成
if (CompletedWaveLine >= TotalWaveLines)
{
// 判断所有敌人是否全部清除
@@ -322,7 +387,9 @@
private IEnumerator DelayToUpdateWave()
{
yield return new WaitForSeconds(WaveInterval);
- UpdateWave();
+ InitWaveData();
+ RefreshBoss();
+ SummonFaZhen();
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
new file mode 100644
index 0000000..b32ece1
--- /dev/null
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
@@ -0,0 +1,61 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Core.Utilities;
+
+/**
+ * 无尽模式boss控制器
+ * @Author: chenxin
+ * @Date: 2020-10-30 16:40:54
+ */
+namespace KTGMGemClient
+{
+ public class EndlessBossCtrl : Singleton<EndlessBossCtrl>
+ {
+ /// <summary>
+ /// boss动作
+ /// </summary>
+ public Animator BossAnimator;
+
+ /// <summary>
+ /// 动作状态
+ /// </summary>
+ public EndlessBossActionState ActionState { get; set; }
+
+ // Start is called before the first frame update
+ private void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ private void Update()
+ {
+
+ }
+
+ /// <summary>
+ /// 帧事件
+ /// </summary>
+ /// <param name="frameName"></param>
+ public void FireAnimationEvent(string frameName)
+ {
+ if (frameName == "summonEnd")
+ {
+ EventCenter.Ins.BroadCast((int)EventType.EndlessBossSummonEnd);
+ }
+ }
+
+ /// <summary>
+ /// 切换状态
+ /// </summary>
+ /// <param name="newState"></param>
+ public void ChangeState(EndlessBossActionState newState)
+ {
+ if (newState == ActionState) return;
+
+ ActionState = newState;
+ BossAnimator.SetInteger("State", (int)newState);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs.meta b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs.meta
new file mode 100644
index 0000000..5953c30
--- /dev/null
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4a9888d9463147846ada342fbc131017
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
index 7d03af3..10feb0a 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossHPManager.cs
@@ -30,17 +30,10 @@
private string path = "UI/Endless/Blood/";
- private string bossPath = "UI/Endless/Boss/";
-
/// <summary>
/// 血条底图
/// </summary>
public Sprite BaseBlood;
-
- /// <summary>
- /// 当前的进度值
- /// </summary>
- private float current;
/// <summary>
/// 目标进度值
@@ -109,7 +102,6 @@
/// </summary>
private void ResetProgress()
{
- current = 1f;
target = 1f;
HPImage1.fillAmount = 1;
HPImage2.fillAmount = 1;
@@ -207,8 +199,8 @@
public void SetBossImage(int resId)
{
resId = (resId + 1) % 2 + 1;
- BossImage.sprite = Resources.Load<Sprite>($"{bossPath}{resId}");
- BossImage.SetNativeSize();
+ // BossImage.sprite = Resources.Load<Sprite>($"{bossPath}{resId}");
+ // BossImage.SetNativeSize();
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs b/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
index a79d808..178329b 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
@@ -16,13 +16,6 @@
{
public List<SelectBuffIcon> IconList;
- private string iconPath = "UI/Endless/BuffIcon/BuffIcon_";
-
- /// <summary>
- /// buff是否选中完成
- /// </summary>
- private bool isCompleted;
-
public event Action<int> BuffSelectCompleted;
/// <summary>
@@ -32,9 +25,11 @@
public Button SelectBtn;
- public GameObject EffectObj;
+ public GameObject EffectPrefabObject;
- private Vector3[] effectPosArr = { new Vector3(-21.6f, 73.4f, 5.5f), new Vector3(0, 73.4f, 5.5f), new Vector3(21.6f, 73.4f, 5.5f) };
+ private GameObject effectObj;
+
+ private Vector3[] effectPosArr = { new Vector3(-21.6f, 0, 6.6f), new Vector3(0, 0, 6.6f), new Vector3(21.6f, 0, 6.6f) };
// Start is called before the first frame update
private void Start()
@@ -49,15 +44,18 @@
private void OnEnable()
{
- isCompleted = false;
SelectedIndex = -1;
for (int i = 0; i < IconList.Count; ++i)
{
IconList[i].Reset();
}
+ }
- EndlessMaskUI.instance.Show();
+ private void OnDisable()
+ {
+ if (effectObj != null)
+ Destroy(effectObj);
}
public void OnClick(int index)
@@ -79,16 +77,26 @@
private void PlayEffect()
{
- EffectObj.transform.localPosition = effectPosArr[SelectedIndex];
- ParticleSystem ps = EffectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
+ if (effectObj == null)
+ {
+ effectObj = Instantiate(EffectPrefabObject);
+ GameObject particleSystemObject = GameObject.Find("ParticleSystemObject");
+ effectObj.transform.SetParent(particleSystemObject.transform, false);
+ effectObj.transform.localScale = new Vector3(1.5f, 1.5f, 1.5f);
+ }
+ effectObj.transform.localPosition = effectPosArr[SelectedIndex];
+ ParticleSystem ps = effectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
ps.Play();
}
private void StopEffect()
{
- ParticleSystem ps = EffectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
- ps.Stop();
- ps.Clear();
+ if (effectObj != null)
+ {
+ ParticleSystem ps = effectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
+ ps.Stop();
+ ps.Clear();
+ }
}
/// <summary>
@@ -108,6 +116,7 @@
public void ShowBuffUI()
{
+ EndlessMaskUI.instance.Show();
gameObject.SetActive(true);
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index f1f562a..1377390 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -41,6 +41,10 @@
public GameObject SettlementUI;
+ public GameObject EffectPrefabObject;
+
+ private GameObject effectObj;
+
public void Init()
{
LazyLoad();
@@ -76,7 +80,24 @@
RefreshFinalWave();
RefreshPropList();
+ EndlessMaskUI.instance.Show();
SettlementUI.SetActive(true);
+ PlayEffect();
+ }
+
+ private void PlayEffect()
+ {
+ if (effectObj == null)
+ {
+ effectObj = Instantiate(EffectPrefabObject);
+ GameObject particleSystemObject = GameObject.Find("ParticleSystemObject");
+ effectObj.transform.SetParent(particleSystemObject.transform, false);
+ effectObj.transform.localPosition = new Vector3(0, 0, 36.6f);
+ effectObj.transform.localScale = new Vector3(3, 3, 3);
+ }
+
+ ParticleSystem ps = effectObj.transform.GetChild(0).GetComponent<ParticleSystem>();
+ ps.Play();
}
/// <summary>
@@ -147,7 +168,7 @@
int level = EndlessLevelManager.instance.CurrentLevel;
int wave = EndlessLevelManager.instance.WaveManager.CurrentWaveIndex;
- FinalWaveText.text = $"最终波次：第{level}关，第{wave}波";
+ FinalWaveText.text = $"第{level}关，第{wave}波";
}
private void RefreshPropList()
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 0a8de2f..0050dc6 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -52,26 +52,19 @@
// Start is called before the first frame update
void Start()
{
- if (TDAA_SDKManager.Ins == null)
- gameObject.AddComponent<TDAA_SDKManager>();
- TDAA_SDKManager.Ins.ArriveBattle();//埋点
-
- TDAA_SDKManager.Ins.Statistics(4);//埋点
+ InitSDK();
bVibrate = new bool[4];
bVibrate[0] = bVibrate[1] = bVibrate[2] = bVibrate[3] = false;
- // 设置为顶层渲染:
- countDownTextNew.transform.SetAsLastSibling();
-
if (timeStatic)
timeStatic.gameObject.SetActive(false);
EndlessBuffSelect.instance.HideBuffUI();
- EndlessBossHPManager.instance.HideHP();
EndlessSettlement settlement = SettlementUI.transform.GetChild(0).GetComponent<EndlessSettlement>();
settlement.Init();
SettlementUI.SetActive(false);
EndlessMaskUI.instance.Hide();
+ EndlessBossHPManager.instance.HideHP();
//查询是否已经做过了新手引导
int guide = PlayerPrefs.GetInt("GemBattleGuide");
@@ -94,6 +87,14 @@
GameConfig.EndlessPortUseSkillTowerCount = 0;
}
+ private void InitSDK()
+ {
+ if (TDAA_SDKManager.Ins == null)
+ gameObject.AddComponent<TDAA_SDKManager>();
+ TDAA_SDKManager.Ins.ArriveBattle();//埋点
+ TDAA_SDKManager.Ins.Statistics(4);//埋点
+ }
+
/// <summary>
/// 添加新手引导事件
/// </summary>
@@ -109,6 +110,24 @@
EventCenter.Ins.Add((int)KTGMGemClient.EventType.GuideFinish, NewbieGuideEnd);
}
+ private void RemoveGuideEvent()
+ {
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.CreateFireLv2, CreateFireLv2);
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.CreateFirstWave, CreateFirstWave);
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.RestartWave, RestartWave);
+ EventCenter.Ins.Remove<int>((int)KTGMGemClient.EventType.AddGold, AddGold);
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.CreateWaterLv1, CreateWaterLv1);
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
+ EventCenter.Ins.Remove((int)KTGMGemClient.EventType.GuideFinish, NewbieGuideEnd);
+ }
+
+ protected override void OnDestroy()
+ {
+ base.OnDestroy();
+ RemoveGuideEvent();
+ }
+
/// <summary>
/// 在（2，3）位置放置一个火元素的塔
/// </summary>
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
index a666cf0..b0a4e34 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessRandomTower.cs
@@ -42,8 +42,6 @@
protected int maxTower = 0;
- private bool firstDeploy = false;
-
public static readonly int MAX_TOWERDIS = 5;
// 开始出现技能塔的时间：
diff --git a/Assets/StreamingAssets/Table/battle.json b/Assets/StreamingAssets/Table/battle.json
index f1ee002..4d3a548 100644
--- a/Assets/StreamingAssets/Table/battle.json
+++ b/Assets/StreamingAssets/Table/battle.json
@@ -1 +1 @@
-[[1,"skilltime",30,[],"","生成技能宝石的时间（秒）"],[2,"initialgold",100,[],"","战斗内初始金币"],[3,"doublegem",180,[],"","购买宝石直接获得2级宝石的时间（秒）"],[4,"initialmoney",5000,[],"","初始金币"],[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",500,[],"","战斗内初始金币"],[3,"doublegem",180,[],"","购买宝石直接获得2级宝石的时间（秒）"],[4,"initialmoney",5000,[],"","初始金币"],[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/Assets/StreamingAssets/Table/endless_buff.json b/Assets/StreamingAssets/Table/endless_buff.json
index 4326761..8be1b3c 100644
--- a/Assets/StreamingAssets/Table/endless_buff.json
+++ b/Assets/StreamingAssets/Table/endless_buff.json
@@ -1 +1 @@
-[[1,"火灵之力",[2,1],[1,5,0],-1,"增加全体火精灵5%攻击力",0,10,10001,2],[2,"水灵之力",[2,2],[1,5,0],-1,"增加全体水精灵5%攻击力",0,10,10002,2],[3,"木灵之力",[2,3],[1,5,0],-1,"增加全体木精灵5%攻击力",0,10,10003,2],[4,"精灵之力",[1,0],[1,3,0],5,"5波增加全体精灵3%攻击力",0,10,10004,2],[5,"时空宝石",[1,0],[1,10,0],5,"5波内增加全体精灵10%攻击力",0,10,10005,3],[6,"飞来横财",[0],[2,500,0],0,"增加500金币",0,10,10006,1],[7,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",0,10,10007,1]]
\ 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%攻击力",0,99,10001,2],[5,"水灵之力",[2,2],[1,4,0],-1,"增加全体水精灵4%攻击力",0,99,10002,2],[6,"木灵之力",[2,3],[1,4,0],-1,"增加全体木精灵4%攻击力",0,99,10003,2],[7,"高级火灵之力",[2,1],[1,6,0],-1,"增加全体火精灵6%攻击力",0,99,10001,3],[8,"高级水灵之力",[2,2],[1,6,0],-1,"增加全体水精灵6%攻击力",0,99,10002,3],[9,"高级木灵之力",[2,3],[1,6,0],-1,"增加全体木精灵6%攻击力",0,99,10003,3],[10,"精灵之力",[1,0],[1,10,0],3,"3波增加全体精灵10%攻击力",0,99,10004,2],[11,"时空宝石",[1,0],[1,20,0],3,"3波内增加全体精灵20%攻击力",0,99,10005,3],[12,"飞来横财",[0],[2,500,0],0,"增加500金币",0,99,10007,1],[13,"中大奖!",[0],[2,1000,0],0,"增加1000金币",0,99,10007,3],[14,"精灵魔盒",[0],[3,3,300],0,"随机获得一个3级精灵",0,99,10006,2],[15,"超级精灵魔盒",[0],[3,4,500],0,"随机获得一个4级精灵",0,99,10006,3]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/endless_enemy.json b/Assets/StreamingAssets/Table/endless_enemy.json
index 89c5e9f..4a7fcec 100644
--- a/Assets/StreamingAssets/Table/endless_enemy.json
+++ b/Assets/StreamingAssets/Table/endless_enemy.json
@@ -1 +1 @@
-[[1,"测试小怪1",1,1,3,1,101],[2,"测试小怪2",1,15,1,3,102],[3,"测试小怪3",1,3,1.5,1,103],[4,"测试小怪4",1,4,2,1,104],[5,"测试小怪5",2,5,2,1,105],[6,"测试小怪6",2,6,2,1,106]]
\ No newline at end of file
+[[1,"测试小怪1",1,1,2.2,1,101],[2,"测试小怪2",1,4,1,3,102],[3,"测试小怪3",1,1.5,1.2,1,103],[4,"测试小怪4",1,4,2,1,104],[5,"测试小怪5",2,5,2,1,105],[6,"测试小怪6",2,6,2,1,106]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/endless_port.json b/Assets/StreamingAssets/Table/endless_port.json
index b8814d3..b01cc78 100644
--- a/Assets/StreamingAssets/Table/endless_port.json
+++ b/Assets/StreamingAssets/Table/endless_port.json
@@ -1 +1 @@
-[[1,-2,"史莱姆大王",1,1,1,0,0,0,200,1.5,2,3000,["0"],[0],0],[2,-2,"史莱姆大王",1,1,2,0,0,0,200,1.5,2,3000,["0"],[0],0],[3,-2,"史莱姆大王",1,1,3,3,10,2000,200,1.5,2,3000,["0"],[0],3],[4,-2,"史莱姆大王",1,1,4,0,0,0,200,1.5,2,3000,["0"],[0],0],[5,-2,"史莱姆大王",1,1,5,0,0,0,200,1.5,2,3000,["0"],[0],0],[6,-1,"史莱姆大王",1,2,1,0,0,0,350,1.5,2,3000,["0"],[0],0],[7,-1,"史莱姆大王",1,2,2,1,10,2000,500,1.5,2,3000,["0"],[0],1],[8,-1,"史莱姆大王",1,2,3,0,0,0,350,1.5,2,3000,["0"],[0],0],[9,-1,"史莱姆大王",1,2,4,0,0,0,350,1.5,2,3000,["0"],[0],0],[10,-1,"史莱姆大王",1,2,5,0,0,0,350,1.5,2,3000,["0"],[0],0],[11,1,"史莱姆大王",1,1,1,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[12,1,"史莱姆大王",1,1,2,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[13,1,"史莱姆大王",1,1,3,1,12,1500,200,1.5,2,3000,["gold:5"],[500,9500],1],[14,1,"史莱姆大王",1,1,4,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[15,1,"史莱姆大王",1,1,5,0,0,0,200,1.5,2,3000,["gold:5"],[500,9500],0],[16,1,"史莱姆大王",1,2,1,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[17,1,"史莱姆大王",1,2,2,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[18,1,"史莱姆大王",1,2,3,3,6,3000,350,1.5,2,3000,["gold:5"],[500,9500],3],[19,1,"史莱姆大王",1,2,4,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[20,1,"史莱姆大王",1,2,5,0,0,0,350,1.5,2,3000,["gold:5"],[500,9500],0],[21,1,"史莱姆大王",1,3,1,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[22,1,"史莱姆大王",1,3,2,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[23,1,"史莱姆大王",1,3,3,2,4,4500,500,1.5,2,3000,["gold:5"],[500,9500],2],[24,1,"史莱姆大王",1,3,4,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[25,1,"史莱姆大王",1,3,5,0,0,0,500,1.5,2,3000,["gold:5"],[500,9500],0],[26,2,"捣蛋恶魔",2,1,1,0,0,0,1000,1.5,4,3000,["gold:5"],[500,9500],0],[27,2,"捣蛋恶魔",2,1,2,3,6,3000,1000,1.5,4,3000,["gold:5"],[500,9500],3],[28,2,"捣蛋恶魔",2,1,3,1,12,1500,1000,1.5,4,3000,["gold:5"],[500,9500],1],[29,2,"捣蛋恶魔",2,1,4,3,6,3000,1000,1.5,4,3000,["gold:5"],[500,9500],3],[30,2,"捣蛋恶魔",2,1,5,0,0,0,1000,1.5,4,3000,["gold:5"],[500,9500],0],[31,2,"捣蛋恶魔",2,2,1,2,4,4500,1200,1.5,4,3000,["gold:5"],[500,9500],2],[32,2,"捣蛋恶魔",2,2,2,0,0,0,1200,1.5,4,3000,["gold:5"],[500,9500],0],[33,2,"捣蛋恶魔",2,2,3,3,6,3000,1200,1.5,4,3000,["gold:5"],[500,9500],3],[34,2,"捣蛋恶魔",2,2,4,0,0,0,1200,1.5,4,3000,["gold:5"],[500,9500],0],[35,2,"捣蛋恶魔",2,2,5,2,4,4500,1200,1.5,4,3000,["gold:5"],[500,9500],2],[36,2,"捣蛋恶魔",2,3,1,2,4,4500,1400,1.5,4,3000,["gold:5"],[500,9500],2],[37,2,"捣蛋恶魔",2,3,2,3,6,3000,1400,1.5,4,3000,["gold:5"],[500,9500],3],[38,2,"捣蛋恶魔",2,3,3,1,12,1500,1400,1.5,4,3000,["gold:5"],[500,9500],1],[39,2,"捣蛋恶魔",2,3,4,3,6,3000,1400,1.5,4,3000,["gold:5"],[500,9500],3],[40,2,"捣蛋恶魔",2,3,5,2,4,4500,1400,1.5,4,3000,["gold:5"],[500,9500],2],[41,3,"精灵小偷",3,1,1,3,6,3000,1800,1.5,8,3000,["gold:5"],[500,9500],3],[42,3,"精灵小偷",3,1,2,1,12,1500,1800,1.5,8,3000,["gold:5"],[500,9500],1],[43,3,"精灵小偷",3,1,3,2,4,4500,1800,1.5,8,3000,["gold:5"],[500,9500],2],[44,3,"精灵小偷",3,1,4,1,12,1500,1800,1.5,8,3000,["gold:5"],[500,9500],1],[45,3,"精灵小偷",3,1,5,3,6,3000,1800,1.5,8,3000,["gold:5"],[500,9500],3],[46,3,"精灵小偷",3,2,1,1,12,1500,2100,1.5,8,3000,["gold:5"],[500,9500],1],[47,3,"精灵小偷",3,2,2,3,6,3000,2100,1.5,8,3000,["gold:5"],[500,9500],3],[48,3,"精灵小偷",3,2,3,2,4,4500,2100,1.5,8,3000,["gold:5"],[500,9500],2],[49,3,"精灵小偷",3,2,4,3,6,3000,2100,1.5,8,3000,["gold:5"],[500,9500],3],[50,3,"精灵小偷",3,2,5,1,12,1500,2100,1.5,8,3000,["gold:5"],[500,9500],1],[51,3,"精灵小偷",3,3,1,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[52,3,"精灵小偷",3,3,2,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[53,3,"精灵小偷",3,3,3,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[54,3,"精灵小偷",3,3,4,2,4,4500,2400,1.5,8,3000,["gold:5"],[500,9500],2],[55,3,"精灵小偷",3,3,5,2,4,4500,2400,1.5,8,3000,["box:3:1"],[500,9500],2],[56,4,"大波僵尸",3,1,1,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[57,4,"大波僵尸",3,1,2,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[58,4,"大波僵尸",3,1,3,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[59,4,"大波僵尸",3,1,4,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[60,4,"大波僵尸",3,1,5,1,12,1500,2700,1.5,16,3000,["gold:5"],[500,9500],1],[61,4,"大波僵尸",3,2,1,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[62,4,"大波僵尸",3,2,2,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[63,4,"大波僵尸",3,2,3,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[64,4,"大波僵尸",3,2,4,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[65,4,"大波僵尸",3,2,5,3,6,3000,3000,1.5,16,3000,["gold:5"],[500,9500],3],[66,4,"大波僵尸",3,3,1,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[67,4,"大波僵尸",3,3,2,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[68,4,"大波僵尸",3,3,3,1,12,1500,3300,1.5,16,3000,["gold:5"],[500,9500],1],[69,4,"大波僵尸",3,3,4,2,6,3000,3300,1.5,16,3000,["gold:5"],[500,9500],2],[70,4,"大波僵尸",3,3,5,2,6,3000,3300,1.5,16,3000,["box:3:1"],[500,9500],2],[71,5,"Dio",3,1,1,2,8,4500,3600,2,32,3000,["gold:5"],[500,9500],2],[72,5,"Dio",3,1,2,3,12,3000,3600,2,32,3000,["gold:5"],[500,9500],3],[73,5,"Dio",3,1,3,1,24,1500,3600,2,32,3000,["gold:5"],[500,9500],1],[74,5,"Dio",3,1,4,3,12,3000,3600,2,32,3000,["gold:5"],[500,9500],3],[75,5,"Dio",3,1,5,2,8,4500,3600,2,32,3000,["gold:5"],[500,9500],2],[76,5,"Dio",3,2,1,3,12,3000,3900,2,32,3000,["gold:5"],[500,9500],3],[77,5,"Dio",3,2,2,1,24,1500,3900,2,32,3000,["gold:5"],[500,9500],1],[78,5,"Dio",3,2,3,2,8,4500,3900,2,32,3000,["gold:5"],[500,9500],2],[79,5,"Dio",3,2,4,1,24,1500,3900,2,32,3000,["gold:5"],[500,9500],1],[80,5,"Dio",3,2,5,3,12,3000,3900,2,32,3000,["gold:5"],[500,9500],3],[81,5,"Dio",3,3,1,1,24,1500,4200,2,32,3000,["gold:5"],[500,9500],1],[82,5,"Dio",3,3,2,3,12,3000,4200,2,32,3000,["gold:5"],[500,9500],3],[83,5,"Dio",3,3,3,2,8,4500,4200,2,32,3000,["gold:5"],[500,9500],2],[84,5,"Dio",3,3,4,3,12,3000,4200,2,32,3000,["gold:5"],[500,9500],3],[85,5,"Dio",3,3,5,1,24,1500,4200,2,32,3000,["gold:5"],[500,9500],1],[86,5,"Dio",3,4,1,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[87,5,"Dio",3,4,2,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[88,5,"Dio",3,4,3,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[89,5,"Dio",3,4,4,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[90,5,"Dio",3,4,5,2,8,4500,4500,2,64,3000,["gold:5"],[500,9500],2],[91,5,"Dio",3,5,1,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[92,5,"Dio",3,5,2,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[93,5,"Dio",3,5,3,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[94,5,"Dio",3,5,4,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[95,5,"Dio",3,5,5,1,24,1500,4800,2,64,3000,["gold:5"],[500,9500],1],[96,5,"Dio",3,6,1,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[97,5,"Dio",3,6,2,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[98,5,"Dio",3,6,3,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[99,5,"Dio",3,6,4,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[100,5,"Dio",3,6,5,3,12,3000,5100,2,64,3000,["gold:5"],[500,9500],3],[101,5,"Dio",3,7,1,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[102,5,"Dio",3,7,2,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[103,5,"Dio",3,7,3,1,24,1500,5400,2,64,3000,["gold:5"],[500,9500],1],[104,5,"Dio",3,7,4,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[105,5,"Dio",3,7,5,2,12,3000,5400,2,64,3000,["gold:5"],[500,9500],2],[106,5,"Dio",3,8,1,2,8,4500,5700,2,64,3000,["gold:5"],[500,9500],2],[107,5,"Dio",3,8,2,3,12,3000,5700,2,64,3000,["gold:5"],[500,9500],3],[108,5,"Dio",3,8,3,1,24,1500,5700,2,64,3000,["gold:5"],[500,9500],1],[109,5,"Dio",3,8,4,3,12,3000,5700,2,64,3000,["gold:5"],[500,9500],3],[110,5,"Dio",3,8,5,2,8,4500,5700,2,64,3000,["gold:5"],[500,9500],2],[111,5,"Dio",3,9,1,3,12,3000,6000,2,64,3000,["gold:5"],[500,9500],3],[112,5,"Dio",3,9,2,1,24,1500,6000,2,64,3000,["gold:5"],[500,9500],1],[113,5,"Dio",3,9,3,2,8,4500,6000,2,64,3000,["gold:5"],[500,9500],2],[114,5,"Dio",3,9,4,1,24,1500,6000,2,64,3000,["gold:5"],[500,9500],1],[115,5,"Dio",3,9,5,3,12,3000,6000,2,64,3000,["gold:5"],[500,9500],3],[116,5,"Dio",3,10,1,1,24,1500,6300,2,64,3000,["gold:5"],[500,9500],1],[117,5,"Dio",3,10,2,3,12,3000,6300,2,64,3000,["gold:5"],[500,9500],3],[118,5,"Dio",3,10,3,2,8,4500,6300,2,64,3000,["gold:5"],[500,9500],2],[119,5,"Dio",3,10,4,3,12,3000,6300,2,64,3000,["gold:5"],[500,9500],3],[120,5,"Dio",3,10,5,1,24,1500,6300,2,64,3000,["gold:5"],[500,9500],1],[121,5,"Dio",3,11,1,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[122,5,"Dio",3,11,2,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[123,5,"Dio",3,11,3,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[124,5,"Dio",3,11,4,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[125,5,"Dio",3,11,5,2,8,4500,6600,2,64,3000,["gold:5"],[500,9500],2],[126,5,"Dio",3,12,1,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[127,5,"Dio",3,12,2,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[128,5,"Dio",3,12,3,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[129,5,"Dio",3,12,4,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1],[130,5,"Dio",3,12,5,1,24,1500,6900,2,64,3000,["gold:5"],[500,9500],1]]
\ 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,"史莱姆大王",2,1,1,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[12,1,"史莱姆大王",2,1,2,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[13,1,"史莱姆大王",2,1,3,2,"4","6000",400,1.5,5,3000,["gold:1"],[500,9500],2],[14,1,"史莱姆大王",2,1,4,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[15,1,"史莱姆大王",2,1,5,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[16,1,"史莱姆大王",2,2,1,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[17,1,"史莱姆大王",2,2,2,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[18,1,"史莱姆大王",2,2,3,3,"6","4000",400,1.5,5,3000,["gold:1"],[500,9500],3],[19,1,"史莱姆大王",2,2,4,0,"0","0",400,1.5,5,3000,["gold:1"],[500,9500],0],[20,1,"史莱姆大王",2,2,5,0,"0","0",400,1.5,5,3000,["box:1:1"],[500,9500],0],[21,1,"拿破仑",1,1,1,0,"0","0",520,1.5,5,3000,["gold:1"],[500,9500],0],[22,2,"拿破仑",1,1,2,2,"4","6000",555,1.5,5,3000,["gold:1"],[500,9500],2],[23,2,"拿破仑",1,1,3,0,"0","0",590,1.5,5,3000,["gold:1"],[500,9500],0],[24,2,"拿破仑",1,1,4,2,"4","6000",625,1.5,5,3000,["gold:1"],[500,9500],2],[25,2,"拿破仑",1,1,5,0,"0","0",660,1.5,5,3000,["gold:1"],[500,9500],0],[26,2,"拿破仑",1,2,1,0,"0","0",695,1.5,5,3000,["gold:1"],[500,9500],0],[27,2,"拿破仑",1,2,2,3,"6","4000",730,1.5,5,3000,["gold:1"],[500,9500],3],[28,2,"拿破仑",1,2,3,1,"12","2000",765,1.5,5,3000,["gold:1"],[500,9500],1],[29,2,"拿破仑",1,2,4,3,"6","4000",800,1.5,5,3000,["gold:1"],[500,9500],3],[30,2,"拿破仑",1,2,5,0,"0","0",835,1.5,5,3000,["box:1:1"],[500,9500],0],[31,3,"凯撒",2,1,1,3,"6","4000",870,1.5,5,3000,["gold:1"],[500,9500],3],[32,3,"凯撒",2,1,2,0,"0","0",905,1.5,5,3000,["gold:1"],[500,9500],0],[33,3,"凯撒",2,1,3,1,"12","2000",940,1.5,5,3000,["gold:1"],[500,9500],1],[34,3,"凯撒",2,1,4,0,"0","0",975,1.5,5,3000,["gold:1"],[500,9500],0],[35,3,"凯撒",2,1,5,3,"6","4000",1010,1.5,5,3000,["gold:1"],[500,9500],3],[36,3,"凯撒",2,2,1,0,"0","0",1045,1.5,5,3000,["gold:1"],[500,9500],0],[37,3,"凯撒",2,2,2,2,"4","6000",1080,1.5,5,3000,["gold:1"],[500,9500],2],[38,3,"凯撒",2,2,3,3,"6","4000",1115,1.5,5,3000,["gold:1"],[500,9500],3],[39,3,"凯撒",2,2,4,2,"4","6000",1150,1.5,5,3000,["gold:1"],[500,9500],2],[40,3,"凯撒",2,2,5,0,"0","0",1185,1.5,5,3000,["gold:1"],[500,9500],0],[41,3,"凯撒",2,3,1,3,"6","4000",1220,1.5,5,3000,["box:2:1"],[500,9500],3],[42,3,"凯撒",2,3,2,2,"4","6000",1255,1.5,5,3000,["box:2:1"],[500,9500],2],[43,3,"凯撒",2,3,3,1,"12","2000",1290,1.5,5,3000,["box:2:1"],[500,9500],1],[44,3,"凯撒",2,3,4,2,"4","6000",1325,1.5,5,3000,["box:2:1"],[500,9500],2],[45,3,"凯撒",2,3,5,3,"6","4000",1360,1.5,5,3000,["box:2:1"],[500,9500],3],[46,4,"克伦威尔",1,1,1,3,"6","4000",1395,1.5,5,3000,["gold:1"],[500,9500],3],[47,4,"克伦威尔",1,1,2,1,"12","2000",1430,1.5,5,3000,["gold:1"],[500,9500],1],[48,4,"克伦威尔",1,1,3,0,"0","0",1465,1.5,5,3000,["gold:1"],[500,9500],0],[49,4,"克伦威尔",1,1,4,1,"12","2000",1500,1.5,5,3000,["gold:1"],[500,9500],1],[50,4,"克伦威尔",1,1,5,3,"6","4000",1535,1.5,5,3000,["gold:1"],[500,9500],3],[51,4,"克伦威尔",1,2,1,2,"4","6000",1570,1.5,5,3000,["gold:1"],[500,9500],2],[52,4,"克伦威尔",1,2,2,1,"12","2000",1605,1.5,5,3000,["gold:1"],[500,9500],1],[53,4,"克伦威尔",1,2,3,0,"0","0",1640,1.5,5,3000,["gold:1"],[500,9500],0],[54,4,"克伦威尔",1,2,4,1,"12","2000",1675,1.5,5,3000,["gold:1"],[500,9500],1],[55,4,"克伦威尔",1,2,5,2,"4","6000",1710,1.5,5,3000,["gold:1"],[500,9500],2],[56,4,"克伦威尔",1,3,1,3,"6","4000",1745,1.5,5,3000,["box:2:1"],[500,9500],3],[57,4,"克伦威尔",1,3,2,3,"6","4000",1780,1.5,5,3000,["box:2:1"],[500,9500],3],[58,4,"克伦威尔",1,3,3,1,"12","2000",1815,1.5,5,3000,["box:2:1"],[500,9500],1],[59,4,"克伦威尔",1,3,4,2,"4","6000",1850,1.5,5,3000,["box:2:1"],[500,9500],2],[60,4,"克伦威尔",1,3,5,2,"4","6000",1885,1.5,5,3000,["box:2:1"],[500,9500],2],[61,5,"尼克松",2,1,1,1,"12","2000",1920,1.5,5,3000,["gold:1"],[500,9500],1],[62,5,"尼克松",2,1,2,1,"12","2000",1955,1.5,5,3000,["gold:1"],[500,9500],1],[63,5,"尼克松",2,1,3,1,"12","2000",1990,1.5,5,3000,["gold:1"],[500,9500],1],[64,5,"尼克松",2,1,4,1,"12","2000",2025,1.5,5,3000,["gold:1"],[500,9500],1],[65,5,"尼克松",2,1,5,1,"12","2000",2060,1.5,5,3000,["gold:1"],[500,9500],1],[66,5,"尼克松",2,2,1,2,"4","6000",2095,1.5,5,3000,["gold:1"],[500,9500],2],[67,5,"尼克松",2,2,2,2,"4","6000",2130,1.5,5,3000,["gold:1"],[500,9500],2],[68,5,"尼克松",2,2,3,2,"4","6000",2165,1.5,5,3000,["gold:1"],[500,9500],2],[69,5,"尼克松",2,2,4,2,"4","6000",2200,1.5,5,3000,["gold:1"],[500,9500],2],[70,5,"尼克松",2,2,5,2,"4","6000",2235,1.5,5,3000,["gold:1"],[500,9500],2],[71,5,"尼克松",2,3,1,3,"6","4000",2270,1.5,5,3000,["gold:1"],[500,9500],3],[72,5,"尼克松",2,3,2,3,"6","4000",2305,1.5,5,3000,["gold:1"],[500,9500],3],[73,5,"尼克松",2,3,3,3,"6","4000",2340,1.5,5,3000,["gold:1"],[500,9500],3],[74,5,"尼克松",2,3,4,3,"6","4000",2375,1.5,5,3000,["gold:1"],[500,9500],3],[75,5,"尼克松",2,3,5,3,"6","4000",2410,1.5,5,3000,["gold:1"],[500,9500],3],[76,5,"尼克松",2,4,1,-1,"8","3000",2445,1.5,5,3000,["box:2:1"],[500,9500],4],[77,5,"尼克松",2,4,2,-1,"8","3000",2480,1.5,5,3000,["box:2:1"],[500,9500],4],[78,5,"尼克松",2,4,3,-1,"8","3000",2515,1.5,5,3000,["box:2:1"],[500,9500],4],[79,5,"尼克松",2,4,4,-1,"8","3000",2550,1.5,5,3000,["box:2:1"],[500,9500],4],[80,5,"尼克松",2,4,5,-1,"8","3000",2585,1.5,5,3000,["box:2:1"],[500,9500],4],[81,6,"李存勖",1,1,1,1,"12","2000",2620,1.5,5,3000,["gold:1"],[500,9500],1],[82,6,"李存勖",1,1,2,1,"12","2000",2655,1.5,5,3000,["gold:1"],[500,9500],1],[83,6,"李存勖",1,1,3,2,"4","6000",2690,1.5,5,3000,["gold:1"],[500,9500],2],[84,6,"李存勖",1,1,4,1,"12","2000",2725,1.5,5,3000,["gold:1"],[500,9500],1],[85,6,"李存勖",1,1,5,1,"12","2000",2760,1.5,5,3000,["gold:1"],[500,9500],1],[86,6,"李存勖",1,2,1,2,"4","6000",2795,1.5,5,3000,["gold:1"],[500,9500],2],[87,6,"李存勖",1,2,2,2,"4","6000",2830,1.5,5,3000,["gold:1"],[500,9500],2],[88,6,"李存勖",1,2,3,3,"6","4000",2865,1.5,5,3000,["gold:1"],[500,9500],3],[89,6,"李存勖",1,2,4,2,"4","6000",2900,1.5,5,3000,["gold:1"],[500,9500],2],[90,6,"李存勖",1,2,5,2,"4","6000",2935,1.5,5,3000,["gold:1"],[500,9500],2],[91,6,"李存勖",1,3,1,1,"12","2000",2970,1.5,5,3000,["gold:1"],[500,9500],1],[92,6,"李存勖",1,3,2,2,"4","6000",3005,1.5,5,3000,["gold:1"],[500,9500],2],[93,6,"李存勖",1,3,3,3,"6","4000",3040,1.5,5,3000,["gold:1"],[500,9500],3],[94,6,"李存勖",1,3,4,2,"4","6000",3075,1.5,5,3000,["gold:1"],[500,9500],2],[95,6,"李存勖",1,3,5,1,"12","2000",3110,1.5,5,3000,["gold:1"],[500,9500],1],[96,6,"李存勖",1,4,1,2,"4","6000",3145,1.5,5,3000,["box:3:1"],[500,9500],2],[97,6,"李存勖",1,4,2,1,"12","2000",3180,1.5,5,3000,["box:3:1"],[500,9500],1],[98,6,"李存勖",1,4,3,-1,"8","3000",3215,1.5,5,3000,["box:3:1"],[500,9500],4],[99,6,"李存勖",1,4,4,1,"12","2000",3250,1.5,5,3000,["box:3:1"],[500,9500],1],[100,6,"李存勖",1,4,5,2,"4","6000",3285,1.5,5,3000,["box:3:1"],[500,9500],2],[101,7,"AA_12",1,1,1,3,"6","4000",3320,1.5,5,3000,["gold:1"],[500,9500],3],[102,7,"AA_12",1,1,2,3,"6","4000",3355,1.5,5,3000,["gold:1"],[500,9500],3],[103,7,"AA_12",1,1,3,1,"12","2000",3390,1.5,5,3000,["gold:1"],[500,9500],1],[104,7,"AA_12",1,1,4,3,"6","4000",3425,1.5,5,3000,["gold:1"],[500,9500],3],[105,7,"AA_12",1,1,5,3,"6","4000",3460,1.5,5,3000,["gold:1"],[500,9500],3],[106,7,"AA_12",1,2,1,1,"12","2000",3495,1.5,5,3000,["gold:1"],[500,9500],1],[107,7,"AA_12",1,2,2,2,"4","6000",3530,1.5,5,3000,["gold:1"],[500,9500],2],[108,7,"AA_12",1,2,3,3,"6","4000",3565,1.5,5,3000,["gold:1"],[500,9500],3],[109,7,"AA_12",1,2,4,2,"4","6000",3600,1.5,5,3000,["gold:1"],[500,9500],2],[110,7,"AA_12",1,2,5,1,"12","2000",3635,1.5,5,3000,["gold:1"],[500,9500],1],[111,7,"AA_12",1,3,1,2,"4","6000",3670,1.5,5,3000,["gold:1"],[500,9500],2],[112,7,"AA_12",1,3,2,1,"12","2000",3705,1.5,5,3000,["gold:1"],[500,9500],1],[113,7,"AA_12",1,3,3,3,"6","4000",3740,1.5,5,3000,["gold:1"],[500,9500],3],[114,7,"AA_12",1,3,4,1,"12","2000",3775,1.5,5,3000,["gold:1"],[500,9500],1],[115,7,"AA_12",1,3,5,2,"4","6000",3810,1.5,5,3000,["gold:1"],[500,9500],2],[116,7,"AA_12",1,4,1,2,"4","6000",3845,1.5,5,3000,["box:3:1"],[500,9500],2],[117,7,"AA_12",1,4,2,2,"4","6000",3880,1.5,5,3000,["box:3:1"],[500,9500],2],[118,7,"AA_12",1,4,3,-1,"8","3000",3915,1.5,5,3000,["box:3:1"],[500,9500],4],[119,7,"AA_12",1,4,4,3,"6","4000",3950,1.5,5,3000,["box:3:1"],[500,9500],3],[120,7,"AA_12",1,4,5,3,"6","4000",3985,1.5,5,3000,["box:3:1"],[500,9500],3],[121,8,"米高扬",2,1,1,1,"6","4000",4020,1.5,5,3000,["gold:1"],[500,9500],1],[122,8,"米高扬",2,1,2,1,"6","4000",4055,1.5,5,3000,["gold:1"],[500,9500],1],[123,8,"米高扬",2,1,3,1,"12","2000",4090,1.5,5,3000,["gold:1"],[500,9500],1],[124,8,"米高扬",2,1,4,1,"6","4000",4125,1.5,5,3000,["gold:1"],[500,9500],1],[125,8,"米高扬",2,1,5,1,"6","4000",4160,1.5,5,3000,["gold:1"],[500,9500],1],[126,8,"米高扬",2,2,1,2,"12","2000",4195,1.5,5,3000,["gold:1"],[500,9500],2],[127,8,"米高扬",2,2,2,2,"4","6000",4230,1.5,5,3000,["gold:1"],[500,9500],2],[128,8,"米高扬",2,2,3,2,"6","4000",4265,1.5,5,3000,["gold:1"],[500,9500],2],[129,8,"米高扬",2,2,4,2,"4","6000",4300,1.5,5,3000,["gold:1"],[500,9500],2],[130,8,"米高扬",2,2,5,2,"12","2000",4335,1.5,5,3000,["gold:1"],[500,9500],2],[131,8,"米高扬",2,3,1,3,"4","6000",4370,1.5,5,3000,["gold:1"],[500,9500],3],[132,8,"米高扬",2,3,2,3,"12","2000",4405,1.5,5,3000,["gold:1"],[500,9500],3],[133,8,"米高扬",2,3,3,3,"6","4000",4440,1.5,5,3000,["gold:1"],[500,9500],3],[134,8,"米高扬",2,3,4,3,"12","2000",4475,1.5,5,3000,["gold:1"],[500,9500],3],[135,8,"米高扬",2,3,5,3,"4","6000",4510,1.5,5,3000,["gold:1"],[500,9500],3],[136,8,"米高扬",2,4,1,-1,"4","6000",4545,1.5,5,3000,["box:3:1"],[500,9500],4],[137,8,"米高扬",2,4,2,-1,"4","6000",4580,1.5,5,3000,["box:3:1"],[500,9500],4],[138,8,"米高扬",2,4,3,-1,"8","3000",4615,1.5,5,3000,["box:3:1"],[500,9500],4],[139,8,"米高扬",2,4,4,-1,"6","4000",4650,1.5,5,3000,["box:3:1"],[500,9500],4],[140,8,"米高扬",2,4,5,-1,"6","4000",4685,1.5,5,3000,["box:3:1"],[500,9500],4],[141,9,"安德罗波夫",1,1,1,2,"6","4000",4720,1.5,5,3000,["gold:1"],[500,9500],2],[142,9,"安德罗波夫",1,1,2,2,"6","4000",4755,1.5,5,3000,["gold:1"],[500,9500],2],[143,9,"安德罗波夫",1,1,3,1,"12","2000",4790,1.5,5,3000,["gold:1"],[500,9500],1],[144,9,"安德罗波夫",1,1,4,2,"6","4000",4825,1.5,5,3000,["gold:1"],[500,9500],2],[145,9,"安德罗波夫",1,1,5,2,"6","4000",4860,1.5,5,3000,["gold:1"],[500,9500],2],[146,9,"安德罗波夫",1,2,1,3,"12","2000",4895,1.5,5,3000,["gold:1"],[500,9500],3],[147,9,"安德罗波夫",1,2,2,3,"4","6000",4930,1.5,5,3000,["gold:1"],[500,9500],3],[148,9,"安德罗波夫",1,2,3,2,"6","4000",4965,1.5,5,3000,["gold:1"],[500,9500],2],[149,9,"安德罗波夫",1,2,4,3,"4","6000",5000,1.5,5,3000,["gold:1"],[500,9500],3],[150,9,"安德罗波夫",1,2,5,3,"12","2000",5035,1.5,5,3000,["gold:1"],[500,9500],3],[151,9,"安德罗波夫",1,3,1,1,"4","6000",5070,1.5,5,3000,["gold:1"],[500,9500],1],[152,9,"安德罗波夫",1,3,2,1,"12","2000",5105,1.5,5,3000,["gold:1"],[500,9500],1],[153,9,"安德罗波夫",1,3,3,1,"6","4000",5140,1.5,5,3000,["gold:1"],[500,9500],1],[154,9,"安德罗波夫",1,3,4,1,"12","2000",5175,1.5,5,3000,["gold:1"],[500,9500],1],[155,9,"安德罗波夫",1,3,5,1,"4","6000",5210,1.5,5,3000,["gold:1"],[500,9500],1],[156,9,"安德罗波夫",1,4,1,2,"4","6000",5245,1.5,5,3000,["box:3:1"],[500,9500],2],[157,9,"安德罗波夫",1,4,2,-1,"4","6000",5280,1.5,5,3000,["box:3:1"],[500,9500],4],[158,9,"安德罗波夫",1,4,3,-1,"8","3000",5315,1.5,5,3000,["box:3:1"],[500,9500],4],[159,9,"安德罗波夫",1,4,4,-1,"6","4000",5350,1.5,5,3000,["box:3:1"],[500,9500],4],[160,9,"安德罗波夫",1,4,5,2,"6","4000",5385,1.5,5,3000,["box:3:1"],[500,9500],2]]
\ No newline at end of file
diff --git a/Assets/StreamingAssets/Table/goldInfo.json b/Assets/StreamingAssets/Table/goldInfo.json
index c00545a..c8e201f 100644
--- a/Assets/StreamingAssets/Table/goldInfo.json
+++ b/Assets/StreamingAssets/Table/goldInfo.json
@@ -1 +1 @@
-[[1,5,5000]]
\ No newline at end of file
+[[1,0,5000]]
\ No newline at end of file
diff --git a/Assets/UI/Endless.meta b/Assets/UI/Endless.meta
new file mode 100644
index 0000000..870c5c8
--- /dev/null
+++ b/Assets/UI/Endless.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3eadc242b0756954cb50e21767281532
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss.meta b/Assets/UI/Endless/boss.meta
new file mode 100644
index 0000000..f2c98fc
--- /dev/null
+++ b/Assets/UI/Endless/boss.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a42c3bdcea1d504b9d7ee4b92a6144d
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4.meta b/Assets/UI/Endless/boss/a_4.meta
new file mode 100644
index 0000000..a3ea885
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c09285527c092d5498dfc3449885ed40
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0000.png b/Assets/UI/Endless/boss/a_4/a_40000_0000.png
new file mode 100644
index 0000000..9fe2eab
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0000.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0000.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0000.png.meta
new file mode 100644
index 0000000..0eddd6a
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0000.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 027731aa2f988cd48abab44b65628d9e
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0001.png b/Assets/UI/Endless/boss/a_4/a_40000_0001.png
new file mode 100644
index 0000000..140e234
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0001.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0001.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0001.png.meta
new file mode 100644
index 0000000..ca92546
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0001.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: b1c1221f9e98d114796186481b0150c2
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0002.png b/Assets/UI/Endless/boss/a_4/a_40000_0002.png
new file mode 100644
index 0000000..a18ef0b
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0002.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0002.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0002.png.meta
new file mode 100644
index 0000000..f42e802
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0002.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: ad5b59c89f1bc3b41b9705f02b67eefa
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0003.png b/Assets/UI/Endless/boss/a_4/a_40000_0003.png
new file mode 100644
index 0000000..f0174b4
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0003.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0003.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0003.png.meta
new file mode 100644
index 0000000..4427aec
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0003.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: b86aa0b361ce58e42bc3fc746dad7750
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0004.png b/Assets/UI/Endless/boss/a_4/a_40000_0004.png
new file mode 100644
index 0000000..1c04dbf
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0004.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
new file mode 100644
index 0000000..6623810
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0004.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: d8b657dbab4a60c4e98c4cae98030e4b
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0005.png b/Assets/UI/Endless/boss/a_4/a_40000_0005.png
new file mode 100644
index 0000000..49fd209
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0005.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0005.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0005.png.meta
new file mode 100644
index 0000000..f282518
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0005.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 97cf279232a99f24cb0b930520af87af
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0006.png b/Assets/UI/Endless/boss/a_4/a_40000_0006.png
new file mode 100644
index 0000000..8ad579a
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0006.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0006.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0006.png.meta
new file mode 100644
index 0000000..fc9e62f
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0006.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 6b250b585c8e8294a8b65786e817b97d
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0007.png b/Assets/UI/Endless/boss/a_4/a_40000_0007.png
new file mode 100644
index 0000000..2107fe9
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0007.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/a_4/a_40000_0007.png.meta b/Assets/UI/Endless/boss/a_4/a_40000_0007.png.meta
new file mode 100644
index 0000000..d36f180
--- /dev/null
+++ b/Assets/UI/Endless/boss/a_4/a_40000_0007.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 45b54175b869d114cb57d45e1ec80c50
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/s_4.meta b/Assets/UI/Endless/boss/s_4.meta
new file mode 100644
index 0000000..9ef21a6
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e6be7bc8c9d62634689be5b72d76872f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0008.png b/Assets/UI/Endless/boss/s_4/s_40000_0008.png
new file mode 100644
index 0000000..00860f6
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0008.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0008.png.meta b/Assets/UI/Endless/boss/s_4/s_40000_0008.png.meta
new file mode 100644
index 0000000..88358f3
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0008.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 9f43aa951d6e12d47a69576a54158624
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0009.png b/Assets/UI/Endless/boss/s_4/s_40000_0009.png
new file mode 100644
index 0000000..8de7cec
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0009.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta b/Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
new file mode 100644
index 0000000..e12f7c4
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0009.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: 8db35398193affa479065700b24b95c9
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0010.png b/Assets/UI/Endless/boss/s_4/s_40000_0010.png
new file mode 100644
index 0000000..50cd865
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0010.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0010.png.meta b/Assets/UI/Endless/boss/s_4/s_40000_0010.png.meta
new file mode 100644
index 0000000..061df7b
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0010.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: bfa3f1d04db2a7849b85c1b9ed44da4b
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0011.png b/Assets/UI/Endless/boss/s_4/s_40000_0011.png
new file mode 100644
index 0000000..8689ade
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0011.png
Binary files differ
diff --git a/Assets/UI/Endless/boss/s_4/s_40000_0011.png.meta b/Assets/UI/Endless/boss/s_4/s_40000_0011.png.meta
new file mode 100644
index 0000000..70afbe9
--- /dev/null
+++ b/Assets/UI/Endless/boss/s_4/s_40000_0011.png.meta
@@ -0,0 +1,118 @@
+fileFormatVersion: 2
+guid: b20fb97cac43bce438f3e3be77634794
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 4
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.9.1