Merge branch 'master' into yujie

* master:
  任务跳转
  限时累充
  会员中心套装展示
  修复常驻礼包bug
  抽奖活动
  限时抽奖活动
  任务
  限时抽奖奖励
  套装合成
  头像未获得

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

FGUIProject/assets/Activity/package.xml

@@ -1,20 +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="/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/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1344">
   <displayList>
     <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
+      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
     </component>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListTaskItem.xml → FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="882,208">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -8,11 +8,11 @@
   </controller>
   <displayList>
     <image id="n2_mbf1" name="n2" src="mbf13" fileName="images/tc_xuanxiangkuang.png" xy="0,0"/>
-    <list id="n3_mbf1" name="lsitRewards" xy="30,69" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="30,69" 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" vars="true" text="{title=巴拉巴拉限定摘星99次}（{curValue=0}/{allValue=}99）"/>
+    <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">
       <gearDisplay controller="c1" pages="0"/>
       <Button title="领取"/>

FGUIProject/assets/ActivityThemeLuckyBox/package.xml

@@ -10,8 +10,7 @@
     <image id="mbf15" name="cj_xiafang_db.png" path="/images/"/>
     <component id="mbf16" name="ActivityThemeLuckyBoxBonusUI.xml" path="/" exported="true"/>
     <image id="mbf17" name="tx_xuanxiang_zz.png" path="/images/"/>
-    <component id="mbf19" name="ListTaskItem.xml" path="/compoents/"/>
-    <component id="mbf1a" name="ListRewardItem.xml" path="/compoents/"/>
+    <component id="mbf19" name="ListItem.xml" path="/compoents/"/>
     <image id="mbf1b" name="lm_biaotizi_15.png" path="/images/"/>
     <image id="mbf1c" name="lm_biaotizi_14.png" path="/images/"/>
     <component id="mbf1d" name="ActivityThemeLuckyBoxTaskUI.xml" path="/" exported="true"/>

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

@@ -7,12 +7,12 @@
     <component id="n0_j539" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://4f294tdkweok2i"/>
     </component>
-    <image id="n18_weok" name="n18" src="weok2j" fileName="images/jbhc_btbandi.png" xy="246,201"/>
+    <image id="n18_weok" name="n18" src="weok2j" fileName="images/jbhc_btbandi.png" xy="93,201" size="891,81"/>
     <list id="n4_j539" name="listMenu" xy="31,201" size="1017,80" layout="row" align="center" foldInvisibleItems="true">
       <relation target="" sidePair="center-center"/>
       <item url="ui://4f294tdkj539f"/>
-      <item url="ui://4f294tdkj539h"/>
       <item url="ui://4f294tdkkqeb25"/>
+      <item url="ui://4f294tdkj539h"/>
     </list>
     <list id="n14_j539" name="listSuit" xy="25,363" size="1030,1557" layout="flow_hz" overflow="scroll" lineGap="47" colGap="2" defaultItem="ui://4f294tdkj539k" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/CommonGame/components/ComItemNew.xml

@@ -2,7 +2,7 @@
 <component size="124,124" pivot="0.5,0.5" overflow="hidden" opaque="false">
   <displayList>
     <component id="n25_pu55" name="comItemIcon" src="9jv6tlt" fileName="components/ComItemIconNew.xml" xy="0,0" pivot="0.5,0.5" aspect="true"/>
-    <text id="n15_ehs9" name="txtCount" xy="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" vars="true" text="x00200">
+    <text id="n15_ehs9" name="txtCount" xy="61,78" pivot="0.5,0" anchor="true" size="97,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="x00200">
       <relation target="n25_pu55" sidePair="center-center"/>
     </text>
     <text id="n26_r9ri" name="txtName" xy="62,124" pivot="0.5,0" anchor="true" size="60,39" fontSize="28" color="#a78d67" text="江南">

FGUIProject/assets/CommonGame/package.xml

@@ -332,6 +332,7 @@
     <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="idkdtn9" name="bq_whd.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -11,11 +11,18 @@
       <Button icon="ui://t8nwuj7ifqor1"/>
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,95" size="1080,191"/>
-    <component id="n4_fqor" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,408">
+    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,360" group="n30_idkd">
+      <Button title="限时累充"/>
+    </component>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,742" group="n30_idkd">
+      <Button title="一周黄历"/>
+    </component>
+    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,1124" group="n30_idkd">
       <Button title="每日签到"/>
     </component>
-    <component id="n5_fqor" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,911">
+    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1506" group="n30_idkd">
       <Button title="每日补给"/>
     </component>
+    <group id="n30_idkd" name="n30" xy="0,360" size="1080,1474" advanced="true" layout="vt" lineGap="54" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="994,1393">
+  <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">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <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">
+      <relation target="" sidePair="top-top"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/Activity/SevenDayLoginUI.xml → FGUIProject/assets/DailyWelfare/SevenDayLoginUI.xml

@@ -2,7 +2,7 @@
 <component size="994,1393">
   <displayList>
     <image id="n4_ox5b" name="n4" src="ox5b9" fileName="images/yzhd_ditu.png" xy="0,0"/>
-    <list id="n0_lh8v" name="list" xy="77,66" size="839,693" layout="flow_hz" overflow="hidden" lineGap="15" colGap="10" defaultItem="ui://5uawdql9jyml7">
+    <list id="n0_lh8v" name="list" xy="77,66" size="839,693" layout="flow_hz" overflow="hidden" lineGap="15" colGap="10" defaultItem="ui://t8nwuj7ijyml7">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Activity/SevenDayLoginComponents/Component1.xml → FGUIProject/assets/DailyWelfare/components/Component1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="553,492">
   <displayList>
-    <loader id="n5_ox5b" name="loaIcon" xy="0,0" size="553,492" url="ui://5uawdql9ox5bg" autoSize="true"/>
+    <loader id="n5_ox5b" name="loaIcon" xy="0,0" size="553,492" url="ui://t8nwuj7iox5bg" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListRewardItem.xml → FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -6,19 +6,23 @@
     <remark page="2" value="已领取"/>
   </controller>
   <displayList>
-    <image id="n2_mbf1" name="n2" src="mbf13" fileName="images/tc_xuanxiangkuang.png" xy="0,0"/>
-    <list id="n3_mbf1" name="lsitRewards" xy="30,69" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <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">
       <item/>
       <item/>
     </list>
-    <text id="n4_mbf1" name="txtTitle" xy="30,8" size="448,44" fontSize="32" color="#a07c49" vars="true" text="{title=巴拉巴拉限定摘星99次}（{curValue=0}/{allValue=}99）"/>
+    <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">
+      <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">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpmbf1tn8"/>
     </component>
-    <component id="n7_mbf1" name="btnGot" src="mbf1tn7" fileName="components/BtnStyle003.xml" pkg="eg2y0ldp" xy="648,80">
-      <gearDisplay controller="c1" pages="0,2"/>
-      <Button title="领取"/>
+    <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="624,84" size="233,51">
+      <gearDisplay controller="c1" pages="2"/>
+      <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/Activity/SevenDayLoginComponents/ListItem.xml → FGUIProject/assets/DailyWelfare/components/ListItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="270,334">
   <displayList>
-    <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://5uawdql9ox5ba" autoSize="true"/>
+    <loader id="n2_ox5b" name="loaBg" xy="0,0" size="270,334" url="ui://t8nwuj7iox5ba" autoSize="true"/>
     <loader id="n3_ox5b" name="loaIcon" xy="60,98" size="150,150" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scaleMatchHeight"/>
     <text id="n6_ox5b" name="txtNum" xy="171,220" size="67,44" fontSize="32" color="#be675e" text="X88"/>
     <text id="n5_ox5b" name="txtName" xy="99,281" pivot="0.5,0" size="71,46" fontSize="34" color="#91a08b" text="名字"/>

FGUIProject/assets/DailyWelfare/package.xml

@@ -30,7 +30,23 @@
     <image id="qik1z" name="mrbj_tb1.png" path="/images/"/>
     <image id="qik110" name="mrbj_wz2.png" path="/images/"/>
     <image id="qik111" name="wz_mrbj.png" path="/images/"/>
-    <image id="qik112" name="ornamental_title.png" path="/imagesNew/"/>
+    <component id="idkd13" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
+    <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
+    <image id="ox5b9" name="yzhd_ditu.png" path="/images/"/>
+    <image id="ox5ba" name="yzhd_dyt_1.png" path="/images/" exported="true"/>
+    <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="ox5bg" name="yzhd_dyt_5.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="ox5bi" name="yzhd_zszs.png" path="/images/"/>
+    <image id="ox5b8" name="yzhl_yqd.png" path="/images/"/>
+    <component id="rkrwj" name="Component1.xml" path="/components/"/>
+    <component id="jyml7" name="ListItem.xml" path="/components/"/>
+    <component id="idkd14" name="LimitChargeUI.xml" path="/" exported="true"/>
+    <component id="idkd15" name="ListChargeItem.xml" path="/components/"/>
+    <image id="idkd16" name="tc_xuanxiangkuang.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/ChangeHead.xml

@@ -35,10 +35,10 @@
     </component>
     <group id="n10_r9ri" name="n10" xy="205,93" size="585,84"/>
     <image id="n11_r9ri" name="n11" src="r9rim" fileName="images/grxx_xtxtx.png" xy="381,330" size="520,6" group="n12_r9ri"/>
-    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="105,187" size="236,238" group="n12_r9ri" scale="1.2,1.2"/>
+    <component id="n4_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="105,187" group="n12_r9ri" scale="1.2,1.2"/>
     <text id="n5_r9ri" name="txtName" xy="394,263" size="129,56" group="n12_r9ri" fontSize="42" color="#ab8759" text="头像名"/>
     <text id="n6_r9ri" name="txtDesc" xy="394,345" size="138,46" group="n12_r9ri" fontSize="34" color="#ceb599" text="头像描述"/>
-    <group id="n12_r9ri" name="n12" xy="105,187" size="796,238"/>
+    <group id="n12_r9ri" name="n12" xy="105,187" size="796,230"/>
     <image id="n13_r9ri" name="n13" src="r9rim" fileName="images/grxx_xtxtx.png" xy="88,957"/>
     <component id="n14_r9ri" name="btnSure" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="356,1003">
       <Button title="保存" titleColor="#ffffff" titleFontSize="42"/>

FGUIProject/assets/RoleInfo/components/ListHeadBorderItem.xml

@@ -8,7 +8,9 @@
     </image>
     <loader id="n6_v95q" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" aspect="true" touchable="false" url="ui://374k3dwvr9ri23" autoSize="true"/>
     <image id="n7_v95q" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="154,45"/>
-    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="26,100"/>
+    <image id="n9_idkd" name="imgUnGet" src="idkdtn9" fileName="imagesNew/bq_whd.png" pkg="eg2y0ldp" xy="20,95" group="n11_idkd"/>
+    <text id="n10_idkd" name="n10" xy="62,104" size="88,39" group="n11_idkd" fontSize="28" color="#fff9f6" text="未获得"/>
+    <group id="n11_idkd" name="grpUnGet" xy="20,95" size="172,56" advanced="true"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/RoleInfo/components/ListHeadItem.xml

@@ -8,7 +8,9 @@
       <gearDisplay controller="button" pages="1"/>
     </image>
     <image id="n7_r9ri" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="140,18"/>
-    <image id="n8_mbf1" name="imgUnGet" src="cs8jthx" fileName="images/yx_whd.png" pkg="eg2y0ldp" xy="11,89"/>
+    <image id="n8_mbf1" name="imgUnGet" src="idkdtn9" fileName="imagesNew/bq_whd.png" pkg="eg2y0ldp" xy="6,80" group="n11_idkd"/>
+    <text id="n10_idkd" name="n10" xy="48,89" size="88,39" group="n11_idkd" fontSize="28" color="#fff9f6" text="未获得"/>
+    <group id="n11_idkd" name="grpUnGet" xy="6,80" size="172,56" advanced="true"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Store/StoreUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImageOffsetY="-240">
+<component size="1080,1920" overflow="hidden" designImageOffsetY="-240">
   <displayList>
     <image id="n21_hhx9" name="n21" src="hhx91q" fileName="imagesNew/sc_beijing.png" xy="0,-240"/>
     <loader id="n0_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">

FGUIProject/assets/Store/components/ListVipItem.xml

@@ -14,11 +14,14 @@
     <text id="n43_qik1" name="txtName3" xy="120,176" pivot="0.5,0" size="34,41" group="n45_qik1" fontSize="30" color="#915e15" text="婵"/>
     <text id="n44_qik1" name="txtName4" xy="116,203" pivot="0.5,0" size="41,122" group="n45_qik1" fontSize="36" color="#915e15" align="center" leading="-12" autoSize="none" text="婵娟"/>
     <group id="n45_qik1" name="n45" xy="80,60" size="96,265" group="n58_qik1"/>
-    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,113" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
-    <text id="n48_qik1" name="txtGiftBag" xy="649,100" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
-    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,113" pivot="0.5,0.5" group="n49_qik1"/>
-    <group id="n49_qik1" name="n49" xy="582,100" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
-    <list id="n50_qik1" name="listGiftBag" xy="574,161" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+    <image id="n46_qik1" name="n46" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,88" pivot="0.5,0.5" group="n49_qik1" scale="-1,1"/>
+    <text id="n48_qik1" name="txtGiftBag" xy="649,75" pivot="0.5,0" size="244,44" group="n49_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级特级礼包"/>
+    <image id="n47_qik1" name="n47" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,88" pivot="0.5,0.5" group="n49_qik1"/>
+    <group id="n49_qik1" name="n49" xy="582,75" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n50_qik1" name="listGiftBag" xy="588,132" size="601,447" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" overflow="scroll" lineGap="15" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
@@ -26,12 +29,15 @@
       <item/>
       <item/>
     </list>
-    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,445" group="n58_qik1"/>
-    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,565" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
-    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,552" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
-    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,565" pivot="0.5,0.5" group="n54_qik1"/>
-    <group id="n54_qik1" name="n54" xy="582,552" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
-    <list id="n55_qik1" name="listWeekGiftBag" xy="574,619" size="601,401" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" lineGap="20" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+    <component id="n56_qik1" name="btnGetGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="690,445" group="n58_qik1"/>
+    <image id="n51_qik1" name="n51" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="582,557" pivot="0.5,0.5" group="n54_qik1" scale="-1,1"/>
+    <text id="n52_qik1" name="txtWeekGiftBag" xy="649,544" pivot="0.5,0" size="244,44" group="n54_qik1" fontSize="32" color="#915e15" align="center" vars="true" text="会员{value=1}级每周礼包"/>
+    <image id="n53_qik1" name="n53" src="hhx9r" fileName="imagesNew/ornament_title.png" xy="912,557" pivot="0.5,0.5" group="n54_qik1"/>
+    <group id="n54_qik1" name="n54" xy="582,544" size="378,44" group="n58_qik1" advanced="true" layout="hz" colGap="19" excludeInvisibles="true"/>
+    <list id="n55_qik1" name="listWeekGiftBag" xy="588,601" size="601,444" group="n58_qik1" scale="0.65,0.65" layout="flow_hz" overflow="scroll" lineGap="15" colGap="20" defaultItem="ui://eg2y0ldpqik1tly">
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
@@ -39,8 +45,8 @@
       <item/>
       <item/>
     </list>
-    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="673,906" group="n58_qik1"/>
-    <group id="n58_qik1" name="n58" xy="80,0" size="1095,1037"/>
+    <component id="n57_qik1" name="btnGetWeekGiftBag" src="qik1tbw" fileName="components/Button7.xml" xy="690,914" group="n58_qik1"/>
+    <group id="n58_qik1" name="n58" xy="80,0" size="1109,1045"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

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

@@ -254,6 +254,8 @@ namespace GFGGame
             ArenaDataManager.Instance.ReqArenaInfo();
             SkillSProxy.ReqGetSkillList(SkillType.LeagueSkill).Coroutine();
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
+            ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
+            ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -26,13 +26,20 @@ namespace GFGGame
             }
             return 0;
         }
+        /**********************************************************限时累充*************************************************/
+        /// <summary>
+        /// 当前限时累充活动id
+        /// </summary>
+        /// <value></value>
+        public int actLimitChargeId { get; set; }
+
 
         /**********************************************************限时抽奖活动*********************************************/
         /// <summary>
         /// 当前抽奖活动id
         /// </summary>
         /// <value></value>
-        public int activityId { get; set; }
+        public int actLuckyBoxId { get; set; }
         /// <summary>
         /// 抽奖总次数
         /// </summary>
@@ -42,7 +49,7 @@ namespace GFGGame
         /// 限时抽奖必掉次数
         /// </summary>
         /// <value></value>
-        public int lastCount { get; set; }
+        public int lastDrawCount { get; set; }
         /// <summary>
         /// </summary>
         /// <typeparam name="int">奖励key，这里对应抽奖次数</typeparam>

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

@@ -151,5 +151,31 @@ namespace GFGGame
                 default: return string.Format(activeRewardCfg.desc, taskCfg.count);
             }
         }
+        /// <summary>
+        /// 任务界面跳转
+        /// </summary>
+        /// <param name="jumpId"></param>
+        public void JumpToView(string jumpId, object[] goBackDatas)
+        {
+            switch (jumpId)
+            {
+                case nameof(LeagueAnswerView):
+                    
+                    if (LeagueDataManager.Instance.Type == 1)
+                    {
+                        ViewManager.Show<LeagueView>();
+                        ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
+                    }
+                    else
+                    {
+                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
+                    }
+
+                    break;
+                default:
+                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
+                    break;
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListItem.cs

@@ -4,11 +4,11 @@ using FairyGUI;
 
 namespace UI.ActivityThemeLuckyBox
 {
-    public partial class UI_ListTaskItem
+    public partial class UI_ListItem
     {
         public GComponent target;
         public Controller m_c1;
-        public GList m_lsitRewards;
+        public GList m_listRewards;
         public GTextField m_txtTitle;
         public GButton m_btnGetNone;
         public GButton m_btnGet;
@@ -16,12 +16,12 @@ namespace UI.ActivityThemeLuckyBox
         public GButton m_btnGo;
         public const string URL = "ui://ubfk2kobmbf19";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
-        public const string RES_NAME = "ListTaskItem";
-        private static UI_ListTaskItem _proxy;
+        public const string RES_NAME = "ListItem";
+        private static UI_ListItem _proxy;
 
-        public static UI_ListTaskItem Create(GObject gObject = null)
+        public static UI_ListItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListTaskItem();
+            var ui = new UI_ListItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -30,11 +30,11 @@ namespace UI.ActivityThemeLuckyBox
             return ui;
         }
 
-        public static UI_ListTaskItem Proxy(GObject gObject = null)
+        public static UI_ListItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListTaskItem();
+                _proxy = new UI_ListItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -62,7 +62,7 @@ namespace UI.ActivityThemeLuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_lsitRewards = (GList)comp.GetChild("lsitRewards");
+            m_listRewards = (GList)comp.GetChild("listRewards");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnGetNone = (GButton)comp.GetChild("btnGetNone");
             m_btnGet = (GButton)comp.GetChild("btnGet");
@@ -72,7 +72,7 @@ namespace UI.ActivityThemeLuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_lsitRewards = null;
+            m_listRewards = null;
             m_txtTitle = null;
             m_btnGetNone = null;
             m_btnGet = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListTaskItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ListItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a760567c6036cbf49b9c0dacad857c9d
+guid: 1c2c2b24b08f93f48b678d58ccc42720
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://t8nwuj7irkrwj";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        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/Views/Store/RechargeStoreView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_Component1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f2509e9193382ac4fba4b6f878e416eb
+guid: f33c60c8c340c304392b5922a8a042af
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -10,6 +10,8 @@ namespace UI.DailyWelfare
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
         public GButton m_btnback;
+        public GButton m_btnLimitChargeAddUp;
+        public GButton m_btnSevenDayLogin;
         public GButton m_btnSign;
         public GButton m_btnSupply;
         public const string URL = "ui://t8nwuj7ifqor0";
@@ -62,6 +64,8 @@ namespace UI.DailyWelfare
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
+            m_btnLimitChargeAddUp = (GButton)comp.GetChild("btnLimitChargeAddUp");
+            m_btnSevenDayLogin = (GButton)comp.GetChild("btnSevenDayLogin");
             m_btnSign = (GButton)comp.GetChild("btnSign");
             m_btnSupply = (GButton)comp.GetChild("btnSupply");
         }
@@ -70,6 +74,8 @@ namespace UI.DailyWelfare
             m_loaBg = null;
             m_comValueBar = null;
             m_btnback = null;
+            m_btnLimitChargeAddUp = null;
+            m_btnSevenDayLogin = null;
             m_btnSign = null;
             m_btnSupply = null;
             if(disposeTarget && target != null)

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

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

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

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_LimitChargeUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public GButton m_btnCharge;
+        public GTextField m_txtTime;
+        public const string URL = "ui://t8nwuj7iidkd14";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "LimitChargeUI";
+        private static UI_LimitChargeUI _proxy;
+
+        public static UI_LimitChargeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LimitChargeUI();
+            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_LimitChargeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LimitChargeUI();
+            }
+            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_btnCharge = (GButton)comp.GetChild("btnCharge");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            m_btnCharge = null;
+            m_txtTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_ListChargeItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GList m_listRewards;
+        public GTextField m_txtTitle;
+        public GButton m_btnGetNone;
+        public GButton m_btnGet;
+        public GButton m_btnGot;
+        public const string URL = "ui://t8nwuj7iidkd15";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        public const string RES_NAME = "ListChargeItem";
+        private static UI_ListChargeItem _proxy;
+
+        public static UI_ListChargeItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListChargeItem();
+            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_ListChargeItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListChargeItem();
+            }
+            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_listRewards = (GList)comp.GetChild("listRewards");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_btnGetNone = (GButton)comp.GetChild("btnGetNone");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnGot = (GButton)comp.GetChild("btnGot");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_listRewards = null;
+            m_txtTitle = null;
+            m_btnGetNone = null;
+            m_btnGet = null;
+            m_btnGot = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListChargeItem.cs.meta

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

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

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    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://t8nwuj7ijyml7";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        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/DailyWelfare/UI_ListItem.cs.meta

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

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

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyWelfare
+{
+    public partial class UI_SevenDayLoginUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public UI_Component1 m_comIcon;
+        public const string URL = "ui://t8nwuj7ilh8v6";
+        public const string PACKAGE_NAME = "DailyWelfare";
+        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/DailyWelfare/UI_SevenDayLoginUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadBorderItem.cs

@@ -11,6 +11,7 @@ namespace UI.RoleInfo
         public GLoader m_loaBorder;
         public GImage m_imgNew;
         public GImage m_imgUnGet;
+        public GGroup m_grpUnGet;
         public const string URL = "ui://374k3dwvv95qg3";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListHeadBorderItem";
@@ -62,6 +63,7 @@ namespace UI.RoleInfo
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_imgUnGet = (GImage)comp.GetChild("imgUnGet");
+            m_grpUnGet = (GGroup)comp.GetChild("grpUnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.RoleInfo
             m_loaBorder = null;
             m_imgNew = null;
             m_imgUnGet = null;
+            m_grpUnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ListHeadItem.cs

@@ -10,6 +10,7 @@ namespace UI.RoleInfo
         public GLoader m_loaIcon;
         public GImage m_imgNew;
         public GImage m_imgUnGet;
+        public GGroup m_grpUnGet;
         public const string URL = "ui://374k3dwvr9ri9";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ListHeadItem";
@@ -60,12 +61,14 @@ namespace UI.RoleInfo
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_imgUnGet = (GImage)comp.GetChild("imgUnGet");
+            m_grpUnGet = (GGroup)comp.GetChild("grpUnGet");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
             m_imgNew = null;
             m_imgUnGet = null;
+            m_grpUnGet = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,7 +10,7 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, S2C_NoticeTimeLimitLuckyBoxDropOutCount message)
         {
-            ActivityDataManager.Instance.lastCount = message.Count;
+            ActivityDataManager.Instance.lastDrawCount = message.Count;
             EventAgent.DispatchEvent(ConstMessage.ACTIVITY_LUCKY_BOX);
             await ETTask.CompletedTask;
         }
@@ -82,13 +82,13 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    if (ActivityDataManager.Instance.activityId != response.ActivityId)
+                    if (ActivityDataManager.Instance.actLuckyBoxId != response.ActivityId)
                     {
                         ActivityDataManager.Instance.luckyBoxActBonusState.Clear();
                     }
-                    ActivityDataManager.Instance.activityId = response.ActivityId;
+                    ActivityDataManager.Instance.actLuckyBoxId = response.ActivityId;
                     ActivityDataManager.Instance.allPlayTimes = response.AllPlayTimes;
-                    ActivityDataManager.Instance.lastCount = response.Count;
+                    ActivityDataManager.Instance.lastDrawCount = response.Count;
                     for (int i = 0; i < response.KsBonusState.Count; i++)
                     {
                         ActivityDataManager.Instance.luckyBoxActBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
@@ -113,7 +113,37 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    if (ActivityDataManager.Instance.activityId != response.ActivityId)
+                    if (ActivityDataManager.Instance.actLuckyBoxId != response.ActivityId)
+                    {
+                        return false;
+                    }
+                    ActivityDataManager.Instance.luckyBoxActBonusState[response.BonusKey] = response.BonusStatus;
+
+                    int[][] bonus = ActivityLuckybonusCfgArray.Instance.GetCfgByidAndnum(response.ActivityId, response.BonusKey).bonusArr;
+                    BonusController.TryShowBonusList(bonus);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /*************************************************************限时累充*****************************************************/
+        /// <summary>
+        /// 领取累充奖励
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <param name="bonusKey">奖励key，这里对应抽奖次数</param>
+        /// <returns></returns>
+        public static async ETTask<bool> ReqGetLimitChargeBonus(int activityId, int bonusKey)
+        {
+            S2C_GetTimeLimitLuckyBoxBonus response = null;
+            response = (S2C_GetTimeLimitLuckyBoxBonus)await MessageHelper.SendToServer(new C2S_GetTimeLimitLuckyBoxBonus() { ActivityId = activityId, BonusKey = bonusKey });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    if (ActivityDataManager.Instance.actLuckyBoxId != response.ActivityId)
                     {
                         return false;
                     }

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

@@ -14,6 +14,11 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLuckyBoxId);
+                    if (activityOpenCfg.paramsArr[0] == luckyBoxId)
+                    {
+                        ActivityDataManager.Instance.allPlayTimes += response.Times;
+                    }
                     LuckyBoxDataManager.Instance.times = response.Times;
                     LuckyBoxDataManager.Instance.luckyBoxId = response.LuckyBoxId;
                     LuckyBoxDataManager.Instance.RewardList = ItemUtil.CreateItemDataList(response.bonusList);

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.ActivityThemeLuckyBox;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ActivityThemeLuckyBoxBonusView : BaseWindow
+    {
+        private UI_ActivityThemeLuckyBoxBonusUI _ui;
+        private List<ActivityLuckybonusCfg> _bonueCfgs = new List<ActivityLuckybonusCfg>();
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityThemeLuckyBoxBonusUI.PACKAGE_NAME;
+            _ui = UI_ActivityThemeLuckyBoxBonusUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(ActivityDataManager.Instance.actLuckyBoxId);
+            _ui.m_list.numItems = _bonueCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLuckyBoxId);
+
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+
+            item.m_txtTitle.text = string.Format("{0}限定摘星{1}次({2}/{3})", activityOpenCfg.themeName, _bonueCfgs[index].num, ActivityDataManager.Instance.allPlayTimes, _bonueCfgs[index].num);
+            if (item.m_listRewards.data == null)
+            {
+                item.m_listRewards.itemRenderer = RenderListRewardItem;
+            }
+            item.m_listRewards.data = _bonueCfgs[index].bonusArr;
+            item.m_listRewards.numItems = _bonueCfgs[index].bonusArr.Length;
+            int key = _bonueCfgs[index].num;
+            int state = ActivityDataManager.Instance.luckyBoxActBonusState.ContainsKey(key) ? ActivityDataManager.Instance.luckyBoxActBonusState[key] : 0;
+            bool canGet = state < ConstBonusStatus.GOT && ActivityDataManager.Instance.allPlayTimes >= _bonueCfgs[index].num;
+            item.m_c1.selectedIndex = canGet ? 1 : state;
+
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnBtnGetClick);
+            }
+            item.m_btnGet.data = key;
+
+            UI_ListItem.ProxyEnd();
+        }
+
+        private void RenderListRewardItem(int index, GObject obj)
+        {
+            int[][] bonus = (int[][])obj.parent.data;
+            ItemData reward = ItemUtil.createItemData(bonus[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int key = (int)obj.data;
+            bool result = await ActivitySProxy.ReqGetTimeLimitLuckyBoxBonus(ActivityDataManager.Instance.actLuckyBoxId, key);
+            if (result)
+            {
+                _ui.m_list.numItems = _bonueCfgs.Count;
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.ActivityThemeLuckyBox;
@@ -8,6 +9,7 @@ namespace GFGGame
     public class ActivityThemeLuckyBoxTaskView : BaseWindow
     {
         private UI_ActivityThemeLuckyBoxTaskUI _ui;
+        private List<TaskCfg> _taskCfgs = new List<TaskCfg>();
 
         public override void Dispose()
         {
@@ -29,6 +31,8 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_list.itemRenderer = RenderListItem;
+
         }
         protected override void AddEventListener()
         {
@@ -38,7 +42,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _taskCfgs = TaskCfgArray.Instance.GetCfgsBytaskType(TaskType.LuckyBoxActivity);
+            _ui.m_list.numItems = _taskCfgs.Count;
         }
 
         protected override void OnHide()
@@ -52,5 +57,62 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+            //领取状态
+            int state = TaskDataManager.Instance.GetTaskStateById(_taskCfgs[index].id);
+            item.m_c1.selectedIndex = state == ConstBonusStatus.CAN_NOT_GET && !string.IsNullOrEmpty(_taskCfgs[index].jumpId) ? 3 : state;
+            item.m_txtTitle.text = string.Format("{0}({1}/{2})", TaskDataManager.Instance.GetTaskDesc(_taskCfgs[index].id), TaskDataManager.Instance.GetTaskProgressById(_taskCfgs[index].id), _taskCfgs[index].count);
+
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnBtnGetClick);
+            }
+            item.m_btnGet.data = _taskCfgs[index].id;
+
+            if (item.m_btnGo.data == null)
+            {
+                item.m_btnGo.onClick.Add(OnBtnGoClick);
+            }
+            item.m_btnGo.data = _taskCfgs[index].jumpId;
+
+            if (item.m_listRewards.data == null)
+            {
+                item.m_listRewards.itemRenderer = RenderListRewardItem;
+            }
+            item.m_listRewards.data = _taskCfgs[index].rewardsArr;
+            item.m_listRewards.numItems = _taskCfgs[index].rewardsArr.Length;
+            UI_ListItem.ProxyEnd();
+        }
+
+        private void RenderListRewardItem(int index, GObject obj)
+        {
+            int[][] bonus = (int[][])obj.parent.data;
+            ItemData reward = ItemUtil.createItemData(bonus[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            if (!(context.sender is GObject btnGet)) return;
+            var result = await TaskSProxy.GetTaskBonus((int)btnGet.data);
+            if (!result) return;
+            _ui.m_list.numItems = _taskCfgs.Count;
+
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            // Hide();
+            if (!(context.sender is GObject btnGo)) return;
+            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -45,7 +45,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
+            bool showTask = this.viewData == null ? false : (bool)this.viewData;
+            if (showTask)
+            {
+                OnBtnTaskClick();
+            }
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res);
@@ -64,7 +69,7 @@ namespace GFGGame
 
         private void OnBtnTaskClick()
         {
-
+            ViewManager.Show<ActivityThemeLuckyBoxTaskView>();
         }
         private void OnBtnLuckyBoxClick()
         {

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -357,6 +357,7 @@ namespace GFGGame
             GameObject myRole = _sceneObject.transform.Find("MyRole").Find("Role").gameObject;
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, myRole, false);
             MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
+            myRole.transform.localPosition = Vector3.zero;
 
             GameObject targetRole = _sceneObject.transform.Find("TargetRole").Find("Role").gameObject;
             targetRole.SetActive(false);

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
                 _ui.m_listMenu.selectedIndex = suitCfg.syntheticType - 1;
             }
-            _ui.m_listMenu.GetChildAt(1).visible = false;
+            // _ui.m_listMenu.GetChildAt(1).visible = false;
             UpdateSuitList();
             Timers.inst.AddUpdate(CheckGuide);
         }

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -12,7 +12,7 @@ namespace GFGGame
         private UI_ComModel _comModel;
         private DressUpObjUI _dressUpObjUI;
         private LuckyBoxCfg _luckyBoxCfg;
-        private const int _turnTime = 3;
+        private const int _turnTime = 8;
         private int _curTime = _turnTime;
         private int _bgIndex = 0;
         private int _modelIndex = 0;
@@ -45,10 +45,11 @@ namespace GFGGame
         private void UpdateTime(object param)
         {
             _curTime = _curTime - 1 == 0 ? _turnTime : _curTime - 1;
-            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
-            _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
+
             if (_curTime == _turnTime)
             {
+                _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
+                _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
                 if (_luckyBoxCfg.resArr.Length > 1)
                 {
                     _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);

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

@@ -45,6 +45,8 @@ namespace GFGGame
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             // _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_btnLimitChargeAddUp.onClick.Add(OnBtnLimitChargeAddUpClick);
+            _ui.m_btnSevenDayLogin.onClick.Add(OnBtnSevenDayLoginClick);
             _ui.m_btnSign.onClick.Add(OnBtnSignClick);
             _ui.m_btnSupply.onClick.Add(OnBtnSupplyClick);
 
@@ -62,6 +64,9 @@ namespace GFGGame
 
             _valueBarController.OnShown();
 
+            _ui.m_btnLimitChargeAddUp.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
+            _ui.m_btnSevenDayLogin.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
+            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
         }
 
@@ -80,6 +85,14 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
         }
+        private void OnBtnLimitChargeAddUpClick()
+        {
+            ViewManager.Show<LimitChargeView>();
+        }
+        private void OnBtnSevenDayLoginClick()
+        {
+            ViewManager.Show<SevenDayLoginView>();
+        }
         private void OnBtnSignClick()
         {
             ViewManager.Show<DailySignView>();

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
-using UI.Activity;
+using UI.DailyWelfare;
 using UI.CommonGame;
 using UnityEngine;
 

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b36531dc8592069468824f72bd94eed5
+guid: 01d0ad46c0527eb4a8162a6be1714910
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,122 @@
+
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.DailyWelfare;
+using UI.CommonGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LimitChargeView : BaseWindow
+    {
+        private UI_LimitChargeUI _ui;
+        private List<ActivityRechargeCfg> _rechargeCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LimitChargeUI.PACKAGE_NAME;
+            _ui = UI_LimitChargeUI.Create();
+            this.viewCom = _ui.target;
+            this.modal = true;
+            this.viewCom.Center();
+
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+
+            _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByid(ActivityDataManager.Instance.actLimitChargeId);
+            UpdateView();
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
+            Timers.inst.Remove(UpdateTime);
+        }
+
+        private void UpdateTime(object param)
+        {
+            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
+            long curTime = TimeHelper.ServerNow();
+            long endTime = TimeUtil.DateTimeToTimestamp(openCfg.endTime);
+            _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
+        }
+
+        private void OnBtnChargeClick()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE });
+        }
+
+        private void UpdateView()
+        {
+            _ui.m_list.numItems = _rechargeCfgs.Count;
+        }
+        private void RenderListItem(int index, GObject obj)
+        {
+
+            UI_ListChargeItem item = UI_ListChargeItem.Proxy(obj);
+
+            item.m_txtTitle.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, RoleDataManager.vipExp, _rechargeCfgs[index].value);
+
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnBtnGetClick);
+            }
+            item.m_btnGet.data = _rechargeCfgs[index].value;
+
+            if (item.m_listRewards.data == null)
+            {
+                item.m_listRewards.itemRenderer = RenderListRewardItem;
+            }
+            item.m_listRewards.data = _rechargeCfgs[index].bonusArr;
+            item.m_listRewards.numItems = _rechargeCfgs[index].bonusArr.Length;
+
+            UI_ListChargeItem.ProxyEnd();
+        }
+        private void RenderListRewardItem(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();
+        }
+
+        private async void OnBtnGetClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int value = (int)obj.data;
+
+            bool result = await ActivitySProxy.ReqGetLimitChargeBonus(ActivityDataManager.Instance.actLimitChargeId, value);
+            if (result)
+            {
+                UpdateView();
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs.meta

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

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
-using UI.Activity;
+using UI.DailyWelfare;
 using UnityEngine;
 
 namespace GFGGame
@@ -15,12 +15,7 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            // for (int i = 0; i < _ui.m_list.numItems; i++)
-            // {
-            //     UI_ListItem listItem = UI_ListItem.Proxy(_ui.m_list.GetChildAt(i));
-            //     listItem.m_loaIcon.Dispose();
-            //     UI_ListItem.ProxyEnd();
-            // }
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -53,7 +48,7 @@ namespace GFGGame
             _cfgs = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Item);
             _cfg = DailyLoginCfgArray.Instance.GetCfgsBytype((int)ConstBonusType.Suit)[0];
             UpdateView();
-            _ui.m_comIcon.m_loaIcon.url = "ui://Activity/yzhd_dyt_5";
+            _ui.m_comIcon.m_loaIcon.url = "ui://DailyWelfare/yzhd_dyt_5";
             _ui.m_comIcon.m_loaIcon.data = _cfg;
         }
         private void UpdateView()
@@ -72,7 +67,7 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = _cfgs[index];
             UI_ListItem item = UI_ListItem.Proxy(obj);
-            item.m_loaBg.url = string.Format("ui://Activity/yzhd_dyt_{0}", cfg.id);
+            item.m_loaBg.url = string.Format("ui://DailyWelfare/yzhd_dyt_{0}", cfg.id);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.rewardsArr[0][0]);
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtName.text = itemCfg.name;

GameClient/Assets/Game/HotUpdate/Views/Activity/SevenDayLoginView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/SevenDayLoginView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6857cde1d442be54a94c3bbb52b6baf4
+guid: e7bba041c331d8143801e4762f49f482
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -488,6 +488,7 @@ namespace GFGGame
             //this.Hide();
         }
 
+        //购买连续礼包之后，更新数据+更新界面
         private void UpDayRebateAndView(EventContext context)
         {
             ShopCfg shopCfg = context.data as ShopCfg;
@@ -497,12 +498,9 @@ namespace GFGGame
                 itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
             {
                 int dayNum = EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id);
-                if (dayNum > 0)
-                {
-                    dayNum -= 1;
-                }
+                int totalDayNum = dayNum + itemCfg.param2Arr[0];
 
-                EnduringGiftBoxDataManager.Instance.UpDayAllRebateItemDic(itemCfg.id, dayNum);
+                EnduringGiftBoxDataManager.Instance.UpDayAllRebateItemDic(itemCfg.id, totalDayNum);
                 EnduringGiftBoxDataManager.Instance.AddDayRebateItemIds(itemCfg.id);
             }
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_SuitShowUI.PACKAGE_NAME;
             _ui = UI_SuitShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
@@ -112,7 +113,7 @@ namespace GFGGame
             _actionIsPic = isPic;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
             _ui.m_txtSuitName.text = suitCfg.name;
-            _dressUpObjUI.ResetSceneObj(100, false,true,null,false);
+            _dressUpObjUI.ResetSceneObj(100, false, true, null, false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(_suitId, isPic, new int[] { ConstDressUpItemType.BEI_JING });
             _dressUpObjUI.UpdateWrapper(_ui.m_holder);
             UpdateSuitBoxStatus();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -89,7 +89,7 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastCount.ToString()).FlushVars();
+            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
             _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
             UI_ComBox_4 comBox = UI_ComBox_4.Proxy(_ui.m_comBox.target);
 
@@ -179,11 +179,11 @@ namespace GFGGame
 
         private void OnClikcBtnReward()
         {
-
+            ViewManager.Show<ActivityThemeLuckyBoxBonusView>();
         }
         private void OnClikcBtnShop()
         {
-
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
         private void OnClikcBtnGiftBag()
         {

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

@@ -17,7 +17,8 @@ namespace GFGGame
         private SwipeGesture swipeGesture;
         private const int swipeDistance = 100;
         private bool isOpen = false;
-        private int _luckyBoxActivtyId = 0;
+        private int _actLuckyBoxId = 0;
+        private int _actLimitChargeId = 0;
         private GButton _btnGongGao;
         private GButton _btnHaoYou;
         private GButton _btnYouJian;
@@ -624,24 +625,33 @@ namespace GFGGame
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);
         }
 
-
         private void Update(object param)
         {
             ShowExitAlert();
-            int activityId =
-                ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox);
-            _ui.m_btnActivityLuckyBox.target.visible = activityId > 0;
-            if (activityId > 0)
+
+            int actLuckyBoxId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox);
+            _ui.m_btnActivityLuckyBox.target.visible = actLuckyBoxId > 0;
+            if (actLuckyBoxId > 0)
             {
-                if (activityId != _luckyBoxActivtyId)
+                if (actLuckyBoxId != _actLuckyBoxId)
                 {
-                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(activityId).Coroutine();
-                    _luckyBoxActivtyId = activityId;
+                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLuckyBoxId).Coroutine();
+                    _actLuckyBoxId = actLuckyBoxId;
                 }
-                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
-                _ui.m_btnActivityLuckyBox.target.title =
-                    TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) -
-                                                     TimeHelper.ServerNow());
+                ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(actLuckyBoxId);
+                _ui.m_btnActivityLuckyBox.target.title = TimeUtil.FormattingTimeTo_DDHHmm(TimeUtil.DateTimeToTimestamp(activityOpenCfg.endTime) - TimeHelper.ServerNow());
+            }
+
+            int actLimitChargeId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitChargeId);
+            if (_actLimitChargeId != actLimitChargeId)
+            {
+                ActivityDataManager.Instance.actLimitChargeId = actLimitChargeId;
+                _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
+                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
+                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
+                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
+                !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
+                (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT)));
             }
         }
 
@@ -677,36 +687,28 @@ namespace GFGGame
 
         private void CheckFunOpen()
         {
-            _ui.m_btnXiuFang.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
-            _ui.m_btnHuanZhuang.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
-            _ui.m_btnCiPai.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
-            _ui.m_btnZhaiXing.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
-            _ui.m_btnMain.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            _ui.m_btnStudio.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
-            _ui.m_btnField.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
-            _ui.m_btnPoem.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
-            _ui.m_btnTravel.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
-            _ui.m_btnArena.m_loaLockIcon.visible =
-                !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
-            _ui.m_btnActivityLuckyBox.target.visible =
-                ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.LimitLuckyBox) > 0;
-
-            _ui.m_btnDailyLogin.target.visible =
-                !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
-                  || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 &&
-                      ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
-            _ui.m_btnDailyWelfare.target.visible =
-                FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false);
-
+            _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
+            _ui.m_btnHuanZhuang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
+            _ui.m_btnCiPai.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            _ui.m_btnZhaiXing.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
+            _ui.m_btnMain.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
+            _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
+            _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
+            _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
+            _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
+
+            _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
+            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
+
+            int actLimitChargeId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitChargeId);
+            _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
+            FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyWelfareView).Name, false) && (
+            FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySignView).Name, false) ||
+            FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailySupplyView).Name, false) ||
+            !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
+            (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);
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeHeadView.cs

@@ -101,7 +101,7 @@ namespace GFGGame
             UI_ListHeadItem item = UI_ListHeadItem.Proxy(obj);
             item.m_loaIcon.url = ResPathUtil.GetHeadPath(_headCfgs[index].res);
             item.m_imgNew.visible = RoleInfoManager.Instance.isNewHead(headId);
-            item.m_imgUnGet.visible = ItemDataManager.GetItemNum(headId) <= 0;
+            item.m_grpUnGet.visible = ItemDataManager.GetItemNum(headId) <= 0;
             if (RoleInfoManager.Instance.isNewHead(headId))
             {
                 ItemProxy.ReqSetItemRead(headId).Coroutine();
@@ -122,7 +122,7 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
             item.m_loaBorder.url = ResPathUtil.GetHeadBorderPath(borderCfg.res);
             item.m_imgNew.visible = RoleInfoManager.Instance.isNewHeadBorder(headBorderId);
-            item.m_imgUnGet.visible = ItemDataManager.GetItemNum(headBorderId) <= 0;
+            item.m_grpUnGet.visible = ItemDataManager.GetItemNum(headBorderId) <= 0;
             if (RoleInfoManager.Instance.isNewHeadBorder(headBorderId))
             {
                 ItemProxy.ReqSetItemRead(headBorderId).Coroutine();

GameClient/Assets/Game/HotUpdate/Views/Store/RechargeStoreView.cs

@@ -1,289 +0,0 @@
-// using UI.Store;
-// using UI.CommonGame;
-// using FairyGUI;
-// using System.Collections.Generic;
-// using ET;
-
-// namespace GFGGame
-// {
-//     public class RechargeStoreView : BaseWindow
-//     {
-//         private UI_RechargeStoreUI _ui;
-//         private List<GiftBagCfg> _giftCfgs;
-//         private List<ShopExchangeCfg> _exchangeCfgs;
-//         public override void Dispose()
-//         {
-
-//             if (_ui != null)
-//             {
-//                 _ui.Dispose();
-//             }
-//             _ui = null;
-//             base.Dispose();
-//         }
-
-//         protected override void OnInit()
-//         {
-//             base.OnInit();
-//             packageName = UI_RechargeStoreUI.PACKAGE_NAME;
-//             _ui = UI_RechargeStoreUI.Create();
-//             this.viewCom = _ui.target;
-//             isfullScreen = true;
-//             this.clickBlankToClose = false;
-
-//             _ui.m_list.itemRenderer = ListItemRenderer;
-//             _ui.m_listGift.itemRenderer = ListGiftItemRenderer;
-//             _ui.m_listExchange.itemRenderer = ListExchangeItemRenderer;
-
-//             _ui.m_comTab.m_c1.onChanged.Add(OnComTabChange);
-//             _ui.m_c1.onChanged.Add(OnTabChange);
-
-
-//         }
-//         protected override void AddEventListener()
-//         {
-//             base.AddEventListener();
-//             EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
-//             EventAgent.AddEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
-//             EventAgent.AddEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
-//             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-//         }
-//         protected override void OnShown()
-//         {
-//             base.OnShown();
-
-//             _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
-//             _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
-//             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-//             UpdateExchangeList();
-//             UpdateGiftBagList();
-//             OnTabChange();
-//             Timers.inst.Add(1, 0, UpdateExchangeTime);
-//         }
-
-//         protected override void OnHide()
-//         {
-//             base.OnHide();
-//             Timers.inst.Remove(UpdateExchangeTime);
-
-//         }
-//         protected override void RemoveEventListener()
-//         {
-//             base.RemoveEventListener();
-//             EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
-//             EventAgent.RemoveEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
-//             EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
-//             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-//         }
-
-//         private void OnComTabChange()
-//         {
-//             _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
-
-//         }
-//         private void OnTabChange()
-//         {
-//             _ui.m_list.ScrollToView(0);
-//             _ui.m_listGift.ScrollToView(0);
-//             _ui.m_listExchange.ScrollToView(0);
-//         }
-//         private void UpdateList()
-//         {
-//             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-//         }
-//         private void UpdateGiftBagList()
-//         {
-//             _giftCfgs = StoreDataManager.Instance.GetGiftBagCfgs();
-//             _ui.m_listGift.numItems = _giftCfgs.Count;
-//             UpdateRedDot();
-//         }
-//         private void UpdateExchangeList()
-//         {
-//             _exchangeCfgs = StoreDataManager.Instance.GetExchangeCfgs();
-//             _ui.m_listExchange.numItems = _exchangeCfgs.Count;
-//         }
-//         private void UpdateExchangeTime(object param)
-//         {
-//             long endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
-//             string time = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
-//             _ui.m_txtRefreshTime.text = time + "后刷新";
-//             for (int i = 0; i < _ui.m_listGift.numItems; i++)
-//             {
-//                 UI_ListGiftItem item = UI_ListGiftItem.Proxy(_ui.m_listGift.GetChildAt(i));
-//                 GiftBagCfg cfg = _giftCfgs[i];
-//                 item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
-//                 UI_ListGiftItem.ProxyEnd();
-//             }
-//         }
-//         private void ListItemRenderer(int index, GObject obj)
-//         {
-//             RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
-//             UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
-//             item.m_txtExchangeCount.visible = false;
-//             item.m_btnBuy.m_c1.selectedIndex = 1;
-//             item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
-//             if (item.target.data == null)
-//             {
-//                 item.target.onClick.Add(() =>
-//                 {
-//                     if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
-//                     {
-//                         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
-//                         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
-//                     }
-//                 });
-//             }
-//             item.target.data = index;
-//             item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
-//             item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.name);
-//             bool isDouble = StoreDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
-//             item.m_imgDouble.visible = isDouble;
-//             item.m_txtDesc.visible = isDouble;
-//             item.m_icon.url = "ui://Store/sc_zizhuan_" + itemData.id;
-
-//             UI_StoreListItem.ProxyEnd();
-//         }
-
-//         private void ListGiftItemRenderer(int index, GObject obj)
-//         {
-//             UI_ListGiftItem item = UI_ListGiftItem.Proxy(obj);
-//             GiftBagCfg cfg = _giftCfgs[index];
-
-//             item.m_txtName.text = cfg.name;
-//             item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res);
-
-//             item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
-//             item.m_grpDiscount.visible = cfg.desc != "";
-
-//             item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
-//             item.m_grpEndTime.visible = cfg.endTime != "";
-
-//             item.m_c2.selectedIndex = StoreDataManager.Instance.GetGiftStateById(cfg.id) ? 0 : 1;
-//             if (cfg.lockType == LockType.STORY_LV)
-//             {
-//                 StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
-//                 item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
-//             }
-//             else if (cfg.lockType == LockType.ROLE_LV)
-//             {
-//                 item.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
-//             }
-
-//             int buyNum = StoreDataManager.Instance.GetGiftBuyNumById(cfg.id);
-//             item.m_txtLimit.text = string.Format("{0}({1}/{2})", StoreDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
-//             item.m_txtLimit.visible = cfg.maxBuyNum > 0;
-//             item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1;
-//             if (item.m_c1.selectedIndex == 0)
-//             {
-//                 item.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
-//                 if (cfg.price > 0 && cfg.costType != CostType.FREE)
-//                 {
-//                     item.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
-//                     item.m_grpIcon.visible = true;
-//                     item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
-
-//                     if (cfg.costType == CostType.RMB)
-//                     {
-//                         item.m_loaIcon.visible = false;
-//                         item.m_txtIcon.visible = true;
-//                         item.m_txtIcon.text = "￥";
-//                     }
-//                     else
-//                     {
-//                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
-//                         item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-//                         item.m_loaIcon.visible = true;
-//                         item.m_txtIcon.visible = false;
-//                     }
-//                 }
-//                 else
-//                 {
-//                     item.m_grpIcon.visible = false;
-//                     item.m_grpOriginalPrice.visible = false;
-//                     item.m_txtPrice.text = "免费";
-//                 }
-//             }
-
-//             if (item.target.data == null)
-//             {
-//                 item.target.onClick.Add(OnBtnBuyClick);
-//             }
-//             item.target.data = cfg.id;
-//             bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && cfg.price == 0;
-
-//             RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
-//             UI_ListGiftItem.ProxyEnd();
-//         }
-//         private void OnBtnBuyClick(EventContext context)
-//         {
-//             GObject btn = context.sender as GObject;
-//             int giftId = (int)btn.data;
-//             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
-//             if (cfg.maxBuyNum != 0 && StoreDataManager.Instance.GetGiftBuyNumById(giftId) == cfg.maxBuyNum)
-//             {
-//                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
-//                 return;
-//             }
-//             if (cfg.price == 0 || cfg.costType == CostType.FREE)
-//             {
-//                 RechargeSProxy.ReqBuyGiftBag((int)btn.data).Coroutine();
-//             }
-//             else
-//             {
-//                 ViewManager.Show<GiftBagBuyView>(btn.data);
-//             }
-//         }
-
-//         private void ListExchangeItemRenderer(int index, GObject obj)
-//         {
-//             ShopExchangeCfg cfg = _exchangeCfgs[index];
-//             UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
-//             item.m_btnBuy.m_c1.selectedIndex = 0;
-//             item.m_btnBuy.m_txtTitle.text = cfg.costNum.ToString();
-//             item.m_txtExchangeCount.text = string.Format("x{0}", cfg.num);
-//             // item.m_txtExchangeCount.visible = cfg.num > 1;
-//             bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-//             item.m_c1.selectedIndex = isSellOut ? 1 : 0;
-//             if (item.target.data == null)
-//             {
-//                 // item.target.onClick.Add(() =>
-//                 // {
-//                 //     bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-//                 //     if (isSellOut)
-//                 //     {
-//                 //         PromptController.Instance.ShowFloatTextPrompt("已售罄");
-//                 //         return;
-//                 //     }
-//                 //     ViewManager.Show<ItemExchangeView>(cfg.id);
-//                 // });
-//                 item.target.onClick.Add(OnBtnBugItem);
-//             }
-//             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
-//             item.target.data = cfg;
-//             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costId).res);
-//             item.m_txtName.text = itemCfg.name;
-//             item.m_txtDesc.text = string.Format("剩余：{0}", cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id));
-//             if (cfg.maxLimit == 0) item.m_txtDesc.text = "剩余：不限";
-//             item.m_imgDouble.visible = false;
-//             item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-
-//             UI_StoreListItem.ProxyEnd();
-//         }
-//         private void OnBtnBugItem(EventContext context)
-//         {
-//             ShopExchangeCfg cfg = (context.sender as GObject).data as ShopExchangeCfg;
-//             bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-//             if (isSellOut)
-//             {
-//                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
-//                 return;
-//             }
-//             ViewManager.Show<ItemExchangeView>(cfg.id);
-//         }
-
-//         private void UpdateRedDot()
-//         {
-//             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
-//         }
-//     }
-// }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -130,10 +130,15 @@ namespace GFGGame
                 _dressUpObjUIs.Add(dressUpObjUI);
             }
             _dressUpObjUI = item.m_holder.data as DressUpObjUI;
-            _dressUpObjUI.ResetSceneObj(90, false, true, null, false);
+            _dressUpObjUI.ResetSceneObj(85, false, true, null, false);
             _dressUpObjUI.dressUpObj.PutOnSuitCfg(vipCfg.suitId, true, new int[] { ConstDressUpItemType.BEI_JING }, true, false);
             _dressUpObjUI.UpdateWrapper(item.m_holder);
 
+            if (item.m_btnShow.data == null)
+            {
+                item.m_btnShow.onClick.Add(OnBtnShowClick);
+            }
+            item.m_btnShow.data = vipCfg.suitId;
             if (item.m_btnGetGiftBag.data == null)
             {
                 item.m_btnGetGiftBag.onClick.Add(OnBtnGetGiftBagClick);
@@ -165,6 +170,23 @@ namespace GFGGame
             (obj.data as ItemView).SetData(itemData);
             (obj.data as ItemView).ChangeTxtCountStyle();
         }
+
+        private void OnBtnShowClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int suitId = (int)obj.data;
+            int _suitTypeId = 0;
+            for (int i = 0; i < SuitGuideMenuCfgArray.Instance.dataArray.Length; i++)
+            {
+                string[] suitIds = SuitGuideMenuCfgArray.Instance.dataArray[i].suitIds.Split(';');
+                if (Array.IndexOf(suitIds, suitId.ToString()) >= 0)
+                {
+                    _suitTypeId = SuitGuideMenuCfgArray.Instance.dataArray[i].id;
+                    break;
+                }
+            }
+            ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, new List<int>() { suitId } });
+        }
         private void OnBtnGetGiftBagClick(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -193,19 +215,21 @@ namespace GFGGame
             if (_curSelectIndex == 0) return;
             _curSelectIndex = _curSelectIndex - 1;
             _ui.m_list.ScrollToView(_curSelectIndex, true);
-            _ui.m_list.selectedIndex = _curSelectIndex;
+            // _ui.m_list.selectedIndex = _curSelectIndex;
         }
         private void OnBtnRightClick()
         {
             if (_curSelectIndex == _ui.m_list.numItems - 1) return;
             _curSelectIndex = _curSelectIndex + 1;
             _ui.m_list.ScrollToView(_curSelectIndex, true);
-            _ui.m_list.selectedIndex = _curSelectIndex;
+            // _ui.m_list.selectedIndex = _curSelectIndex;
         }
         private void UpdateSuitView()
         {
             _curSelectIndex = _ui.m_list.GetFirstChildInView();
             _ui.m_list.selectedIndex = _curSelectIndex;
         }
+
+
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -103,6 +103,7 @@ namespace GFGGame
         {
             ViewManager.Hide(_curViewName);
             this.Hide();
+            // ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
 
         private void OnTabChange()

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -173,7 +173,7 @@ namespace GFGGame
         {
             Hide();
             if (!(context.sender is GObject btnGo)) return;
-            ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(TaskView).FullName, viewData }, true);
+            TaskDataManager.Instance.JumpToView(btnGo.data.ToString(), new object[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -194,17 +194,17 @@ namespace GFGGame
             switch (state)
             {
                 case ConstBonusStatus.CAN_NOT_GET:
-                {
-                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-                    break;
-                }
+                    {
+                        var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                        ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                        break;
+                    }
                 case ConstBonusStatus.CAN_GET:
-                {
-                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                    if (result) UpdateLivenessProcess();
-                    break;
-                }
+                    {
+                        var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                        if (result) UpdateLivenessProcess();
+                        break;
+                    }
                 case ConstBonusStatus.GOT:
                     //领取完毕
                     break;

GameClient/Assets/ResIn/Prefab/SceneArena.prefab

@@ -432,7 +432,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7684116393383725891}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4342571773848954758}

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: df7b435660347d340a4f2729e2c586cd
+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/DailyWelfare/DailyWelfare_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e59e76af429a2e54489f17f26db2db9d
+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: