修改ui

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -127,10 +127,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 499, y: 1081}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &358993056284816294
 CanvasRenderer:
@@ -160,7 +160,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: daf9bc156dff8ea4095ba8999515604e, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 77a2c64e56d1dc94aa2c2a7e245ae77e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -211,14 +211,14 @@ RectTransform:
   m_GameObject: {fileID: 1408015899473625068}
   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_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.4, y: -421.38263}
+  m_AnchoredPosition: {x: 295, y: -624}
   m_SizeDelta: {x: 388.5915, y: 114.5688}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4283077157061789222
@@ -288,8 +288,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000015258789, y: 0}
-  m_SizeDelta: {x: 0, y: 45.4981}
+  m_AnchoredPosition: {x: 0.000030517578, y: 0}
+  m_SizeDelta: {x: 0, y: 69.2}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5055091540865727381
 CanvasRenderer:
@@ -379,8 +379,8 @@ RectTransform:
   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: 4.2281, y: 32.5174}
-  m_SizeDelta: {x: 166.1559, y: 47.0466}
+  m_AnchoredPosition: {x: 5.1485, y: 51.4956}
+  m_SizeDelta: {x: 249.4528, y: 66.451}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1252414563731702906
 CanvasRenderer:
@@ -522,8 +522,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.8297, y: 46.45099}
-  m_SizeDelta: {x: 401.1988, y: 521.1722}
+  m_AnchoredPosition: {x: 1.9702, y: 69.98932}
+  m_SizeDelta: {x: 604.5302, y: 782.8624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9156533754913033698
 CanvasRenderer:
@@ -746,8 +746,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200.5994, y: -69.20005}
-  m_SizeDelta: {x: 359.0693, y: 85.1549}
+  m_AnchoredPosition: {x: 302.27, y: -102.9}
+  m_SizeDelta: {x: 539.2167, y: 124.6087}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9047568930966635103
 CanvasRenderer:
@@ -779,7 +779,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 18
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -838,10 +838,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -111.4, y: -276.7}
-  m_SizeDelta: {x: -287.1213, y: 3.1027}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 120.4, y: -26.100006}
+  m_SizeDelta: {x: 170.6728, y: 3.1026917}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &824729706875111370
 CanvasRenderer:
@@ -963,7 +963,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 37
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1026,8 +1026,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 194.49939, y: -277.69998}
-  m_SizeDelta: {x: 91.5303, y: 25.9394}
+  m_AnchoredPosition: {x: 289.2, y: -418.35}
+  m_SizeDelta: {x: 152.2567, y: 59.3625}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1806185420655456625
 CanvasRenderer:
@@ -1059,7 +1059,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1248,7 +1248,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200.5994, y: -164.50005}
+  m_AnchoredPosition: {x: 277.4, y: -246.4}
   m_SizeDelta: {x: 400.6232, y: 75.5206}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3214678112079635339
@@ -1281,7 +1281,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 16
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1340,10 +1340,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2569128129379278262}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 101.729324, y: -276.7}
-  m_SizeDelta: {x: -287.1213, y: 3.1027}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -138.1, y: -25.799988}
+  m_SizeDelta: {x: 170.67279, y: 3.1026917}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8250381170657316525
 CanvasRenderer:
@@ -1431,8 +1431,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 200.6, y: -22.749}
-  m_SizeDelta: {x: 401.2, y: 45.498}
+  m_AnchoredPosition: {x: 302.27, y: -34.6}
+  m_SizeDelta: {x: 604.53, y: 69.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &126500885704442088
 CanvasRenderer:
@@ -1464,7 +1464,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2

Assets/Res/UI/Task/仙途事件-事件详情.png.meta → Assets/Res/UI/Task/仙途事件-事件详情 1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WytJvHj+Un6K6n0WttTGmGzbYG+/6H1kQJ8nzZhND8nu2/T5pEH4yX4HADlb
+guid: CH1Ot3mrVy5I9YM8QOkj0kIWtTkUjWP3WTK4MGAQDuTj2mrz6UyUgff/t42f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs

@@ -82,14 +82,14 @@ namespace Fort23.Mono.Phases
             pgm.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(1000);
             pgm.SetOnClickMask(false);
-            CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+            CombatDrive.Instance.CombatController.isUpdate = false;
             await pgm.ConfigLogic(501, delegate() { pgm.NextGuide(); });
         }
 
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+            CombatDrive.Instance.CombatController.isUpdate = true;
             pgm.SetBlackBaseVisiable(false);
             ForceGuideOver();
         }