主界面UI排版

FGUIProject/assets/Main/MainUI.xml

@@ -66,17 +66,17 @@
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>
-    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" size="141,129" group="n89_vols">
+    <component id="n74_fqor" name="btnDailyWelfare" src="volsoq" fileName="components/BtnModle1.xml" xy="22,469" size="141,130" group="n89_vols">
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="活动" icon="ui://mfvz4q8kvolsof"/>
     </component>
-    <component id="n78_bhmm" name="btnActivityDay7" src="volsoq" fileName="components/BtnModle1.xml" xy="22,608" size="141,157" group="n89_vols" controller="c1,1">
+    <component id="n78_bhmm" name="btnActivityDay7" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,609" size="141,159" group="n89_vols" controller="c1,1">
       <Button title="七日活动" icon="ui://mfvz4q8kvolsoh"/>
     </component>
-    <component id="n75_mbf1" name="btnActivityLuckyBox" src="volsoq" fileName="components/BtnModle1.xml" xy="22,775" size="141,157" group="n89_vols" controller="c1,1">
+    <component id="n75_mbf1" name="btnActivityLuckyBox" src="t6j1ow" fileName="components/BtnModle2.xml" xy="28,778" size="141,159" group="n89_vols" controller="c1,1">
       <Button title="镜花水月" icon="ui://mfvz4q8kvolsog"/>
     </component>
-    <group id="n89_vols" name="n89" xy="0,314" size="411,618" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
+    <group id="n89_vols" name="n89" xy="0,314" size="411,623" group="n52_qqat" advanced="true" layout="vt" lineGap="10" excludeInvisibles="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>

FGUIProject/assets/Main/components/BtnModle1.xml

@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="141,158" extention="Button">
+<component size="141,130" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="c1" exported="true" pages="0,,1," selected="1">
     <remark page="0" value="不显示时间"/>
     <remark page="1" value="显示时间"/>
   </controller>
   <displayList>
-    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n13_vols" url="ui://mfvz4q8kvolsoh" align="center"/>
-    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,99" pivot="0.5,0" size="81,29" group="n12_vols">
+    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n14_t6j1" url="ui://mfvz4q8kvolsog" align="center"/>
+    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,100" pivot="0.5,0" size="81,29" group="n14_t6j1">
       <relation target="n7_vols" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_vols" name="title" xy="39,91" pivot="0.5,0" size="63,41" group="n12_vols" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
-    <group id="n12_vols" name="grpName" xy="30,91" size="81,42" group="n13_vols" advanced="true"/>
-    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,131" pivot="0.5,0" group="n11_vols">
-      <relation target="n9_vols" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n9_vols" name="txtTime" xy="20,122" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
-    <group id="n11_vols" name="grpTime" xy="14,122" size="112,39" group="n13_vols" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
-    <group id="n13_vols" name="n13" xy="6,0" size="127,161" advanced="true" layout="vt" lineGap="-11" excludeInvisibles="true"/>
+    <text id="n7_vols" name="title" xy="39,92" pivot="0.5,0" size="63,41" group="n14_t6j1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
+    <group id="n14_t6j1" name="n14" xy="6,0" size="127,133" advanced="true"/>
   </displayList>
   <Button/>
-  <relation target="n13_vols" sidePair="height-height"/>
 </component>

FGUIProject/assets/Main/components/BtnModle2.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="141,159" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n4_wg7t" name="icon" xy="70,51" pivot="0.5,0.5" anchor="true" size="127,102" group="n14_t6j1" url="ui://mfvz4q8kvolsog" align="center"/>
+    <image id="n5_vols" name="n5" src="volsoe" fileName="imagesNew/zjm_tb_db_hd.png" xy="30,100" pivot="0.5,0" size="81,29" group="n14_t6j1">
+      <relation target="n7_vols" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n7_vols" name="title" xy="39,92" pivot="0.5,0" size="63,41" group="n14_t6j1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#ffffff" align="center" strokeColor="#936f37" text="首充"/>
+    <group id="n14_t6j1" name="n14" xy="6,0" size="127,133" advanced="true"/>
+    <image id="n10_vols" name="n10" src="volsoa" fileName="imagesNew/zjm_hd_sj_db.png" xy="14,132" pivot="0.5,0" group="n11_vols">
+      <relation target="n9_vols" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n9_vols" name="txtTime" xy="20,123" pivot="0.5,0" size="100,39" group="n11_vols" fontSize="28" color="#775839" text="03:58:28"/>
+    <group id="n11_vols" name="grpTime" xy="14,123" size="112,39" advanced="true"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -644,6 +644,7 @@
     <component id="volsot" name="ListAdItem.xml" path="/components/"/>
     <component id="volsou" name="ComAdSelectItem.xml" path="/components/"/>
     <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
+    <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -8,9 +8,6 @@ namespace UI.Main
     {
         public GButton target;
         public Controller m_c1;
-        public GGroup m_grpName;
-        public GTextField m_txtTime;
-        public GGroup m_grpTime;
         public const string URL = "ui://mfvz4q8kvolsoq";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "BtnModle1";
@@ -59,16 +56,10 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_grpName = (GGroup)comp.GetChild("grpName");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_grpName = null;
-            m_txtTime = null;
-            m_grpTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_BtnModle2
+    {
+        public GButton target;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public const string URL = "ui://mfvz4q8kt6j1ow";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "BtnModle2";
+        private static UI_BtnModle2 _proxy;
+
+        public static UI_BtnModle2 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnModle2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnModle2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnModle2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTime = null;
+            m_grpTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -23,8 +23,8 @@ namespace UI.Main
         public GGroup m_grpList;
         public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
-        public UI_BtnModle1 m_btnActivityDay7;
-        public UI_BtnModle1 m_btnActivityLuckyBox;
+        public UI_BtnModle2 m_btnActivityDay7;
+        public UI_BtnModle2 m_btnActivityLuckyBox;
         public GGroup m_grpLeft;
         public UI_ButtonModle6 m_btnArena;
         public UI_ButtonModle7 m_btn1;
@@ -103,8 +103,8 @@ namespace UI.Main
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
-            m_btnActivityDay7 = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityDay7"));
-            m_btnActivityLuckyBox = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnActivityLuckyBox"));
+            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
+            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_btnArena = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnArena"));
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));