修改预制件

Assets/Res/UI/CombatHPPanel.prefab

@@ -95,6 +95,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4256368909595512735}
   - component: {fileID: 6639033252934572828}
+  - component: {fileID: 7097928347397599925}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: CombatHPPanel
@@ -142,6 +143,29 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!223 &7097928347397599925
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2338948186607179410}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: -2
+  m_TargetDisplay: 0
 --- !u!1 &3198516901098534151
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/CombatShowTextPanel.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5278909242882344280}
   - component: {fileID: 682982680581346231}
+  - component: {fileID: 1211599414478167821}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: CombatShowTextPanel
@@ -36,7 +37,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: 478, y: 923}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &682982680581346231
 MonoBehaviour:
@@ -57,6 +58,29 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!223 &1211599414478167821
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2146930729811229805}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: -1
+  m_TargetDisplay: 0
 --- !u!1 &5029639117996355141
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainUIPanel.prefab

@@ -735,7 +735,7 @@ Canvas:
   m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
-  m_SortingOrder: -1
+  m_SortingOrder: -3
   m_TargetDisplay: 0
 --- !u!114 &662163898753535128
 MonoBehaviour:
@@ -790,7 +790,7 @@ 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: 22, y: 0}
+  m_AnchoredPosition: {x: 85, y: -6}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &827445854524362949
@@ -2503,7 +2503,7 @@ 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: -290, y: 0}
+  m_AnchoredPosition: {x: -273, y: -6}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3769501664327749828
@@ -2647,7 +2647,7 @@ 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: 311.1, y: -1.9}
+  m_AnchoredPosition: {x: 305, y: 382}
   m_SizeDelta: {x: 105.8279, y: 108.6129}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1659965290666304219
@@ -3828,7 +3828,7 @@ 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: 178, y: 0}
+  m_AnchoredPosition: {x: 264, y: -6}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5345206875650113673
@@ -4113,7 +4113,7 @@ 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: -134, y: 0}
+  m_AnchoredPosition: {x: -98, y: -6}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5997383203689388094

Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -46,6 +46,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5356005532403119995}
   - component: {fileID: 7368292285738498687}
+  - component: {fileID: 4076525721253167778}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ShowItemMoveToTargetPanel
@@ -105,6 +106,29 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!223 &4076525721253167778
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4955333483468909094}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: -1
+  m_TargetDisplay: 0
 --- !u!1 &5048446545418806876
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/GameUI/UI/Combat/CombatShowTextPanel.cs

@@ -43,6 +43,12 @@ namespace Fort23.Mono
         {
         }
 
+        public override async CTask Open()
+        {
+            await base.Open();
+            transform.SetSiblingIndex(0);
+        }
+
         private async void RecoverUpdate(IEventData iEventData)
         {
             HarmUpdateEventData harmUpdateEventData = iEventData as HarmUpdateEventData;

Assets/Scripts/GameUI/UI/Hero/HeroUpTxtEft.cs

@@ -1,29 +1,41 @@
 using Common.Utility.CombatTimer;
+using Fort23.Core;
 using Fort23.UTool;
 
 namespace Fort23.Mono
 {
-    [UIBinding(prefab = "HeroUpTxtEft"  )]
+    [UIBinding(prefab = "HeroUpTxtEft")]
     public partial class HeroUpTxtEft : UIComponent
     {
+        private TimerEntity _timerEntity;
         private void Init()
         {
-            CombatTimerManager.Instance.AddTimer(1f, delegate
+            _timerEntity=TimerComponent.Instance.AddTimer(1000, delegate
             {
                 UIManager.Instance.DormancyGComponent(this);
                 LogTool.Log("Recycle:" + poolObjName);
+                _timerEntity = null;
             });
             // UIManager.Instance.
         }
+
         public override void AddEvent()
         {
         }
+
         public override void DelEvent()
         {
         }
+
         public override void AddButtonEvent()
         {
         }
 
+        public override void DormancyObj()
+        {
+            base.DormancyObj();
+            TimerComponent.Instance.Remove(_timerEntity);
+            _timerEntity = null;
+        }
     }
 }

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -48,7 +48,7 @@ namespace Fort23.Mono
 
         private void StartBossBattle(IEventData iEventData)
         {
-            UIManager.Instance.LoadAndOpenPanel<StartBossPanel>(null, UILayer.Top);
+            UIManager.Instance.LoadAndOpenPanel<StartBossPanel>(null, UILayer.Middle);
         }
 
         private void ShowDialogue(IEventData iEventData)