首冲

FGUIProject/assets/Activit/FirstChargeBonusUI.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="994,1393">
+  <controller name="c1" pages="0,,1,,2," selected="1">
+    <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"/>
+    <list id="n1_fqor" name="list" xy="84,201" size="681,830" layout="flow_hz" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_fqor" name="btnCharge" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="538,1073">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="充值"/>
+    </component>
+    <component id="n3_fqor" name="btnGet" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="540,1074">
+      <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="领取"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Activit/package.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="5uawdql9">
+  <resources>
+    <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
+    <component id="jyml7" name="ListItem.xml" path="/SevenDayLoginComponents/"/>
+    <image id="ox5b8" name="yzhl_yqd.png" path="/SevenDayLoginImages/"/>
+    <image id="ox5b9" name="yzhd_ditu.png" path="/SevenDayLoginImages/"/>
+    <image id="ox5ba" name="yzhd_dyt_1.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5bb" name="yzhd_dyt_2.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5bc" name="yzhd_dyt_3.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5bd" name="yzhd_dyt_4.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5be" name="yzhd_dyt_6.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5bf" name="yzhd_dyt_7.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5bg" name="yzhd_dyt_5.png" path="/SevenDayLoginImages/" exported="true"/>
+    <image id="ox5bi" name="yzhd_zszs.png" path="/SevenDayLoginImages/"/>
+    <component id="rkrwj" name="Component1.xml" path="/SevenDayLoginComponents/"/>
+    <component id="fqor0" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Activity" packageCount="2" genCode="true" extractAlpha="true"/>
+</packageDescription>

FGUIProject/assets/League/components/Button12.xml → FGUIProject/assets/CommonGame/components/BtnYellowBig.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="187,56" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down,4,disable" selected="2"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://tw70qm9dwm603f" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603g" fill="scale" autoSize="true">
+      <gearIcon controller="button" pages="4" values="ui://eg2y0ldpwm603g" default="ui://eg2y0ldpwm603f"/>
+    </loader>
     <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>

FGUIProject/assets/League/components/Button17.xml → FGUIProject/assets/CommonGame/components/BtnYellowSmall.xml

@@ -2,7 +2,7 @@
 <component size="144,43" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="144,43" aspect="true" url="ui://tw70qm9do9gh4m" fill="scale" autoSize="true"/>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="144,43" aspect="true" url="ui://eg2y0ldpo9gh4m" fill="scale" autoSize="true"/>
     <text id="n3_u2u3" name="title" xy="51,4" pivot="0.5,0" size="41,35" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>

FGUIProject/assets/CommonGame/package.xml

@@ -281,6 +281,11 @@
     <component id="9jv6tlt" name="ComItemIconNew.xml" path="/components/"/>
     <image id="9jv6tlu" name="lm_daoju_db.png" path="/images/"/>
     <image id="miy37t" name="tb_suo.png" path="/imagesNew/" exported="true"/>
+    <component id="rv091p" name="BtnYellowBig.xml" path="/components/" exported="true"/>
+    <component id="rv091x" name="BtnYellowSmall.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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyLogin/package.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packageDescription id="5uawdql9">
-  <resources>
-    <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
-    <component id="jyml7" name="ListItem.xml" path="/components/"/>
-    <image id="ox5b8" name="yzhl_yqd.png" path="/images/"/>
-    <image id="ox5b9" name="yzhd_ditu.png" path="/images/"/>
-    <image id="ox5ba" name="yzhd_dyt_1.png" path="/images/" exported="true"/>
-    <image id="ox5bb" name="yzhd_dyt_2.png" path="/images/" exported="true"/>
-    <image id="ox5bc" name="yzhd_dyt_3.png" path="/images/" exported="true"/>
-    <image id="ox5bd" name="yzhd_dyt_4.png" path="/images/" exported="true"/>
-    <image id="ox5be" name="yzhd_dyt_6.png" path="/images/" exported="true"/>
-    <image id="ox5bf" name="yzhd_dyt_7.png" path="/images/" exported="true"/>
-    <image id="ox5bg" name="yzhd_dyt_5.png" path="/images/" exported="true"/>
-    <image id="ox5bi" name="yzhd_zszs.png" path="/images/"/>
-    <component id="rkrwj" name="Component1.xml" path="/"/>
-  </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyLogin" packageCount="2" genCode="true" extractAlpha="true"/>
-</packageDescription>

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -16,7 +16,7 @@
     <group id="n13_9jv6" name="n13" xy="81,69" size="316,401"/>
     <text id="n6_pvb4" name="txtRule" xy="386,198" size="602,289" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" autoSize="none" text="1.每天19:10分开启雅集夜宴&#xD;&#xA;2.活动需要成员尽可能在10分钟内快速回答问题，每答对一题在场的所有成员均可获得一份奖励&#xD;&#xA;3.活动结束时按照全员答对题数，仍在场的成员还可获得一份额外大奖&#xD;&#xA;4.每个成员每道题目只有一次回答机会，请认真回答哦"/>
     <text id="n4_pvb4" name="txtTime" xy="458,497" pivot="0.5,0" size="163,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="23:59:59后开启"/>
-    <component id="n5_pvb4" name="btnAnswer" src="pvb454" fileName="components/Button121.xml" xy="446,530">
+    <component id="n5_pvb4" name="btnAnswer" src="rv091p" fileName="components/Button12.xml" xy="446,530" pkg="eg2y0ldp">
       <Button title="开始答题"/>
     </component>
     <text id="n15_9jv6" name="n15" xy="388,140" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#a9733e" text="玩法描述"/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -37,10 +37,10 @@
     <component id="n23_rv09" name="btnRecruit" src="rv091r" fileName="components/Button14.xml" xy="90,1564" group="n25_rv09">
       <Button title="招募成员"/>
     </component>
-    <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/Button12.xml" xy="317,1564" group="n25_rv09">
-      <Button title="申请列表" icon="ui://tw70qm9dwm603f"/>
+    <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="317,1564" group="n25_rv09">
+      <Button title="申请列表"/>
     </component>
-    <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/Button12.xml" xy="544,1564" group="n25_rv09">
+    <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnYellowBig.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
       <Button title="联盟信息"/>
     </component>
     <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" xy="771,1562" group="n25_rv09">

FGUIProject/assets/League/components/Button121.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="187,56" opaque="false" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" group="n5_pvb4" aspect="true" url="ui://tw70qm9dwm603f" fill="scale" autoSize="true"/>
-    <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" group="n5_pvb4" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}"/>
-    <group id="n5_pvb4" name="n5" xy="0,0" size="187,56" advanced="true">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </group>
-  </displayList>
-  <Button/>
-  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
-</component>

FGUIProject/assets/League/components/Button14.xml

@@ -6,10 +6,10 @@
     <remark page="1" value="可点击"/>
   </controller>
   <displayList>
-    <image id="n7_wm60" name="n7" src="wm603g" fileName="images/lm_an__3weixuan.png" xy="0,0">
+    <image id="n7_wm60" name="n7" src="wm603g" fileName="images/lm_an__3weixuan.png" xy="0,0" pkg="eg2y0ldp">
       <gearDisplay controller="touchable" pages="0"/>
     </image>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://tw70qm9dwm603f" fill="scale" autoSize="true">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603f" fill="scale" autoSize="true">
       <gearDisplay controller="touchable" pages="1"/>
     </loader>
     <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">

FGUIProject/assets/League/components/ListApplyItem.xml

@@ -3,10 +3,10 @@
   <displayList>
     <component id="n1_rv09" name="comHead" src="o9ghtlp" fileName="components/ComHeadWithLv2.xml" pkg="eg2y0ldp" xy="0,-12" scale="0.55,0.55"/>
     <text id="n4_a0cf" name="txtName" xy="144,43" size="178,35" font="ui://eg2y0ldpa0cftkz" fontSize="25" color="#923c1a" text="玩家名字七个字"/>
-    <component id="n2_rv09" name="btnAgree" src="rv091x" fileName="components/Button17.xml" xy="495,39" size="144,43">
+    <component id="n2_rv09" name="btnAgree" src="rv091x" fileName="components/Button17.xml" xy="495,39" size="144,43" pkg="eg2y0ldp">
       <Button title="同意"/>
     </component>
-    <component id="n3_rv09" name="btnRefuse" src="rv091x" fileName="components/Button17.xml" xy="655,39">
+    <component id="n3_rv09" name="btnRefuse" src="rv091x" fileName="components/Button17.xml" xy="655,39" pkg="eg2y0ldp">
       <Button title="拒绝" icon="ui://tw70qm9do9gh4o"/>
     </component>
     <image id="n5_o9gh" name="n5" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="0,108" size="816,12"/>

FGUIProject/assets/League/components/ListGiftButItem.xml

@@ -4,7 +4,7 @@
     <image id="n19_9jv6" name="n19" src="9jv65t" fileName="images/lm_kp_db_chang.png" xy="0,0" group="n22_9jv6"/>
     <loader id="n12_pvb4" name="loaIcon" xy="134,265" pivot="0.5,0.5" size="112,112" group="n22_9jv6" url="ui://eg2y0ldpu2u3tkq" autoSize="true"/>
     <text id="n15_pvb4" name="txtCount" xy="210,437" pivot="0.5,0" size="144,34" group="n22_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="24" color="#b08548" letterSpacing="-2" text="今日剩余：1/1"/>
-    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6">
+    <component id="n14_pvb4" name="btnBuy" src="rv091x" fileName="components/Button17.xml" xy="126,588" group="n22_9jv6" pkg="eg2y0ldp">
       <Button title="采购" icon="ui://tw70qm9d9jv66c"/>
     </component>
     <component id="n16_pvb4" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="124,636" pivot="0.5,0" group="n22_9jv6" scale="0.7,0.7" controller="c1,1"/>

FGUIProject/assets/League/package.xml

@@ -33,10 +33,8 @@
     <component id="rv091m" name="ComLeader.xml" path="/components/"/>
     <component id="rv091n" name="ListMemberItem.xml" path="/components/"/>
     <component id="rv091o" name="Button11.xml" path="/components/"/>
-    <component id="rv091p" name="Button12.xml" path="/components/"/>
     <component id="rv091r" name="Button14.xml" path="/components/"/>
     <component id="rv091s" name="Button15.xml" path="/components/"/>
-    <component id="rv091x" name="Button17.xml" path="/components/"/>
     <component id="rv091z" name="ListApplyItem.xml" path="/components/"/>
     <component id="rv0920" name="ButtonToggle.xml" path="/components/"/>
     <component id="rv0923" name="ListLogItem.xml" path="/components/"/>
@@ -74,10 +72,6 @@
     <image id="wm603a" name="lm_db_4.png" path="/images/"/>
     <image id="wm603b" name="lm_db_3.png" path="/images/" scale="9grid" scale9grid="191,91,382,182"/>
     <image id="wm603d" name="lm_yeqian_db.png" path="/images/"/>
-    <image id="wm603f" name="lm_an__3xuanzhong.png" path="/images/"/>
-    <image id="wm603g" name="lm_an__3weixuan.png" path="/images/"/>
-    <image id="wm603h" name="lm_an_2.png" path="/images/"/>
-    <image id="wm603i" name="lm_an.png" path="/images/"/>
     <image id="wm603j" name="db_1xuanzhong.png" path="/images/"/>
     <image id="wm603k" name="db_1weixuan.png" path="/images/"/>
     <image id="wm603l" name="biaotizi_5.png" path="/images/"/>
@@ -113,7 +107,6 @@
     <image id="o9gh4j" name="lm_biaotizi_6.png" path="/images/"/>
     <image id="o9gh4k" name="lm_an__xuanzhong_qifu.png" path="/images/"/>
     <image id="o9gh4l" name="lm_an__weixuan_qifu.png" path="/images/"/>
-    <image id="o9gh4m" name="lm_an__tongyi.png" path="/images/"/>
     <image id="o9gh4o" name="lm_an_jujue.png" path="/images/"/>
     <image id="o9gh4p" name="biaotizi_9.png" path="/images/"/>
     <image id="o9gh4q" name="biaotizi_8.png" path="/images/"/>
@@ -128,7 +121,6 @@
     <component id="pvb451" name="ListRankItem.xml" path="/components/"/>
     <component id="pvb452" name="LeagueAnswerUI.xml" path="/" exported="true"/>
     <component id="pvb453" name="LeagueAnsweringUI.xml" path="/" exported="true"/>
-    <component id="pvb454" name="Button121.xml" path="/components/"/>
     <component id="pvb455" name="ListAnswerJoinItem.xml" path="/components/"/>
     <component id="pvb456" name="ListChatItem.xml" path="/components/" exported="true"/>
     <component id="pvb457" name="ListChatItemMine.xml" path="/components/" exported="true"/>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -106,7 +106,7 @@ namespace GFGGame
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();
             await SuitFosterProxy.SendGetSuitInfos();
-            await ActivitySProxy.ReqDailyLoginInfos();
+            await ActivitySProxy.ReqSevenDayLoginInfos();
             await RechargeSProxy.ReqRequestGiftBagInfo();
             await StudioSProxy.ReqStudioInfos();
             await RoleInfoSProxy.ReqPersonalInfo();

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -6,28 +6,37 @@ namespace GFGGame
     {
 
         /**********************************************************每日登录*************************************************/
-        private int _dailyLoginId = 1;
+        private int _sevenDayLoginLoginId = 1;
         /// <summary>
         /// 七日登录 当日奖励id
         /// </summary>
         /// <value></value>
-        public int dailyLoginId
+        public int sevenDayLoginLoginId
         {
-            get { return _dailyLoginId; }
-            set { _dailyLoginId = value; }
+            get { return _sevenDayLoginLoginId; }
+            set { _sevenDayLoginLoginId = value; }
         }
 
-        private int _bonusStatus = 0;
+        private int _sevenDayLoginBonusStatus = 0;
         /// <summary>
         /// 七日登录 当前奖励状态
         /// </summary>
         /// <value></value>
-        public int dailyLoginBonusStatus
+        public int sevenDayLoginBonusStatus
         {
-            get { return _bonusStatus; }
-            set { _bonusStatus = value; }
+            get { return _sevenDayLoginBonusStatus; }
+            set { _sevenDayLoginBonusStatus = value; }
         }
         /******************************************************************************************************************/
-
+        private int _firstChargeBonusStatus = 0;
+        /// <summary>
+        /// 首冲奖励 当前奖励状态,ConstBonusStatus 0不可领，1可领，2已领
+        /// </summary>
+        /// <value></value>
+        public int firstChargeBonusStatus
+        {
+            get { return _firstChargeBonusStatus; }
+            set { _firstChargeBonusStatus = value; }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -45,7 +45,7 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetDailyLoginRed()
         {
-            return ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET;
+            return ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET;
         }
         /// <summary>
         /// 有邮件未读或未领奖励

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_Component1.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.DailyLogin
+namespace UI.Activit
 {
     public partial class UI_Component1
     {
         public GComponent target;
         public GLoader m_loaIcon;
         public const string URL = "ui://5uawdql9rkrwj";
-        public const string PACKAGE_NAME = "DailyLogin";
+        public const string PACKAGE_NAME = "Activit";
         public const string RES_NAME = "Component1";
         private static UI_Component1 _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_Component1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8bfc11a15d30f614a8ef5dee665983fb
+guid: 57d58fcd76122474d879a5aea8fe6418
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Activit
+{
+    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://5uawdql9fqor0";
+        public const string PACKAGE_NAME = "Activit";
+        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;
+        }
+    }
+}

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_ListItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.DailyLogin
+namespace UI.Activit
 {
     public partial class UI_ListItem
     {
@@ -13,7 +13,7 @@ namespace UI.DailyLogin
         public GTextField m_txtName;
         public GImage m_imgGot;
         public const string URL = "ui://5uawdql9jyml7";
-        public const string PACKAGE_NAME = "DailyLogin";
+        public const string PACKAGE_NAME = "Activit";
         public const string RES_NAME = "ListItem";
         private static UI_ListItem _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_ListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 57a6a92ecd126bc4280a10aa2d08219a
+guid: 267f50892cb196a4ea81ff661cdf9d4a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_SevenDayLoginUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_SevenDayLoginUI.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.DailyLogin
+namespace UI.Activit
 {
     public partial class UI_SevenDayLoginUI
     {
@@ -10,7 +10,7 @@ namespace UI.DailyLogin
         public GList m_list;
         public UI_Component1 m_comIcon;
         public const string URL = "ui://5uawdql9lh8v6";
-        public const string PACKAGE_NAME = "DailyLogin";
+        public const string PACKAGE_NAME = "Activit";
         public const string RES_NAME = "SevenDayLoginUI";
         private static UI_SevenDayLoginUI _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_SevenDayLoginUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit/UI_SevenDayLoginUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 20f50cd2e1c839d42a0ec994bd1f41df
+guid: 4005c64400415834f84bdbf68a7ab73b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -5,10 +5,10 @@ using GFGGame;
 
 namespace GFGGame
 {
-    /**********************************************************每日登录*************************************************/
+    /**********************************************************七日登录*************************************************/
     public static class ActivitySProxy
     {
-        public static async ETTask<bool> ReqDailyLoginInfos()
+        public static async ETTask<bool> ReqSevenDayLoginInfos()
         {
             M2C_GetDailySignInBonusInfos response = null;
             response = (M2C_GetDailySignInBonusInfos)await MessageHelper.SendToServer(new C2M_GetDailySignInBonusInfos());
@@ -16,14 +16,14 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.dailyLoginId = response.CuurentBonusId;
-                    ActivityDataManager.Instance.dailyLoginBonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.sevenDayLoginLoginId = response.CuurentBonusId;
+                    ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
                     return true;
                 }
             }
             return false;
         }
-        public static async ETTask<bool> ReqGetDailyLoginRewards(int id)
+        public static async ETTask<bool> ReqSevenDayLoginRewards(int id)
         {
             M2C_GetDailySinInBonus response = null;
             response = (M2C_GetDailySinInBonus)await MessageHelper.SendToServer(new C2M_GetDailySinInBonus() { BonusId = id });
@@ -31,7 +31,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.dailyLoginBonusStatus = response.BonusStatus;
+                    ActivityDataManager.Instance.sevenDayLoginBonusStatus = response.BonusStatus;
                     int[][] rewards = DailyLoginCfgArray.Instance.GetCfg(response.BonusId).rewardsArr;
 
                     BonusController.TryShowBonusList(rewards);
@@ -42,7 +42,25 @@ namespace GFGGame
             }
             return false;
         }
-    }
-    /******************************************************************************************************************/
+        /*************************************************************首冲奖励*****************************************************/
 
+        //领取首冲奖励
+        public static async ETTask<bool> ReqFirstChargeBonusRewards()
+        {
+            M2C_GetDailySinInBonus response = null;
+            response = (M2C_GetDailySinInBonus)await MessageHelper.SendToServer(new C2M_GetDailySinInBonus() { });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    ActivityDataManager.Instance.firstChargeBonusStatus = response.BonusStatus;
+                    BonusController.TryShowBonusList(GlobalCfgArray.globalCfg.firstChargeBonusArr);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
 }
+
+

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

@@ -0,0 +1,85 @@
+
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Activit;
+using UI.CommonGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class FirstChargeBonusView : BaseWindow
+    {
+        private UI_FirstChargeBonusUI _ui;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_FirstChargeBonusUI.PACKAGE_NAME;
+            _ui = UI_FirstChargeBonusUI.Create();
+            this.viewCom = _ui.target;
+            this.modal = true;
+            this.viewCom.Center();
+
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = ListItemRender;
+
+            _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
+            _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+        }
+        private void OnBtnChargeClick()
+        {
+
+        }
+        private async void OnBtnGetClick()
+        {
+            bool result = await ActivitySProxy.ReqFirstChargeBonusRewards();
+            if (result)
+            {
+                UpdateView();
+            }
+        }
+        private void UpdateView()
+        {
+            _ui.m_list.numItems = GlobalCfgArray.globalCfg.firstChargeBonusArr.Length;
+            _ui.m_c1.selectedIndex = ActivityDataManager.Instance.firstChargeBonusStatus;
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+            UI_ComItem item = UI_ComItem.Proxy(obj);
+            int[] reward = GlobalCfgArray.globalCfg.firstChargeBonusArr[index];
+            ItemData itemData = ItemUtil.createItemData(reward);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+                   (obj.data as ItemView).SetData(itemData);
+            UI_ComItem.ProxyEnd();
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Activity/FirstChargeBonusView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Activity/SevenDayLoginView.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
-using UI.DailyLogin;
+using UI.Activit;
 using UnityEngine;
 
 namespace GFGGame
@@ -60,7 +60,7 @@ namespace GFGGame
         {
             _ui.m_list.numItems = _cfgs.Count;
 
-            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, _cfg.id == ActivityDataManager.Instance.dailyLoginId && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET);
+            RedDotController.Instance.SetComRedDot(_ui.m_comIcon.target, _cfg.id == ActivityDataManager.Instance.sevenDayLoginLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET);
         }
         protected override void OnHide()
         {
@@ -77,11 +77,11 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.name;
             item.m_txtNum.text = "x" + NumberUtil.ChangeNumberUnit(cfg.rewardsArr[0][1], 10000);
-            int dailyLoginId = ActivityDataManager.Instance.dailyLoginId;
-            item.m_imgGot.visible = cfg.id < dailyLoginId || cfg.id == dailyLoginId && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT;
+            int dailyLoginId = ActivityDataManager.Instance.sevenDayLoginLoginId;
+            item.m_imgGot.visible = cfg.id < dailyLoginId || cfg.id == dailyLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT;
             // if (cfg.id == dailyLoginId)
             // {
-            RedDotController.Instance.SetComRedDot(item.target, cfg.id == dailyLoginId && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET);
+            RedDotController.Instance.SetComRedDot(item.target, cfg.id == dailyLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET);
             // }
             if (item.target.data == null)
             {
@@ -94,9 +94,9 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
 
-            if (cfg.id == ActivityDataManager.Instance.dailyLoginId && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET)
+            if (cfg.id == ActivityDataManager.Instance.sevenDayLoginLoginId && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET)
             {
-                bool result = await ActivitySProxy.ReqGetDailyLoginRewards(cfg.id);
+                bool result = await ActivitySProxy.ReqSevenDayLoginRewards(cfg.id);
                 if (result)
                 {
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);

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

@@ -193,7 +193,7 @@ namespace GFGGame
 
 
             long lastTime = GameGlobal.lastLoginTime;// GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
-            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET && GuideDataManager.currentGuideId <= 0)
+            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET && GuideDataManager.currentGuideId <= 0)
             {
                 ViewManager.Show<SevenDayLoginView>();
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
@@ -612,7 +612,7 @@ namespace GFGGame
             _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
 
             _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
-            || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));
+            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
             _btnHaoYou.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FriendView).Name, false);

GameClient/Assets/ResIn/UI/Activity.meta

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

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c16d7c3f9c76a7d4a8d7c340099b6bf5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5a8211e10d9bc3b4d8d4866ca44ce0a1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: a762d564b75aef94b8024359a2e80666
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Activity/Activit_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5bafc39d9c9203747b07bf0033c17796
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Activity/Activit_fui.bytes.meta

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

GameClient/Assets/ResIn/UI/DailyLogin/Activit_atlas0!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7c341473fdb568d4187555f0aebb321a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/DailyLogin/Activit_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 0b25b400716d64840842d8610fd23f43
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/DailyLogin/Activit_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 4b6023f3ee50ac048bdb6b427b550423
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/DailyLogin/Activit_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7a6472fb7051afd47a7a7d79eb39346d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/DailyLogin/Activit_fui.bytes.meta

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