主界面ui

FGUIProject/assets/Main/MainUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetY="-240">
+<component size="1080,1920" designImage="ui://mfvz4q8kjx6zp4" designImageOffsetY="-240">
   <displayList>
     <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n59_oju1"/>
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1448" group="n52_qqat">
@@ -87,41 +87,39 @@
       <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"/>
-    <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="70,447" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8in"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv461j7"/>
-    </component>
-    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="615,1195" group="n58_oju1">
+    <component id="n70_weok" name="loaLeft" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="38,164" group="n58_oju1"/>
+    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="580,1199" group="n58_oju1" visible="false">
       <Button icon="ui://mfvz4q8kmzf8ik"/>
       <property target="loaLockIcon" propertyId="1" value=""/>
       <property target="icon1" propertyId="1" value=""/>
     </component>
-    <component id="n44_n3xh" name="btnStudio" src="mzf8ip" fileName="components/ButtonModle2.xml" xy="343,673" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8im"/>
+    <component id="n44_n3xh" name="btnStudio" src="jx6zpd" fileName="components/ButtonModle9.xml" xy="436,581" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp7"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482ft"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zp8"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="753,893" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8il"/>
+    <component id="n60_wono" name="btnTravel" src="jx6zpd" fileName="components/ButtonModle9.xml" xy="106,381" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp7"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kwonohg"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zp5"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="118,1487" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8ij"/>
+    <component id="n51_v482" name="btnPoem" src="jx6zpc" fileName="components/ButtonModle8.xml" xy="174,1316" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp6"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fr"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zpb"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="663,1584" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8io"/>
+    <component id="n45_kqhd" name="btnField" src="jx6zpd" fileName="components/ButtonModle9.xml" xy="746,451" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp7"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fv"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zpa"/>
     </component>
-    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="-46,1447" size="200,234" group="n58_oju1" controller="c1,1"/>
-    <group id="n58_oju1" name="grpRight" xy="-46,447" size="1126,1497" group="n59_oju1" advanced="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
-    <group id="n59_oju1" name="grpMove" xy="-46,85" size="1176,1859" advanced="true"/>
+    <component id="n73_mzf8" name="btnArena" src="jx6zpc" fileName="components/ButtonModle8.xml" xy="637,1208" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp6"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zp9"/>
+    </component>
+    <group id="n58_oju1" name="grpRight" xy="38,164" size="892,1402" group="n59_oju1" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,85" size="1130,1835" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/Main/components/ButtonModle8.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,250" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="125,125" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n1_wg7t" name="icon" xy="125,125" pivot="0.5,0.5" anchor="true" size="396,400" group="n10_jx6z" url="ui://mfvz4q8kjx6zp6" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n9_jx6z" name="icon1" xy="142,128" pivot="0.5,0.5" anchor="true" size="234,144" group="n10_jx6z" url="ui://mfvz4q8kjx6zp9" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <graph id="n4_lki4" name="holder1" xy="125,125" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n8_v95q" name="loaLockIcon" xy="125,125" pivot="0.5,0.5" anchor="true" size="84,395" group="n10_jx6z" url="ui://eg2y0ldpv95qtk0" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <group id="n10_jx6z" name="n10" xy="-73,-75" size="396,400"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

FGUIProject/assets/Main/components/ButtonModle9.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="184,538" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="92,296" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n1_wg7t" name="icon" xy="92,296" pivot="0.5,0.5" anchor="true" size="242,632" group="n10_jx6z" url="ui://mfvz4q8kjx6zp7" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n9_jx6z" name="icon1" xy="85,229" pivot="0.5,0.5" anchor="true" size="190,300" group="n10_jx6z" url="ui://mfvz4q8kjx6zp5" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <graph id="n4_lki4" name="holder1" xy="92,296" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n8_v95q" name="loaLockIcon" xy="92,296" pivot="0.5,0.5" anchor="true" size="84,395" group="n10_jx6z" url="ui://eg2y0ldpv95qtk0" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <group id="n10_jx6z" name="n10" xy="-29,-20" size="242,632"/>
+  </displayList>
+  <Button/>
+  <relation target="n1_wg7t" sidePair="width-width,height-height"/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

FGUIProject/assets/Main/package.xml

@@ -359,8 +359,6 @@
     <image id="v482ft" name="zjm_rk_7.png" path="/images/"/>
     <image id="v482fu" name="zjm_rk_8.png" path="/images/"/>
     <image id="v482fv" name="zjm_rk_9.png" path="/images/"/>
-    <image id="v482fw" name="zjm_2.jpg" path="/"/>
-    <image id="v482fx" name="zjm_1.jpg" path="/" atlas="alone_npot"/>
     <image id="qqatfy" name="zjm_hdhd_2.png" path="/images/"/>
     <image id="wonog1" name="zd_jsjm_jszi_0.png" path="/imagesFight/"/>
     <image id="wonog2" name="jz_ejd_yz.png" path="/imagesFight/"/>
@@ -651,6 +649,16 @@
     <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
     <component id="ofwup2" name="ComSkillTips.xml" path="/"/>
     <image id="jx6zp3" name="zjm_dibutb_db.png" path="/imagesNew/"/>
+    <image id="jx6zp4" name="fuben_bg.png" path="/"/>
+    <image id="jx6zp5" name="sn_txt_xfqs.png" path="/imagesNew/"/>
+    <image id="jx6zp6" name="sn_img_circle.png" path="/imagesNew/"/>
+    <image id="jx6zp7" name="sn_img_ver.png" path="/imagesNew/"/>
+    <image id="jx6zp8" name="sn_txt_gzs.png" path="/imagesNew/"/>
+    <image id="jx6zp9" name="sn_txt_jjc.png" path="/imagesNew/"/>
+    <image id="jx6zpa" name="sn_txt_tydc.png" path="/imagesNew/"/>
+    <image id="jx6zpb" name="sn_txt_wss.png" path="/imagesNew/"/>
+    <component id="jx6zpc" name="ButtonModle8.xml" path="/components/"/>
+    <component id="jx6zpd" name="ButtonModle9.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -31,7 +31,7 @@ namespace GFGGame
             //背景1
             Transform tf1 = sceneObj.transform.Find("Bg1");
             SpriteRenderer spr1 = tf1.GetComponent<SpriteRenderer>();
-            var resPath1 = ResPathUtil.GetBgImgPath("zjm_2");
+            var resPath1 = ResPathUtil.GetBgImgPath("fuben_bg");
             Sprite sp1 = GFGAsset.Load<Sprite>(resPath1);
             DressUpUtil.AddAssetReleaser(tf1.gameObject, resPath);
             spr1.sprite = sp1;

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonModle2
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8ip";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle2";
-        private static UI_ButtonModle2 _proxy;
-
-        public static UI_ButtonModle2 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle2();
-            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_ButtonModle2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle2();
-            }
-            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_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonModle5
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8is";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle5";
-        private static UI_ButtonModle5 _proxy;
-
-        public static UI_ButtonModle5 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle5();
-            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_ButtonModle5 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle5();
-            }
-            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_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonModle6
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8it";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle6";
-        private static UI_ButtonModle6 _proxy;
-
-        public static UI_ButtonModle6 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle6();
-            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_ButtonModle6 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle6();
-            }
-            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_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle8.cs

@@ -4,21 +4,21 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ButtonModle3
+    public partial class UI_ButtonModle8
     {
         public GButton target;
         public GGraph m_holder;
-        public GGraph m_holder1;
         public GLoader m_icon1;
+        public GGraph m_holder1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8iq";
+        public const string URL = "ui://mfvz4q8kjx6zpc";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle3";
-        private static UI_ButtonModle3 _proxy;
+        public const string RES_NAME = "ButtonModle8";
+        private static UI_ButtonModle8 _proxy;
 
-        public static UI_ButtonModle3 Create(GObject gObject = null)
+        public static UI_ButtonModle8 Create(GObject gObject = null)
         {
-            var ui = new UI_ButtonModle3();
+            var ui = new UI_ButtonModle8();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ButtonModle3 Proxy(GObject gObject = null)
+        public static UI_ButtonModle8 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ButtonModle3();
+                _proxy = new UI_ButtonModle8();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -59,15 +59,15 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
-            m_holder1 = null;
             m_icon1 = null;
+            m_holder1 = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle8.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f5d5cd4ad253de94dbb54ba135e78a00
+guid: 676d22f16cf0a8343b915731a75c25d1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle9.cs

@@ -4,21 +4,21 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ButtonModle4
+    public partial class UI_ButtonModle9
     {
         public GButton target;
         public GGraph m_holder;
-        public GGraph m_holder1;
         public GLoader m_icon1;
+        public GGraph m_holder1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8ir";
+        public const string URL = "ui://mfvz4q8kjx6zpd";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle4";
-        private static UI_ButtonModle4 _proxy;
+        public const string RES_NAME = "ButtonModle9";
+        private static UI_ButtonModle9 _proxy;
 
-        public static UI_ButtonModle4 Create(GObject gObject = null)
+        public static UI_ButtonModle9 Create(GObject gObject = null)
         {
-            var ui = new UI_ButtonModle4();
+            var ui = new UI_ButtonModle9();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ButtonModle4 Proxy(GObject gObject = null)
+        public static UI_ButtonModle9 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ButtonModle4();
+                _proxy = new UI_ButtonModle9();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -59,15 +59,15 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
-            m_holder1 = null;
             m_icon1 = null;
+            m_holder1 = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle9.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9107d46dc08f8c54d9ceece7fd1877c7
+guid: 5225c1b1730e8a346b9fd6c97f8a105a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -27,13 +27,13 @@ namespace UI.Main
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public GGroup m_grpLeft;
-        public UI_ButtonModle6 m_btnArena;
+        public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
-        public UI_ButtonModle2 m_btnStudio;
-        public UI_ButtonModle3 m_btnTravel;
-        public UI_ButtonModle5 m_btnPoem;
-        public UI_ButtonModle4 m_btnField;
-        public UI_Component7 m_loaLeft;
+        public UI_ButtonModle9 m_btnStudio;
+        public UI_ButtonModle9 m_btnTravel;
+        public UI_ButtonModle8 m_btnPoem;
+        public UI_ButtonModle9 m_btnField;
+        public UI_ButtonModle8 m_btnArena;
         public GGroup m_grpRight;
         public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
@@ -108,13 +108,13 @@ namespace UI.Main
             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_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
-            m_btnStudio = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnStudio"));
-            m_btnTravel = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnTravel"));
-            m_btnPoem = (UI_ButtonModle5)UI_ButtonModle5.Create(comp.GetChild("btnPoem"));
-            m_btnField = (UI_ButtonModle4)UI_ButtonModle4.Create(comp.GetChild("btnField"));
-            m_loaLeft = (UI_Component7)UI_Component7.Create(comp.GetChild("loaLeft"));
+            m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
+            m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
+            m_btnPoem = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnPoem"));
+            m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
+            m_btnArena = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnArena"));
             m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
@@ -160,8 +160,7 @@ namespace UI.Main
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
             m_grpLeft = null;
-            m_btnArena.Dispose();
-            m_btnArena = null;
+            m_loaLeft = null;
             m_btn1.Dispose();
             m_btn1 = null;
             m_btnStudio.Dispose();
@@ -172,8 +171,8 @@ namespace UI.Main
             m_btnPoem = null;
             m_btnField.Dispose();
             m_btnField = null;
-            m_loaLeft.Dispose();
-            m_loaLeft = null;
+            m_btnArena.Dispose();
+            m_btnArena = null;
             m_grpRight = null;
             m_grpMove = null;
             m_loaGuidestudio = null;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -161,7 +161,7 @@ namespace GFGGame
             _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
-            _ui.m_loaLeft.target.onClick.Add(MoveRight);
+            _ui.m_loaLeft.onClick.Add(MoveRight);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -281,16 +281,12 @@ namespace GFGGame
 
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl_d");
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl");
-            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4,
-                out _wrapper4);
-            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3,
-                out _effectObj4_1, out _wrapper4_1);
+            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4, out _wrapper4);
+            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
 
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_jt");
-            SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6,
-                out _wrapper6);
-            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7,
-                out _wrapper7);
+            // SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6,out _wrapper6);
+            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7, out _wrapper7);
 
 
             // string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
@@ -1121,7 +1117,7 @@ namespace GFGGame
                 GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
                 GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
                 GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
-                GuideController.TryGuide(_ui.m_loaLeft.target, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
+                GuideController.TryGuide(_ui.m_loaLeft, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             }
         }
     }