合并预设和代码

Assets/Res/UI/MainUIPanel.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 667431388228105620}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtHeroExp
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -148,7 +148,7 @@ GameObject:
   - component: {fileID: 3173585067917471387}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Icon_Gem
+  m_Name: Icon_Diamon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -807,7 +807,7 @@ GameObject:
   - component: {fileID: 2163574940505033628}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Energy
+  m_Name: HeroExp
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -970,7 +970,7 @@ GameObject:
   - component: {fileID: 2299632390429321421}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Gem
+  m_Name: Diamond
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2510,7 +2510,7 @@ GameObject:
   - component: {fileID: 7701462367861168002}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: txtDiamond
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3216,7 +3216,7 @@ GameObject:
   - component: {fileID: 1451205693205235240}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: coinText
+  m_Name: txtCoin
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3450,7 +3450,7 @@ RectTransform:
   m_Father: {fileID: 2250993577439367798}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.442, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -4322,7 +4322,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: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1623.9999}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1056032702526251692
 MonoBehaviour:
@@ -4445,6 +4445,33 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: txtCoin
+    gameObject: {fileID: 1451205693205235240}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: txtDiamond
+    gameObject: {fileID: 7701462367861168002}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: txtHeroExp
+    gameObject: {fileID: 667431388228105620}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4904,7 +4931,7 @@ GameObject:
   - component: {fileID: 2002673787439862528}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Icon_Energy
+  m_Name: Icon_HeroExp
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -21,7 +21,6 @@ namespace Fort23.Mono
         {
             InitRes();
             InitBattleHeroWidget();
-            InitBattleHero();
         }
 
         protected override void AddEvent()
@@ -144,14 +143,9 @@ namespace Fort23.Mono
             }
         }
 
-        
-        private List<WidgetHero> widgetHeroes = new List<WidgetHero>(); 
-            
-        private async void InitBattleHeroWidget()
-
         private List<WidgetHero> widgetHeroes = new List<WidgetHero>();
 
-        private async void InitBattleHero()
+        private async void InitBattleHeroWidget()
         {
             widgetHeroes.Clear();
             for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -76,37 +76,15 @@ namespace Fort23.Mono
 	      return _TextExp;
 	     }
 	   }
-	  private TextMeshProUGUI _txtCoin;
-	  public TextMeshProUGUI txtCoin
-	   {
-	   get{
-	      if (_txtCoin == null)
-	       {
-	         _txtCoin  = GetUIUnit<TextMeshProUGUI>("txtCoin"); 
-	       }
-	      return _txtCoin;
-	     }
-	   }
-	  private TextMeshProUGUI _txtDiamond;
-	  public TextMeshProUGUI txtDiamond
-	   {
-	   get{
-	      if (_txtDiamond == null)
-	       {
-	         _txtDiamond  = GetUIUnit<TextMeshProUGUI>("txtDiamond"); 
-	       }
-	      return _txtDiamond;
-	     }
-	   }
-	  private TextMeshProUGUI _txtHeroExp;
-	  public TextMeshProUGUI txtHeroExp
+	  private TextMeshProUGUI _coinText;
+	  public TextMeshProUGUI coinText
 	   {
 	   get{
-	      if (_txtHeroExp == null)
+	      if (_coinText == null)
 	       {
-	         _txtHeroExp  = GetUIUnit<TextMeshProUGUI>("txtHeroExp"); 
+	         _coinText  = GetUIUnit<TextMeshProUGUI>("coinText"); 
 	       }
-	      return _txtHeroExp;
+	      return _coinText;
 	     }
 	   }
 	  private GameObject _Slider_Exp_Process;
@@ -164,6 +142,39 @@ namespace Fort23.Mono
 	      return _bossHpText;
 	     }
 	   }
+	  private TextMeshProUGUI _txtCoin;
+	  public TextMeshProUGUI txtCoin
+	   {
+	   get{
+	      if (_txtCoin == null)
+	       {
+	         _txtCoin  = GetUIUnit<TextMeshProUGUI>("txtCoin"); 
+	       }
+	      return _txtCoin;
+	     }
+	   }
+	  private TextMeshProUGUI _txtDiamond;
+	  public TextMeshProUGUI txtDiamond
+	   {
+	   get{
+	      if (_txtDiamond == null)
+	       {
+	         _txtDiamond  = GetUIUnit<TextMeshProUGUI>("txtDiamond"); 
+	       }
+	      return _txtDiamond;
+	     }
+	   }
+	  private TextMeshProUGUI _txtHeroExp;
+	  public TextMeshProUGUI txtHeroExp
+	   {
+	   get{
+	      if (_txtHeroExp == null)
+	       {
+	         _txtHeroExp  = GetUIUnit<TextMeshProUGUI>("txtHeroExp"); 
+	       }
+	      return _txtHeroExp;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

UserSettings/EditorUserSettings.asset

@@ -45,22 +45,22 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae415d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898e91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650