修改bug

Assets/Art/UIAssets/decorate/dec_juxing_fang.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 50, y: 50, z: 50, w: 50}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -711,7 +711,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: 0.0010023, y: 110.72443}
+  m_AnchoredPosition: {x: 0.0013685, y: 110.72443}
   m_SizeDelta: {x: 750, y: 886.7512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4946174474217477249
@@ -3041,7 +3041,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.7607844, g: 0.67058825, b: 0.5019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3306,7 +3306,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 30
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40

Assets/Res/UI/DaoYouPanel/DaoYouLevelWidget.prefab

@@ -363,7 +363,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.69411767, g: 0.65882355, b: 0.6, a: 1}
+  m_Color: {r: 0.5377358, g: 0.517761, b: 0.48446953, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/DaoYouPanel/DaoYouWidgetItem.prefab

@@ -274,7 +274,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8509535454573882615
 RectTransform:
   m_ObjectHideFlags: 0
@@ -316,7 +316,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.3882353}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.8509804}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -4189,7 +4189,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.7176471}
+  m_Color: {r: 0.20784315, g: 0.23529413, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -340,7 +340,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.80392164, g: 0.65882355, b: 0.41176474, a: 1}
+  m_Color: {r: 0.7830189, g: 0.7819636, b: 0.7793254, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -348,7 +348,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -357,7 +357,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2193,7 +2193,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6639653483637829207
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -194,7 +194,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.44705883}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -826,7 +826,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 38
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -851,7 +851,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
+  m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
 --- !u!1 &3458075374136346509
 GameObject:
@@ -1231,7 +1231,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 38
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -1256,7 +1256,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0.13725491, g: 0.38431376, b: 0.36862746, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
+  m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
 --- !u!1 &4310037918721046610
 GameObject:
@@ -2098,7 +2098,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: 6.600006, y: -168.97}
+  m_AnchoredPosition: {x: 6.600006, y: -171.3}
   m_SizeDelta: {x: 557.185, y: 58.6841}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &9156104007059516416
@@ -2155,6 +2155,7 @@ GameObject:
   - component: {fileID: 6830660241309542230}
   - component: {fileID: 8870392335744758782}
   - component: {fileID: 8911828159305465162}
+  - component: {fileID: 1321197118262069093}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2213,7 +2214,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 38
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -2224,6 +2225,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E39\u836F"
+--- !u!114 &1321197118262069093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7368366197341708070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.1137255, g: 0.23137257, b: 0.20000002, a: 1}
+  m_EffectDistance: {x: 2, y: -2}
+  m_UseGraphicAlpha: 1
 --- !u!1 &7809232107031970724
 GameObject:
   m_ObjectHideFlags: 0
@@ -2416,7 +2432,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.49803922}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -303,7 +303,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -220, y: -183.9}
-  m_SizeDelta: {x: 167.9902, y: 167.9902}
+  m_SizeDelta: {x: 194, y: 191}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1929128560441779914
 CanvasRenderer:
@@ -343,14 +343,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_xinjing1
+  _icon_name: dec_xinjing
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: a0625ec79d61afda18672ed59c9364f7
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: dfb4c3d9c19aa8c5a48b193f37a82226
   imageH: 110.78021
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -794,7 +794,7 @@ 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: 7.7883, y: -14.582298}
+  m_AnchoredPosition: {x: -6.6, y: 7.1}
   m_SizeDelta: {x: 201.0818, y: 44.582}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5679273784600044542

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -953,7 +953,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6508395234197773420
 RectTransform:
   m_ObjectHideFlags: 0
@@ -968,10 +968,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6895274337125899519}
   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: -641, y: -1429.7}
-  m_SizeDelta: {x: 115, y: 115}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.0000038146973, y: -45.09996}
+  m_SizeDelta: {x: 50.203, y: -28.1956}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6546612787619616397
 CanvasRenderer:
@@ -994,7 +994,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.50980395}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1002,7 +1002,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1011,14 +1011,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_map_di
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: 84621fa40ca51eb52cde8b5d36f124e5
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 7d981d434f811102ccce93d38d2b1655
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UI/WidgetItem.prefab

@@ -76,7 +76,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_wupin_pinzhi0
+  _icon_name: dec_wupin_pinzhi1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using Fort23.Core;
+using Mono.Utility;
 
 namespace Fort23.Mono
 {
@@ -7,6 +9,8 @@ namespace Fort23.Mono
     {
         private System.Action callBack;
 
+        List<SkipToWidget> skipToWidgets = new List<SkipToWidget>();
+
         private void Init()
         {
             isAddStack = false;
@@ -30,7 +34,7 @@ namespace Fort23.Mono
             });
         }
 
-        public void CustomInit(bool isWin, System.Action callBack)
+        public async void CustomInit(bool isWin, System.Action callBack)
         {
             this.callBack = callBack;
             if (isWin)
@@ -45,11 +49,25 @@ namespace Fort23.Mono
             {
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
+
+                SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponentForObject<SkipToWidget>(SkipToWidgetGam, null, SkipToContent);
+                skipToWidget.CustonInit(1);
+                skipToWidgets.Add(skipToWidget);
+                skipToWidget.OnClick = OnClick;
                 // Text_Desc.gameObject.SetActive(true);
                 // Text_Settlement.text = "失败";
             }
         }
 
+        private async void OnClick(ItemWidgetBasic obj)
+        {
+            SkipToWidget skipToWidget = obj as SkipToWidget;
+            await UIManager.Instance.HideUIUIPanel(this);
+            callBack?.Invoke();
+            callBack = null;
+            SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);
+        }
+
         public static async CTask<BattleSettlementPanel> OpenPanel(bool isWin, System.Action callBack)
         {
             BattleSettlementPanel battleSettlementPanel = await UIManager.Instance.LoadAndOpenPanel<BattleSettlementPanel>(null);
@@ -57,5 +75,17 @@ namespace Fort23.Mono
 
             return battleSettlementPanel;
         }
+
+        public override void Close()
+        {
+            foreach (var skipToWidget in skipToWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(skipToWidget);
+            }
+
+            skipToWidgets.Clear();
+
+            base.Close();
+        }
     }
 }

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanelData.cs

@@ -74,6 +74,28 @@ namespace Fort23.Mono
 	      return _FailRoot;
 	     }
 	   }
+	  private RectTransform _SkipToContent;
+	  public RectTransform SkipToContent
+	   {
+	   get{
+	      if (_SkipToContent == null)
+	       {
+	         _SkipToContent  = GetUIUnit<RectTransform>("SkipToContent"); 
+	       }
+	      return _SkipToContent;
+	     }
+	   }
+	  private GameObject _SkipToWidgetGam;
+	  public GameObject SkipToWidgetGam
+	   {
+	   get{
+	      if (_SkipToWidgetGam == null)
+	       {
+	         _SkipToWidgetGam  = GetUIUnit<GameObject>("SkipToWidgetGam"); 
+	       }
+	      return _SkipToWidgetGam;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -161,6 +161,11 @@ namespace Fort23.Mono
             if (eventList.isCompleted)
             {
                 Text_Go.text = "已完成";
+                Btn_Go.image.color = new Color32(200,199,199,255);
+            }
+            else
+            {
+                Btn_Go.image.color = new Color32(206,168,105,255);
             }