技能栏和esc界面更改

Assets/Resources/Prefabs/UI/ESCpanel.prefab

@@ -110,6 +110,7 @@ RectTransform:
   m_LocalScale: {x: 0.4791567, y: 0.4791567, z: 0.4791567}
   m_Children:
   - {fileID: 2290520137832830468}
+  - {fileID: 6510195335747387027}
   - {fileID: 2290520136886573037}
   - {fileID: 2290520136962102293}
   - {fileID: 2245353215868521668}
@@ -207,7 +208,7 @@ RectTransform:
   m_Children:
   - {fileID: 2152458885540247619}
   m_Father: {fileID: 4277727978802878724}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -285,6 +286,112 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   cdtext: {fileID: 5832018931002283119}
   anim: {fileID: 7499823897739993267}
+--- !u!1001 &3275939065290558658
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4277727978802878724}
+    m_Modifications:
+    - target: {fileID: 956115667615939766, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_Name
+      value: BackToBaseBtn
+      objectReference: {fileID: 0}
+    - target: {fileID: 2264532331409041512, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_Text
+      value: "\u8FD4\u56DE\u57FA\u5730"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 298.661
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 96.191
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.09069824
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -3.8760195
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 145.83301
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+--- !u!224 &6510195335747387027 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
+  m_PrefabInstance: {fileID: 3275939065290558658}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7496168775948402325
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -314,7 +421,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchorMax.x
@@ -370,11 +477,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -48
+      value: -2
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -65.463
+      value: -143
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -452,11 +559,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 302.413
+      value: 298.661
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 100.042
+      value: 96.191
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_LocalPosition.x
@@ -488,11 +595,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -49.873917
+      value: -3.8760614
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 225.303
+      value: 242.02298
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -542,7 +649,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchorMax.x
@@ -598,11 +705,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -47.999916
+      value: -1.9999361
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -161.65408
+      value: -239.19107
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -652,7 +759,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchorMax.x
@@ -708,11 +815,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -47.999916
+      value: -1.9999361
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 127.177
+      value: 49.640007
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -762,7 +869,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchorMax.x
@@ -818,11 +925,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -47.999916
+      value: -1.9999361
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 30.986
+      value: -46.550995
       objectReference: {fileID: 0}
     - target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/Resources/Prefabs/UI/SkillPanel.prefab

@@ -350,7 +350,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7351047679837723735
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scenes/SampleScene_k.unity

@@ -294,143 +294,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &197035528
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  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: 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: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5954056124943457219, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMax.y
-      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
-      value: BattlePanel
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0.00012207031
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -0.000061035156
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
 --- !u!1 &751788417
 GameObject:
   m_ObjectHideFlags: 0
@@ -797,105 +660,3 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9845de5ae41f49b489a6eacf5296e564, type: 3}
---- !u!1001 &1750523147
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4035117218401293311, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-      propertyPath: m_Name
-      value: Canvas
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
---- !u!224 &1750523148 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 486615778616002635, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
-  m_PrefabInstance: {fileID: 1750523147}
-  m_PrefabAsset: {fileID: 0}

Assets/Scripts/GameManagers/BuildingManager.cs

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

Assets/Scripts/Player/PlayerController.cs

@@ -105,7 +105,7 @@ public class PlayerController : MonoBehaviour {
         if (Input.GetKeyDown(KeyCode.B)&& UIManager.Instance.panelStack.Count == 0)
         {
             UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").isActive = true;
-            //UIManager.Instance.ShowPanel<BuildPanelCtrl>("BuildPanel", E_UI_Layer.System, null);
+            UIManager.Instance.ShowPanel<SkillPanelCtrl>("SkillPanel",E_UI_Layer.System);
         }
     }
 

Assets/Scripts/UI/BattlePanel.cs

@@ -47,6 +47,7 @@ public class BattlePanel : BasePanel
     {
         gameObject.SetActive(true);
         UIManager.Instance.ShowPanel<SkillPanelCtrl>("SkillPanel", E_UI_Layer.System, null, false);
+        UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").gameObject.SetActive(false);
     }
 
     /// <summary>

Assets/Scripts/UI/ESCpanelCtrl.cs

@@ -37,7 +37,9 @@ public class ESCpanelCtrl : BasePanel
         }
         else
         {
-            // GameManager.Instance.GameResume();
+            if (!(UIManager.Instance.panelStack.Count > 0)) {
+                GameManager.Instance.GameResume();
+            }
             gameObject.SetActive(false);
         }
     }
@@ -52,6 +54,9 @@ public class ESCpanelCtrl : BasePanel
                 UIManager.Instance.ShowPanel<RemindPanelCtrl>("RemindPanel", E_UI_Layer.System, null);
                 toMenu = true;
                 break;
+            case "BackToBaseBtn":
+                GameManager.Instance.GameOver();
+                break;
             case "HelpBtn":
                 UIManager.Instance.ShowPanel<HelpPanelCtrl>("HelpPanel", E_UI_Layer.System, null);
                 break;
@@ -64,7 +69,6 @@ public class ESCpanelCtrl : BasePanel
             case "ReadingBtn":
                 UIManager.Instance.ShowPanel<ReadingPanelCtrl>("ReadingPanel", E_UI_Layer.System, null);
                 break;
-
             default:
                 break;
         }

Assets/Scripts/UI/RemindPanelCtrl.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 public class RemindPanelCtrl : BasePanel
 {
     /// <summary>
-    /// ʾԼ
+    /// 显示自己
     /// </summary>
     public override void ShowMe()
     {
@@ -14,7 +14,7 @@ public class RemindPanelCtrl : BasePanel
     }
 
     /// <summary>
-    /// Լ
+    /// 隐藏自己
     /// </summary>
     public override void HideMe()
     {

Assets/Scripts/UI/SkillPanelCtrl.cs

@@ -47,6 +47,7 @@ public class SkillPanelCtrl : BasePanel
         Init();
         Debug.Log("SkillPanel is showing!");
         gameObject.SetActive(true);
+        isActive = true;
     }
 
     /// <summary>
@@ -55,6 +56,7 @@ public class SkillPanelCtrl : BasePanel
     public override void HideMe()
     {
         gameObject.SetActive(false);
+        isActive = false;
     }
 
     /// <summary>
@@ -62,8 +64,6 @@ public class SkillPanelCtrl : BasePanel
     /// </summary>
     public void Init()
     {
-        isActive = false;
-
         DeleteOldImage();
         BuildingManager.Instance.Init();
         turretList = BuildingManager.Instance.turretList;