签入

Assets/Resources/Prefabs/Enemys/Boss01.prefab

@@ -292,6 +292,7 @@ GameObject:
   - component: {fileID: 6319764948986589666}
   - component: {fileID: 6319764948986589668}
   - component: {fileID: 5910518667629181464}
+  - component: {fileID: 8399182177745500279}
   m_Layer: 11
   m_Name: Boss01
   m_TagString: Enemy
@@ -454,8 +455,8 @@ MonoBehaviour:
         byteData: 
         byteDataArray: 4265686176696f7244657369676e65722e52756e74696d652e5368617265644f626a656374656e656d79014265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374746172676574014265686176696f7244657369676e65722e52756e74696d652e536861726564496e747461726765744e756d010000000000000000456e747279010000008643000014c200000000000000000000010000004265686176696f722054726565205265666572656e6365010000e0ccbd0000fe420000000000000000000001000000000000000000000000
       Version: 1.7.2
-  gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 1
+  gizmoViewMode: 0
+  showBehaviorDesignerGizmo: 0
 --- !u!114 &6319764948986589667
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -633,5 +634,47 @@ MonoBehaviour:
         byteData: 
         byteDataArray: 
       Version: 
-  gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 1
+  gizmoViewMode: 0
+  showBehaviorDesignerGizmo: 0
+--- !u!114 &8399182177745500279
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6319764948986589673}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 180ecf9b41d478f468eb3e9083753217, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ImpulseDefinition:
+    m_ImpulseChannel: 1
+    m_RawSignal: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4, type: 2}
+    m_AmplitudeGain: 1
+    m_FrequencyGain: 1
+    m_RepeatMode: 0
+    m_Randomize: 1
+    m_TimeEnvelope:
+      m_AttackShape:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      m_DecayShape:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      m_AttackTime: 0
+      m_SustainTime: 0.2
+      m_DecayTime: 0.7
+      m_ScaleWithImpact: 1
+      m_HoldForever: 0
+    m_ImpactRadius: 100
+    m_DirectionMode: 0
+    m_DissipationMode: 2
+    m_DissipationDistance: 1000
+    m_PropagationSpeed: 343

Assets/Resources/Prefabs/Players/astro.prefab

@@ -338,9 +338,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -934118569
+  m_SortingLayer: 5
+  m_SortingOrder: 2
   m_Sprite: {fileID: 21300000, guid: ccb9df7f8a53efc44ab53432ddaa10da, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Resources/Prefabs/Players/cyborg.prefab

@@ -338,9 +338,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -934118569
+  m_SortingLayer: 5
+  m_SortingOrder: 2
   m_Sprite: {fileID: 21300000, guid: ccb9df7f8a53efc44ab53432ddaa10da, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Resources/Prefabs/Players/scientist.prefab

@@ -98,9 +98,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: -934118569
+  m_SortingLayer: 5
+  m_SortingOrder: 2
   m_Sprite: {fileID: 21300000, guid: ccb9df7f8a53efc44ab53432ddaa10da, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Resources/Prefabs/Rooms/RoomGenerator.prefab

@@ -44,7 +44,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   version: 1
-  uniqueID: 1191350308849351094
+  uniqueID: 5637788435863504959
   points:
   - {x: -100, y: 0.1, z: 100}
   - {x: 21.3891, y: -0.000016750637, z: 140.51454}

Assets/Resources/Prefabs/UI/BattlePanel.prefab

@@ -1135,8 +1135,8 @@ RectTransform:
   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.000048161, y: -0.000013351}
-  m_SizeDelta: {x: 218.9329, y: 160.5317}
+  m_AnchoredPosition: {x: 0.898, y: -0.000013351}
+  m_SizeDelta: {x: 244.0752, y: 160.5317}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2862708112138629664
 CanvasRenderer:
@@ -1179,17 +1179,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'New Text
-
-    1
-
-    1
-
-    1
-
-    1
-
-'
+  m_Text: 
 --- !u!1 &4973202837892990786
 GameObject:
   m_ObjectHideFlags: 0
@@ -1296,12 +1286,12 @@ RectTransform:
   m_Children:
   - {fileID: 4027961817602266038}
   m_Father: {fileID: 8402943828183286182}
-  m_RootOrder: 9
+  m_RootOrder: 10
   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: 782.76, y: -240.85}
-  m_SizeDelta: {x: 253.5073, y: 180.7224}
+  m_AnchoredPosition: {x: 790.84155, y: -240.85}
+  m_SizeDelta: {x: 269.6703, y: 180.7224}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9205788066123829289
 CanvasRenderer:
@@ -1324,7 +1314,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
+  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
@@ -1341,6 +1331,85 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5734694049214477198
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7855970380756456567}
+  - component: {fileID: 2613123643202936030}
+  - component: {fileID: 1587971060064779486}
+  m_Layer: 5
+  m_Name: spaceText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7855970380756456567
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734694049214477198}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7742519585530487990}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 24}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &2613123643202936030
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734694049214477198}
+  m_CullTransparentMesh: 1
+--- !u!114 &1587971060064779486
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734694049214477198}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 8297a2bf97dbbba468bd2518d003a876, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Space
 --- !u!1 &6290667043194319338
 GameObject:
   m_ObjectHideFlags: 0
@@ -1448,6 +1517,82 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6555002297292598494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7742519585530487990}
+  - component: {fileID: 13786505488776772}
+  - component: {fileID: 1040421819664199245}
+  m_Layer: 5
+  m_Name: DashIconBackground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7742519585530487990
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6555002297292598494}
+  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: 7855970380756456567}
+  m_Father: {fileID: 8402943828183286182}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -311.5, y: -354.09998}
+  m_SizeDelta: {x: 110, y: 116}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &13786505488776772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6555002297292598494}
+  m_CullTransparentMesh: 1
+--- !u!114 &1040421819664199245
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6555002297292598494}
+  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: 0.19607843}
+  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: 0}
+  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!1 &7346534222164761981
 GameObject:
   m_ObjectHideFlags: 0
@@ -1577,6 +1722,7 @@ RectTransform:
   - {fileID: 1426096238}
   - {fileID: 8709117453435532097}
   - {fileID: 248607955634153063}
+  - {fileID: 7742519585530487990}
   - {fileID: 5526911453532237629}
   - {fileID: 1970169760416999683}
   m_Father: {fileID: 0}
@@ -1584,7 +1730,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000061035156, y: 0}
+  m_AnchoredPosition: {x: -77, y: 104}
   m_SizeDelta: {x: 0.00012207031, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5715038912248928455
@@ -2075,7 +2221,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3994323799509627406, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 3994323799509627406, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
       propertyPath: m_AnchorMax.x
@@ -2131,11 +2277,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3994323799509627406, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -288
+      value: -311.5
       objectReference: {fileID: 0}
     - target: {fileID: 3994323799509627406, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -371.21
+      value: -347.3
       objectReference: {fileID: 0}
     - target: {fileID: 3994323799509627406, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2149,10 +2295,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3994323799509627407, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
-      propertyPath: m_Type
-      value: 3
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: bc2ad2f1cbb6dfc42b4ae78d7bf76a69, type: 3}
 --- !u!224 &5526911453532237629 stripped

Assets/Resources/Prefabs/UI/BossHPPanel.prefab.meta

+fileFormatVersion: 2
+guid: ab8daa973381f2b40aaf2bd719f54d03
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Prefabs/UI/ChangeStagePanel.prefab.meta

+fileFormatVersion: 2
+guid: 674d300a858aeba47b97cda75c4bb7f9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Prefabs/UI/DashIcon.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1137174144
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1137174145}
+  - component: {fileID: 1137174147}
+  - component: {fileID: 1137174146}
+  - component: {fileID: 1137174148}
+  m_Layer: 5
+  m_Name: CDTwinkling
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1137174145
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1137174144}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3994323799509627406}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 74.1677, y: 66.0676}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1137174147
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1137174144}
+  m_CullTransparentMesh: 1
+--- !u!114 &1137174146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1137174144}
+  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: 0}
+  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!114 &1137174148
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1137174144}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e7c66de9d55769342a12f53599098147, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3994323798866619701
 GameObject:
   m_ObjectHideFlags: 0
@@ -34,8 +122,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: -0.3475, y: 0.4346}
+  m_SizeDelta: {x: 104.769, y: 96.238}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3994323798866619688
 CanvasRenderer:
@@ -106,6 +194,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3994323798866619702}
+  - {fileID: 1137174145}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Resources/Prefabs/UI/SkillPanel.prefab

@@ -32,8 +32,8 @@ RectTransform:
   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.000011444}
-  m_SizeDelta: {x: 450, y: 80}
+  m_AnchoredPosition: {x: 0.00064720813, y: 0.000076770964}
+  m_SizeDelta: {x: 478.13, y: 113.75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2732576822692853781
 GameObject:
@@ -72,7 +72,7 @@ RectTransform:
   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: 450, y: 80}
+  m_SizeDelta: {x: 480, y: 116}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2836845163703388851
 CanvasRenderer:
@@ -160,8 +160,8 @@ RectTransform:
   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: 170}
-  m_SizeDelta: {x: 450, y: 80}
+  m_AnchoredPosition: {x: 0, y: 190}
+  m_SizeDelta: {x: 480, y: 116}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &307596169717137189
 CanvasRenderer:
@@ -214,14 +214,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 10
+    m_Left: 25
     m_Right: 10
-    m_Top: 10
+    m_Top: 15
     m_Bottom: 10
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartAxis: 0
-  m_CellSize: {x: 50, y: 50}
+  m_CellSize: {x: 90, y: 90}
   m_Spacing: {x: 0, y: 0}
   m_Constraint: 0
   m_ConstraintCount: 2
@@ -261,8 +261,8 @@ RectTransform:
   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: 170}
-  m_SizeDelta: {x: 450, y: 80}
+  m_AnchoredPosition: {x: 0, y: 190}
+  m_SizeDelta: {x: 480, y: 116}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5570556944312831472
 CanvasRenderer:
@@ -285,7 +285,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
+  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
@@ -424,3 +424,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Step_Panel: {fileID: 4798568053201618047}
   TwrX: {fileID: 8339495389024906659, guid: 185a0bf3f292a3245becfa37bb5bb234, type: 3}
+  isActive: 0

Assets/Resources/Prefabs/UI/StartPanel.prefab

@@ -145,7 +145,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.8235294}
+  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

Assets/Resources/Prefabs/UI/tower_step.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &94001222767289282
+--- !u!1 &928440470587998967
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,50 +8,125 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1089302390150461734}
-  - component: {fileID: 5758152953928239766}
-  - component: {fileID: 7343518334263005526}
+  - component: {fileID: 6826586314609152953}
+  - component: {fileID: 716781698107557851}
+  - component: {fileID: 1798765461194516628}
   m_Layer: 5
-  m_Name: Count
+  m_Name: HaveNo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6826586314609152953
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 928440470587998967}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2010011872622175348}
+  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: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &716781698107557851
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 928440470587998967}
+  m_CullTransparentMesh: 1
+--- !u!114 &1798765461194516628
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 928440470587998967}
+  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: 0, g: 0, b: 0, a: 0.5882353}
+  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: 0}
+  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!1 &4514516974026715294
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5547460432261825736}
+  - component: {fileID: 2189949765302030695}
+  - component: {fileID: 4962367906914460934}
+  m_Layer: 5
+  m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1089302390150461734
+--- !u!224 &5547460432261825736
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 94001222767289282}
+  m_GameObject: {fileID: 4514516974026715294}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2010011872622175348}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 45, y: -20}
-  m_SizeDelta: {x: 20, y: 30}
+  m_AnchoredPosition: {x: 0, y: -50.505}
+  m_SizeDelta: {x: 110, y: 22.9892}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5758152953928239766
+--- !u!222 &2189949765302030695
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 94001222767289282}
+  m_GameObject: {fileID: 4514516974026715294}
   m_CullTransparentMesh: 1
---- !u!114 &7343518334263005526
+--- !u!114 &4962367906914460934
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 94001222767289282}
+  m_GameObject: {fileID: 4514516974026715294}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@@ -67,19 +142,19 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 8297a2bf97dbbba468bd2518d003a876, type: 3}
-    m_FontSize: 25
+    m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 7
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: n
---- !u!1 &3408440107218473490
+  m_Text: B
+--- !u!1 &5659245375644838329
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,58 +162,57 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2123103239886906681}
-  - component: {fileID: 2615100073091122736}
-  - component: {fileID: 1717385951282190274}
-  - component: {fileID: 6204654782561656276}
+  - component: {fileID: 5633398655218776512}
+  - component: {fileID: 6421380957991133582}
+  - component: {fileID: 4096029007293042188}
   m_Layer: 5
-  m_Name: TextBackground
+  m_Name: background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2123103239886906681
+--- !u!224 &5633398655218776512
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3408440107218473490}
+  m_GameObject: {fileID: 5659245375644838329}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2010011872622175348}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 45, y: -20}
-  m_SizeDelta: {x: 20, y: 25}
+  m_AnchoredPosition: {x: 0, y: -4}
+  m_SizeDelta: {x: 110, y: 116}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2615100073091122736
+--- !u!222 &6421380957991133582
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3408440107218473490}
+  m_GameObject: {fileID: 5659245375644838329}
   m_CullTransparentMesh: 1
---- !u!114 &1717385951282190274
+--- !u!114 &4096029007293042188
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3408440107218473490}
+  m_GameObject: {fileID: 5659245375644838329}
   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: 0.5882353}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -155,50 +229,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &6204654782561656276
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3408440107218473490}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 1717385951282190274}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &8339495389024906659
 GameObject:
   m_ObjectHideFlags: 0
@@ -210,6 +240,8 @@ GameObject:
   - component: {fileID: 2010011872622175348}
   - component: {fileID: 2366155876667133175}
   - component: {fileID: 8623693995805050079}
+  - component: {fileID: 187041576336948680}
+  - component: {fileID: 3799687074507417449}
   m_Layer: 5
   m_Name: tower_step
   m_TagString: Untagged
@@ -228,15 +260,16 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 2123103239886906681}
-  - {fileID: 1089302390150461734}
+  - {fileID: 6826586314609152953}
+  - {fileID: 5633398655218776512}
+  - {fileID: 5547460432261825736}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -176.9, y: 0}
-  m_SizeDelta: {x: 50, y: 50}
+  m_SizeDelta: {x: 90, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2366155876667133175
 CanvasRenderer:
@@ -276,3 +309,60 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &187041576336948680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8339495389024906659}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8623693995805050079}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3799687074507417449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8339495389024906659}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 363fbbd612d9e964a90a57e59fd3a269, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  test: 0

Assets/Resources/Prefabs/Vehicles/Vehicle_Normal.prefab

@@ -379,10 +379,10 @@ MonoBehaviour:
   rotationSpeed: 360
   slowdownDistance: 0.6
   pickNextWaypointDist: 2
-  endReachedDistance: 0.2
+  endReachedDistance: 0.1
   alwaysDrawGizmos: 0
   slowWhenNotFacingTarget: 1
-  whenCloseToDestination: 0
+  whenCloseToDestination: 1
   constrainInsideGraph: 0
 --- !u!114 &3832613827231906347
 MonoBehaviour:

Assets/Resources/SOData/CameraShake_SO.asset

@@ -17,3 +17,4 @@ MonoBehaviour:
   playerHPLowStrength: 5
   aveShieldBreakStrength: 4
   aveHPLowStrength: 4
+  bossSwitchStepStrength: 6

Assets/Resources/SOData/Enemy_02_SO.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cf20f38de597f7f40b762bc818992dac, type: 3}
   m_Name: Enemy_02_SO
   m_EditorClassIdentifier: 
-  maxHP: 10
-  speed: 1
+  maxHP: 80
+  speed: 2
   maxMP: 0

Assets/Resources/SOData/Enemy_Slime_SO.asset

@@ -13,5 +13,5 @@ MonoBehaviour:
   m_Name: Enemy_Slime_SO
   m_EditorClassIdentifier: 
   maxHP: 100
-  speed: 5
+  speed: 3
   maxMP: 0

Assets/Resources/SOData/Turret_BU_Normal_SO.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cf20f38de597f7f40b762bc818992dac, type: 3}
   m_Name: Turret_BU_Normal_SO
   m_EditorClassIdentifier: 
-  maxHP: 100
+  maxHP: 80
   speed: 0
   maxMP: 0

Assets/Resources/SOData/Vehicle_Normal_SO.asset

@@ -12,11 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5da9ad0a729b2e54e86ee18fc6a9432d, type: 3}
   m_Name: Vehicle_Normal_SO
   m_EditorClassIdentifier: 
-  maxHP: 800
+  maxHP: 500
   speed: 1
   maxMP: 0
-  playerDetectRange: 4
-  maxBarricade: 300
+  playerDetectRange: 0
+  maxBarricade: 500
   barricadeRecoveryRate: 5
   maxTurretNum: 5
   recoveryTime: 3

Assets/Scenes/RoomGenTestScene.unity

@@ -312,7 +312,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &754235980
 MonoBehaviour:
@@ -501,7 +501,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3832613826561346247, guid: 6ee4c2ad534bb1a459166fc2cff1e37b, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 3832613826561346247, guid: 6ee4c2ad534bb1a459166fc2cff1e37b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -860,34 +860,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: currentLevel
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: enemyListL1.Array.size
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: enemyListL2.Array.size
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: enemyListL1.Array.data[0]
-      value: 
-      objectReference: {fileID: 72202464873785082, guid: 18f5572d141acad478bb4be47fbc8f27, type: 3}
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: enemyListL1.Array.data[1]
-      value: 
-      objectReference: {fileID: 8446258296090259608, guid: 11d5af1d0dbb70045840b5ed2d2bb06f, type: 3}
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: enemyListL2.Array.data[0]
-      value: 
-      objectReference: {fileID: 72202464873785082, guid: 18f5572d141acad478bb4be47fbc8f27, type: 3}
-    - target: {fileID: 1733989283936459714, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
-      propertyPath: enemyListL2.Array.data[1]
-      value: 
-      objectReference: {fileID: 8446258296090259608, guid: 11d5af1d0dbb70045840b5ed2d2bb06f, type: 3}
     - target: {fileID: 3223762812490867136, guid: f22b007571a0c104293280fc4d364f1d, type: 3}
       propertyPath: m_RootOrder
       value: 3

Assets/Scenes/SampleScene.unity

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 1
+    m_PVRDenoiserTypeDirect: 1
+    m_PVRDenoiserTypeIndirect: 1
+    m_PVRDenoiserTypeAO: 1
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &1848325728
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1848325731}
+  - component: {fileID: 1848325730}
+  - component: {fileID: 1848325729}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1848325729
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1848325728}
+  m_Enabled: 1
+--- !u!20 &1848325730
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1848325728}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1848325731
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1848325728}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2112115251
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2112115253}
+  - component: {fileID: 2112115252}
+  m_Layer: 0
+  m_Name: testgo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2112115252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2112115251}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b8b122d92176ca34f8088152e9722eb5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &2112115253
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2112115251}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 154, y: -82, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scenes/SampleScene.unity.meta

+fileFormatVersion: 2
+guid: fd40456082177a648a8e73837bee3315
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/SampleScene_k.unity

@@ -301,29 +301,45 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1750523148}
     m_Modifications:
+    - target: {fileID: 2661469240565809975, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
+      propertyPath: m_Value
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3703635699288633025, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3703635699288633025, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3703635699288633025, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -0.48791504
+      objectReference: {fileID: 0}
+    - target: {fileID: 5498746623913090029, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
+      propertyPath: m_Value
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5954056124943457219, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5954056124943457219, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -0.7053833
       objectReference: {fileID: 0}
     - target: {fileID: 7567430611629406064, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
       propertyPath: m_Name
@@ -735,10 +751,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: punky
       objectReference: {fileID: 0}
-    - target: {fileID: 6846872781715836391, guid: 9845de5ae41f49b489a6eacf5296e564, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6846872781715836412, guid: 9845de5ae41f49b489a6eacf5296e564, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -880,10 +892,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: Canvas
       objectReference: {fileID: 0}
-    - target: {fileID: 4035117218401293311, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
 --- !u!224 &1750523148 stripped

Assets/Sci-Fi UI/_SciFi_GUISkin_/Bonus_Assets/bars/bar_purple.png.meta

 fileFormatVersion: 2
 guid: 1ceb59d66cd59eb40a2da04ee9509bd1
 TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 2
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 1024
   textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
-  buildTargetSettings: []
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    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: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    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: 

Assets/Sci-Fi UI/_SciFi_GUISkin_/Bonus_Assets/bars/bar_red1.png.meta

 fileFormatVersion: 2
 guid: 2678aad9451e8e44a9c17d6e98886f05
 TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 2
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: .25
+    heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 1024
   textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: .5, y: .5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  alphaIsTransparency: 0
-  textureType: -1
-  buildTargetSettings: []
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    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: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    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: 

Assets/Scripts/Data/EffectData/CameraShakeData_SO.cs

@@ -14,4 +14,6 @@ public class CameraShakeData_SO : ScriptableObject {
     public float aveShieldBreakStrength;
     [Label("潼야됴沂좆떰땡제똑")]
     public float aveHPLowStrength;
+    [Label("BOSS瘻쌓뙈떰땡제똑")]
+    public float bossSwitchStepStrength;
 }

Assets/Scripts/Data/WeaponData/WeaponData_SO.cs

@@ -4,20 +4,20 @@ using UnityEngine;
 [CreateAssetMenu(menuName = "Data/Create WeaponData ")]
 public class WeaponData_SO : ScriptableObject
 {
-    [Label("名称")]
+    [Label("名称")]
     public string itemName;
-    [Label("子弹预制体")]
+    [Label("子弹预制体")]
     public GameObject bullet;
-    [Label("攻击间隔")]
+    [Label("攻击间隔")]
     public float attackCD;
-    [Label("弹速")]
+    [Label("弹速")]
     public float speed;
-    [Label("伤害")]
+    [Label("伤害")]
     public int damage;
-    [Label("射程")]
+    [Label("射程")]
     public float bulletRange;
-    [Label("初次升级魔石")]
+    [Label("初次升级魔石")]
     public int MSRequirement;
-    [Label("射击音效文件名称")]
+    [Label("射击音效文件名称")]
     public string shootSoundName;
 }

Assets/Scripts/Enemys/Boss.cs

+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-public enum BossStep { Step1=1, Step2, Step3 }
+public enum BossStep { Step1=1, Step2=2, Step3=3 }
 
 public class Boss : Enemy
 {
@@ -12,11 +13,17 @@ public class Boss : Enemy
     public BossStep currentStep;
     public BossGun weapon;
     public bool inShoot;
+
+    public event Action<int, int> OnHPChanged;
     public override void Init()
     {
         base.Init();
         currentStep = BossStep.Step1;
         weapon.Init();
+
+        UIManager.Instance.ShowPanel<BossHPPanelCtrl>("BossHPPanel");
+        OnHPChanged += UIManager.Instance.GetPanel<BossHPPanelCtrl>("BossHPPanel").HPChanged;
+        HPChangedInvoke();
     }
 
     public override void Attack()
@@ -29,8 +36,10 @@ public class Boss : Enemy
 
     public override void Dead()
     {
+        UIManager.Instance.HidePanel("BossHPPanel");
+
         Debug.Log("怪物死亡");
-        int num = Random.Range(dropNum.minValue, dropNum.maxValue);
+        int num = UnityEngine.Random.Range(dropNum.minValue, dropNum.maxValue);
 
         //boss不用计入小怪生成上限数量
         //if (!isSleeping)
@@ -65,8 +74,13 @@ public class Boss : Enemy
         touchTimer = touchTime;
         MusicMgr.Instance.PlaySound("enemy_hit", false);
         currentHP -= damage;
-        if (currentHP / maxHP <= (1 - (int)currentStep / 3)) 
+        if (OnHPChanged != null)
         {
+            OnHPChanged.Invoke(currentHP, maxHP);
+        }
+        if (currentHP * 1.0f / maxHP <= (1.0f - (int)currentStep / 3.0f)) 
+        {
+            Debug.Log("转阶段");
             SwitchStep();
         }
         if (currentHP <= 0)
@@ -76,7 +90,21 @@ public class Boss : Enemy
     }
     public void SwitchStep()
     {
-        if ((int)currentStep < 3)
-        currentStep += 1;
+        if ((int)currentStep < 3) {
+            currentStep += 1;
+            CameraController.Instance.CameraShake(transform.gameObject,ShakeEvent.BossSwitchStep);
+            UIManager.Instance.ShowPanel<ChangeStagePanel>("ChangeStagePanel");
+        }
+    }
+
+    /// <summary>
+    /// 血量变化委托启动接口
+    /// </summary>
+    public void HPChangedInvoke()
+    {
+        if (OnHPChanged != null)
+        {
+            OnHPChanged.Invoke(currentHP, maxHP);
+        }
     }
 }

Assets/Scripts/GameManagers/BuildingManager.cs

@@ -59,6 +59,8 @@ public class BuildingManager : SingletonAutoMono<BuildingManager>
         circleTip.SetActive(false);
         inBuild = false;
         mouseVisualTransfrom.gameObject.SetActive(false);
+        //禁用技能面板
+        UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").isActive = false;
     }
     void PutTurret()
     {

Assets/Scripts/GameManagers/CameraController.cs

@@ -8,7 +8,8 @@ public enum ShakeEvent {
     PlayerHit,
     PlayerHPTooLow,
     AVEShieldBreak,
-    AVEHPTooLow
+    AVEHPTooLow,
+    BossSwitchStep
 }
 
 public class CameraController : SingletonAutoMono<CameraController> {
@@ -49,6 +50,9 @@ public class CameraController : SingletonAutoMono<CameraController> {
                 case ShakeEvent.AVEHPTooLow:
                     impulseSource.GenerateImpulse(shakeData.aveHPLowStrength);
                     break;
+                case ShakeEvent.BossSwitchStep:
+                    impulseSource.GenerateImpulse(shakeData.bossSwitchStepStrength);
+                    break;
                 default:
                     break;
             }

Assets/Scripts/GameManagers/GameManager.cs

+using Cinemachine;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -85,6 +86,7 @@ public class GameManager : SingletonAutoMono<GameManager>
             GameResume();
             GameManager.Instance.player.transform.position = Vector3.zero;
             GameManager.Instance.vehicle.transform.position = Vector3.zero;
+            Camera.main.GetComponent<CinemachineBrain>().ActiveVirtualCamera.Follow = Instance.player.transform;
             LevelManage.Instance.IncreaseLevel();
             RoomGenerator.Instance.LoadMap();
         });

Assets/Scripts/Map/Room.cs

@@ -21,18 +21,6 @@ public class Room : MonoBehaviour
 
     protected bool isUpdated = false;
 
-    //public bool isActivate;
-    // Start is called before the first frame update
-    void Start()
-    {
-
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-    }
-
     public void ShowDoor()
     {
         doorLeft.SetActive(roomLeft);

Assets/Scripts/Map/RoomGenerator.cs

@@ -131,6 +131,8 @@ public class RoomGenerator : SingletonMono<RoomGenerator>
         g.SetDimensions(maxx - minx, maxy - miny, 1);
         g.center = new Vector2((maxx + minx) / 2, (maxy + miny) / 2);
         Debug.Log($"maxx is {maxx} minx is {minx} maxy is {maxy} miny is {miny} ");
+        Vector3[] points = { new Vector3(minx, 10, maxy), new Vector3(maxx, -15, maxy), new Vector3(minx, 10, miny), new Vector3(maxx, -15, miny) };
+        up.points = points;
         AstarPath.active.Scan();
     }
     public void DestroyMap()

Assets/Scripts/Player/Player.cs

@@ -40,7 +40,9 @@ public class Player : BattleUnit
 
 
     private void FixedUpdate() {
-        FindInteractableObject();
+        if (!BuildingManager.Instance.inBuild){
+            FindInteractableObject();
+        }
     }
     
     private void Update() {

Assets/Scripts/Player/PlayerController.cs

@@ -48,10 +48,10 @@ public class PlayerController : MonoBehaviour {
         isDashing = false;
     }
 
-     //TODO:测试用
-     // private void Awake() {
-     //     Init();
-     // }
+     // TODO:测试用
+      // private void Awake() {
+      //     Init();
+      // }
 
     // Update is called once per frame
     void Update() {
@@ -84,6 +84,7 @@ public class PlayerController : MonoBehaviour {
         }
         GetESCInput();
         GameCheat();
+        TeleportToVehicle();
     }
     /// <summary>
     /// 与可交互物体物体交互
@@ -103,7 +104,8 @@ public class PlayerController : MonoBehaviour {
     {
         if (Input.GetKeyDown(KeyCode.B)&& UIManager.Instance.panelStack.Count == 0)
         {
-            UIManager.Instance.ShowPanel<BuildPanelCtrl>("BuildPanel", E_UI_Layer.System, null);
+            UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").isActive = true;
+            //UIManager.Instance.ShowPanel<BuildPanelCtrl>("BuildPanel", E_UI_Layer.System, null);
         }
     }
 
@@ -242,17 +244,24 @@ public class PlayerController : MonoBehaviour {
     {
         if (Input.GetKey(KeyCode.F1))
         {
-            player.currentWeapon.damage = 99999;
+            player.currentWeapon.damage = 1000;
             player.maxHP = 999999;
             player.maxSpeed = 10;
             speed = 10;
             player.currentHP = 999999;
             player.currentWeapon.attackSpeed = 20;
-            GameManager.Instance.magicCore = 9999;
-            GameManager.Instance.magicStone = 9999;
+            GameManager.Instance.magicStone = 999999;
             GameManager.Instance.vehicle.maxHP = 99999;
             GameManager.Instance.vehicle.currentHP = 99999;
-            GameManager.Instance.vehicle.speed = 10;
+        }
+    }
+
+    /// <summary>
+    /// 把玩家传送到车的位置
+    /// </summary>
+    private void TeleportToVehicle() {
+        if (Input.GetKeyDown(KeyCode.F2)) {
+            GameManager.Instance.player.transform.position = GameManager.Instance.vehicle.transform.position;
         }
     }
 }

Assets/Scripts/UI/BattlePanel.cs

@@ -19,7 +19,6 @@ public class BattlePanel : BasePanel
 
     private Animator animator;
 
-
     private void OnEnable()
     {
         Debug.Log("BattlePanel is showing");
@@ -39,15 +38,15 @@ public class BattlePanel : BasePanel
         GameManager.Instance.player.MagicStoneChangedInvoke();
         GameManager.Instance.vehicle.OnBarricadeChanged();
         GameManager.Instance.vehicle.OnHPChanged();
-
-        //Debug.Log("展示状态栏11111111111111111111111111111");
-        //Debug.Log("展示状态栏333333333333333333333333333333");
     }
 
-
+    /// <summary>
+    /// 显示自己
+    /// </summary>
     public override void ShowMe()
     {
         gameObject.SetActive(true);
+        UIManager.Instance.ShowPanel<SkillPanelCtrl>("SkillPanel", E_UI_Layer.System, null, false);
     }
 
     /// <summary>
@@ -56,6 +55,7 @@ public class BattlePanel : BasePanel
     public override void HideMe()
     {
         gameObject.SetActive(false);
+        UIManager.Instance.HidePanel("SkillPanel", false);
     }
 
     /// <summary>
@@ -121,31 +121,53 @@ public class BattlePanel : BasePanel
     {
         Image image = GetControl<Image>("StateBar");
         Text statetext = GetControl<Text>("StateText");
+        Color background = new Color32(255, 255, 255, 100);
         if (data == null)
         {
-            Debug.Log("state null");
+            //Debug.Log("state null");
             image.color = Color.clear;
             statetext.text = null;
         }
         else
         {
+            image.color = background;
             UpgradeData d = data.Value;
             Debug.Log("state" + d.type);
             switch (d.type)
             {
+                //空格是为了换行
                 case UpgradeType.Weapon:
-                    statetext.text = "";
+                    statetext.text = "等级：" + d.level + "   " + "攻击力：" + d.damage + "   " + "攻击范围：" + d.attackRange + "   " + "攻击速度：" + d.attackSpeed + "   " + "升级魔石消耗：" + d.cost;
                     break;
                 case UpgradeType.Turret:
-                    statetext.text = "";
+                    statetext.text = "等级：" + d.level + "   " + "攻击力：" + d.damage + "   " + "攻击范围：" + d.attackRange + "   " + "攻击速度：" + d.attackSpeed + "   " + "升级魔石消耗：" + d.cost; 
                     break;
                 case UpgradeType.Treasure:
-                    statetext.text = "";
+                    statetext.text = "打开这个宝箱" + "   " + "需要消耗魔石:" + d.cost;
+                    //  statetext.text = "                    "+"打开这个宝箱" + "   " +"需要消耗魔石:" + d.cost;
                     break;
                 default:
                     break;
             }
         }
+    }
 
+    public void StateBarChanged(GameObject data)
+    {
+        Image image = GetControl<Image>("StateBar");
+        Text statetext = GetControl<Text>("StateText");
+        Color background = new Color32(255, 255, 255, 100);
+        if (data == null)
+        {
+            Debug.Log("state null");
+            image.color = Color.clear;
+            statetext.text = null;
+        }
+        else
+        {
+            image.color = background;
+            Debug.Log("state:building turret.");
+            statetext.text = "等级：1" + "   " + "攻击力：" + data.GetComponent<Turret>().turretData.damage.ToString() + "   " + "攻击范围：" + data.GetComponent<Turret>().turretData.weaponData.bulletRange.ToString() + "   " + "攻击速度：" + (1 / data.GetComponent<Turret>().turretData.weaponData.attackCD).ToString() + "   " + "升级魔石消耗：" + data.GetComponent<Turret>().turretData.weaponData.MSRequirement.ToString();
+        }
     }
 }

Assets/Scripts/UI/BossHPPanelCtrl.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class BossHPPanelCtrl : BasePanel
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    /// <summary>
+    /// ʾԼ
+    /// </summary>
+    public override void ShowMe()
+    {
+        gameObject.SetActive(true);
+    }
+
+    /// <summary>
+    /// Լ
+    /// </summary>
+    public override void HideMe()
+    {
+        gameObject.SetActive(false);
+    }
+
+    public void HPChanged(int currentHP,int maxHP)
+    {
+        Slider slider = GetControl<Slider>("BossHP");
+        float nowHP = (float)currentHP / maxHP;
+        slider.value = nowHP;
+        //Debug.Log("!!!BossHP:" + slider.value);
+    }
+}

Assets/Scripts/UI/BossHPPanelCtrl.cs.meta

+fileFormatVersion: 2
+guid: 2853757cc9a4c0b41aac4b29a126e32e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/CDTwinkling.cs

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class CDTwinkling : MonoBehaviour {
+    private float lastAlpha;
+    private Image thisImg;
+    private PlayerController playerController;
+    private void OnEnable() {
+        thisImg = this.gameObject.GetComponent<Image>();
+        thisImg.color = Color.white;
+        lastAlpha = thisImg.color.a;
+        playerController = GameManager.Instance.player.GetComponent<PlayerController>();
+    }
+
+    private void Update() {
+        float thisAlpha = lastAlpha - (1.0f / playerController.dashCoolDown * Time.deltaTime);
+        Color color = new Color(1, 1, 1, thisAlpha);
+        thisImg.color = color;
+        lastAlpha = thisAlpha;
+    }
+}

Assets/Scripts/UI/CDTwinkling.cs.meta

+fileFormatVersion: 2
+guid: e7c66de9d55769342a12f53599098147
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/ChangeStagePanel.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ChangeStagePanel : BasePanel
+{
+    private float activeTime;
+    /// <summary>
+    /// 显示自己
+    /// </summary>
+    public override void ShowMe()
+    {
+        gameObject.SetActive(true);
+    }
+
+    /// <summary>
+    /// 隐藏自己
+    /// </summary>
+    public override void HideMe()
+    {
+        gameObject.SetActive(false);
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        activeTime -= Time.deltaTime;
+        if (activeTime <= 0.0f)
+        {
+            HideMe();
+        }
+
+    }
+
+    private void OnEnable()
+    {
+        activeTime = 1.0f;
+    }
+
+}

Assets/Scripts/UI/ChangeStagePanel.cs.meta

+fileFormatVersion: 2
+guid: 7c72bcb505482a0499c22e9c63e0ef42
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/DashIcon.cs

@@ -10,22 +10,34 @@ public class DashIcon : MonoBehaviour {
     private Image cdImg;
     private PlayerController playerController;
     private float totalCdTime;
-
+    private Image cdTwinkling;
+    
     private void OnEnable() {
         Init();
     }
 
+    // private void Start() {
+    //     Init();
+    // }
+
     private void Update() {
         if (playerController.isDashing) {
             cdImg.fillAmount = 1.0f;
+            cdTwinkling.gameObject.SetActive(false);
             return;
         }
         cdImg.fillAmount -= 1.0f / totalCdTime * Time.deltaTime;
+        if (cdImg.fillAmount <= 0) {
+            cdTwinkling.gameObject.SetActive(true);
+        }
     }
     
     public void Init() {
         cdImg = this.transform.GetChild(0).gameObject.GetComponent<Image>();
+        cdTwinkling = this.transform.GetChild(1).gameObject.GetComponent<Image>();
+        cdTwinkling.gameObject.SetActive(false);
         cdImg.fillAmount = 0;
+        cdTwinkling.color = new Color(0, 0, 0, 0);
         playerController = GameManager.Instance.player.GetComponent<PlayerController>();
         totalCdTime = playerController.dashCoolDown;
     }

Assets/Scripts/UI/ESCpanelCtrl.cs

@@ -37,7 +37,7 @@ public class ESCpanelCtrl : BasePanel
         }
         else
         {
-            GameManager.Instance.GameResume();
+            // GameManager.Instance.GameResume();
             gameObject.SetActive(false);
         }
     }

Assets/Scripts/UI/SkillPanelCtrl.cs

@@ -16,6 +16,10 @@ public class SkillPanelCtrl : BasePanel
     private Text CountX;
     private List<GameObject> turretList;
 
+    private GameObject turretIsClicked;
+
+    public bool isActive;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -23,9 +27,16 @@ public class SkillPanelCtrl : BasePanel
     }
 
     // Update is called once per frame
-    void Update()
+    private void Update()
     {
-        
+        if (BuildingManager.Instance.inBuild && turretIsClicked != null)
+        {
+            UIManager.Instance.GetPanel<BattlePanel>("BattlePanel").StateBarChanged(turretIsClicked);
+        }
+        if (!BuildingManager.Instance.inBuild)
+        {
+            turretIsClicked = null;
+        }
     }
 
     /// <summary>
@@ -51,6 +62,8 @@ public class SkillPanelCtrl : BasePanel
     /// </summary>
     public void Init()
     {
+        isActive = false;
+
         DeleteOldImage();
         BuildingManager.Instance.Init();
         turretList = BuildingManager.Instance.turretList;
@@ -65,18 +78,42 @@ public class SkillPanelCtrl : BasePanel
             //初始化点击事件
             BtnX = TwrX.GetComponentInChildren<Button>();
             BtnX.onClick.AddListener(() => {
-                if (BuildingManager.Instance.inBuild && System.Convert.ToInt32(CountX.text)>0)
+                if (isActive)// && System.Convert.ToInt32(CountX.text)>0
                 {
+                    turretIsClicked = turretList[index];
+                    //Debug.Log("TurretX is clicked!");
                     BuildingManager.Instance.build(index);
-                    //UIManager.Instance.HidePanel("BuildPanel");
+                    CountX.text = (System.Convert.ToInt32(CountX.text) - 1).ToString();
+                    //switch (System.Convert.ToInt32(CountX.text))
+                    //{
+                    //    case 0:
+                    //        TwrX.transform.GetChild(0).gameObject.SetActive(true);
+                    //        TwrX.transform.GetChild(1).gameObject.SetActive(false);
+                    //        CountX.gameObject.SetActive(false);
+                    //        break;
+                    //    case 1:
+                    //        TwrX.transform.GetChild(0).gameObject.SetActive(false);
+                    //        TwrX.transform.GetChild(1).gameObject.SetActive(false);
+                    //        CountX.gameObject.SetActive(false);
+                    //        break;
+                    //    default:
+                    //        TwrX.transform.GetChild(0).gameObject.SetActive(true);
+                    //        TwrX.transform.GetChild(1).gameObject.SetActive(true);
+                    //        CountX.gameObject.SetActive(true);
+                    //        break;
+                    //}
                 }
+
+                
             });
+
             //初始化图标
-            ImgX = TwrX.GetComponentInChildren<Image>();
+            ImgX = TwrX.GetComponentsInChildren<Image>()[0];
             ImgX.sprite = turretList[index].GetComponent<SpriteRenderer>().sprite;
+
             //初始化可建造数量n
-            CountX = TwrX.GetComponentInChildren<Text>();
-            CountX.text = "1";
+            //CountX = TwrX.GetComponentInChildren<Text>();
+            //CountX.text = "2";
         }
 
         TwrX.transform.SetParent(Step_Panel.transform);
@@ -89,4 +126,40 @@ public class SkillPanelCtrl : BasePanel
             Destroy(Step_Panel.transform.GetChild(i).gameObject);
         }
     }
+
+
+    public void refresh()
+    {
+        for (int i = 0; i < Step_Panel.transform.childCount; i++)
+        {
+            int index = i;
+
+            TwrX = Step_Panel.transform.GetChild(i).gameObject;
+
+            //刷新图标
+            ImgX = TwrX.GetComponentsInChildren<Image>()[0];
+            ImgX.sprite = turretList[index].GetComponent<SpriteRenderer>().sprite;
+
+            //刷新可建造数量n
+            //TODO:根据turretList里面的数据更新CountX
+            //switch (System.Convert.ToInt32(CountX.text))
+            //{
+            //    case 0:
+            //        TwrX.transform.GetChild(0).gameObject.SetActive(true);
+            //        TwrX.transform.GetChild(1).gameObject.SetActive(false);
+            //        CountX.gameObject.SetActive(false);
+            //        break;
+            //    case 1:
+            //        TwrX.transform.GetChild(0).gameObject.SetActive(false);
+            //        TwrX.transform.GetChild(1).gameObject.SetActive(false);
+            //        CountX.gameObject.SetActive(false);
+            //        break;
+            //    default:
+            //        TwrX.transform.GetChild(0).gameObject.SetActive(true);
+            //        TwrX.transform.GetChild(1).gameObject.SetActive(true);
+            //        CountX.gameObject.SetActive(true);
+            //        break;
+            //}
+        }
+    }
 }

Assets/Scripts/UI/StartPanel.cs

@@ -5,8 +5,6 @@ using UnityEngine.UI;
 
 public class StartPanel : BasePanel
 {
-    private Button btn;
-
     /// <summary>
     /// 显示自己
     /// </summary>

Assets/Scripts/UI/StepXCtrl.cs

@@ -7,7 +7,6 @@ using UnityEngine.EventSystems;
 public class StepXCtrl : MonoBehaviour
 {
     public Button btn;
-    public GameObject gameObject;
     public Sprite imageActive;
     public Sprite imageDefault;
     public Sprite imagePush;
@@ -21,13 +20,6 @@ public class StepXCtrl : MonoBehaviour
         UIManager.AddCustomEventListener(btn, EventTriggerType.PointerExit, MouseNoEnter);
         UIManager.AddCustomEventListener(btn, EventTriggerType.PointerUp, MouseNoEnter);
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-
     private void MouseEnter(BaseEventData data)
     {
         btn.image.sprite = imageActive;

Assets/Scripts/UI/TestGOCtrl.cs

@@ -36,21 +36,11 @@ public class TestGOCtrl : MonoBehaviour
             }
         }
 
-        if (Input.GetKeyDown(KeyCode.T))
+        if (Input.GetKeyDown(KeyCode.C))
         {
-            if (UIManager.Instance.panelStack.Count > 0)
-            {
-                UIManager.Instance.HidePanel(UIManager.Instance.panelStack.Peek().name);
-            }
-            else
-            {
-                UIManager.Instance.ShowPanel<TowerUpPanelCtrl>("TowerUpgradePanel", E_UI_Layer.System, null);
-
-            }
+            UIManager.Instance.ShowPanel<ChangeStagePanel>("ChangeStagePanel", E_UI_Layer.Mid, null);
         }
 
-
-
     }
 
    

Assets/Scripts/UI/TowerStepCtrl.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class TowerStepCtrl : BasePanel
 {
-    
+
+    private Image haveNo;
+    private Image textBkg;
+    private Text count;
+
+    public int test;
 
     // Start is called before the first frame update
     void Start()
     {
-        
+        haveNo = GetControl<Image>("HaveNo");
+        textBkg = GetControl<Image>("TextBackground");
+        count = GetControl<Text>("Count");
     }
 
     // Update is called once per frame
     void Update()
     {
-        
     }
 
     /// <summary>
@@ -34,8 +41,4 @@ public class TowerStepCtrl : BasePanel
         gameObject.SetActive(false);
     }
 
-    public void Init()
-    {
-
-    }
 }

Assets/Scripts/Utility/MathValue.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 public class MathValue : BaseManager<MathValue>
 {
-    public static double upgradeLimit = 1;
+    public static double upgradeLimit = 4;
     public static double upgradeBase = 2.1479;
     public static double dropBase = 2;
     public static double treasureBase = 3;

Assets/Scripts/Vehicles/Vehicle.cs

@@ -53,8 +53,6 @@ public abstract class Vehicle : BattleUnit
     [HideInInspector]
     public event Action<int, int> HPChangedEvent;
     [HideInInspector]
-    public event Action BarricadeRecoveredEvent;
-    [HideInInspector]
     protected Collider2D[] result;
     protected Material shield;
     protected GameObject shieldObj;

Assets/Scripts/Weapons/Weapon.cs

@@ -43,7 +43,6 @@ public abstract class Weapon : MonoBehaviour,Interactable
     public virtual void Init()
     {
         data = new UpgradeData();
-        data.type = UpgradeType.Weapon;
         level = 1;
         animator = GetComponent<Animator>();
         damage = weaponData.damage;
@@ -125,9 +124,27 @@ public abstract class Weapon : MonoBehaviour,Interactable
         return data;
     }
 
-    public UpgradeData? GetStates()
-    {
+    public UpgradeData? GetStates() {
+        data.type = UpgradeType.Weapon;
         data.name = weaponData.itemName;
-        return GetCurrentData();
+        
+        UpgradeData upgradeData = GetCurrentData();
+        if (upgradeData.damage == 0) {
+            upgradeData.damage = weaponData.damage;
+        }
+        if (upgradeData.level == 0) {
+            upgradeData.level = 1;
+        }
+        if (upgradeData.attackRange == 0) {
+            upgradeData.attackRange = weaponData.bulletRange;
+        }
+        if (upgradeData.attackSpeed == 0) {
+            upgradeData.attackSpeed = 1 / weaponData.attackCD;
+        }
+        if (upgradeData.cost == 0) {
+            upgradeData.cost = weaponData.MSRequirement;
+        }
+        
+        return upgradeData;
     }
 }

Assets/Texture2D/ChangeStage.meta

+fileFormatVersion: 2
+guid: 3b40d1577f4392f4f897ebf7f7488f07
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture2D/ChangeStage/DangerWarning1.png.meta

+fileFormatVersion: 2
+guid: b251cda04f9769b4eb6f3d6445750b93
+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: 0
+    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
+  flipbookRows: 1
+  flipbookColumns: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture2D/ChangeStage/warning.png.meta

+fileFormatVersion: 2
+guid: 7b0c19a4d93543044bf3ff0d851f8631
+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: 0
+    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
+  flipbookRows: 1
+  flipbookColumns: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture2D/ChangeStage/warning1.png.meta

+fileFormatVersion: 2
+guid: e389a0e6842acad4389c6a12d3960b61
+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: 0
+    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
+  flipbookRows: 1
+  flipbookColumns: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture2D/ChangeStage/warning2.png.meta

+fileFormatVersion: 2
+guid: 02ccd4284afab9a4da010f53b0e085a0
+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: 0
+    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
+  flipbookRows: 1
+  flipbookColumns: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture2D/ChangeStage/warningRight.png.meta

+fileFormatVersion: 2
+guid: 70263448684412746ab830abed160238
+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: 0
+    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
+  flipbookRows: 1
+  flipbookColumns: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Texture2D/ChangeStage/warningdown.png.meta

+fileFormatVersion: 2
+guid: 266ed7e56aa91b64dbdffd82047549d0
+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: 0
+    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
+  flipbookRows: 1
+  flipbookColumns: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: