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

* 'master' of http://10.108.64.190:3000/gfg/Client: (36 commits)
  版本bugfix
  活动礼包红点
  随机礼包
  雅集
  雅集
  每日补给弹窗
  活动抽奖
  抽奖展示
  添加注释
  屏蔽后端报错导致的卡死
  换装资源打包屏蔽
  抽奖引导
  换装资源打包屏蔽
  卡牌升级限制提示
  雅集创建状态
  雅集福利可单独领取
  清理
  vip进度显示错误
  体力礼包引导
  抽奖
  ...

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,48 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1025">
   <displayList>
-    <component id="n0_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1025">
-      <relation target="n33_l500" sidePair="height-height"/>
-    </component>
-    <text id="n5_si5z" name="txtName" xy="65,58" size="186,61" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
-    <text id="n6_si5z" name="txtOwned" xy="752,80" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
-    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,130" group="n12_si5z"/>
-    <loader id="n8_si5z" name="loaRarity" xy="40,164" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="165,253" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
-    <image id="n10_si5z" name="n10" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
-    <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="243,314" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
-    <group id="n12_si5z" name="n12" xy="40,58" size="866,313" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="205,391" pivot="0.5,0" size="569,131" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <image id="n37_qdaz" name="n37" src="qdaztno" fileName="images/tanchuang_2.png" xy="-59,-31" size="1021,1113"/>
+    <text id="n5_si5z" name="txtName" xy="65,109" size="188,62" group="n12_si5z" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
+    <text id="n6_si5z" name="txtOwned" xy="750,131" pivot="1,0" size="131,42" group="n12_si5z" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
+    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,181" group="n12_si5z"/>
+    <loader id="n8_si5z" name="loaRarity" xy="40,215" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="165,304" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
+    <image id="n10_si5z" name="n10" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="357,218" group="n12_si5z"/>
+    <text id="n11_si5z" name="txtDesc" xy="375,240" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="243,365" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
+    <group id="n12_si5z" name="n12" xy="40,109" size="866,313" group="n33_l500" advanced="true"/>
+    <list id="n32_l500" name="listItem" xy="205,442" pivot="0.5,0" size="569,131" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,564" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,542" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,542" size="897,54" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,619" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,617" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,615" size="897,15" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="359,593" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
+    <group id="n4_si5z" name="n4" xy="32,593" size="897,54" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,670" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,668" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,618" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,616" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,669" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,667" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="343,624" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,616" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="319,706" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="416,797" pivot="0.5,0" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
-    <text id="n36_l500" name="txtRmbCost" xy="450,787" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
-    <group id="n26_si5z" name="n26" xy="319,706" size="323,135" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,863" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="343,675" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="175,667" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="317,757" pivot="0.5,0" size="326,52" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="415,848" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="450,839" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="317,757" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="124,914" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,863" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,914" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,863" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="32,542" size="897,410" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="32,58" size="897,894" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n20_si5z" name="n20" xy="124,914" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="32,593" size="897,410" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="32,109" size="897,894" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/BtnStyle005.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="316,102" extention="Button">
+<component size="94,94" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="316,102" url="ui://eg2y0ldpvolstnf" autoSize="true"/>
-    <text id="n1_9qpb" name="title" xy="0,-4" size="316,102" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="前往">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </text>
+    <image id="n0_duuf" name="n0" src="volstnj" fileName="imagesNew/an_bt_cut.png" xy="0,0"/>
   </displayList>
   <Button/>
-  <relation target="n2_idkd" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="94,94" extention="Button">
+<component size="316,94" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="94,94" url="ui://eg2y0ldpvolstni" autoSize="true">
+    <loader id="n2_idkd" name="icon" xy="0,0" pivot="0.5,0.5" size="316,102" url="ui://eg2y0ldpvolstni" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <text id="n1_9qpb" name="title" xy="0,0" size="94,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -322,7 +322,6 @@
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
-    <image id="qik1tm7" name="db_jiajian_1.png" path="/images/"/>
     <component id="mdmdtn5" name="ComItem001_1.xml" path="/components/" exported="true"/>
     <image id="uxxstma" name="wpk_db_2.png" path="/imagesNew/" exported="true"/>
     <image id="uxxstm5" name="wpk_sz_db2.png" path="/imagesNew/" exported="true"/>
@@ -341,14 +340,16 @@
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
     <component id="volstnd" name="ComIcon003.xml" path="/components/"/>
     <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
-    <component id="volstnf" name="BtnStyle005.xml" path="/components/"/>
-    <component id="volstng" name="BtnStyle006.xml" path="/components/"/>
+    <component id="volstnf" name="BtnStyle005.xml" path="/components/" exported="true"/>
+    <component id="volstng" name="BtnStyle006.xml" path="/components/" exported="true"/>
     <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>
-    <image id="volstni" name="an_bt_bai.png" path="/imagesNew/"/>
+    <image id="volstni" name="an_bt_bai.png" path="/imagesNew/" exported="true"/>
     <image id="volstnj" name="an_bt_cut.png" path="/imagesNew/"/>
-    <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/"/>
+    <image id="volstnk" name="an_bt_jin.png" path="/imagesNew/" exported="true"/>
     <image id="volstnl" name="wp_bg_yuan.png" path="/imagesNew/"/>
     <image id="volstnm" name="wp_own.png" path="/imagesNew/"/>
+    <image id="qdaztnn" name="db_jiajian_1.png" path="/images/"/>
+    <image id="qdaztno" name="tanchuang_2.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueJoinUI.xml

@@ -25,7 +25,7 @@
     <text id="n13_a0cf" name="n13" xy="608,422" pivot="0.5,0" size="116,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="是否审核"/>
     <text id="n14_a0cf" name="n14" xy="857,422" pivot="0.5,0" size="60,39" group="n15_a0cf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="操作"/>
     <group id="n15_a0cf" name="n15" xy="0,420" size="1080,41" group="n16_a0cf"/>
-    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" group="n16_a0cf" lineGap="17" defaultItem="ui://tw70qm9drv091f" autoClearItems="true">
+    <list id="n5_u2u3" name="list" xy="70,484" size="936,968" group="n16_a0cf" lineGap="5" defaultItem="ui://tw70qm9drv091f" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -33,8 +33,9 @@
       <item/>
       <item/>
       <item/>
+      <item/>
     </list>
-    <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1510" group="n16_a0cf">
+    <component id="n6_u2u3" name="btnChange" src="a0cf2z" fileName="components/Button42.xml" xy="375,1526" group="n16_a0cf">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="换一批"/>
     </component>

FGUIProject/assets/League/components/ListJoinItem.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="935,137">
+<component size="935,144">
   <displayList>
-    <text id="n7_u2u3" name="txtLeagueName" xy="150,23" size="188,39" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" autoClearText="true" text="联盟名字7个字"/>
-    <text id="n11_u2u3" name="txtMemberCount" xy="401,49" pivot="0.5,0" size="55,37" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}/{maxValue=70}"/>
-    <text id="n12_rv09" name="txtCheck" xy="584,49" pivot="0.5,0" size="30,38" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" text="是"/>
-    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/Button5.xml" xy="704,43" pkg="mk0fwx0x">
+    <text id="n7_u2u3" name="txtLeagueName" xy="150,23" size="188,39" group="n19_duuf" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" autoClearText="true" text="联盟名字7个字"/>
+    <text id="n11_u2u3" name="txtMemberCount" xy="401,49" pivot="0.5,0" size="54,37" group="n19_duuf" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}/{maxValue=70}"/>
+    <text id="n12_rv09" name="txtCheck" xy="584,49" pivot="0.5,0" size="30,37" group="n19_duuf" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" text="是"/>
+    <component id="n14_rv09" name="btnJoin" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="704,43" group="n19_duuf">
       <Button title="申请"/>
     </component>
-    <component id="n15_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="5,0"/>
-    <image id="n17_a0cf" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="2,138"/>
-    <image id="n18_a0cf" name="imgAd" src="a0cf2j" fileName="images/lm_yz.png" xy="150,74"/>
+    <component id="n15_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="5,0" group="n19_duuf"/>
+    <image id="n17_a0cf" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="2,138" group="n19_duuf"/>
+    <image id="n18_a0cf" name="imgAd" src="a0cf2j" fileName="images/lm_yz.png" xy="150,74" group="n19_duuf"/>
+    <group id="n19_duuf" name="n19" xy="2,0" size="931,150"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -22,9 +22,7 @@
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n20_dhoa" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="808,1766">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
+    <component id="n20_dhoa" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1802"/>
     <loader id="n19_v95q" name="loaMask" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>

FGUIProject/assets/LuckyBox/LuckyBoxActivityUI.xml

@@ -27,7 +27,7 @@
     <group id="n52_mbf1" name="n52" xy="9,246" size="151,459" advanced="true"/>
     <image id="n56_mbf1" name="n56" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
     <image id="n53_mbf1" name="n53" src="mbf1tam" fileName="images/cj_tswz_db.png" xy="136,1497" group="n54_mbf1"/>
-    <text id="n44_mbf1" name="txtCount" xy="210,1496" pivot="0.5,0" size="659,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" vars="true" text="{value=15}次摘星内必得【{name=沧海月明}】限定部件或对应词牌"/>
+    <text id="n44_mbf1" name="txtCount" xy="280,1496" pivot="0.5,0" size="519,42" group="n54_mbf1" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fff7d4" align="center" ubb="true" vars="true" text="[color=#4BFB4B]{value=15}[/color] 次摘星内必得【{name=沧海月明}】限定部件"/>
     <group id="n54_mbf1" name="n54" xy="136,1496" size="808,43" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>

FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <graph id="n2_qdrt" name="bg" xy="0,0" size="1080,1920" alpha="0.4" type="rect" lineSize="0" fillColor="#ff000000">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
+    <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,center-center,middle-middle"/>
+    </loader>
+    <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>
+    <image id="n6_duuf" name="n6" src="volstar" fileName="imageNews/zx_tx_hengxiang.png" xy="0,420" group="n9_duuf"/>
+    <image id="n7_duuf" name="n7" src="volstav" fileName="imageNews/zx_tx_yuanquan.png" xy="28,381" group="n9_duuf"/>
+    <image id="n8_duuf" name="n8" src="volstaw" fileName="imageNews/zx_tx_zhongjian.png" xy="53,484" group="n9_duuf"/>
+    <group id="n9_duuf" name="n9" xy="0,381" size="1080,1158" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="863,1802">
+    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1802">
       <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button icon="ui://drx9d1usvolstbo"/>
     </component>
   </displayList>
   <transition name="t_open">

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="1"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391i" fill="scaleMatchWidth">
+    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391g" fill="scaleMatchWidth">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="498,973">
+    <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
     </component>
-    <component id="n31_iakb" name="comStar0_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="605,857">
+    <component id="n31_iakb" name="comStar0_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
     </component>
-    <component id="n32_iakb" name="comStar0_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="605,857">
+    <component id="n32_iakb" name="comStar0_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
-    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="193,291" group="n19_l5nz"/>
-    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="513,121" group="n19_l5nz"/>
-    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="913,581" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="207,970" group="n19_l5nz"/>
-    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="294,1130" group="n19_l5nz"/>
-    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="914,1142" group="n19_l5nz"/>
-    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="185,1320" group="n19_l5nz"/>
-    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="741,1444" group="n19_l5nz"/>
-    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="392,1533" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="146,82" size="807,1490" advanced="true">
+    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="232,537" group="n19_l5nz"/>
+    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="449,224" group="n19_l5nz"/>
+    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="849,557" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="419,803" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="253,1005" group="n19_l5nz"/>
+    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="828,1066" group="n19_l5nz"/>
+    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="253,1398" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="584,1272" group="n19_l5nz"/>
+    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="586,1619" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="193,185" size="695,1473" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="389,363" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="268,561" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="220,778" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="229,976" group="n25_iakb"/>
-    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="295,1278" group="n25_iakb"/>
-    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="414,1511" group="n25_iakb"/>
-    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="697,653" group="n25_iakb"/>
-    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="853,990" group="n25_iakb"/>
-    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="819,1408" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="181,324" size="711,1226" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="420,283" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="227,499" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="229,848" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="431,1035" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="186,1279" group="n25_iakb"/>
+    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="430,1471" group="n25_iakb"/>
+    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="610,644" group="n25_iakb"/>
+    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="832,903" group="n25_iakb"/>
+    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="779,1480" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="147,244" size="724,1275" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="635,267" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="343,498" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="562,1709" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="117,721" group="n30_iakb"/>
-    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="308,1073" group="n30_iakb"/>
-    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="368,1409" group="n30_iakb"/>
-    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="875,1411" group="n30_iakb"/>
-    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="546,898" group="n30_iakb"/>
-    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="774,754" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="78,228" size="836,1520" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="722,318" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="338,446" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="625,1568" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="198,708" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="341,1060" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="276,1365" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="819,1405" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="797,1132" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="708,665" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="159,279" size="699,1328" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -4,16 +4,19 @@
     <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" align="center" vAlign="middle" fill="scale">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usnjmn2p">
+    <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usduuftcr">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>
+      <item/>
+      <item/>
+      <item/>
     </list>
     <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n32_vek8">
       <relation target="" sidePair="right-right"/>
     </component>
     <component id="n6_fka7" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n32_vek8"/>
-    <component id="n7_fka7" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n32_vek8"/>
+    <component id="n7_fka7" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220" group="n32_vek8" visible="false"/>
     <group id="n32_vek8" name="grpTop" xy="0,80" size="1080,230" advanced="true"/>
-    <component id="n33_ly9g" name="btnLeft" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
-    <component id="n39_ly9g" name="btnRight" src="ly9g1e" fileName="components/Button13.xml" pkg="eg2y0ldp" xy="1000,960" pivot="0.5,0.5" anchor="true"/>
+    <component id="n33_ly9g" name="btnLeft" src="volstnf" fileName="components/BtnStyle005.xml" pkg="eg2y0ldp" xy="74,960" pivot="0.5,0.5" anchor="true" rotation="180"/>
+    <component id="n39_ly9g" name="btnRight" src="volstnf" fileName="components/BtnStyle005.xml" pkg="eg2y0ldp" xy="1000,960" pivot="0.5,0.5" anchor="true"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/combox/ComBox.xml

@@ -14,15 +14,9 @@
     <group id="n66_vols" name="n66" xy="861,241" size="226,148" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <image id="n72_vols" name="imgActLuckyBox" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376" visible="false">
+    <image id="n72_vols" name="imgActLuckyBox" src="volstcj" fileName="imageNews/cj_wz_jhsy.png" xy="101,376">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <image id="n68_vols" name="n68" src="qi041j" fileName="images/cj_zizi_2.png" xy="392,545" group="n71_vols"/>
-    <image id="n69_vols" name="n69" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="676,700" group="n71_vols"/>
-    <text id="n70_vols" name="txtTime" xy="643,949" size="62,237" group="n71_vols" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
-    <group id="n71_vols" name="grpLuckyBox" xy="392,545" size="387,700" visible="false" advanced="true">
-      <relation target="" sidePair="middle-middle"/>
-    </group>
     <component id="n55_vols" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n61_vols">
       <relation target="" sidePair="left-left"/>
     </component>

FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" overflow="hidden" designImage="ui://drx9d1usduuftcs" designImageOffsetY="-240" designImageAlpha="100">
+  <displayList>
+    <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <image id="n82_duuf" name="n82" src="duuftcn" fileName="imageNews/zx_bgzz.png" xy="0,981">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <loader id="n73_duuf" name="loaTitle" xy="72,198" pivot="0.5,0.5" size="483,175" group="n77_duuf" url="ui://drx9d1usduuftcp" autoSize="true"/>
+    <image id="n78_duuf" name="n78" src="volstcg" fileName="imageNews/zx_title_bg.png" xy="146,360" size="382,42" group="n81_duuf"/>
+    <image id="n79_duuf" name="n79" src="volstc1" fileName="imageNews/zx_title_xianding.png" xy="98,346" group="n81_duuf"/>
+    <image id="n80_duuf" name="n80" src="volstbm" fileName="imageNews/zx_title_guangdian.png" xy="153,344" group="n81_duuf"/>
+    <text id="n70_vols" name="txtTime" xy="174,361" pivot="0.5,0" size="291,39" group="n81_duuf" fontSize="28" color="#6b5da7" align="center" vAlign="middle" letterSpacing="-2" text="活动时间: 2023年10月10日"/>
+    <group id="n81_duuf" name="grpTime" xy="98,344" size="430,74" group="n77_duuf" advanced="true"/>
+    <group id="n77_duuf" name="grpTitle" xy="72,198" size="483,219" advanced="true">
+      <relation target="" sidePair="left-left,top-top"/>
+    </group>
+    <component id="n62_vols" name="btnPreview" src="duuftct" fileName="components/Button6.xml" xy="916,240" group="n66_vols">
+      <Button icon="ui://drx9d1usvek8v"/>
+    </component>
+    <image id="n64_vols" name="n64" src="volstbs" fileName="imageNews/zx_jindu_bg.png" xy="903,341" group="n66_vols"/>
+    <text id="n65_vols" name="txtOwned" xy="939,335" pivot="0.5,0" size="44,39" group="n66_vols" fontSize="28" color="#faf6e6" align="center" vars="true" text="{v1=0}/{v2=0}">
+      <relation target="n64_vols" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n66_vols" name="n66" xy="903,240" size="116,134" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <component id="n55_vols" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="300,1782" pivot="0.5,0" anchor="true" group="n61_vols">
+      <relation target="" sidePair="left-left"/>
+    </component>
+    <component id="n56_vols" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="777,1782" pivot="0.5,0" anchor="true" group="n61_vols">
+      <relation target="" sidePair="left-left"/>
+    </component>
+    <component id="n57_vols" name="btnBuyOne" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="140,1675" group="n61_vols">
+      <Button title="摘星一次"/>
+    </component>
+    <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
+      <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
+    </component>
+    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n61_vols">
+      <relation target="n58_vols" sidePair="left-left,top-top"/>
+    </image>
+    <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数：{v1=0}">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
+  </displayList>
+  <customProperty target="loaBg" propertyId="1"/>
+</component>

FGUIProject/assets/LuckyBox/combox/ComBox_1.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" designImage="ui://drx9d1usdhoatab" designImageOffsetY="-240">
+  <displayList>
+    <component id="n44_mbf1" name="comModel" src="mbf1tah" fileName="combox/ComModel.xml" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <component id="n32_njmn" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="920,177" group="n36_njmn" controller="c1,0">
+      <Button icon="ui://drx9d1usvek8v"/>
+    </component>
+    <component id="n33_njmn" name="btnExchange" src="ga16d" fileName="components/Button3.xml" xy="966,177" group="n36_njmn" visible="false">
+      <Button icon="ui://drx9d1usvek8t"/>
+    </component>
+    <image id="n34_njmn" name="n34" src="fka75" fileName="images/cj_dikuangtw.png" xy="854,290" group="n36_njmn"/>
+    <text id="n35_njmn" name="txtOwned" xy="891,289" size="143,36" group="n36_njmn" fontSize="26" color="#fff7ea" align="center" vars="true" text="已拥有：{v1=0}/{v2=0}">
+      <relation target="n34_njmn" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n36_njmn" name="n36" xy="854,177" size="226,148" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <graph id="n39_dhoa" name="holder" xy="280,910" size="100,100"/>
+    <graph id="n40_dhoa" name="holder1" xy="869,1097" size="100,100"/>
+    <image id="n41_dhoa" name="n41" src="qi041j" fileName="images/cj_zizi_2.png" xy="390,548" group="n42_dhoa"/>
+    <image id="n43_mzf8" name="n43" src="mzf8tac" fileName="images/cj_zizi_3.png" xy="674,703" group="n42_dhoa"/>
+    <text id="n38_dhoa" name="txtTime" xy="641,952" size="62,237" group="n42_dhoa" font="ui://eg2y0ldpwonotj9" fontSize="46" color="#fffbdd" align="center" vAlign="middle" autoSize="height" strokeColor="#a98538" strokeSize="2" text="剩余80天"/>
+    <group id="n42_dhoa" name="n42" xy="390,548" size="387,700" advanced="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+    <component id="n26_njmn" name="comCostOne" src="vek812" fileName="components/ComCost.xml" xy="256,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
+      <relation target="" sidePair="left-left"/>
+    </component>
+    <component id="n27_njmn" name="comCostTen" src="vek812" fileName="components/ComCost.xml" xy="741,1635" pivot="0.5,0" anchor="true" group="n31_njmn">
+      <relation target="" sidePair="left-left"/>
+    </component>
+    <component id="n28_njmn" name="btnBuyOne" src="ga16b" fileName="components/Button1.xml" xy="45,1688" group="n31_njmn"/>
+    <component id="n29_njmn" name="btnBuyTen" src="ga16c" fileName="components/Button2.xml" xy="531,1688" group="n31_njmn"/>
+    <image id="n30_njmn" name="imgSpecial" src="ga16i" fileName="images/cj_anniu_ts.png" xy="873,1603" group="n31_njmn">
+      <relation target="n29_njmn" sidePair="left-left,top-top"/>
+    </image>
+    <text id="n37_njmn" name="txtRemainTimes" xy="540,1809" pivot="0.5,0" anchor="true" size="244,44" group="n31_njmn" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数：{v1=0}">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <group id="n31_njmn" name="n31" xy="45,1603" size="989,250" advanced="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
+  </displayList>
+  <customProperty target="loaBg" propertyId="1"/>
+</component>

FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" align="center" vAlign="middle" fill="scale">
+    <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <loader id="n43_duuf" name="loaRes" xy="354,717" pivot="0.5,0.5" anchor="true" size="50,50" align="center" vAlign="middle"/>
     <graph id="n39_dhoa" name="holder" xy="540,900" pivot="0.5,0.5" anchor="true" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>

FGUIProject/assets/LuckyBox/components/Button4.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="186,69" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="100,100" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_qdrt" src="qdrt1b" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
+    <loader id="n1_duuf" name="icon" xy="0,0" size="100,100" url="ui://drx9d1usvolstbo" autoSize="true"/>
   </displayList>
+  <Button/>
+  <relation target="n1_duuf" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/LuckyBox/components/Button6.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="90,90" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_duuf" name="n0" src="volstbh" fileName="imageNews/zx_yulan_tubiao_bg.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_duuf" name="n1" src="volstbf" fileName="imageNews/zx_yulan_diaoshi.png" xy="-9,-92"/>
+    <image id="n2_duuf" name="n2" src="volstbg" fileName="imageNews/zx_yulan_tubiao.png" xy="23,17"/>
+    <image id="n3_duuf" name="n3" src="volstbi" fileName="imageNews/zx_yulan_xinggui.png" xy="-15,-6"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="948,970">
   <displayList>
-    <loader id="n0_qdrt" name="bg" xy="0,0" size="948,970" url="ui://drx9d1usqdrt14" autoSize="true"/>
-    <loader id="n1_qdrt" name="loaType" xy="693,211" size="54,224" url="ui://eg2y0ldpqdrt15" fill="scaleMatchWidth"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="295,226" size="358,358" aspect="true" url="ui://eg2y0ldpkubi7e" fill="scaleMatchWidth"/>
-    <loader id="n3_qdrt" name="loaProperty" xy="256,234" size="60,60" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
-    <text id="n5_qdrt" name="txtDiscribe" xy="474,697" pivot="0.5,0" anchor="true" size="406,101" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
-    <graph id="n6_dcro" name="holder" xy="467,473" size="1,1" touchable="false" type="rect"/>
-    <text id="n4_qdrt" name="txtName" xy="469,72" pivot="0.5,0.5" anchor="true" size="98,64" fontSize="48" color="#feeac2" text="服装"/>
+    <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="332,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <text id="n5_qdrt" name="txtDiscribe" xy="473,1056" pivot="0.5,0" anchor="true" size="406,101" visible="false" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
+    <image id="n12_duuf" name="n12" src="volstbk" fileName="imageNews/zx_zhuangshi_diaoshi.png" xy="645,164" group="n13_duuf"/>
+    <loader id="n1_qdrt" name="loaType" xy="645,299" size="44,94" group="n13_duuf" url="ui://eg2y0ldpo9ghtll" fill="scaleMatchWidth" autoSize="true"/>
+    <loader id="n3_qdrt" name="loaProperty" xy="645,242" size="44,44" group="n13_duuf" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
+    <group id="n13_duuf" name="n13" xy="645,164" size="54,248"/>
+    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="336,880" size="332,50" group="n15_duuf"/>
+    <text id="n4_qdrt" name="txtName" xy="502,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
+    <group id="n15_duuf" name="n15" xy="336,878" size="332,54"/>
+    <graph id="n17_duuf" name="holder1" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/ComCost.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="180,43" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <image id="n28_vek8" name="n28" src="fka75" fileName="images/cj_dikuangtw.png" xy="17,4" size="159,34"/>
-    <text id="n14_ga16" name="txtCost" xy="106,20" pivot="0.5,0.5" anchor="true" size="101,44" fontSize="32" color="#fff7d4" align="center" vars="true" autoSize="none" text="1"/>
-    <loader id="n29_vek8" name="loaCost" xy="-3,-9" pivot="0.5,0.5" size="60,60" url="ui://eg2y0ldpq08x6" autoSize="true"/>
+    <image id="n28_vek8" name="n28" src="volstbs" fileName="imageNews/zx_jindu_bg.png" xy="-7,4" size="195,34"/>
+    <loader id="n29_vek8" name="loaCost" xy="57,3" pivot="0.5,0.5" size="35,35" group="n30_duuf" aspect="true" url="ui://eg2y0ldpq08x6" fill="scale"/>
+    <text id="n14_ga16" name="txtCost" xy="112,19" pivot="0.5,0.5" anchor="true" size="20,44" group="n30_duuf" fontSize="32" color="#faf6e6" align="center" vAlign="middle" vars="true" text="1"/>
+    <group id="n30_duuf" name="n30" xy="57,-3" size="65,44" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/ComHolder.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="78,78">
+<component size="10,10">
   <displayList>
-    <graph id="n5_tt1q" name="holder" xy="38,38" size="1,1"/>
+    <graph id="n5_tt1q" name="holder" xy="4,4" size="1,1"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="78,78" pivot="0.5,0.5" anchor="true">
+<component size="10,10" pivot="0.5,0.5" anchor="true">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n4_l5nz" name="imgLine" src="l5nzp" fileName="images/cj_xk_xian.png" xy="36,34" pivot="0,0.5" size="10,12"/>
+    <component id="n8_t6j1" name="comLine" src="duufteb" fileName="components/ComponentLine.xml" xy="5,5" pivot="0,0.5" anchor="true" size="850,24"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/Component3.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="850,24" overflow="hidden">
+  <displayList>
+    <image id="n1_uj53" name="bar" src="t6j1tem" fileName="imagesNew/pro_activate.png" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/LuckyBox/components/ComponentLine.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="850,24" mask="n4_duuf">
+  <displayList>
+    <graph id="n2_o9gh" name="holder" xy="1200,11" size="1,1"/>
+    <graph id="n4_duuf" name="grpMask" xy="0,0" size="850,24" type="rect">
+      <relation target="" sidePair="width-width"/>
+    </graph>
+  </displayList>
+</component>

FGUIProject/assets/LuckyBox/package.xml

@@ -81,7 +81,7 @@
     <image id="volstau" name="zx_tx_star.png" path="/imageNews/"/>
     <image id="volstav" name="zx_tx_yuanquan.png" path="/imageNews/"/>
     <image id="volstaw" name="zx_tx_zhongjian.png" path="/imageNews/"/>
-    <image id="volstax" name="zx_wp_baseboard.png" path="/imageNews/"/>
+    <image id="volstax" name="zx_wp_baseboard.png" path="/imageNews/" scale="9grid" scale9grid="72,12,144,24"/>
     <image id="volstay" name="zx_wp_fen_bg.png" path="/imageNews/"/>
     <image id="volstaz" name="zx_wp_fen_diguang.png" path="/imageNews/"/>
     <image id="volstb0" name="zx_wp_fen_guangxiao.png" path="/imageNews/"/>
@@ -105,7 +105,6 @@
     <image id="volstbi" name="zx_yulan_xinggui.png" path="/imageNews/"/>
     <image id="volstbj" name="zx_wp_jin_guangxiao.png" path="/imageNews/"/>
     <image id="volstbk" name="zx_zhuangshi_diaoshi.png" path="/imageNews/"/>
-    <image id="volstbl" name="zx_title_zi.png" path="/imageNews/"/>
     <image id="volstbm" name="zx_title_guangdian.png" path="/imageNews/"/>
     <image id="volstbn" name="bt_jiaobiao_bichu.png" path="/imageNews/"/>
     <image id="volstbo" name="bt_tiaoguo.png" path="/imageNews/"/>
@@ -136,13 +135,26 @@
     <image id="volstcd" name="zx_tc_tab_xuanzhong.png" path="/imageNews/"/>
     <image id="volstce" name="zx_tc_taozhuang_zhuagnshi.png" path="/imageNews/"/>
     <image id="volstcf" name="zx_tc_title_zhuangshi.png" path="/imageNews/"/>
-    <image id="volstcg" name="zx_title_bg.png" path="/imageNews/"/>
+    <image id="volstcg" name="zx_title_bg.png" path="/imageNews/" scale="9grid" scale9grid="11,10,80,20"/>
     <image id="volstch" name="zx_lianxian_lan_shang.png" path="/imageNews/"/>
     <image id="volstci" name="zx_zhuangshi_xinggui.png" path="/imageNews/"/>
     <image id="volstcj" name="cj_wz_jhsy.png" path="/imageNews/"/>
     <image id="t6j1tck" name="cj_mrth_db.png" path="/images/"/>
     <image id="t6j1tcl" name="cj_zxjl_db.png" path="/images/"/>
     <image id="t6j1tcm" name="cj_zxth_db.png" path="/images/"/>
+    <image id="duuftcn" name="zx_bgzz.png" path="/imageNews/"/>
+    <image id="duuftco" name="lh_scfsls.png" path="/imageNews/" exported="true"/>
+    <image id="duuftcp" name="zx_title_2.png" path="/imageNews/" exported="true"/>
+    <image id="duuftcq" name="zx_title_3.png" path="/imageNews/" exported="true"/>
+    <component id="duuftcr" name="ComBox1.xml" path="/combox/" exported="true"/>
+    <component id="duuftct" name="Button6.xml" path="/components/"/>
+    <image id="duuftcw" name="dz_liuli.png" path="/imageNews/"/>
+    <image id="duuftcx" name="dz_danxiaozj.png" path="/imageNews/"/>
+    <component id="duuftcy" name="ComBox_1.xml" path="/combox/"/>
+    <component id="duufteb" name="ComponentLine.xml" path="/components/"/>
+    <component id="duuftec" name="Component3.xml" path="/components/"/>
+    <image id="duuftf0" name="zx_title_1.png" path="/imageNews/" exported="true"/>
+    <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/components/ComVipLv.xml

@@ -16,6 +16,6 @@
     <component id="n44_hhx9" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="862,63" size="52,52">
       <Button icon="ui://p9mtgheofqortar"/>
     </component>
-    <text id="n45_l500" name="txtTipsFull" xy="505,107" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
+    <text id="n45_l500" name="txtTipsFull" xy="505,87" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

GameClient/Assets/BuildSetting.asset

@@ -16,6 +16,7 @@ MonoBehaviour:
   - Assets/Res/Animation/Card
   - Assets/Res/Animation/DressUp
   - Assets/Res/Effect/DressUp
+  - Assets/Res/Effect/DressUpAni
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
   - Assets/ResIn/Dll
@@ -26,4 +27,4 @@ MonoBehaviour:
   - texture_dressup_ts_
   - texture_dressup_xz_
   - texture_dressup_zr_
-  - prefab
+  - prefab_

GameClient/Assets/BuildSetting1.asset

@@ -16,6 +16,7 @@ MonoBehaviour:
   - Assets/Res/Animation/Card
   - Assets/Res/Animation/DressUp
   - Assets/Res/Effect/DressUp
+  - Assets/Res/Effect/DressUpAni
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
   - Assets/ResIn/Dll

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using GFGEditor;
+using GFGGame;
 using UnityEditor;
 using UnityEngine;
 
@@ -77,16 +78,132 @@ namespace VEngine.Editor.Builds
 
         public void BuildCustomBundles(string[] resRootDirNames, string setName)
         {
+            List<string> hideFilePathList = new List<string>();
+            List<string> hideDirPahtList = new List<string>();
+            //换装资源打包屏蔽
+            SqliteController.Instance.dirPath = Path.Combine(Environment.CurrentDirectory, ResPathUtil.CONFIG_DIR_PATH);
+            SqliteController.Instance.Init(false, null);
+            var dressUpItemList = ItemCfgArray.Instance.GetCfgsByitemType(ConstItemType.DRESS_UP);
+            foreach (var itemCfg in dressUpItemList)
+            {
+                if (itemCfg.isHide <= 0)
+                {
+                    continue;
+                }
+                if (!string.IsNullOrEmpty(itemCfg.resLayer1))
+                {
+                    HideItemRes(itemCfg, 1, hideFilePathList, hideDirPahtList);
+                }
+                if (!string.IsNullOrEmpty(itemCfg.resLayer2))
+                {
+                    HideItemRes(itemCfg, 2, hideFilePathList, hideDirPahtList);
+                }
+                if (!string.IsNullOrEmpty(itemCfg.resLayer3))
+                {
+                    HideItemRes(itemCfg, 3, hideFilePathList, hideDirPahtList);
+                }
+            }
+            //套装动作资源打包屏蔽
+            var suitCfgs = SuitCfgArray.Instance.dataArray;
+            foreach(var suitCfg in suitCfgs)
+            {
+                HideSuitActionRes(suitCfg, hideFilePathList, hideDirPahtList);
+            }
+            //卡牌资源打包屏蔽
+            //var cardCfgs = ItemCfgArray.Instance.GetCfgsByitemType(ConstItemType.CARD);
+            //foreach (var itemCfg in cardCfgs)
+            //{
+            //    if (itemCfg.isHide <= 0)
+            //    {
+            //        continue;
+            //    }
+            //    HideCardRes(itemCfg, hideFilePathList, hideDirPahtList);
+            //}
+
             foreach (var resRootDirName in resRootDirNames)
             {
-                CreateBundles(resRootDirName, setName);
+                CreateBundles(resRootDirName, setName, hideFilePathList, hideDirPahtList);
             }
             CheckAssets();
             EditorUtility.ClearProgressBar();
             FinishBuild();
         }
 
-        private void CreateBundles(string resRootDirName, string setName)
+        private void HideItemRes(ItemCfg itemCfg, int layerId, List<string> hideFilePathList, List<string> hideDirPahtList)
+        {
+            string res = DressUpUtil.GetDressUpItemLayerRes(itemCfg, layerId);
+            //部件图
+            var resPath = ResPathUtil.GetDressUpPath(res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            hideFilePathList.Add(resPath);
+            //动画
+            resPath = ResPathUtil.GetDressUpAnimationDirPath(res);
+            hideDirPahtList.Add(resPath);
+            //特效
+            resPath = ResPathUtil.GetDressUpEffectDirPath(res);
+            hideDirPahtList.Add(resPath);
+            resPath = ResPathUtil.GetDressUpEffectDirPath(res, true);
+            hideDirPahtList.Add(resPath);
+        }
+
+        private void HideSuitActionRes(SuitCfg suitCfg, List<string> hideFilePathList, List<string> hideDirPahtList)
+        {
+            string resPath;
+            if(!string.IsNullOrEmpty(suitCfg.aniRes))
+            {
+                //屏蔽立绘资源，临时代码，下个大版本将删除
+                bool used = false;
+                var luckyboxCfgs = LuckyBoxCfgArray.Instance.dataArray;
+                foreach(var luckyboxCfg in luckyboxCfgs)
+                {
+                    if(luckyboxCfg.isAni <= 0 && luckyboxCfg.suitIdArr != null)
+                    {
+
+                        if (Array.IndexOf(luckyboxCfg.suitIdArr, suitCfg.id) >= 0)
+                        {
+                            used = true;
+                        }
+                    }
+                }
+                if(used)
+                {
+                    Debug.Log($"suit {suitCfg.id} used picture res");
+                }
+                else
+                {
+                    resPath = ResPathUtil.GetDressUpPath(suitCfg.aniRes);
+                    hideFilePathList.Add(resPath);
+                }
+                if (suitCfg.isHide <= 0)
+                {
+                    return;
+                }
+                //动画
+                resPath = ResPathUtil.GetDressUpAnimationDirPath(suitCfg.aniRes);
+                hideDirPahtList.Add(resPath);
+                //特效
+                resPath = ResPathUtil.GetDressUpEffectDirPath(suitCfg.aniRes);
+                hideDirPahtList.Add(resPath);
+                resPath = ResPathUtil.GetDressUpEffectDirPath(suitCfg.aniRes, true);
+                hideDirPahtList.Add(resPath);
+            }
+        }
+
+        //private void HideCardRes(ItemCfg itemCfg, List<string> hideFilePathList, List<string> hideDirPahtList)
+        //{
+        //    //大图
+        //    var resPath = ResPathUtil.GetCardPath(itemCfg.res);
+        //    hideFilePathList.Add(resPath); 
+        //    //小图
+        //    resPath = ResPathUtil.GetCardSmallPath(itemCfg.res);
+        //    hideFilePathList.Add(resPath);
+        //    //动画
+        //    resPath = ResPathUtil.GetCardAnimationDirPath(itemCfg.res);
+        //    hideDirPahtList.Add(resPath);
+        //    //特效
+        //    //to do...暂时没有
+        //}
+
+        private void CreateBundles(string resRootDirName, string setName, List<string> hideFilePathList, List<string> hideDirPahtList)
         {
             var path = Path.Combine(Application.dataPath, resRootDirName);
             var buildSetting = GFGEditor.BuildSetting.GetBuildSetting(setName);
@@ -101,6 +218,10 @@ namespace VEngine.Editor.Builds
                     file = file.Replace('\\', '/');
                     string curDir = Environment.CurrentDirectory.Replace("\\", "/");
                     string filePath = file.Replace(curDir + "/", "");
+                    if(hideFilePathList.Contains(filePath))
+                    {
+                        return;
+                    }
                     EditorUtility.DisplayProgressBar("采集资源", filePath, 1f);
                     var bundle = filePath.Replace($"Assets/{resRootDirName}/", "");
 
@@ -140,12 +261,15 @@ namespace VEngine.Editor.Builds
                     var targetDirPath = subDirPath.Replace('\\', '/');
                     string curDirPath = Environment.CurrentDirectory.Replace("\\", "/");
                     string subDir = targetDirPath.Replace(curDirPath + "/", "");
+                    if(hideDirPahtList.Contains(subDir))
+                    {
+                        return;
+                    }
                     var bundle = subDir.Replace($"Assets/{resRootDirName}/", "");
                     bundle = bundle.Replace('/', '_');
                     bundle = bundle.ToLower();
                     GFGEditor.FileUtil.ForeachFileInDir(subDirPath, null, (string file) =>
                     {
-                        var ext = Path.GetExtension(file);
                         file = file.Replace('\\', '/');
                         string curDir = Environment.CurrentDirectory.Replace("\\", "/");
                         string filePath = file.Replace(curDir + "/", "");

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

@@ -28,7 +28,8 @@ namespace GFGGame
         {
             get
             {
-                return GlobalCfgArray.globalCfg.maxGetPowerCount + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.MonthCardFriendPowerAdd);
+                var t = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.MonthCardFriendPowerAdd);
+                return GlobalCfgArray.globalCfg.maxGetPowerCount + t * GlobalCfgArray.globalCfg.onceGivePowerCount;
             }
         }
 

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

@@ -9,6 +9,11 @@ namespace GFGGame
         public static int NobodyRight = 2;// 2:无人答对
         public static int Ending = 3;// 3:答题结束
     }
+    public class LeagueJoinType
+    {
+        public static int Join = 1;//1:已经加入军团
+        public static int UnJoin = 2;//1:未加入军团
+    }
     public class LeagueDataManager : SingletonBase<LeagueDataManager>
     {
         public int Type = 2;// 1:已经加入军团 2:未加入军团
@@ -29,7 +34,7 @@ namespace GFGGame
 
         public void Clear()
         {
-            Type = 2;
+            Type = LeagueJoinType.UnJoin;
             ListDatas.Clear();
             LeagueData = null;
             ListApplyDatas.Clear();

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

@@ -319,7 +319,7 @@ namespace GFGGame
             return itemHas >= itemNeed && costHas >= costNeed;
         }
 
-        //商店-会员中心
+        //商店-充值-会员中心
         public bool GetChargeAddUpReward()
         {
             VipCfg[] vipCfgs = VipCfgArray.Instance.dataArray;
@@ -334,5 +334,16 @@ namespace GFGGame
             return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 &&
                    RoleDataManager.vipLv > 0;
         }
+        //商店-礼包-活动礼包
+        public bool GetGiftBagReward()
+        {
+            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
+            shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs);
+            for (int i = 0; i < shopCfgs.Count; i++)
+            {
+                if (shopCfgs[i].price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfgs[i].id) < shopCfgs[i].maxBuyNum) return true;
+            }
+            return false;
+        }
     }
 }

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

@@ -24,9 +24,14 @@ namespace GFGGame
         {
             UI_ComVipLv com = UI_ComVipLv.Proxy(obj);
             com.m_txtLv.text = RoleDataManager.vipLv.ToString();
+            int level = RoleDataManager.vipLv;
+            ET.Log.Debug("vipLv:" + level);
+            ET.Log.Debug("vipExp:" + RoleDataManager.vipExp);
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
+            if (vipCfg == null) return;
             VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
-            com.m_txtTipsFull.visible = nextVipCfg == null;
+            com.m_txtTipsFull.visible = RoleDataManager.vipExp >= vipCfg.num && nextVipCfg == null;
+            com.m_grpTips.visible = nextVipCfg != null || RoleDataManager.vipExp < vipCfg.num;
             if (com.m_btnRule.data == null)
             {
                 com.m_btnRule.onClick.Add(RuleController.ShowRuleView);

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

@@ -171,9 +171,9 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
-                {
-                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
-                }
+                    {
+                        return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                    }
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
@@ -188,7 +188,7 @@ namespace GFGGame
             {
                 case nameof(LeagueAnswerView):
 
-                    if (LeagueDataManager.Instance.Type == 1)
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
                         ViewManager.Show<LeagueView>(null, goBackDatas, true);
                         ViewManager.Show($"GFGGame.{jumpId}");
@@ -200,7 +200,7 @@ namespace GFGGame
 
                     break;
                 case nameof(LeagueView):
-                    if (LeagueDataManager.Instance.Type == 1)
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
                         ViewManager.Show<LeagueView>(null, goBackDatas, true);
                     }

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -586,7 +586,7 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
                 var hasAniRes = ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
                 var res = hasAniRes ? suitCfg.aniRes : null;
-                DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, suitCfg.effRes, false, _roleObj);
+                DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, res, false, _roleObj);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -206,27 +206,39 @@ namespace GFGGame
             assetDisposer.resPath = resPath;
         }
 
-        private static void updateLayerRes(ItemCfg itemCfg, GameObject parentObj, int layerId, bool needSetMask, bool showAni = true)
+        public static string GetDressUpItemLayerRes(ItemCfg itemCfg, int layerId)
         {
-
-            ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
-
             string res = itemCfg.res;
-            int sortingOrder = typeCfg.defaultLayer;
             switch (layerId)
             {
                 case 1:
                     res = itemCfg.resLayer1 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer1);
                     break;
                 case 2:
-                    sortingOrder = typeCfg.specialLayer;
                     res = itemCfg.resLayer2 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer2);
                     break;
                 case 3:
-                    sortingOrder = typeCfg.thirdlLayer;
                     res = itemCfg.resLayer3 == "n" ? res : string.Format("{0}_{1}", res, itemCfg.resLayer3);
                     break;
             }
+            return res;
+        }
+
+        private static void updateLayerRes(ItemCfg itemCfg, GameObject parentObj, int layerId, bool needSetMask, bool showAni = true)
+        {
+
+            ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
+
+            string res = GetDressUpItemLayerRes(itemCfg, layerId);
+            int sortingOrder = typeCfg.defaultLayer;
+            if(layerId == 2)
+            {
+                sortingOrder = typeCfg.specialLayer;
+            }
+            else if(layerId == 3)
+            {
+                sortingOrder = typeCfg.thirdlLayer;
+            }
 
             //清理旧的
             var spritObjName = string.Format(FORMAT_SPRITE_NAME, itemCfg.subType, layerId);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta
+guid: baea59a7a552059409d451a9a60dd358
+=======
 guid: 4ad5e828cb8d0004488ba34ffb26c6e0
+>>>>>>> remotes/origin/master:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta~merged

@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
+=======
+<<<<<<< HEAD:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon000.cs.meta
+guid: 6ab0ba8a5e22ea948a6f5e2dbe615dd4
+=======
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
+>>>>>>> remotes/origin/master:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
+>>>>>>> remotes/origin/master
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta~merged.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1d707ae18079c3408a724bfe45e437e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
+guid: 4ad5e828cb8d0004488ba34ffb26c6e0
+=======
 guid: 8aa459e7d8832484abfa8f7737db7902
+>>>>>>> remotes/origin/master:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs

@@ -7,7 +7,6 @@ namespace UI.CommonGame
     public partial class UI_ItemExchangeUI
     {
         public GComponent target;
-        public GComponent m_comBg;
         public GTextField m_txtName;
         public GTextField m_txtOwned;
         public GLoader m_loaRarity;
@@ -72,7 +71,6 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
@@ -93,7 +91,6 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
             m_txtName = null;
             m_txtOwned = null;
             m_loaRarity = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -11,8 +11,6 @@ namespace UI.LuckyBox
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
         public GImage m_imgActLuckyBox;
-        public GTextField m_txtTime;
-        public GGroup m_grpLuckyBox;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_Button1 m_btnBuyOne;
@@ -70,8 +68,6 @@ namespace UI.LuckyBox
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_imgActLuckyBox = (GImage)comp.GetChild("imgActLuckyBox");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpLuckyBox = (GGroup)comp.GetChild("grpLuckyBox");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
@@ -87,8 +83,6 @@ namespace UI.LuckyBox
             m_btnPreview = null;
             m_txtOwned = null;
             m_imgActLuckyBox = null;
-            m_txtTime = null;
-            m_grpLuckyBox = null;
             m_comCostOne.Dispose();
             m_comCostOne = null;
             m_comCostTen.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -0,0 +1,110 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComBox1
+    {
+        public GComponent target;
+        public UI_ComModel m_comModel;
+        public GLoader m_loaTitle;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GGroup m_grpTitle;
+        public GButton m_btnPreview;
+        public GTextField m_txtOwned;
+        public UI_ComCost m_comCostOne;
+        public UI_ComCost m_comCostTen;
+        public GButton m_btnBuyOne;
+        public GButton m_btnBuyTen;
+        public GImage m_imgSpecial;
+        public GTextField m_txtRemainTimes;
+        public const string URL = "ui://drx9d1usduuftcr";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComBox1";
+        private static UI_ComBox1 _proxy;
+
+        public static UI_ComBox1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComBox1();
+            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_ComBox1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComBox1();
+            }
+            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_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_grpTitle = (GGroup)comp.GetChild("grpTitle");
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
+            m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
+            m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
+            m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comModel.Dispose();
+            m_comModel = null;
+            m_loaTitle = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_grpTitle = null;
+            m_btnPreview = null;
+            m_txtOwned = null;
+            m_comCostOne.Dispose();
+            m_comCostOne = null;
+            m_comCostTen.Dispose();
+            m_comCostTen = null;
+            m_btnBuyOne = null;
+            m_btnBuyTen = null;
+            m_imgSpecial = null;
+            m_txtRemainTimes = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCard.cs

@@ -7,13 +7,13 @@ namespace UI.LuckyBox
     public partial class UI_ComCard
     {
         public GComponent target;
-        public GLoader m_bg;
-        public GLoader m_loaType;
+        public GGraph m_holder;
         public GLoader m_loaIcon;
-        public GLoader m_loaProperty;
         public GTextField m_txtDiscribe;
-        public GGraph m_holder;
+        public GLoader m_loaType;
+        public GLoader m_loaProperty;
         public GTextField m_txtName;
+        public GGraph m_holder1;
         public const string URL = "ui://drx9d1usqdrt1a";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCard";
@@ -61,23 +61,23 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
-            m_loaType = (GLoader)comp.GetChild("loaType");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_loaProperty = (GLoader)comp.GetChild("loaProperty");
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-            m_holder = (GGraph)comp.GetChild("holder");
+            m_loaType = (GLoader)comp.GetChild("loaType");
+            m_loaProperty = (GLoader)comp.GetChild("loaProperty");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
-            m_loaType = null;
+            m_holder = null;
             m_loaIcon = null;
-            m_loaProperty = null;
             m_txtDiscribe = null;
-            m_holder = null;
+            m_loaType = null;
+            m_loaProperty = null;
             m_txtName = null;
+            m_holder1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost.cs

@@ -7,8 +7,8 @@ namespace UI.LuckyBox
     public partial class UI_ComCost
     {
         public GComponent target;
-        public GTextField m_txtCost;
         public GLoader m_loaCost;
+        public GTextField m_txtCost;
         public const string URL = "ui://drx9d1usvek812";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComCost";
@@ -56,13 +56,13 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_txtCost = (GTextField)comp.GetChild("txtCost");
             m_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtCost = (GTextField)comp.GetChild("txtCost");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtCost = null;
             m_loaCost = null;
+            m_txtCost = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModel.cs

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GLoader m_loaRes;
         public GGraph m_holder;
         public const string URL = "ui://drx9d1usmbf1tah";
         public const string PACKAGE_NAME = "LuckyBox";
@@ -57,11 +58,13 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_loaRes = (GLoader)comp.GetChild("loaRes");
             m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_loaRes = null;
             m_holder = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComStar.cs

@@ -8,7 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
-        public GImage m_imgLine;
+        public UI_ComponentLine m_comLine;
         public const string URL = "ui://drx9d1usl5nzq";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComStar";
@@ -57,12 +57,13 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_imgLine = (GImage)comp.GetChild("imgLine");
+            m_comLine = (UI_ComponentLine)UI_ComponentLine.Create(comp.GetChild("comLine"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_imgLine = null;
+            m_comLine.Dispose();
+            m_comLine = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComponentLine.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComponentLine
+    {
+        public GComponent target;
+        public GGraph m_holder;
+        public GGraph m_grpMask;
+        public const string URL = "ui://drx9d1usduufteb";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComponentLine";
+        private static UI_ComponentLine _proxy;
+
+        public static UI_ComponentLine Create(GObject gObject = null)
+        {
+            var ui = new UI_ComponentLine();
+            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_ComponentLine Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComponentLine();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+            m_grpMask = (GGraph)comp.GetChild("grpMask");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_grpMask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComponentLine.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs

@@ -7,7 +7,7 @@ namespace UI.LuckyBox
     public partial class UI_LuckyBoxNewDressUI
     {
         public GComponent target;
-        public GGraph m_bg;
+        public GLoader m_loaBg;
         public UI_ComCard m_comCard;
         public GButton m_btnPass;
         public Transition m_t_open;
@@ -59,7 +59,7 @@ namespace UI.LuckyBox
 
         private void Init(GComponent comp)
         {
-            m_bg = (GGraph)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
             m_btnPass = (GButton)comp.GetChild("btnPass");
             m_t_open = comp.GetTransition("t_open");
@@ -67,7 +67,7 @@ namespace UI.LuckyBox
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_comCard.Dispose();
             m_comCard = null;
             m_btnPass = null;

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

@@ -66,8 +66,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     // DailyWelfareManager.Instance.SupplyRewardDatas.Add(id);
-                    List<ItemData> bonus = ItemUtil.CreateItemDataList(response.reward);
-                    BonusController.TryShowBonusList(bonus);
+                    DailySupplyCfg supplyCfg = DailySupplyCfgArray.Instance.GetCfg(id);
+                    BonusController.TryShowBonusList(supplyCfg.bonusArr);
                     return true;
                 }
             }

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

@@ -114,5 +114,24 @@ namespace GFGGame
 
             return false;
         }
+
+        //使用背包物品-随机礼包
+        public static async ETTask<bool> ReqUseRandomItem(int itemID, long count)
+        {
+            S2C_UseRandomItem response = null;
+            response = (S2C_UseRandomItem)await MessageHelper.SendToServer(new C2S_UseRandomItem()
+                { ItemId = itemID, itemNum = count });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    List<ItemData> items = ItemUtil.CreateItemDataList(response.GotItemList);
+                    BonusController.TryShowBonusList(items);
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }

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

@@ -86,6 +86,7 @@ namespace GFGGame
                         leagueData.SubOwnerId = 0;
                     }
                 }
+                LeagueDataManager.Instance.LeagueData.Num = LeagueDataManager.Instance.LeagueData.Num - 1;
                 EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             }
             await ETTask.CompletedTask;
@@ -96,7 +97,7 @@ namespace GFGGame
     {
         protected override async ETTask Run(Session session, L2C_NoticeJoinLeague message)
         {
-            if (LeagueDataManager.Instance.Type == 2)
+            if (LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin)
             {
                 bool result = await LeagueSproxy.ReqGetLeagueInfo();
                 if (result && ViewManager.isViewOpen(typeof(LeagueJoinView).FullName))
@@ -108,6 +109,7 @@ namespace GFGGame
             {
                 LeagueMemberData memberData = LeagueSproxy.GetLeagueMemberData(message.RoleInfo);
                 LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[memberData.RoleInfo.roleId] = memberData;
+                LeagueDataManager.Instance.LeagueData.Num = LeagueDataManager.Instance.LeagueData.Num + 1;
             }
             EventAgent.DispatchEvent(ConstMessage.LEAGUE_MEMBER_CHANGE);
             await ETTask.CompletedTask;
@@ -292,7 +294,8 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     LeagueDataManager.Instance.Type = response.Type;
-                    if (response.Type == 1)//1:已经加入军团
+
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)//1:已经加入军团
                     {
                         LeagueDataManager.Instance.LeagueData = GetLeagueData(response.LeagueDetailInfo);
                         int myPos = LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].Pos;
@@ -302,7 +305,7 @@ namespace GFGGame
                             ReqLeagueJoinQuitLog().Coroutine();
                         }
                     }
-                    else if (response.Type == 2)//2:未加入军团
+                    else if (LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin)//2:未加入军团
                     {
                         LeagueDataManager.Instance.ListDatas.Clear();
                         for (int i = 0; i < response.list.Count; i++)
@@ -348,6 +351,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     LeagueDataManager.Instance.LeagueData = GetLeagueData(response.LeagueDetailInfo);
+                    LeagueDataManager.Instance.Type = LeagueJoinType.Join;
                     return true;
                 }
             }
@@ -584,15 +588,16 @@ namespace GFGGame
             return false;
         }
         //领取联盟福利//LeagueWelfareType
-        public static async ETTask<bool> ReqGetLeagueWelfare()
+        public static async ETTask<bool> ReqGetLeagueWelfare(int type)
         {
             S2C_GetLeagueWelfare response = null;
-            response = (S2C_GetLeagueWelfare)await MessageHelper.SendToServer(new C2S_GetLeagueWelfare());
+            response = (S2C_GetLeagueWelfare)await MessageHelper.SendToServer(new C2S_GetLeagueWelfare() { LeagueWelfareType = type });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    // PromptController.Instance.ShowFloatTextPrompt("购买成功");
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.Bonus);
+                    BonusController.TryShowBonusList(itemDatas);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -106,9 +106,14 @@ namespace GFGGame
         {
             return $"{PREFAB_DIR_PATH}/{res}.{extName}";
         }
+        public static string GetDressUpAnimationDirPath(string res)
+        {
+            return $"{ANIMATION_DIR_PATH}/DressUp/{res}";
+        }
+
         public static string GetDressUpAnimationPath(string res, string extName = "prefab")
         {
-            return $"{ANIMATION_DIR_PATH}/DressUp/{res}/{res}.{extName}";
+            return $"{GetDressUpAnimationDirPath(res)}/{res}.{extName}";
         }
 
         public static bool CheckDressUpAnimationExist(string res, string extName = "prefab")
@@ -121,21 +126,30 @@ namespace GFGGame
             return VEngine.Versions.Contains(resPath);
         }
 
-        public static string GetDressUpEffectPath(string res, bool inAni = false, string extName = "prefab")
+        public static string GetDressUpEffectDirPath(string res, bool inAni = false)
         {
-            if(inAni)
+            if (inAni)
             {
-                return $"{EFFECT_DIR_PATH}/DressUpAni/{res}/{res}.{extName}";
+                return $"{EFFECT_DIR_PATH}/DressUpAni/{res}";
             }
-            return $"{EFFECT_DIR_PATH}/DressUp/{res}/{res}.{extName}";
+            return $"{EFFECT_DIR_PATH}/DressUp/{res}";
+        }
+
+        public static string GetDressUpEffectPath(string res, bool inAni = false, string extName = "prefab")
+        {
+            return $"{GetDressUpEffectDirPath(res, inAni)}/{res}.{extName}";
         }
         public static string GetViewEffectPath(string uiName, string resName, string extName = "prefab")
         {
             return $"{EFFECT_DIR_PATH}/UI/{uiName}/{resName}.{extName}";
         }
+        public static string GetCardAnimationDirPath(string res)
+        {
+            return $"{ANIMATION_DIR_PATH}/Card/{res}";
+        }
         public static string GetCardAnimationPath(string res, string extName = "prefab")
         {
-            return $"{ANIMATION_DIR_PATH}/Card/{res}/{res}.{extName}";
+            return $"{GetCardAnimationDirPath(res)}/{res}.{extName}";
         }
         public static string GetActivityPath(string res, string extName = "jpg")
         {

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 using ET;
@@ -14,6 +13,8 @@ namespace GFGGame
         private UI_ItemExchangeUI _ui;
         private int _itemId;
         private long _count;
+        private List<int[]> _itemList = new List<int[]>();
+
         public override void Dispose()
         {
             base.Dispose();
@@ -41,13 +42,13 @@ namespace GFGGame
             _ui.m_btnConfirm.onClick.Add(OnBtnConfirmClick);
             _ui.m_btnCancle.onClick.Add(OnBtnCancleClick);
             _ui.m_listItem.itemRenderer = ListItemRenderer;
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
-
         }
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -60,9 +61,9 @@ namespace GFGGame
 
         protected override void OnHide()
         {
-
             base.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -72,6 +73,7 @@ namespace GFGGame
         private void UpdateView()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+
             _ui.m_txtName.text = itemCfg.name;
             _ui.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
@@ -80,8 +82,61 @@ namespace GFGGame
             _ui.m_loaRarity.visible = itemCfg.itemType == ConstItemType.DRESS_UP;
             _ui.m_txtExchangeCount.visible = false;
             _ui.m_comCost.target.visible = false;
-            _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
-            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE && itemCfg.subType != ConstItemSubType.USEABLE_AUTO;
+
+            UpdateThItemList(itemCfg);
+            _ui.m_listItem.numItems = _itemList.Count; //itemCfg.itemsArr.Length;
+            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE &&
+                                     itemCfg.subType != ConstItemSubType.USEABLE_AUTO;
+        }
+
+        private void UpdateThItemList(ItemCfg itemCfg)
+        {
+            _itemList.Clear();
+            //普通物品
+            foreach (var t in itemCfg.itemsArr)
+            {
+                var itemId = t[0];
+                var itemNum = t.Length > 1 ? t[1] : 1;
+                _itemList.Add(new[] { itemId, itemNum });
+            }
+
+            if (itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM)
+            {
+                if (itemCfg.param2Arr.Length > 0)
+                {
+                    //特殊物品 不存在的套装部件id
+                    List<int> noExistSuitItemIds = new List<int>();
+                    foreach (var suitId in itemCfg.param2Arr)
+                    {
+                        noExistSuitItemIds.Clear();
+                        SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+
+                        foreach (var suitItemId in suitCfg.partsArr)
+                        {
+                            if (!ItemUtil.CheckItemEnough(suitItemId, 1))
+                            {
+                                noExistSuitItemIds.Add(suitItemId);
+                            }
+                        }
+
+                        foreach (var noExistSuitItemId in noExistSuitItemIds)
+                        {
+                            _itemList.Add(new[] { noExistSuitItemId, 1 });
+                        }
+                    }
+                }
+            }
+
+            //保底物品
+            if (itemCfg.param1Arr.Length > 0)
+            {
+                foreach (var t in itemCfg.param1Arr)
+                {
+                    var itemId = t[0];
+                    var itemNum = t.Length > 1 ? t[1] : 1;
+                    _itemList.Add(new[] { itemId, itemNum });
+                }
+            }
         }
 
         private void UpdateUseView()
@@ -99,17 +154,20 @@ namespace GFGGame
             _ui.m_txtShow.text = "选择使用数量";
             _ui.m_txtTips.text = string.Format("是否使用{0}个{1}？", _count, itemCfg.name);
         }
+
         private void ListItemRenderer(int index, GObject obj)
         {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
-            ItemData itemData = ItemUtil.createItemData(itemCfg.itemsArr[index]);
+            //ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+            ItemData itemData = ItemUtil.createItemData(_itemList[index]);
             if (obj.data == null)
             {
                 obj.data = new ItemView(obj as GComponent);
             }
+
             (obj.data as ItemView).SetData(itemData);
             (obj.data as ItemView).ChangeTxtCountStyle();
         }
+
         private void OnBtnAddClick()
         {
             _count++;
@@ -117,22 +175,36 @@ namespace GFGGame
             _count = Math.Min(hasCount, _count);
             UpdateUseView();
         }
+
         private void OnBtnMinusClick()
         {
             _count--;
             _count = Math.Max(1, _count);
             UpdateUseView();
         }
+
         private void OnBtnMaxClick()
         {
             _count = ItemDataManager.GetItemNum(_itemId);
             UpdateUseView();
         }
+
         private void OnBtnConfirmClick()
         {
-            ItemProxy.ReqUseItem(_itemId, _count).Coroutine();
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+            if (itemCfg.itemType == ConstItemType.USEABLE &&
+                itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM)
+            {
+                ItemProxy.ReqUseRandomItem(_itemId, _count).Coroutine();
+            }
+            else
+            {
+                ItemProxy.ReqUseItem(_itemId, _count).Coroutine();
+            }
+            
             this.Hide();
         }
+
         private void OnBtnCancleClick()
         {
             this.Hide();

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -342,7 +342,7 @@ namespace GFGGame
             _consumeSelectIndex = type;
             if (type == 1)
             {
-                if (IsUpLvLimit()) return;
+                if (IsUpLvLimit(itemId)) return;
 
                 if (ItemDataManager.GetItemNum(itemId) == 0)
                 {
@@ -371,7 +371,9 @@ namespace GFGGame
                 }
                 else
                 {
-                    if (!CommonUtil.Instance.CheckPointIsOnComponent(_consumeSelectItem, CommonUtil.Instance.GetMouseV2Point()) || IsUpLvLimit())
+                    int index = (int)_consumeSelectItem.data;
+                    int itemId = upgradeCardItemsArr[index];
+                    if (!CommonUtil.Instance.CheckPointIsOnComponent(_consumeSelectItem, CommonUtil.Instance.GetMouseV2Point()) || IsUpLvLimit(itemId))
                     {
                         Timers.inst.Remove(OnTimedEvent);
                         return;
@@ -421,7 +423,7 @@ namespace GFGGame
                 }
                 return false;
             }
-            if (IsUpLvLimit(false)) return false;
+            if (IsUpLvLimit(itemId, false)) return false;
             itemsCount[index] = itemsCount[index] + 1;
             listItem.m_txtUseCount.text = itemsCount[index].ToString();
             this.UpdatePreView();
@@ -471,7 +473,7 @@ namespace GFGGame
         {
             for (int i = 0; i < itemsCount.Count; i++)
             {
-                if (IsUpLvLimit()) break;
+                // if (IsUpLvLimit()) break;
                 long itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
                 for (long j = 0; j < itemNum; j++)
                 {
@@ -546,10 +548,13 @@ namespace GFGGame
             }
         }
 
-        private bool IsUpLvLimit(bool showTips = true)
+        private bool IsUpLvLimit(int itemId, bool showTips = true)
         {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             int lvLimit = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).cardLeverLimit;
-            if (_showLv > lvLimit)
+            int needExp = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(_cardData.itemCfg.rarity, lvLimit).needExp;
+
+            if (_showLv > lvLimit || _showLv == lvLimit && _comFosterBottom.m_barLv.value + itemCfg.cardUpLvExp > needExp)
             {
                 if (!showTips) return true;
 

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

@@ -29,67 +29,70 @@ namespace GFGGame
             _comModel = UI_ComModel.Proxy(_com);
             _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
-            _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
-            if (_luckyBoxCfg.suitShowArr.Length > 0)
+            ChangeRes();
+            Timers.inst.Add(_turnTime, 0, UpdateTime);
+        }
+
+        private void UpdateTime(object param)
+        {
+
+            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.bgResArr.Length ? 0 : _bgIndex + 1;
+            if (_luckyBoxCfg.resArr.Length > 0)
             {
-                int scale = 100;
-                int direction = 1;
-                if (_luckyBoxCfg.scaleArr.Length > 0)
-                {
-                    scale = Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]);
-                    direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
-                }
-                _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
-                _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
-                _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
-                _dressUpObjUI.sceneObject.transform.localPosition = new Vector3(_luckyBoxCfg.suitShowArr[_modelIndex][1], _luckyBoxCfg.suitShowArr[_modelIndex][2], 0);
-                _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
+                _modelIndex = _modelIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _modelIndex + 1;
             }
-            if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitShowArr.Length > 1)
+            else
             {
-                Timers.inst.Remove(UpdateTime);
-                Timers.inst.Add(_turnTime, 0, UpdateTime);
+                _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitIdArr.Length ? 0 : _modelIndex + 1;
             }
+            ChangeRes();
         }
 
-        private void UpdateTime(object param)
+        private void ChangeRes()
         {
-            // _curTime = _curTime - 1 == 0 ? _turnTime : _curTime - 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.bgResArr[_bgIndex]);
+            if (_luckyBoxCfg.resArr.Length > 0)
             {
-                _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
-
+                _comModel.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
+                _comModel.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
             }
-            if (_luckyBoxCfg.suitShowArr.Length > 0)
+            else if (_luckyBoxCfg.suitIdArr.Length > 0)
             {
-                int scale = 100;
                 int direction = 1;
                 if (_luckyBoxCfg.scaleArr.Length > 0)
                 {
-                    scale = Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]);
                     direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
                 }
-                _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
-                _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitShowArr[_modelIndex][0], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
-                _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
-                _dressUpObjUI.sceneObject.transform.localPosition = new Vector3(_luckyBoxCfg.suitShowArr[_modelIndex][1], _luckyBoxCfg.suitShowArr[_modelIndex][2], 0);
-                _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
+                if (_luckyBoxCfg.isAni == 0)
+                {
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_luckyBoxCfg.suitIdArr[_modelIndex]);
+                    _comModel.m_loaRes.url = ResPathUtil.GetDressUpPath(suitCfg.aniRes);
+
+                    float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
+                    _comModel.m_loaRes.SetScale(direction * scale, scale);
+                    _comModel.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                }
+                else
+                {
+                    _comModel.m_loaRes.url = "";
+
+                    int scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000 : 100;
+                    _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
+                    _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitIdArr[_modelIndex], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
+                    _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
+                    _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
+                    _comModel.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                }
             }
-            // }
         }
-
         public void OnHide()
         {
-            UI_ComModel.ProxyEnd();
-            Timers.inst.Remove(UpdateTime);
             _bgIndex = 0;
             _modelIndex = 0;
             _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
+            _comModel.m_loaRes.url = "";
+            Timers.inst.Remove(UpdateTime);
         }
 
         public void Dispose()
@@ -99,6 +102,7 @@ namespace GFGGame
                 _dressUpObjUI.Dispose();
                 _dressUpObjUI = null;
             }
+            UI_ComModel.ProxyEnd();
         }
     }
 }

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

@@ -371,7 +371,7 @@ namespace GFGGame
         // ReSharper disable Unity.PerformanceAnalysis
         private void OnBtnBuyClick(EventContext context)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_POWER) <= 0)
+            if (_itemId == ConstItemID.POWER && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_POWER) <= 0)
             {
                 GuideController.TryCompleteGuideIndex(ConstGuideId.BUY_POWER, 1);
                 GuideController.TryCompleteGuide(ConstGuideId.BUY_POWER, 1);
@@ -568,7 +568,10 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_list.GetChildAt(1).asCom.GetChild("btnCurReceive").asButton, ConstGuideId.BUY_POWER, 1, "花点小钱可以购买体力超值返利包，每天都能领体力哦~");
+            if (_itemId == ConstItemID.POWER)
+            {
+                GuideController.TryGuide(_ui.m_list.GetChildAt(1).asCom.GetChild("btnCurReceive").asButton, ConstGuideId.BUY_POWER, 1, "花点小钱可以购买体力超值返利包，每天都能领体力哦~");
+            }
 
         }
     }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs

@@ -38,6 +38,7 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+            _ui.m_btnGet.data = LeagueWelfareType.ALL;
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300003;
             _ui.m_listBuy.itemRenderer = RenderListBuyItem;
@@ -109,6 +110,11 @@ namespace GFGGame
             item.m_comItem.m_loaType.url = string.Format("ui://League/lm_biaoqian_{0}", _getDatas[index].GiftCfg.type);
             item.m_comItem.m_listGift.data = _getDatas[index].GiftCfg.bonusArr;
             item.m_comItem.m_listGift.numItems = _getDatas[index].GiftCfg.bonusArr.Length;
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnBtnGetClick);
+            }
+            item.target.data = _getDatas[index].Type;
             UI_ListGiftGetItemTop.ProxyEnd();
         }
         private void RenderListBuyItem(int index, GObject obj)
@@ -215,14 +221,11 @@ namespace GFGGame
             LeagueSproxy.ReqBuyLeagueWelfare(buyData.GiftCfg.type).Coroutine();
 
         }
-        private void OnBtnGetClick()
+        private void OnBtnGetClick(EventContext context)
         {
-            // bool result = await LeagueSproxy.ReqGetLeagueWelfare();
-            // if (result)
-            // {
-            //     UpdateGetList();
-            // }
-            LeagueSproxy.ReqGetLeagueWelfare().Coroutine();
+            GObject obj = context.sender as GObject;
+            int type = (int)obj.data;
+            LeagueSproxy.ReqGetLeagueWelfare(type).Coroutine();
         }
     }
 }

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

@@ -101,11 +101,11 @@ namespace GFGGame
         private void UpdateView()
         {
             _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
-            _ui.m_txtCount.SetVar("name", _activityCfg.themeName).FlushVars();
+            _ui.m_txtCount.SetVar("name", _luckyBoxCfg.name).FlushVars();
             UI_ComBox comBox = UI_ComBox.Proxy(_ui.m_comBox.target);
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
-            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
+            // comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
             comBox.m_btnPreview.m_c1.selectedIndex = 1;
             LuckyBoxDataManager.Instance.GetOwnedCount(_luckyBoxCfg.id, out int count, out int totalCount);
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
@@ -129,8 +129,6 @@ namespace GFGGame
                 comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
             }
             comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
-            comBox.m_imgActLuckyBox.visible = true;
-            comBox.m_grpLuckyBox.visible = false;
             if (comBox.m_btnPreview.target.data == null)
             {
                 comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);

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

@@ -52,7 +52,7 @@ namespace GFGGame
 
             InitAllItem();
             _ui.m_loaBg.onClick.Add(OnClickBg);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bj_ckzxin");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
             _ui.m_btnPass.onClick.Add(OnBtnPassClick);
 
         }

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

@@ -20,10 +20,16 @@ namespace GFGGame
 
         private GameObject gameObject;
         private GoWrapper wrapper;
+        private GameObject gameObject1;
+        private GoWrapper wrapper1;
+        private GameObject gameObject2;
+        private GoWrapper wrapper2;
         public override void Dispose()
         {
             base.Dispose();
             SceneController.DestroyObjectFromView(gameObject, wrapper);
+            SceneController.DestroyObjectFromView(gameObject1, wrapper1);
+            SceneController.DestroyObjectFromView(gameObject2, wrapper2);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,9 +48,9 @@ namespace GFGGame
             this.modal = true;
 
 
-            _ui.m_bg.onTouchBegin.Add(OnClickBg);
+            _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
             _ui.m_btnPass.onClick.Add(OnClickBtnPass);
-
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
             SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
@@ -95,16 +101,43 @@ namespace GFGGame
             if (_rewardList.Count - 1 < 0) return;
             ItemData itemdata = _rewardList[_rewardList.Count - 1];
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemdata.id);
+            string resPath = "";
+            string resPath1 = "";
+            // switch (itemCfg.rarity)
+            // {
+            //     case ConstDressRarity.Rarity_TIANYI:
+            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Yellow_01");
+            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+            //         _ui.m_comCard.m_holder.visible = true;
+            //         resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Yellow_01_top");
+            //         SceneController.AddObjectToView(gameObject2, wrapper2, _ui.m_comCard.m_holder1, resPath1, out gameObject2, out wrapper2);
+            //         _ui.m_comCard.m_holder1.visible = true;
+            //         break;
+            //     case ConstDressRarity.Rarity_DIANCANG:
+            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Purple_02");
+            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+            //         _ui.m_comCard.m_holder.visible = true;
+            //         resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Purple_02_top");
+            //         SceneController.AddObjectToView(gameObject2, wrapper2, _ui.m_comCard.m_holder1, resPath1, out gameObject2, out wrapper2);
+            //         _ui.m_comCard.m_holder1.visible = true;
+            //         break;
+            //     case ConstDressRarity.Rarity_ZHENXI:
+            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_Bule_03");
+            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+            //         _ui.m_comCard.m_holder.visible = true;
+            //         break;
+            //     case ConstDressRarity.Rarity_FANPIN:
+            //         resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_grey_04");
+            //         SceneController.AddObjectToView(gameObject1, wrapper1, _ui.m_comCard.m_holder, resPath, out gameObject1, out wrapper1);
+            //         _ui.m_comCard.m_holder.visible = true;
+            //         break;
+            // }
+
             _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + itemCfg.rarity);
             _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            // int mainScore = 0;
-            // int mainScoreValue = 0;
-            // ItemDataManager.GetMainScore(itemdata.id, out mainScore, out mainScoreValue);
             _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
-
             _ui.m_comCard.m_txtName.text = itemCfg.name;
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
-            _ui.m_comCard.m_holder.visible = true;
 
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
@@ -135,6 +168,7 @@ namespace GFGGame
             _ui.m_t_close.Play(() =>
             {
                 _ui.m_comCard.m_holder.visible = false;
+                _ui.m_comCard.m_holder1.visible = false;
                 _ui.m_t_open.Play();
                 UpdateView();
             });

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

@@ -6,6 +6,7 @@ using FairyGUI;
 using System.Threading;
 using System.Threading.Tasks;
 using System;
+using Random = UnityEngine.Random;
 
 namespace GFGGame
 {
@@ -22,7 +23,8 @@ namespace GFGGame
         // private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
         private Dictionary<int, List<GameObject>> dicGameobj = new Dictionary<int, List<GameObject>>();
         private Dictionary<int, List<GoWrapper>> dicWraper = new Dictionary<int, List<GoWrapper>>();
-
+        private List<GameObject> lineObj = new List<GameObject>();
+        private List<GoWrapper> lineWrapper = new List<GoWrapper>();
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;
 
@@ -30,6 +32,7 @@ namespace GFGGame
 
         private const int checkDistance = 40;//鼠标靠近星星周围加减40都算选中星星
         private const int imgLineWidth = 10;//线的原始长度
+        private bool _isLuckyBox = true;//是抽奖（true）,是限时主题活动（false）
 
         private bool showGuide = false;
         public override void Dispose()
@@ -50,7 +53,7 @@ namespace GFGGame
                 UI_ComStar comStar = UI_ComStar.Proxy(star);
                 for (int i = comStar.target.numChildren - 1; i >= 0; i--)
                 {
-                    if (comStar.target.GetChildAt(i).name == "imgLine") continue;
+                    if (comStar.target.GetChildAt(i).name == "comLine") continue;
                     comStar.target.RemoveChildAt(i);
                 }
                 index++;
@@ -66,6 +69,10 @@ namespace GFGGame
                     SceneController.DestroyObjectFromView(value[i], wrappersValue[i]);
                 }
             }
+            for (int i = 0; i < lineObj.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(lineObj[i], lineWrapper[i]);
+            }
             notClickComStars.Clear();
             clickComStars.Clear();
             dicGameobj.Clear();
@@ -95,10 +102,10 @@ namespace GFGGame
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
 
-            bool isLuckyBox = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(LuckyBoxDataManager.Instance.currentBoxId) >= 0;
-            _ui.m_ctrlRewardsType.selectedIndex = isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
-            string resPath = string.Format("cj_tp_{0}", isLuckyBox ? LuckyBoxDataManager.Instance.currentBoxId : 1);
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath(resPath);
+            _isLuckyBox = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(LuckyBoxDataManager.Instance.currentBoxId) >= 0;
+            _ui.m_ctrlRewardsType.selectedIndex = _isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
+            // string resPath = string.Format("cj_tp_{0}", _isLuckyBox ? LuckyBoxDataManager.Instance.currentBoxId : 1);
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
             ResetStartView();
             Timers.inst.AddUpdate(CheckGuide);
@@ -117,27 +124,32 @@ namespace GFGGame
             while (star != null && star.visible == true)
             {
                 UI_ComStar comStar = UI_ComStar.Proxy(star);
-                comStar.m_imgLine.visible = true;
+                comStar.m_comLine.target.visible = true;
 
                 comStar.m_c1.selectedIndex = 0;
-                comStar.m_imgLine.width = imgLineWidth;
-                comStar.m_imgLine.rotation = 0;
+                comStar.m_comLine.target.width = imgLineWidth;
+                comStar.m_comLine.target.rotation = 0;
 
-                GComponent gcom = CreateEffect(comStar, 1, "ui_ck"); ;
+                float scale = Random.Range(0.5f, 1f);
+                float rotation = Random.Range(0, 360);
+                GComponent gcom = CreateEffect(comStar, 1, _isLuckyBox ? "STAR_Ready_Bule" : "STAR_Ready"); ;
                 gcom.visible = true;
                 comStar.target.AddChildAt(gcom, 1);
+                gcom.scale = new Vector2(scale, scale);
+                gcom.rotation = rotation;
 
-                GComponent gcom1 = CreateEffect(comStar, 2, "ui_ck_dj");
+                GComponent gcom1 = CreateEffect(comStar, 2, _isLuckyBox ? "STAR_Bule" : "STAR");
                 gcom1.visible = false;
                 comStar.target.AddChildAt(gcom1, 2);
+                gcom1.scale = new Vector2(scale, scale);
 
-                GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
-                gcom2.visible = false;
-                comStar.target.AddChildAt(gcom2, 3);
+                // GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
+                // gcom2.visible = false;
+                // comStar.target.AddChildAt(gcom2, 3);
 
-                GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
-                gcom3.visible = false;
-                comStar.target.AddChildAt(gcom3, 4);
+                // GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
+                // gcom3.visible = false;
+                // comStar.target.AddChildAt(gcom3, 4);
 
 
 
@@ -160,7 +172,7 @@ namespace GFGGame
             else
             {
                 gcom = UIPackage.CreateObject("LuckyBox", "ComHolder").asCom;
-                string resPath = ResPathUtil.GetViewEffectPath("ui_ck", name);
+                string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", name);
                 SceneController.AddObjectToView(null, null, gcom.GetChild("holder").asGraph, resPath, out GameObject gameObject, out GoWrapper wrapper);
                 if (!dicGameobj.ContainsKey(index))
                 {
@@ -206,9 +218,13 @@ namespace GFGGame
                     }
                     UI_ComStar comStar = UI_ComStar.Proxy(comStars[i]);
                     comStar.target.GetChildAt(2).asCom.visible = true;
-                    comStar.target.GetChildAt(1).asCom.visible = false;
+                    // comStar.target.GetChildAt(1).asCom.visible = false;
+                    string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", _isLuckyBox ? "LINE_Bule" : "LINE");
+                    SceneController.AddObjectToView(null, null, comStar.m_comLine.m_holder, resPath, out GameObject gameObject, out GoWrapper wrapper);
+                    lineObj.Add(gameObject);
+                    lineWrapper.Add(wrapper);
                     UI_ComStar.ProxyEnd();
-                    // comStar.m_c1.selectedIndex = 1;
+
                     curComStar = comStars[i];
                     lastPos = Vector2.right;
 
@@ -238,8 +254,8 @@ namespace GFGGame
             angle *= Mathf.Sign(Vector3.Dot(normal, Vector3.forward));  //Mathf.Sign()求符号，Vector3.Dot()求方向，求法线向量与物体上方向向量点乘，结果为1或-1，修正旋转方向 
 
             UI_ComStar comStar = UI_ComStar.Proxy(curComStar);
-            comStar.m_imgLine.rotation += angle;
-            comStar.m_imgLine.width = Vector2.Distance(targetPos, (Vector2)curComStar.data);
+            comStar.m_comLine.target.rotation += angle;
+            comStar.m_comLine.target.width = Vector2.Distance(targetPos, (Vector2)curComStar.data);
             UI_ComStar.ProxyEnd();
 
         }
@@ -249,7 +265,7 @@ namespace GFGGame
             if (clickComStars.Count <= 0) return;
 
             UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[clickComStars.Count - 1]);
-            comStar.m_imgLine.visible = false;
+            comStar.m_comLine.target.visible = false;
             UI_ComStar.ProxyEnd();
 
 
@@ -259,55 +275,55 @@ namespace GFGGame
             }
             else
             {
-                CheckNotClickComStar();
-                SetComStarDarken();
+                // CheckNotClickComStar();
+                // SetComStarDarken();
                 RemoveListener();
-                Timers.inst.Add(1f, 1, SetClickComStarAni);
-
-            }
-        }
-        private void CheckNotClickComStar()
-        {
-            int index = 0;
-            GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-
-            while (star != null && star.visible == true)
-            {
-                if (clickComStars.IndexOf(star) < 0)
-                {
-                    notClickComStars.Add(star);
-                }
-                index++;
-                star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
-            }
-        }
-
-        private void SetComStarDarken()
-        {
-
-            for (int i = 0; i < notClickComStars.Count; i++)
-            {
-                UI_ComStar notClickComStar = UI_ComStar.Proxy(notClickComStars[i]);
-                notClickComStar.m_imgLine.visible = false;
-                notClickComStar.target.GetChildAt(3).asCom.visible = true;
-                notClickComStar.target.GetChildAt(1).asCom.visible = false;
-                UI_ComStar.ProxyEnd();
-
-            }
-
-        }
-
-        private void SetClickComStarAni(object param)
-        {
-            for (int i = 0; i < clickComStars.Count; i++)
-            {
-                UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[i]);
-                comStar.target.GetChildAt(4).asCom.visible = true;
-                UI_ComStar.ProxyEnd();
-
+                // Timers.inst.Add(1f, 1, SetClickComStarAni);
+                Timers.inst.Add(0.5f, 1, SetEndEffect);
             }
-            Timers.inst.Add(0.5f, 1, SetEndEffect);
         }
+        // private void CheckNotClickComStar()
+        // {
+        //     int index = 0;
+        //     GObject star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
+
+        //     while (star != null && star.visible == true)
+        //     {
+        //         if (clickComStars.IndexOf(star) < 0)
+        //         {
+        //             notClickComStars.Add(star);
+        //         }
+        //         index++;
+        //         star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
+        //     }
+        // }
+
+        // private void SetComStarDarken()
+        // {
+
+        //     for (int i = 0; i < notClickComStars.Count; i++)
+        //     {
+        //         UI_ComStar notClickComStar = UI_ComStar.Proxy(notClickComStars[i]);
+        //         notClickComStar.m_comLine.target.visible = false;
+        //         notClickComStar.target.GetChildAt(3).asCom.visible = true;
+        //         notClickComStar.target.GetChildAt(1).asCom.visible = false;
+        //         UI_ComStar.ProxyEnd();
+
+        //     }
+
+        // }
+
+        // private void SetClickComStarAni(object param)
+        // {
+        //     for (int i = 0; i < clickComStars.Count; i++)
+        //     {
+        //         UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[i]);
+        //         comStar.target.GetChildAt(4).asCom.visible = true;
+        //         UI_ComStar.ProxyEnd();
+
+        //     }
+        //     Timers.inst.Add(0.5f, 1, SetEndEffect);
+        // }
         private void SetEndEffect(object param)
         {
             _ui.m_effEnd.visible = true;

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

@@ -33,7 +33,6 @@ namespace GFGGame
 
         private bool isActiveBoxOpen = false;
         private int _activeBoxId = 0;
-        private int _bgIndex = 0;
         private int _curIndex = 0;
 
         public override void Dispose()
@@ -85,17 +84,17 @@ namespace GFGGame
             // _ui.m_txtRemainTimes.visible = false;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
+            // _ui.m_btnHome.onClick.Add(OnClickBtnHome);
 
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
             _ui.m_btnRight.onClick.Add(OnBtnRightClick);
 
-            _ui.m_listBg.SetVirtual();
+            // _ui.m_listBg.SetVirtual();
             _ui.m_listBg.itemRenderer = RenderListBgItem;
-            _ui.m_listBg.itemProvider = GetListItemResource;
+            // _ui.m_listBg.itemProvider = GetListItemResource;
             _ui.m_listBg.scrollPane.onScrollEnd.Add(OnListBgScroll);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("jingzhongh_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
         }
         protected override void AddEventListener()
         {
@@ -144,94 +143,30 @@ namespace GFGGame
 
             Timers.inst.AddUpdate(CheckGuide);
         }
-        private string GetListItemResource(int index)
-        {
-            if (index == 0 && _activeBoxId > 0)
-            {
-                return "UI://LuckyBox/ComBox";
-            }
-            else
-            {
-                int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-                return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
-            }
-        }
+        // private string GetListItemResource(int index)
+        // {
+        //     if (index == 0 && _activeBoxId > 0)
+        //     {
+        //         return "UI://LuckyBox/ComBox";
+        //     }
+        //     else
+        //     {
+        //         int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
+        //         return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
+        //     }
+        // }
         private void RenderListBgItem(int index, GObject obj)
         {
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            LuckyBoxDataManager.Instance.InitData(boxId);
-
-            UI_ComBox comBox = UI_ComBox.Proxy(obj);
-            comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(cfg.resArr[_bgIndex]);
-            if (!_lcukyBoxCtrl.ContainsKey(boxId))
-            {
-                _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
-                if (_ui.m_listBg.ChildIndexToItemIndex(0) == index)
-                {
-                    _lcukyBoxCtrl[boxId].OnShown(boxId);
-                }
-            }
-            comBox.m_btnPreview.m_c1.selectedIndex = boxId;
-            LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
-            comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
-            comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
-            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
-            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", cfg.maxCount - boughtCount);
-            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
-            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
-            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
-            if (comBox.m_btnBuyOne.target.data == null)
-            {
-                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
-            }
-            comBox.m_btnBuyOne.target.data = boxId;
+            // LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            // LuckyBoxDataManager.Instance.InitData(boxId);
 
-            if (comBox.m_btnBuyTen.target.data == null)
-            {
-                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
-            }
-            comBox.m_btnBuyTen.target.data = boxId;
+            // UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
 
-            if (comBox.m_btnPreview.target.data == null)
-            {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
-            }
-            comBox.m_btnPreview.target.data = boxId;
-
-            obj.data = boxId;
-            // if (comBox.m_grpLuckyBox != null)
-            // {
-            //     comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
-            // }
-            if (boxId == _activeBoxId)
-            {
-                long endTime = LuckyBoxDataManager.Instance.endTime;
-                long curTime = TimeHelper.ServerNow();
-                TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
-                comBox.m_txtTime.text = string.Format("剩余{0}{1}", num, str);
-                comBox.m_grpLuckyBox.visible = boxId == _activeBoxId;
-            }
-
-            UI_ComBox.ProxyEnd();
 
+            // UI_ComBox1.ProxyEnd();
         }
 
-        // private void UpdateBg(object param)
-        // {
-        //     string[] resArr = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.currentBoxId).resArr;
-        //     _bgIndex++;
-        //     if (_bgIndex >= resArr.Length) _bgIndex = 0;
-        //     GObject gObject = _ui.m_listBg.GetChildAt(0);
-        //     if (gObject == null) return;
-        //     GComponent item = gObject.asCom;
-        //     if (item.gameObjectName != "ComBox_2") return;
-        //     GLoader loaBg = item.GetChild("loaBg").asLoader;
-        //     loaBg.url = ResPathUtil.GetBgImgPath(resArr[_bgIndex]);
-        // }
-
-
         private void OnBtnLeftClick()
         {
             int index = _curIndex - 1;
@@ -252,18 +187,78 @@ namespace GFGGame
 
         private void OnListBgScroll()
         {
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
-            _curIndex = _ui.m_listBg.ChildIndexToItemIndex(0);
+            if (_lcukyBoxCtrl.ContainsKey(LuckyBoxDataManager.Instance.currentBoxId)) _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnHide();
+            _curIndex = _ui.m_listBg.GetFirstChildInView();
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
-
-            _bgIndex = 0;
             _valueBarController.UpdateCJ();
-            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
+            UpdateListItem();
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
 
         }
 
+        private void UpdateListItem()
+        {
+            int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[_curIndex];
+            LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
+            LuckyBoxDataManager.Instance.InitData(boxId);
+
+            GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
+            UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
+
+            if (!_lcukyBoxCtrl.ContainsKey(boxId))
+            {
+                _lcukyBoxCtrl.Add(boxId, new LuckyBoxController(comBox.m_comModel.target));
+            }
+            _lcukyBoxCtrl[LuckyBoxDataManager.Instance.currentBoxId].OnShown(LuckyBoxDataManager.Instance.currentBoxId);
+
+            LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
+            comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
+            comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
+            int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
+            comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", cfg.maxCount - boughtCount);
+            comBox.m_comCostOne.m_txtCost.text = cfg.costNum.ToString();
+            comBox.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            comBox.m_comCostTen.m_txtCost.text = cfg.costNumTen.ToString();
+            comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
+            if (comBox.m_btnBuyOne.data == null)
+            {
+                comBox.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
+            }
+            comBox.m_btnBuyOne.data = boxId;
+
+            if (comBox.m_btnBuyTen.data == null)
+            {
+                comBox.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
+            }
+            comBox.m_btnBuyTen.data = boxId;
+
+            if (comBox.m_btnPreview.data == null)
+            {
+                comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
+            }
+            comBox.m_btnPreview.data = boxId;
+
+            obj.data = boxId;
+
+            comBox.m_grpTime.visible = boxId == _activeBoxId;
+            if (boxId == _activeBoxId)
+            {
+                long endTime = LuckyBoxDataManager.Instance.endTime;
+                long curTime = TimeHelper.ServerNow();
+                // TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
+                long time = endTime - curTime;
+                string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+                comBox.m_txtTime.text = string.Format("活动时间:剩余{0}", strTime);
+                comBox.m_loaTitle.url = "ui://LuckyBox/zx_title_1";
+            }
+            else
+            {
+                comBox.m_loaTitle.url = string.Format("ui://LuckyBox/zx_title_{0}", boxId);
+            }
+            UI_ComBox1.ProxyEnd();
+        }
         private void CheckTime(object param = null)
         {
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
@@ -275,34 +270,19 @@ namespace GFGGame
             if (item == null) return;
             GObject textField = item.asCom.GetChild("txtTime");
             if (textField == null) return;
-            textField.asTextField.text = string.Format("剩余{0}{1}", num, str);
+
+            long time = endTime - curTime;
+            string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
+            textField.asTextField.text = string.Format("活动时间:剩余{0}", strTime);
         }
         private void updateBoxEffect()
         {
             if (isActiveBoxOpen)
             {
-                // int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
-                // UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(index));
-                // string resPath = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_bt");
-                // SceneController.AddObjectToView(_gameObject, _wrapper, item.m_holder, resPath, out _gameObject, out _wrapper);
-                // string resPath3 = ResPathUtil.GetDressUpAnimationPath("dz_jiyuet");
-                // SceneController.AddObjectToView(_gameObject3, _wrapper3, item.m_holder1, resPath3, out _gameObject3, out _wrapper3, 120);
-
-                // string resPath1 = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_sl");
-                // SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_btnBuyOne.m_holder, resPath1, out _gameObject1, out _wrapper1);
-                // SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_btnBuyTen.m_holder, resPath1, out _gameObject2, out _wrapper2);
-                // UI_ComListBgItem.ProxyEnd();
 
             }
         }
-        // private void OnClickBtnExChange(EventContext context)
-        // {
-        //     GObject obj = context.sender as GObject;
-        //     int boxId = (int)obj.data;
-        //     int storeId = boxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
-        //     ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-        //     this.Hide();
-        // }
+
         private void OnClickBtnPreview(EventContext context)
         {
             GObject obj = context.sender as GObject;
@@ -417,7 +397,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GObject gObject = _ui.m_listBg.GetChildAt(0);
+            GObject gObject = _ui.m_listBg.GetChildAt(_curIndex);
             if (gObject == null) return;
             GButton btnBuyTen = gObject.asCom.GetChild("btnBuyTen").asButton;
 

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

@@ -613,7 +613,7 @@ namespace GFGGame
             //     PromptController.Instance.ShowFloatTextPrompt("数据来的有点慢,稍后再试下吧");
             //     return;
             // }
-            if (LeagueDataManager.Instance.Type == 1) //已加入联盟
+            if (LeagueDataManager.Instance.Type == LeagueJoinType.Join) //已加入联盟
             {
                 ViewManager.Show<LeagueView>();
             }
@@ -1008,7 +1008,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnTuJian,
                 RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
-            RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetChargeAddUpReward());
+            RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetChargeAddUpReward() || RedDotDataManager.Instance.GetGiftBagReward());
             RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "",
                 10);
             RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target,

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

@@ -11,6 +11,7 @@ namespace GFGGame
         private UI_StoreGiftBagUI _ui;
         private ValueBarController _valueBarController;
         private List<ShopCfg> _shopCfgs;
+        private int menu2;
 
         public override void Dispose()
         {
@@ -47,7 +48,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            int menu2 = (int)this.viewData;
+            menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
             _shopCfgs = ShopDataManager.Instance.RemoveNotOpenCfg(_shopCfgs);
             _valueBarController.OnShown();
@@ -75,6 +76,7 @@ namespace GFGGame
         {
             ShopCfg shopCfg = _shopCfgs[index];
             ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+            RedDotController.Instance.SetComRedDot(obj.asCom, menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY && shopCfg.price == 0 && ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.id) < shopCfg.maxBuyNum, "", 0, 70);
         }
     }
 }

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

@@ -53,6 +53,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateRedDot);
         }
         protected override void OnShown()
         {
@@ -92,6 +93,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateRedDot);
 
         }
         private void OnClickBtnBack()
@@ -200,8 +202,10 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpReward());
+            RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpReward() && (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_CHARGE));
 
-            RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpReward() && (_ui.m_comTab.m_c1.selectedIndex == ConstStoreSubId.STORE_CHARGE + 1));
+            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn2.target, RedDotDataManager.Instance.GetGiftBagReward());
+            RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY).asCom, RedDotDataManager.Instance.GetGiftBagReward() && (_ui.m_comTab.m_c1.selectedIndex == ConstStoreTabId.STORE_GIFT_BAG));
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -119,6 +119,7 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_component.m_btnDecompose.target, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰。");
 
+
             GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade.target, ConstGuideId.SUIT_LIST_VIEW, 2, "");
         }
     }

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 90bfe14dd02f1e54da1366d0fd6cc64a
+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/CommonGame/CommonGame_atlas0_4.png.meta

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