UI

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -24,34 +24,22 @@
     <graph id="n12_mza1" name="grh_5" xy="358,1589" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
     <graph id="n13_mza1" name="grh_6" xy="121,350" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
     <graph id="n14_mza1" name="grh_7" xy="418,516" pivot="0.5,0.5" anchor="true" size="25,25" aspect="true"/>
-    <component id="n28_uj53" name="proScore" src="uj53c8" fileName="components/ProgressBarTargetScore.xml" xy="64,170">
-      <ProgressBar value="50" max="100"/>
-    </component>
-    <component id="n15_mza1" name="comMineCircle" src="mza1c1" fileName="components/comTargetCircle.xml" xy="78,562" pivot="0.5,0.5" anchor="true" visible="false"/>
-    <component id="n17_mza1" name="comTargetCircle" src="mza1c1" fileName="components/comTargetCircle.xml" xy="857,856" pivot="0.5,0.5" anchor="true" visible="false"/>
-    <component id="n20_vbe8" name="btnSkill0" src="uxajc2" fileName="components/ComBtnSkill.xml" xy="141,1718">
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kvuz5b7"/>
-      <property target="txtName" propertyId="0" value="天工"/>
-    </component>
-    <component id="n21_vbe8" name="btnSkill1" src="uxajc2" fileName="components/ComBtnSkill.xml" xy="338,1718">
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kvuz5b6"/>
-      <property target="txtName" propertyId="0" value="荆钗"/>
-    </component>
-    <component id="n22_vbe8" name="btnSkill2" src="uxajc2" fileName="components/ComBtnSkill.xml" xy="569,1714">
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kvuz5b8"/>
-      <property target="txtName" propertyId="0" value="织断"/>
-    </component>
-    <component id="n23_vbe8" name="btnSkill3" src="uxajc2" fileName="components/ComBtnSkill.xml" xy="802,1719">
-      <property target="icon" propertyId="1" value="ui://mfvz4q8kvuz5b9"/>
-      <property target="txtName" propertyId="0" value="锦衣"/>
-    </component>
-    <component id="n24_vbe8" name="ComMinusMine" src="vbe8c6" fileName="components/ComSkillMinus.xml" xy="107,917"/>
-    <component id="n25_vbe8" name="ComShieldMine" src="vbe8c7" fileName="components/ComSkillShield.xml" xy="116,678"/>
-    <component id="n26_vbe8" name="ComMinusNpc" src="vbe8c6" fileName="components/ComSkillMinus.xml" xy="688,929"/>
-    <component id="n27_vbe8" name="ComShieldNpc" src="vbe8c7" fileName="components/ComSkillShield.xml" xy="702,692"/>
-    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="uj53c9" fileName="components/ComRoleSkillScore.xml" xy="137,337"/>
-    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="uj53c9" fileName="components/ComRoleSkillScore.xml" xy="764,337"/>
-    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="uj53c9" fileName="components/ComRoleSkillScore.xml" xy="159,295"/>
-    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="uj53c9" fileName="components/ComRoleSkillScore.xml" xy="786,316"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="64,170">
+      <ProgressBar max="100"/>
+    </component>
+    <component id="n15_mza1" name="comMineCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="78,562" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n17_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="857,856" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n20_vbe8" name="btnSkill0" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="141,1718"/>
+    <component id="n21_vbe8" name="btnSkill1" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="338,1718"/>
+    <component id="n22_vbe8" name="btnSkill2" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="569,1714"/>
+    <component id="n23_vbe8" name="btnSkill3" src="v3k9c0" fileName="components/ComBtnSkill.xml" xy="802,1719"/>
+    <component id="n24_vbe8" name="ComMinusMine" src="v3k9c2" fileName="components/ComSkillMinus.xml" xy="107,917"/>
+    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="116,678"/>
+    <component id="n26_vbe8" name="ComMinusNpc" src="v3k9c2" fileName="components/ComSkillMinus.xml" xy="688,929"/>
+    <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="702,692"/>
+    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="137,337"/>
+    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="764,337"/>
+    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="159,295"/>
+    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="786,316"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -3,8 +3,8 @@
   <displayList>
     <image id="n20_uxaj" name="n20" src="vuz5b8" fileName="imagesStory/zd_pfanniu_3.png" xy="11,11" size="178,178" aspect="true"/>
     <loader id="n22_uxaj" name="icon" xy="11,11" size="178,178" aspect="true" url="ui://mfvz4q8kvuz5b7" fill="scaleMatchHeight"/>
-    <component id="n24_vbe8" name="proCD" src="vbe8c5" fileName="components/ProgressBarCD.xml" xy="21,20" size="156,156">
-      <ProgressBar value="70" max="100"/>
+    <component id="n24_vbe8" name="proCD" src="v3k9c5" fileName="components/ProgressBarCD.xml" xy="21,20" size="156,156">
+      <ProgressBar max="100"/>
     </component>
     <text id="n25_uj53" name="txtName" xy="53,72" size="94,56" fontSize="42" color="#666666" align="center" autoSize="none" text="天工"/>
   </displayList>

FGUIProject/assets/Main/package.xml

@@ -325,6 +325,15 @@
     <component id="vuz5bx" name="Slider1_grip.xml" path="/components/"/>
     <image id="oixcby" name="zd_pfjdt_4.png" path="/imagesStory/"/>
     <image id="oixcbz" name="zd_ztca.png" path="/imagesStory/"/>
+    <component id="v3k9c0" name="ComBtnSkill.xml" path="/components/"/>
+    <component id="v3k9c1" name="ComRoleSkillScore.xml" path="/components/"/>
+    <component id="v3k9c2" name="ComSkillMinus.xml" path="/components/"/>
+    <component id="v3k9c3" name="ComSkillShield.xml" path="/components/"/>
+    <component id="v3k9c4" name="comTargetCircle.xml" path="/components/"/>
+    <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
+    <component id="v3k9c6" name="ProgressBarSingleScore.xml" path="/components/"/>
+    <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
+    <image id="v3k9c8" name="f08dc01e397bcd8d2e04da1517d6cf7.png" path="/imagesStory/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/ExcelConfig.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eff0429ed8f94454ca3dcb06d43b0e18
+guid: bd06685c0f9c17e42933bc22b14c60a9
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: db16dd55f18d81a4a8c9068f29d0aae5
+guid: f27df8c9cb067c948a656202f550affb
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_ListRewardItem.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Mail
-{
-    public partial class UI_ListRewardItem
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtName;
-        public GTextField m_txtCount;
-        public GImage m_imgGot;
-        public const string URL = "ui://y44a413eehs9h";
-        public const string PACKAGE_NAME = "Mail";
-        public const string RES_NAME = "ListRewardItem";
-        private static UI_ListRewardItem _proxy;
-
-        public static UI_ListRewardItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListRewardItem();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListRewardItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListRewardItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaIcon = (GLoader)comp.GetChildAt(1);
-            m_txtName = (GTextField)comp.GetChildAt(3);
-            m_txtCount = (GTextField)comp.GetChildAt(4);
-            m_imgGot = (GImage)comp.GetChildAt(5);
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtName = null;
-            m_txtCount = null;
-            m_imgGot = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_ListRewardItem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9bb2ceec79c11984faa53da7134b2042
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComBtnSkill.cs

@@ -10,7 +10,7 @@ namespace UI.Main
         public GLoader m_icon;
         public GProgressBar m_proCD;
         public GTextField m_txtName;
-        public const string URL = "ui://mfvz4q8kuxajc2";
+        public const string URL = "ui://mfvz4q8kv3k9c0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComBtnSkill";
         private static UI_ComBtnSkill _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs

@@ -10,7 +10,7 @@ namespace UI.Main
         public Controller m_c1;
         public GTextField m_txtScore;
         public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kuj53c9";
+        public const string URL = "ui://mfvz4q8kv3k9c1";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRoleSkillScore";
         private static UI_ComRoleSkillScore _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillMinus.cs

@@ -7,8 +7,8 @@ namespace UI.Main
     public partial class UI_ComSkillMinus
     {
         public GComponent target;
-        public UI_ProgressBarSingleScore m_proMinus;
-        public const string URL = "ui://mfvz4q8kvbe8c6";
+        public UI_ProgressBar1 m_proMinus;
+        public const string URL = "ui://mfvz4q8kv3k9c2";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComSkillMinus";
         private static UI_ComSkillMinus _proxy;
@@ -55,7 +55,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_proMinus = (UI_ProgressBarSingleScore)UI_ProgressBarSingleScore.Create(comp.GetChild("proMinus"));
+            m_proMinus = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proMinus"));
         }
         public void Dispose(bool disposeTarget = false)
         {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs

@@ -8,7 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GImage m_img;
-        public const string URL = "ui://mfvz4q8kvbe8c7";
+        public const string URL = "ui://mfvz4q8kv3k9c3";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComSkillShield";
         private static UI_ComSkillShield _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarSingleScore.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ProgressBarSingleScore
-    {
-        public GProgressBar target;
-        public GTextField m_txtCount;
-        public GImage m_imgFirstScore;
-        public const string URL = "ui://mfvz4q8kvuz5bh";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ProgressBarSingleScore";
-        private static UI_ProgressBarSingleScore _proxy;
-
-        public static UI_ProgressBarSingleScore Create(GObject gObject = null)
-        {
-            var ui = new UI_ProgressBarSingleScore();
-            if(gObject == null)
-            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GProgressBar)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ProgressBarSingleScore Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ProgressBarSingleScore();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GProgressBar)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtCount = null;
-            m_imgFirstScore = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarSingleScore.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9f44f59e1ab68944c84e68563644e8b4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarTargetScore.cs

@@ -9,7 +9,7 @@ namespace UI.Main
         public GProgressBar target;
         public GTextField m_txtMineScore;
         public GTextField m_txtNpcScore;
-        public const string URL = "ui://mfvz4q8kuj53c8";
+        public const string URL = "ui://mfvz4q8kv3k9c7";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ProgressBarTargetScore";
         private static UI_ProgressBarTargetScore _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -18,7 +18,7 @@ namespace UI.Main
         public GGraph m_grh_5;
         public GGraph m_grh_6;
         public GGraph m_grh_7;
-        public UI_ProgressBarSingleScore m_proScore;
+        public UI_ProgressBar1 m_proScore;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -77,7 +77,7 @@ namespace UI.Main
             m_grh_5 = (GGraph)comp.GetChild("grh_5");
             m_grh_6 = (GGraph)comp.GetChild("grh_6");
             m_grh_7 = (GGraph)comp.GetChild("grh_7");
-            m_proScore = (UI_ProgressBarSingleScore)UI_ProgressBarSingleScore.Create(comp.GetChild("proScore"));
+            m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
         }
         public void Dispose(bool disposeTarget = false)
         {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs

@@ -9,7 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GTextField m_txtCount0;
         public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kmza1c1";
+        public const string URL = "ui://mfvz4q8kv3k9c4";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "comTargetCircle";
         private static UI_comTargetCircle _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_XiuFangUI.cs

@@ -59,11 +59,11 @@ namespace UI.XiuFang
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChildAt(0);
-            m_btnBack = (GButton)comp.GetChildAt(1);
-            m_btnClothingShop = (GLoader)comp.GetChildAt(4);
-            m_btnClothingUpgrade = (GLoader)comp.GetChildAt(5);
-            m_btnSuitSynthetic = (GLoader)comp.GetChildAt(6);
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnClothingShop = (GLoader)comp.GetChild("btnClothingShop");
+            m_btnClothingUpgrade = (GLoader)comp.GetChild("btnClothingUpgrade");
+            m_btnSuitSynthetic = (GLoader)comp.GetChild("btnSuitSynthetic");
         }
         public void Dispose(bool disposeTarget = false)
         {