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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_FirstChargeBonusUI.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_FirstChargeBonusUI.cs.meta
#	GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs.meta
#	GameClient/Assets/ResIn/UI/BornLimit_fui.bytes.meta

FGUIProject/assets/BornLimit/FirstChargeBonusUI.xml

@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="994,1393">
-  <controller name="c1" pages="0,,1,,2," selected="1">
+<component size="1080,1230">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="0" value="充值"/>
     <remark page="1" value="领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <displayList>
-    <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">
+    <image id="n4_sjiz" name="n4" src="sjiz5" fileName="首充.png" xy="0,-263"/>
+    <image id="n0_fqor" name="n0" src="sjiz3" fileName="images/sc_db.png" xy="0,-43"/>
+    <image id="n8_sjiz" name="n8" src="sjiz4" fileName="images/sc_lihui_lnlx.png" xy="10,29"/>
+    <image id="n6_sjiz" name="n6" src="sjiz0" fileName="images/sc_mc_db.png" xy="140,202"/>
+    <image id="n9_sjiz" name="n9" src="sjiz2" fileName="images/wz_sc.png" xy="437,139"/>
+    <image id="n13_idkd" name="n13" src="idkdtnc" fileName="imagesNew/xsqg_zsx.png" pkg="eg2y0ldp" xy="461,400"/>
+    <text id="n7_sjiz" name="txtName" xy="151,297" size="40,130" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fffdfc" leading="-6" autoSize="height" strokeColor="#d88f4e" text="岭南荔夏"/>
+    <list id="n1_fqor" name="list" xy="493,414" size="402,476" layout="flow_hz" overflow="scroll" lineGap="14" colGap="14" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
       <item/>
@@ -19,15 +25,17 @@
       <item/>
       <item/>
     </list>
-    <component id="n2_fqor" name="btnCharge" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="538,1073">
+    <component id="n10_idkd" name="btnCharge" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="560,928" size="260,74">
       <gearDisplay controller="c1" pages="0"/>
-      <Button title="充值"/>
+      <Button title="前往充值" icon="ui://eg2y0ldpqqhzk"/>
     </component>
-    <component id="n3_fqor" name="btnGet" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="540,1074">
+    <component id="n3_fqor" name="btnGet" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="560,928" touchable="false" grayed="true">
       <gearDisplay controller="c1" pages="1,2"/>
-      <gearLook controller="c1" pages="2" values="1,0,0,1" default="1,0,0,1"/>
-      <gearText controller="c1" pages="1" values="领取" default="已领取"/>
-      <Button title="领取"/>
+      <gearLook controller="c1" pages="2" values="1,0,1,0" default="1,0,0,1"/>
+      <Button title="领取奖励"/>
     </component>
+    <component id="n5_sjiz" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="496,1137"/>
+    <image id="n11_idkd" name="n11" src="sjiz1" fileName="images/sc_wp_zz.png" xy="467,832"/>
+    <text id="n12_idkd" name="txtTips" xy="485,358" pivot="0.5,0" size="432,39" fontSize="28" color="#d28f88" letterSpacing="-3" text="商城充值、月卡、锦罗织造可激活首充"/>
   </displayList>
 </component>

FGUIProject/assets/BornLimit/package.xml

@@ -2,6 +2,12 @@
 <packageDescription id="cfkvka81">
   <resources>
     <component id="idkd13" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
+    <image id="sjiz0" name="sc_mc_db.png" path="/images/"/>
+    <image id="sjiz1" name="sc_wp_zz.png" path="/images/"/>
+    <image id="sjiz2" name="wz_sc.png" path="/images/"/>
+    <image id="sjiz3" name="sc_db.png" path="/images/"/>
+    <image id="sjiz4" name="sc_lihui_lnlx.png" path="/images/"/>
+    <image id="sjiz5" name="首充.png" path="/"/>
   </resources>
-  <publish name=""/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/BornLimit" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/BtnStyle004.xml

@@ -2,12 +2,11 @@
 <component size="260,75" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_9qpb" name="n0" src="qqhzl" fileName="imagesNew/an_pink.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_9qpb" name="title" xy="0,-5" size="260,75" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffaf7" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
-      <relation target="" sidePair="width-width,height-height"/>
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="260,75" url="ui://eg2y0ldpqqhzl" autoSize="true"/>
+    <text id="n1_9qpb" name="title" xy="0,-4" size="260,75" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#fffaf7" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>
+  <relation target="n2_idkd" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -338,6 +338,8 @@
     <component id="idkdtna" name="BtnStyle004.xml" path="/components/" exported="true"/>
     <image id="nyhm8" name="qrhd_db.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="269,618,540,239"/>
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
+    <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
+    <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/EnduringGiftBox/components/BtnBuy.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n3_qqhz" name="bagGrey" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
-    <image id="n0_qqhz" name="bagYellow" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0">
+    <image id="n0_qqhz" name="bagYellow" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="txtNewPrice" xy="146,2" size="104,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="12元"/>

FGUIProject/assets/EnduringGiftBox/components/BtnBuyWeek.xml

@@ -2,7 +2,7 @@
 <component size="260,74" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qqhz" name="n0" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0">
+    <image id="n0_qqhz" name="n0" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="txtNewPrice" xy="135,0" size="106,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" vAlign="middle" autoSize="shrink" text="300"/>

FGUIProject/assets/EnduringGiftBox/components/BtnReceive.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n2_qqhz" name="received" src="qqhzm" fileName="images/cz_an_grey.png" xy="0,0"/>
-    <image id="n0_qqhz" name="receive" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0">
+    <image id="n0_qqhz" name="receive" src="qqhzk" fileName="images/cz_an_yellow.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="txtRec" xy="0,0" size="260,69" font="SourceHanSerifCN-SemiBold" fontSize="32" color="#fffdf4" align="center" vAlign="middle" autoSize="none" text="领取"/>

FGUIProject/assets/EnduringGiftBox/package.xml

@@ -20,7 +20,6 @@
     <image id="qqhzh" name="cz_jb_juese.png" path="/images/"/>
     <image id="qqhzi" name="cz_gmjd_db.png" path="/images/"/>
     <image id="qqhzj" name="cz_db.png" path="/images/"/>
-    <image id="qqhzk" name="cz_an_yellow.png" path="/images/"/>
     <image id="qqhzm" name="cz_an_grey.png" path="/images/"/>
     <image id="qqhzn" name="cz_an_blue.png" path="/images/"/>
     <image id="qqhzo" name="ch_db_gy.png" path="/images/"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_Component1.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Activity
-{
-    public partial class UI_Component1
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public const string URL = "ui://5uawdql9rkrwj";
-        public const string PACKAGE_NAME = "Activity";
-        public const string RES_NAME = "Component1";
-        private static UI_Component1 _proxy;
-
-        public static UI_Component1 Create(GObject gObject = null)
-        {
-            var ui = new UI_Component1();
-            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_Component1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Component1();
-            }
-            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.GetChild("loaIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_Component1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_FirstChargeBonusUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_ListItem.cs

@@ -1,83 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Activity
-{
-    public partial class UI_ListItem
-    {
-        public GComponent target;
-        public GLoader m_loaBg;
-        public GLoader m_loaIcon;
-        public GTextField m_txtNum;
-        public GTextField m_txtName;
-        public GImage m_imgGot;
-        public const string URL = "ui://5uawdql9jyml7";
-        public const string PACKAGE_NAME = "Activity";
-        public const string RES_NAME = "ListItem";
-        private static UI_ListItem _proxy;
-
-        public static UI_ListItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListItem();
-            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_ListItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListItem();
-            }
-            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_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_imgGot = (GImage)comp.GetChild("imgGot");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaBg = null;
-            m_loaIcon = null;
-            m_txtNum = null;
-            m_txtName = null;
-            m_imgGot = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_ListItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_SevenDayLoginUI.cs

@@ -1,75 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Activity
-{
-    public partial class UI_SevenDayLoginUI
-    {
-        public GComponent target;
-        public GList m_list;
-        public UI_Component1 m_comIcon;
-        public const string URL = "ui://5uawdql9lh8v6";
-        public const string PACKAGE_NAME = "Activity";
-        public const string RES_NAME = "SevenDayLoginUI";
-        private static UI_SevenDayLoginUI _proxy;
-
-        public static UI_SevenDayLoginUI Create(GObject gObject = null)
-        {
-            var ui = new UI_SevenDayLoginUI();
-            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_SevenDayLoginUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_SevenDayLoginUI();
-            }
-            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_list = (GList)comp.GetChild("list");
-            m_comIcon = (UI_Component1)UI_Component1.Create(comp.GetChild("comIcon"));
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_list = null;
-            m_comIcon.Dispose();
-            m_comIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_SevenDayLoginUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 60abd930bfd28934092ac41b997764e6
+guid: 49ff5ccc5433a2445ba238bebe20c8fe
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activity/UI_FirstChargeBonusUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_FirstChargeBonusUI.cs

@@ -2,17 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.Activity
+namespace UI.BornLimit
 {
     public partial class UI_FirstChargeBonusUI
     {
         public GComponent target;
         public Controller m_c1;
+        public GTextField m_txtName;
         public GList m_list;
         public GButton m_btnCharge;
         public GButton m_btnGet;
-        public const string URL = "ui://5uawdql9fqor0";
-        public const string PACKAGE_NAME = "Activity";
+        public GButton m_btnClose;
+        public GTextField m_txtTips;
+        public const string URL = "ui://cfkvka81idkd13";
+        public const string PACKAGE_NAME = "BornLimit";
         public const string RES_NAME = "FirstChargeBonusUI";
         private static UI_FirstChargeBonusUI _proxy;
 
@@ -59,16 +62,22 @@ namespace UI.Activity
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_list = (GList)comp.GetChild("list");
             m_btnCharge = (GButton)comp.GetChild("btnCharge");
             m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_txtName = null;
             m_list = null;
             m_btnCharge = null;
             m_btnGet = null;
+            m_btnClose = null;
+            m_txtTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ComSkillUp.cs.meta
 guid: cc7af52bef82a7d4d95d91a8cab77d77
+=======
+guid: 33f7a6e0b86bc3d4ea5d08d9994f4fd6
+>>>>>>> b37f7b22fc0e29df9b922b1ed157168ed357e97a:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_FirstChargeBonusUI.cs.meta
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs

@@ -1,10 +1,7 @@
-
-using System.Collections.Generic;
 using ET;
 using FairyGUI;
-using UI.DailyWelfare;
+using UI.BornLimit;
 using UI.CommonGame;
-using UnityEngine;
 
 namespace GFGGame
 {

GameClient/Assets/ResIn/UI/BornLimit.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: adb7fea3ac62fd842b2e43af8ded833d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/BornLimit/BornLimit_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5ecfc46bb10e4c049b85d13af6afac02
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: