修改主界面ui

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

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 30, y: 0, z: 31, w: 0}
+  spriteBorder: {x: 30, y: 14, z: 31, w: 13}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -209,7 +209,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.2, y: -26.4}
-  m_SizeDelta: {x: 98, y: 83}
+  m_SizeDelta: {x: 85, y: 86}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6263514538251950369
 CanvasRenderer:
@@ -341,7 +341,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.50001}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3274072020448486571
@@ -374,7 +374,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -422,7 +422,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 182, y: 179}
+  m_SizeDelta: {x: 172, y: 171}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &68198010094673762
 CanvasRenderer:
@@ -512,7 +512,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.6}
-  m_SizeDelta: {x: 91, y: 91}
+  m_SizeDelta: {x: 91, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1937265048322601381
 CanvasRenderer:
@@ -644,7 +644,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.5}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6468258095934692119
@@ -677,7 +677,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -859,7 +859,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.50001}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5311815257834640554
@@ -892,7 +892,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1031,7 +1031,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: -278.2, y: 51.301716}
+  m_AnchoredPosition: {x: -279.4, y: 27.2}
   m_SizeDelta: {x: 182, y: 187.5966}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9120908431640298670
@@ -1486,7 +1486,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: 12, y: -23.599976}
+  m_AnchoredPosition: {x: -0.31704, y: 27.8}
   m_SizeDelta: {x: 172.6341, y: 88.0802}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9118942833055612608
@@ -1519,11 +1519,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 54
+    m_FontSize: 72
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 54
+    m_MaxSize: 75
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1543,7 +1543,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.78, g: 0.5495412, b: 0.10217998, a: 1}
+  m_EffectColor: {r: 0.12941177, g: 0.4666667, b: 0.52156866, a: 1}
   m_EffectDistance: {x: 1.5, y: -1.5}
   m_UseGraphicAlpha: 1
 --- !u!1 &2634108884773401188
@@ -1583,7 +1583,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 50, y: 37}
+  m_SizeDelta: {x: 51, y: 51}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8719992337400722114
 CanvasRenderer:
@@ -1852,7 +1852,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -27.1}
-  m_SizeDelta: {x: 91, y: 96}
+  m_SizeDelta: {x: 84, y: 87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5167439644883526304
 CanvasRenderer:
@@ -1967,7 +1967,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6871685477673824771
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2075,7 +2075,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 32, y: 55}
+  m_SizeDelta: {x: 57, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4856364321762759249
 CanvasRenderer:
@@ -2767,7 +2767,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22, y: -25.6}
-  m_SizeDelta: {x: 81, y: 103}
+  m_SizeDelta: {x: 91, y: 82}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1991973135826434428
 CanvasRenderer:
@@ -2876,6 +2876,7 @@ GameObject:
   - component: {fileID: 8586065168883585880}
   - component: {fileID: 8938417049478677008}
   - component: {fileID: 6163054391845323626}
+  - component: {fileID: 4099233569721547878}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_divineSensePoint
@@ -2901,8 +2902,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: 17.7, y: -78.6}
-  m_SizeDelta: {x: 0, y: 31.8101}
+  m_AnchoredPosition: {x: -0.0000014305, y: -35.549}
+  m_SizeDelta: {x: 0, y: 38.6171}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8586065168883585880
 CanvasRenderer:
@@ -2934,7 +2935,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 32
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -2960,6 +2961,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
   m_VerticalFit: 0
+--- !u!114 &4099233569721547878
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5817671988682709348}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.12941177, g: 0.46666667, b: 0.52156866, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &5848168123700866973
 GameObject:
   m_ObjectHideFlags: 0
@@ -3807,7 +3823,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.1, y: -44.3}
+  m_AnchoredPosition: {x: 0.1, y: -47.50001}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &997768621759475326
@@ -3840,7 +3856,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -3889,7 +3905,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 43, y: 44}
+  m_SizeDelta: {x: 56, y: 31}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &39534253641356633
 CanvasRenderer:
@@ -4024,7 +4040,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 22.5, y: -25.5}
-  m_SizeDelta: {x: 45, y: 51}
+  m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9062925167079628804
 CanvasRenderer:

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -957,7 +957,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 44.9, y: 21.2}
-  m_SizeDelta: {x: 79, y: 84}
+  m_SizeDelta: {x: 94, y: 94}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &1879604139991815501
 CanvasRenderer:
@@ -1041,7 +1041,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_fanhui1
+  _icon_name: dec_fanhuianniu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Res/UI/MainPanel/主界面.png.meta → Assets/Res/UI/MainPanel/主界面2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Dn4Z4yj8Aiq1doPKc3yfmTV2VUabJ2TaQeemBrmB4+9NENBE6rcytIfxHUFZ
+guid: Xn5N4SmoWy5zw8OdLE+dFWFJOp9VCvfOg44ku0btX+ESbTZrij+btBjhP+GI
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -98,7 +98,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 586894738918592578}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -169,8 +169,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: 1.9105, y: 0}
-  m_SizeDelta: {x: 104.9, y: 44.694}
+  m_AnchoredPosition: {x: 2.659, y: 0}
+  m_SizeDelta: {x: 79.382, y: 44.694}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4830072340555722385
 CanvasRenderer:
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.90196085, g: 0.86666673, b: 0.7058824, a: 1}
+  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
@@ -202,7 +202,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
-    m_FontSize: 26
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -213,7 +213,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 420000
+  m_Text: 4200
 --- !u!1 &2245206468840536257
 GameObject:
   m_ObjectHideFlags: 0
@@ -251,7 +251,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 33.836975, y: 12.322754}
-  m_SizeDelta: {x: 151.67401, y: 52.6455}
+  m_SizeDelta: {x: 150, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5554054428056264509
 CanvasRenderer:
@@ -327,8 +327,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: -66.7, y: 1.2}
-  m_SizeDelta: {x: 59.3358, y: 59.3358}
+  m_AnchoredPosition: {x: -65.2, y: 1.2}
+  m_SizeDelta: {x: 55.5112, y: 55.5112}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4099161695515857595
 CanvasRenderer:
@@ -368,7 +368,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_Coins_s
+  _icon_name: icon_GradeBadge_Challenger
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -480,7 +480,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, y: 0}
+  m_AnchoredPosition: {x: 31.9, y: 0}
   m_SizeDelta: {x: 147.9615, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5984184458604740083
@@ -542,7 +542,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanel.cs

@@ -8,8 +8,8 @@ namespace Fort23.Mono
     public partial class TitlePanel : UIPanel
     {
         List<EnergyWidget> widgets = new List<EnergyWidget>();
-        
-         List<int> moRen =new List<int>() { 1001, 1002 };
+
+        List<int> moRen = new List<int>() { 1001, 1002 };
 
         private void Init()
         {
@@ -29,7 +29,6 @@ namespace Fort23.Mono
 
         public async static CTask<TitlePanel> OpenPanel(List<int> items = null)
         {
-           
             TitlePanel appBarPanel = null;
             if (UIManager.Instance.GetComponent<TitlePanel>() == null)
             {
@@ -51,7 +50,7 @@ namespace Fort23.Mono
             {
                 items = moRen;
             }
-            
+
             foreach (var energyWidget in widgets)
             {
                 UIManager.Instance.DormancyGComponent(energyWidget);
@@ -61,7 +60,8 @@ namespace Fort23.Mono
             Text_JingJie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]) +
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 * 10 + "%";
 
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -17,7 +17,8 @@ namespace Fort23.Mono
 
         // private ShengShiEventWidget shengShiEventWidget;
 
-
+        List<int> moRen = new List<int>() { 1001, 1002 };
+        List<EnergyWidget> widgets = new List<EnergyWidget>();
         List<ShengShiConditionWidget> _shengShiConditionWidgets = new List<ShengShiConditionWidget>();
 
         private void Init()
@@ -50,7 +51,7 @@ namespace Fort23.Mono
             {
                 await PlayerGuideManager.Instance.SetGuid(1);
             }
-            
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(4))
             {
                 await PlayerGuideManager.Instance.SetGuid(4);
@@ -200,13 +201,25 @@ namespace Fort23.Mono
 
 
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
-            Text_Jingjie.text =
+            Text_jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]) +
+                PlayerManager.Instance.myHero.powerUpConfig.jingjie3 * 10 + "%";
 
+            foreach (var energyWidget in widgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
 
-            Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
+            widgets.Clear();
+            foreach (var item in moRen)
+            {
+                EnergyWidget energyWidget =
+                    await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+                energyWidget.CustomInit(item);
+                widgets.Add(energyWidget);
+            }
 
             // UpdateTaskInfo();
         }
@@ -220,6 +233,7 @@ namespace Fort23.Mono
                 ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
 
 
+            Text_bigMapName.text = LanguageManager.Instance.Text(placesConfig.placeName);
             Text_ExplorationProgress.text =
                 $"{LanguageManager.Instance.Text(placesConfig.placeName)} - {LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
             Slider_SmallJD.maxValue = smallPlacesConfig.CompletionEventCount;
@@ -297,21 +311,21 @@ namespace Fort23.Mono
         }
 
 
-        [CustomMethod(CustomMethodType.Update)]
-        public void Update()
-        {
-            if (Input.GetKeyDown(KeyCode.Y))
-            {
-                EventSystemManager.Instance.DetectRandomEvents();
-            }
-
-
-            int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
-
-            float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
-
-            Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
-        }
+        // [CustomMethod(CustomMethodType.Update)]
+        // public void Update()
+        // {
+        //     if (Input.GetKeyDown(KeyCode.Y))
+        //     {
+        //         EventSystemManager.Instance.DetectRandomEvents();
+        //     }
+        //
+        //
+        //     int currentMiao = (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) / 1000);
+        //
+        //     float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+        //
+        //     Slider_Exp.value = PlayerManager.Instance.myHero.heroData.exp + allexp;
+        // }
 
 
         public async static CTask<MainPanel> OpenPanel()
@@ -328,6 +342,12 @@ namespace Fort23.Mono
             }
 
             _shengShiConditionWidgets.Clear();
+            foreach (var energyWidget in widgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            widgets.Clear();
             base.Close();
         }
     }

Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -63,13 +63,13 @@ namespace Fort23.Mono
 	      return _Btn_Chat;
 	     }
 	   }
-	  private Text _Text_Jingjie;
-	  public Text Text_Jingjie
+	  private Object _Text_Jingjie;
+	  public Object Text_Jingjie
 	   {
 	   get{
 	      if (_Text_Jingjie == null)
 	       {
-	         _Text_Jingjie  = GetUIUnit<Text>("Text_Jingjie"); 
+	         _Text_Jingjie  = GetUIUnit<Object>("Text_Jingjie"); 
 	       }
 	      return _Text_Jingjie;
 	     }
@@ -96,24 +96,24 @@ namespace Fort23.Mono
 	      return _Text_PlayerName;
 	     }
 	   }
-	  private Slider _Slider_Map;
-	  public Slider Slider_Map
+	  private Object _Slider_Map;
+	  public Object Slider_Map
 	   {
 	   get{
 	      if (_Slider_Map == null)
 	       {
-	         _Slider_Map  = GetUIUnit<Slider>("Slider_Map"); 
+	         _Slider_Map  = GetUIUnit<Object>("Slider_Map"); 
 	       }
 	      return _Slider_Map;
 	     }
 	   }
-	  private Slider _Slider_Exp;
-	  public Slider Slider_Exp
+	  private Object _Slider_Exp;
+	  public Object Slider_Exp
 	   {
 	   get{
 	      if (_Slider_Exp == null)
 	       {
-	         _Slider_Exp  = GetUIUnit<Slider>("Slider_Exp"); 
+	         _Slider_Exp  = GetUIUnit<Object>("Slider_Exp"); 
 	       }
 	      return _Slider_Exp;
 	     }
@@ -250,6 +250,39 @@ namespace Fort23.Mono
 	      return _Btn_ChangeMap;
 	     }
 	   }
+	  private RectTransform _Group_ResourceBar;
+	  public RectTransform Group_ResourceBar
+	   {
+	   get{
+	      if (_Group_ResourceBar == null)
+	       {
+	         _Group_ResourceBar  = GetUIUnit<RectTransform>("Group_ResourceBar"); 
+	       }
+	      return _Group_ResourceBar;
+	     }
+	   }
+	  private Text _Text_jingjie;
+	  public Text Text_jingjie
+	   {
+	   get{
+	      if (_Text_jingjie == null)
+	       {
+	         _Text_jingjie  = GetUIUnit<Text>("Text_jingjie"); 
+	       }
+	      return _Text_jingjie;
+	     }
+	   }
+	  private Text _Text_bigMapName;
+	  public Text Text_bigMapName
+	   {
+	   get{
+	      if (_Text_bigMapName == null)
+	       {
+	         _Text_bigMapName  = GetUIUnit<Text>("Text_bigMapName"); 
+	       }
+	      return _Text_bigMapName;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{