Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/DailyWelfare/FirstChargeBonusUI.xml → FGUIProject/assets/BornLimit/FirstChargeBonusUI.xml

@@ -6,7 +6,7 @@
     <remark page="2" value="已领取"/>
   </controller>
   <displayList>
-    <image id="n0_fqor" name="n0" src="ox5b9" fileName="SevenDayLoginImages/yzhd_ditu.png" xy="0,0"/>
+    <image id="n0_fqor" name="n0" src="ox5b9" fileName="SevenDayLoginImages/yzhd_ditu.png" xy="0,0" pkg="t8nwuj7i"/>
     <list id="n1_fqor" name="list" xy="84,201" size="681,830" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98">
       <item/>
       <item/>

FGUIProject/assets/BornLimit/package.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="cfkvka81">
+  <resources>
+    <component id="idkd13" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
+  </resources>
+  <publish name=""/>
+</packageDescription>

FGUIProject/assets/DailyWelfare/package.xml

@@ -29,7 +29,6 @@
     <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
     <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
     <image id="qik111" name="wz_mrbj.png" path="/images/"/>
-    <component id="idkd13" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
     <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
     <image id="ox5b9" name="yzhd_ditu.png" path="/images/"/>
     <image id="ox5ba" name="yzhd_dyt_1.png" path="/images/" exported="true"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_FirstChargeBonusUI.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_FirstChargeBonusUI
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GList m_list;
-        public GButton m_btnCharge;
-        public GButton m_btnGet;
-        public const string URL = "ui://t8nwuj7iidkd13";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "FirstChargeBonusUI";
-        private static UI_FirstChargeBonusUI _proxy;
-
-        public static UI_FirstChargeBonusUI Create(GObject gObject = null)
-        {
-            var ui = new UI_FirstChargeBonusUI();
-            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_FirstChargeBonusUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_FirstChargeBonusUI();
-            }
-            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_c1 = comp.GetController("c1");
-            m_list = (GList)comp.GetChild("list");
-            m_btnCharge = (GButton)comp.GetChild("btnCharge");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_list = null;
-            m_btnCharge = null;
-            m_btnGet = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}