限时累充

FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n0_nyhm" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,78"/>
-    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108"/>
+    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108" pkg="eg2y0ldp"/>
     <text id="n2_nyhm" name="TimeStr" xy="461,107" size="156,44" fontSize="32" color="#fffaec" autoSize="none" text=""/>
     <component id="n4_nyhm" name="n4" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="640,100"/>
     <component id="n6_rle1" name="ExpProcess" src="nyhmf" fileName="components/ExpProcess.xml" xy="74,190">

FGUIProject/assets/ActivityDay7/package.xml

@@ -6,9 +6,7 @@
     <image id="nyhm2" name="qrhd_jd_fgx.png" path="/images/"/>
     <image id="nyhm3" name="qrhd_zd.png" path="/images/"/>
     <image id="nyhm4" name="qrhd_wp_db_1.png" path="/images/"/>
-    <image id="nyhm5" name="sj_db.png" path="/images/"/>
     <image id="nyhm7" name="qrhd_jdt.png" path="/images/"/>
-    <image id="nyhm8" name="qrhd_db.png" path="/images/"/>
     <image id="nyhm9" name="qrhd_sz_db.png" path="/images/"/>
     <image id="nyhma" name="choose_cardtab_1.png" path="/images/"/>
     <image id="nyhmb" name="qrhd_jdt_db.png" path="/images/"/>

FGUIProject/assets/CommonGame/components/BtnBack0.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="90,90" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_uyux" name="loaBg" xy="-35,0" size="578,116" touchable="false" url="ui://eg2y0ldpuyuxtj8" autoSize="true"/>
+    <loader id="n3_uyux" name="n3" xy="0,-11" size="111,96" url="ui://eg2y0ldpa0cftl1" autoSize="true"/>
+    <loader id="n5_uyux" name="icon" xy="99,10" pivot="0.5,0" size="213,57" url="ui://eg2y0ldpidkdtnb" autoSize="true"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle004.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="90,90" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="50,10" size="429,76" touchable="false" url="ui://eg2y0ldpysx9tk6" autoSize="true"/>
-    <loader id="n3_uyux" name="n3" xy="0,0" size="92,94" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
-    <loader id="n5_uyux" name="icon" xy="125,19" pivot="0.5,0" size="161,54" autoSize="true"/>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/CommonGame/package.xml

@@ -181,7 +181,7 @@
     <image id="qqattj2" name="zjm_gnkuang.png" path="/images/"/>
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
     <image id="uyuxtj4" name="xcpz_fhfh.png" path="/imagesExport/" exported="true"/>
-    <component id="uyuxtj5" name="ButtonBack.xml" path="/components/" exported="true"/>
+    <component id="uyuxtj5" name="BtnBack0.xml" path="/components/" exported="true"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
@@ -282,17 +282,17 @@
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
     <component id="rv091p" name="BtnStyle1Big.xml" path="/components/" exported="true"/>
     <component id="rv091x" name="BtnStyle1Small.xml" path="/components/" exported="true"/>
-    <image id="wm603g" name="lm_an__3weixuan.png" path="/imagesNew/" exported="true"/>
-    <image id="wm603f" name="lm_an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4m" name="lm_an__tongyi.png" path="/imagesNew/" exported="true"/>
-    <image id="9jv66c" name="lm_an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/imagesNew/" exported="true"/>
+    <image id="wm603g" name="an__3weixuan.png" path="/imagesNew/" exported="true"/>
+    <image id="wm603f" name="an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4m" name="an__tongyi.png" path="/imagesNew/" exported="true"/>
+    <image id="9jv66c" name="an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="an__xuanzhong_qifu.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4o" name="lm_an_jujue.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
+    <image id="o9gh4o" name="an_jujue.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4l" name="an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
-    <image id="a0cf2o" name="lm_an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
+    <image id="a0cf2o" name="an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
     <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
     <image id="9jv66j" name="lm_zsx0.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh40" name="tanchuang.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="255,165,510,239"/>
@@ -313,8 +313,8 @@
     <image id="uxxstmq" name="mrrw_bq_qb.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstmj" name="mrrw_db.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstn3" name="txz_tb_ylq.png" path="/imagesNew/" exported="true"/>
-    <image id="ittstn4" name="lm_an_jujue_1.png" path="/imagesNew/" exported="true"/>
-    <image id="nyhm6" name="lm_an_qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
+    <image id="ittstn4" name="an_jujue_1.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm6" name="an_qrhd_ylq_db.png" path="/imagesNew/" exported="true"/>
     <image id="qik1tm2" name="jzsjzs_txktx.png" path="/images/" scale9grid="30,30,60,60"/>
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
@@ -331,8 +331,13 @@
     <component id="mbf1tn5" name="ComBg001.xml" path="/componentsBg/" exported="true"/>
     <image id="mbf1tn6" name="lm_biaotizi_14.png" path="/componentsBg/"/>
     <component id="mbf1tn7" name="BtnStyle003.xml" path="/components/" exported="true"/>
-    <image id="mbf1tn8" name="lm_an__xuanzhong.png" path="/imagesNew/" exported="true"/>
+    <image id="mbf1tn8" name="an__xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtn9" name="bq_whd.png" path="/imagesNew/" exported="true"/>
+    <image id="nyhm5" name="sj_db.png" path="/imagesNew/" exported="true"/>
+    <image id="qqhzl" name="an_pink.png" path="/imagesNew/" exported="true"/>
+    <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/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="994,1393">
+<component size="1080,1920">
   <displayList>
-    <image id="n0_fqor" name="n0" src="ox5b9" fileName="images/yzhd_ditu.png" xy="0,0"/>
-    <list id="n1_fqor" name="list" xy="56,242" size="884,1027" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
+    <image id="n8_idkd" name="n8" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,791">
+      <relation target="" sidePair="height-height,bottom-bottom"/>
+    </image>
+    <list id="n1_fqor" name="list" xy="15,983" size="1040,937" layout="flow_hz" overflow="scroll" lineGap="20" defaultItem="ui://t8nwuj7iidkd15">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -14,13 +17,17 @@
       <item/>
       <item/>
     </list>
-    <component id="n2_fqor" name="btnCharge" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="681,145">
-      <Button title="前往充值"/>
-    </component>
-    <image id="n4_idkd" name="n4" src="mbf14" fileName="imagesNew/sj_dk.png" pkg="eg2y0ldp" xy="373,53" group="n6_idkd"/>
-    <text id="n5_idkd" name="txtTime" xy="400,53" pivot="0.5,0" size="193,44" group="n6_idkd" fontSize="32" color="#fffbf9" align="center" text="00天00时00分"/>
-    <group id="n6_idkd" name="n6" xy="373,53" size="247,44" advanced="true">
+    <image id="n7_idkd" name="n7" src="nyhm5" fileName="imagesNew/sj_db.png" pkg="eg2y0ldp" xy="736,59" group="n6_idkd"/>
+    <text id="n5_idkd" name="txtTime" xy="790,58" pivot="0.5,0" size="193,44" group="n6_idkd" fontSize="32" color="#fffbf9" align="center" text="00天00时00分"/>
+    <group id="n6_idkd" name="n6" xy="736,58" size="366,45" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
+    <component id="n2_fqor" name="btnCharge" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="747,768">
+      <Button title="前往充值"/>
+    </component>
+    <component id="n9_idkd" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="1011,54" size="36,37" scale="1.5,1.5">
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
+    </component>
+    <component id="n10_idkd" name="n10" src="uyuxtj5" fileName="components/BtnBack0.xml" pkg="eg2y0ldp" xy="35,80"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="882,208">
+<component size="1041,216">
   <controller name="c1" pages="0,,1,,2," selected="0">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <displayList>
-    <image id="n2_mbf1" name="n2" src="idkd16" fileName="images/tc_xuanxiangkuang.png" xy="0,0"/>
-    <list id="n3_mbf1" name="listRewards" xy="30,69" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
+    <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
+    <list id="n3_mbf1" name="listRewards" xy="99,64" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
     </list>
-    <text id="n4_mbf1" name="txtTitle" xy="30,8" size="448,44" fontSize="32" color="#a07c49" text="巴拉巴拉限定摘星99次（0/99）"/>
-    <component id="n7_mbf1" name="btnGetNone" src="mbf1tn7" fileName="components/BtnStyle003.xml" pkg="eg2y0ldp" xy="648,80">
+    <text id="n4_mbf1" name="txtTitle" xy="59,10" size="448,44" fontSize="32" color="#a07c49" text="巴拉巴拉限定摘星99次（0/99）"/>
+    <component id="n7_mbf1" name="btnGetNone" src="mbf1tn7" fileName="components/BtnStyle003.xml" pkg="eg2y0ldp" xy="799,70">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="领取"/>
     </component>
-    <component id="n5_mbf1" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="648,80" size="189,58">
+    <component id="n5_mbf1" name="btnGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="799,70" size="189,58">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpmbf1tn8"/>
     </component>
-    <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="624,84" size="233,51">
+    <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="775,74" size="233,51">
       <gearDisplay controller="c1" pages="2"/>
       <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
     </component>

FGUIProject/assets/EnduringGiftBox/components/BtnSub.xml

@@ -2,7 +2,7 @@
 <component size="260,75" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0">
+    <image id="n0_qqhz" name="n0" src="qqhzl" fileName="images/cz_an_pink.png" xy="0,0" pkg="eg2y0ldp">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <text id="n1_qqhz" name="n1" 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

@@ -21,7 +21,6 @@
     <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="qqhzl" name="cz_an_pink.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/DailyWelfare/UI_DailySignUI.cs

@@ -13,6 +13,7 @@ namespace UI.DailyWelfare
         public GTextField m_txtSignCount;
         public GList m_list;
         public GButton m_btnClose;
+        public Transition m_t0;
         public const string URL = "ui://t8nwuj7iqik1q";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "DailySignUI";
@@ -66,6 +67,7 @@ namespace UI.DailyWelfare
             m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
             m_list = (GList)comp.GetChild("list");
             m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +78,7 @@ namespace UI.DailyWelfare
             m_txtSignCount = null;
             m_list = null;
             m_btnClose = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,8 +8,9 @@ namespace UI.DailyWelfare
     {
         public GComponent target;
         public GList m_list;
-        public GButton m_btnCharge;
         public GTextField m_txtTime;
+        public GButton m_btnCharge;
+        public GButton m_btnRule;
         public const string URL = "ui://t8nwuj7iidkd14";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "LimitChargeUI";
@@ -58,14 +59,16 @@ namespace UI.DailyWelfare
         private void Init(GComponent comp)
         {
             m_list = (GList)comp.GetChild("list");
-            m_btnCharge = (GButton)comp.GetChild("btnCharge");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnCharge = (GButton)comp.GetChild("btnCharge");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_list = null;
-            m_btnCharge = null;
             m_txtTime = null;
+            m_btnCharge = null;
+            m_btnRule = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_comPro
+    {
+        public GComponent target;
+        public GImage m_bar;
+        public GGraph m_ani;
+        public const string URL = "ui://t8nwuj7iidkd1g";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "comPro";
+        private static UI_comPro _proxy;
+
+        public static UI_comPro Create(GObject gObject = null)
+        {
+            var ui = new UI_comPro();
+            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_comPro Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_comPro();
+            }
+            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_bar = (GImage)comp.GetChild("bar");
+            m_ani = (GGraph)comp.GetChild("ani");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bar = null;
+            m_ani = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_FirstChargeBonusUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d97212c03c72cc742b88181d0c28938e
+guid: 6f5b474ef893ae64fa7c4aaf97077b22
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

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