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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  礼包加入红点。根据zcz需求：背包内有未使用礼盒，那么主界面背包Icon和背包内物品礼盒红点一直常在
  加入红点
  抽奖特效
  关卡解锁判断bugfix
  限时抽奖红点
  1
  修复自选礼包BUG，调整随机礼包界面
  按钮 显示
  画廊点赞收藏数量更新
  竞技场改飞花令
  精英关卡报错

FGUIProject/assets/ActivityThemeLuckyBox/compoents/ListItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="882,208">
-  <controller name="c1" pages="0,,1,,2,,3," selected="0">
+  <controller name="c1" pages="0,,1,,2,,3," selected="1">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>

FGUIProject/assets/Arena/components/ComFightScore.xml

@@ -6,11 +6,11 @@
       <gearSize controller="c1" pages="1" values="365,168,-1,-1" default="365,168,-1,1"/>
     </image>
     <image id="n55_jcej" name="n55" src="jcej4o" fileName="images/jjcdi_jjxian.png" xy="19,53" group="n60_jcej"/>
-    <text id="n56_jcej" name="n56" xy="20,8" size="152,42" group="n60_jcej" fontSize="30" color="#f8f1db" text="竞技场战力"/>
-    <text id="n57_jcej" name="txtSuitScore" xy="20,60" size="124,32" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="搭配战力：{value=0}"/>
-    <text id="n58_jcej" name="txtClickScore" xy="20,87" size="167,32" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卓越点击战力：{value=0}"/>
-    <text id="n59_jcej" name="txtCardScore" xy="20,114" size="124,32" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卡牌战力：{value=0}"/>
-    <group id="n60_jcej" name="n60" xy="19,8" size="326,138" advanced="true">
+    <text id="n56_jcej" name="n56" xy="20,8" size="152,42" group="n60_jcej" fontSize="30" color="#f8f1db" text="飞花令战力"/>
+    <text id="n57_jcej" name="txtSuitScore" xy="20,60" size="122,31" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="搭配战力：{value=0}"/>
+    <text id="n58_jcej" name="txtClickScore" xy="20,87" size="166,31" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卓越点击战力：{value=0}"/>
+    <text id="n59_jcej" name="txtCardScore" xy="20,114" size="122,31" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卡牌战力：{value=0}"/>
+    <group id="n60_jcej" name="n60" xy="19,8" size="326,137" advanced="true">
       <gearXY controller="c1" pages="0,1" values="19,8|19,19"/>
     </group>
   </displayList>

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -3,15 +3,18 @@
   <displayList>
     <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
     <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
-    <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,135" size="575,274" group="n11_v5no"/>
-    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="243,72" group="n11_v5no"/>
-    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="587,71" pivot="0.5,0" group="n11_v5no" scale="-1,1"/>
-    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,76" group="n11_v5no"/>
-    <text id="n15_v5no" name="txtItemDes" xy="390,165" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
-    <text id="n3_v5no" name="txtName" xy="376,53" size="210,54" group="n11_v5no" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" text="稀有升星材料(自选)"/>
-    <text id="n5_v5no" name="txtTotalNum" xy="725,86" size="206,41" group="n11_v5no" fontSize="28" color="#b08d5c" align="center" leading="1" autoSize="shrink" text="已拥有：1940"/>
-    <loader id="n7_v5no" name="loaIcon" xy="171,252" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
-    <group id="n11_v5no" name="n11" xy="-9,-29" size="946,456"/>
+    <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,138" size="575,274" group="n11_v5no"/>
+    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,79" group="n11_v5no"/>
+    <text id="n15_v5no" name="txtItemDes" xy="390,168" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
+    <text id="n5_v5no" name="txtTotalNum" xy="725,89" size="206,41" group="n11_v5no" fontSize="28" color="#b08d5c" align="center" leading="1" autoSize="shrink" text="已拥有：1940"/>
+    <loader id="n7_v5no" name="loaIcon" xy="171,255" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
+    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="130,69" pivot="0.5,0.5" group="n33_x8jz"/>
+    <text id="n3_v5no" name="txtName" xy="279,51" pivot="0.5,0" size="404,54" group="n33_x8jz" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoClearText="true" text="稀有升星稀星稀星稀星"/>
+    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="702,71" pivot="0.5,0.5" group="n33_x8jz" scale="-1,1"/>
+    <group id="n33_x8jz" name="n33" xy="130,51" size="702,54" group="n11_v5no" advanced="true" layout="hz" colGap="19" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n11_v5no" name="n11" xy="-9,-29" size="946,459"/>
     <image id="n18_v5no" name="n18" src="v5notm4" fileName="images/lm_zsx0.png" xy="117,423" group="n21_v5no"/>
     <text id="n19_v5no" name="n19" xy="378,422" size="206,44" group="n21_v5no" fontSize="32" color="#b69566" align="center" leading="1" autoSize="none" text="自选道具"/>
     <list id="n20_v5no" name="list" xy="43,494" size="875,241" group="n21_v5no" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://2bsz6nelv5notmb" align="center">

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -2,19 +2,21 @@
 <component size="962,1116">
   <displayList>
     <image id="n37_qdaz" name="n37" src="qdaztno" fileName="images/tanchuang_2.png" xy="-59,-31" size="1021,1169"/>
-    <image id="n41_x8jz" name="n41" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="223,128" size="123,18" group="n12_si5z"/>
-    <image id="n42_x8jz" name="n42" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="690,145" size="119,17" group="n12_si5z" rotation="180"/>
-    <text id="n5_si5z" name="txtName" xy="347,109" size="222,54" group="n12_si5z" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoSize="shrink" autoClearText="true" text="物品名字物品名字"/>
-    <text id="n6_si5z" name="txtOwned" xy="750,117" pivot="1,0" size="131,42" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
-    <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,167" group="n12_si5z"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="-11,136" size="346,336" group="n12_si5z" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="42,205" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="163,303" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
-    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="357,204" size="543,204" group="n12_si5z"/>
-    <text id="n11_si5z" name="txtDesc" xy="375,226" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="240,361" 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="-11,109" size="917,363" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="205,492" pivot="0.5,0" size="569,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+    <text id="n6_si5z" name="txtOwned" xy="750,124" pivot="1,0" size="131,42" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
+    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="-11,128" size="346,336" group="n12_si5z" aspect="true"/>
+    <loader id="n8_si5z" name="loaRarity" xy="42,197" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="163,295" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
+    <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="357,196" size="543,204" group="n12_si5z"/>
+    <text id="n11_si5z" name="txtDesc" xy="375,218" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="240,353" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
+    <image id="n41_x8jz" name="n41" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="177,90" pivot="0.5,0.5" size="123,18" group="n43_x8jz"/>
+    <text id="n5_si5z" name="txtName" xy="341,70" pivot="0.5,0" size="284,54" group="n43_x8jz" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoClearText="true" text="物品名字物品名"/>
+    <image id="n42_x8jz" name="n42" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="666,91" pivot="0.5,0.5" size="119,17" group="n43_x8jz" scale="-1,1"/>
+    <group id="n43_x8jz" name="n43" xy="177,70" size="608,54" group="n12_si5z" advanced="true" layout="hz" colGap="41" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n12_si5z" name="n12" xy="-11,70" size="911,394" group="n33_l500" advanced="true"/>
+    <list id="n32_l500" name="listItem" xy="205,484" pivot="0.5,0" size="569,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -23,31 +25,31 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,665" size="897,15" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="359,643" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
-    <group id="n4_si5z" name="n4" xy="32,643" size="897,54" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,720" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,718" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="si5zti8" fileName="imgnew/tc_zszs.png" xy="32,657" size="897,15" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="359,635" size="244,54" group="n4_si5z" fontSize="40" color="#8a7253" text="选择使用数量"/>
+    <group id="n4_si5z" name="n4" xy="32,635" size="897,54" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="197,712" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="175,710" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,719" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,717" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="490,711" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,709" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="343,725" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="175,717" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="317,807" 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,898" 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,889" 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,807" 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,964" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="343,717" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="175,709" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="317,799" 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,879" 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,881" 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,799" 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,948" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,964" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="544,948" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="124,964" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="32,643" size="897,410" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="-11,109" size="940,944" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n20_si5z" name="n20" xy="124,948" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="32,635" size="897,402" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="-11,70" size="940,967" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/components/BtnStyle1Big.xml

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

FGUIProject/assets/DressUp/components/ComFightScore.xml

@@ -6,11 +6,11 @@
       <gearSize controller="c1" pages="1" values="365,168,-1,-1" default="365,168,-1,1"/>
     </image>
     <image id="n55_jcej" name="n55" src="v461f5" fileName="images/jjcdi_jjxian.png" xy="19,53" group="n60_jcej"/>
-    <text id="n56_jcej" name="n56" xy="20,8" size="152,42" group="n60_jcej" fontSize="30" color="#f8f1db" text="竞技场战力"/>
-    <text id="n57_jcej" name="txtSuitScore" xy="20,60" size="124,32" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="搭配之力：{value=0}"/>
-    <text id="n58_jcej" name="txtClickScore" xy="20,87" size="167,32" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卓越点击战力：{value=0}"/>
-    <text id="n59_jcej" name="txtCardScore" xy="20,114" size="124,32" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卡牌战力：{value=0}"/>
-    <group id="n60_jcej" name="n60" xy="19,8" size="326,138" advanced="true">
+    <text id="n56_jcej" name="n56" xy="20,8" size="152,42" group="n60_jcej" fontSize="30" color="#f8f1db" text="飞花令战力"/>
+    <text id="n57_jcej" name="txtSuitScore" xy="20,60" size="122,31" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="搭配之力：{value=0}"/>
+    <text id="n58_jcej" name="txtClickScore" xy="20,87" size="166,31" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卓越点击战力：{value=0}"/>
+    <text id="n59_jcej" name="txtCardScore" xy="20,114" size="122,31" group="n60_jcej" fontSize="22" color="#f8f1db" vars="true" text="卡牌战力：{value=0}"/>
+    <group id="n60_jcej" name="n60" xy="19,8" size="326,137" advanced="true">
       <gearXY controller="c1" pages="0,1" values="19,8|19,19"/>
     </group>
   </displayList>

FGUIProject/assets/League/LeagueAnswerUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,647">
   <displayList>
-    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" pkg="eg2y0ldp"/>
+    <image id="n8_9jv6" name="n8" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0"/>
     <image id="n17_9jv6" name="n17" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="74,491"/>
     <component id="n9_9jv6" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="899,26"/>
     <component id="n3_pvb4" name="btnRank" src="9jv67a" fileName="components/Button122.xml" xy="922,415">
@@ -17,7 +17,7 @@
     <text id="n6_pvb4" name="txtRule" xy="386,198" size="602,289" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#a9733e" autoSize="none" text="1.每天19:10分开启雅集夜宴&#xD;&#xA;2.活动需要成员尽可能在10分钟内快速回答问题，每答对一题在场的所有成员均可获得一份奖励&#xD;&#xA;3.活动结束时按照全员答对题数，仍在场的成员还可获得一份额外大奖&#xD;&#xA;4.每个成员每道题目只有一次回答机会，请认真回答哦"/>
     <text id="n4_pvb4" name="txtTime" xy="458,539" pivot="0.5,0" size="163,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" align="center" text="23:59:59后开启"/>
     <component id="n5_pvb4" name="btnAnswer" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="446,530">
-      <Button title="开始答题"/>
+      <Button title="开始答题" icon="ui://eg2y0ldpwm603f"/>
     </component>
     <text id="n15_9jv6" name="n15" xy="388,140" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#a9733e" text="玩法描述"/>
     <image id="n16_9jv6" name="n16" src="9jv663" fileName="images/lm_zhuangshixian_2.png" xy="377,192"/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -38,10 +38,10 @@
       <Button title="招募成员"/>
     </component>
     <component id="n22_rv09" name="btnApplyList" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="317,1564" group="n25_rv09">
-      <Button title="申请列表"/>
+      <Button title="申请列表" icon="ui://eg2y0ldpwm603f"/>
     </component>
     <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
-      <Button title="雅集信息"/>
+      <Button title="雅集信息" icon="ui://eg2y0ldpwm603f"/>
     </component>
     <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="771,1562" group="n25_rv09">
       <Button title="退出雅集"/>

FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -8,7 +8,7 @@
     <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">
+    <group id="n9_duuf" name="n9" xy="0,381" size="1080,1158" visible="false" 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">

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

@@ -86,7 +86,9 @@ namespace GFGGame
             _roleData.scoreType = InstanceZonesDataManager.currentScoreType;
             _roleData.baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
             _roleData.cardId = InstanceZonesDataManager.currentCardId; ;//卡牌id
-            _roleData.cardScore = _roleData.cardId <= 0 ? 0 : CardDataManager.GetCardDataById(_roleData.cardId).scores[_roleData.scoreType];//卡牌对应主题的属性分数
+
+            CardData cardData = CardDataManager.GetCardDataById(_roleData.cardId);
+            _roleData.cardScore = _roleData.cardId <= 0 || cardData == null ? 0 : cardData.scores[_roleData.scoreType];//卡牌对应主题的属性分数
 
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);

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

@@ -314,5 +314,18 @@ namespace GFGGame
             }
             return false;
         }
+
+        /// <summary>
+        /// 检测背包中是否存在礼包
+        /// </summary>
+        /// <returns></returns>
+        public static bool BagIsExistGiftBag()
+        {
+            var isExistGiftBag = _dataDic.Values.Any(a =>
+                (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
+                (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM));
+
+            return isExistGiftBag;
+        }
     }
 }

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

@@ -7,6 +7,10 @@ namespace GFGGame
 {
     public class LimitedTimeGiftBoxDataManager : SingletonBase<LimitedTimeGiftBoxDataManager>
     {
+        //每日特惠每次登录没有打开过就给红点
+        private bool _isOpenMeiRiTeHui = false;
+        public bool IsOpenMeiRiTeHui => _isOpenMeiRiTeHui;
+        
         //列表数据3--等级条件的数据
         private List<LimitedTimeGiftBoxItemData> _ltgGbItemData3 = new List<LimitedTimeGiftBoxItemData>();
         public List<LimitedTimeGiftBoxItemData> LtgGbItemData3 => _ltgGbItemData3;
@@ -24,6 +28,13 @@ namespace GFGGame
             _ltgGbItemData3.Clear();
             _ltgGbItemData4.Clear();
             _ltgGbItemData5.Clear();
+            _isOpenMeiRiTeHui = false;
+        }
+
+        public void SetIsOpenMeiRiTeHui()
+        {
+            _isOpenMeiRiTeHui = true;
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
         }
 
         public void UpLtgGbItemData3()

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

@@ -122,7 +122,10 @@ namespace GFGGame
             var preChapterCfg = StoryChapterCfgArray.Instance.GetCfg(preChapterId);
             if (preChapterCfg != null)
             {
-                return InstanceZonesDataManager.CheckChapterPass(preChapterCfg.type, preChapterCfg.subType, preChapterCfg.id, preChapterCfg.levelCount);
+                if(!InstanceZonesDataManager.CheckChapterPass(preChapterCfg.type, preChapterCfg.subType, preChapterCfg.id, preChapterCfg.levelCount))
+                {
+                    return false;
+                }
             }
             //前置关卡
             return CheckNeedChapterPass(chapterId, out var needChapterId);

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

@@ -373,5 +373,59 @@ namespace GFGGame
             }
             return false;
         }
+        /// <summary>
+        /// 限时抽奖活动奖励
+        /// </summary>
+        /// <returns></returns>
+        public bool GetActLuckyBoxRewardRed()
+        {
+            if (ActivityDataManager.Instance.actLuckyBoxId <= 0) return false;
+            List<ActivityLuckybonusCfg> _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(ActivityDataManager.Instance.actLuckyBoxId);
+            for (int i = 0; i < _bonueCfgs.Count; i++)
+            {
+                int key = _bonueCfgs[i].num;
+                int state = ActivityDataManager.Instance.luckyBoxActBonusState.ContainsKey(key) ? ActivityDataManager.Instance.luckyBoxActBonusState[key] : 0;
+                bool canGet = state < ConstBonusStatus.GOT && ActivityDataManager.Instance.allPlayTimes >= _bonueCfgs[i].num;
+                if (canGet) return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 摘星-每日特惠
+        /// </summary>
+        /// <returns></returns>
+        public bool GetMeiRiTeHuiRed()
+        {
+            return !LimitedTimeGiftBoxDataManager.Instance.IsOpenMeiRiTeHui;
+        }
+        
+        /// <summary>
+        /// 背包中存在礼包就一直给主界面 背包 红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetMainBagGiftRed()
+        {
+            return ItemDataManager.BagIsExistGiftBag();
+        }
+
+        // /// <summary>
+        // /// 背包内 是礼包物品就一直给红点
+        // /// </summary>
+        // /// <returns></returns>
+        // public bool GetBagGiftRed(int itemId)
+        // {
+        //     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+        //     if (itemCfg.itemType == ConstItemType.USEABLE)
+        //     {
+        //         if (itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE ||
+        //             itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM)
+        //         {
+        //             return true;
+        //         }
+        //     }
+        //
+        //     return false;
+        // }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_GiftBoxSelectorUI.cs

@@ -9,9 +9,9 @@ namespace UI.Bag
         public GComponent target;
         public GButton m_btnCancel;
         public GTextField m_txtItemDes;
-        public GTextField m_txtName;
         public GTextField m_txtTotalNum;
         public GLoader m_loaIcon;
+        public GTextField m_txtName;
         public GList m_list;
         public GTextField m_txtSelRewardStr;
         public GButton m_btnSub;
@@ -64,9 +64,9 @@ namespace UI.Bag
         {
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_txtItemDes = (GTextField)comp.GetChild("txtItemDes");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtTotalNum = (GTextField)comp.GetChild("txtTotalNum");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_list = (GList)comp.GetChild("list");
             m_txtSelRewardStr = (GTextField)comp.GetChild("txtSelRewardStr");
             m_btnSub = (GButton)comp.GetChild("btnSub");
@@ -75,9 +75,9 @@ namespace UI.Bag
         {
             m_btnCancel = null;
             m_txtItemDes = null;
-            m_txtName = null;
             m_txtTotalNum = null;
             m_loaIcon = null;
+            m_txtName = null;
             m_list = null;
             m_txtSelRewardStr = null;
             m_btnSub = null;

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

@@ -7,12 +7,12 @@ namespace UI.CommonGame
     public partial class UI_ItemExchangeUI
     {
         public GComponent target;
-        public GTextField m_txtName;
         public GTextField m_txtOwned;
         public GLoader m_loaRarity;
         public GLoader m_loaIcon;
         public GTextField m_txtDesc;
         public GTextField m_txtExchangeCount;
+        public GTextField m_txtName;
         public GList m_listItem;
         public GTextField m_txtShow;
         public UI_Button2 m_btnMinus;
@@ -71,12 +71,12 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
+            m_txtName = (GTextField)comp.GetChild("txtName");
             m_listItem = (GList)comp.GetChild("listItem");
             m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
@@ -91,12 +91,12 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtName = null;
             m_txtOwned = null;
             m_loaRarity = null;
             m_loaIcon = null;
             m_txtDesc = null;
             m_txtExchangeCount = null;
+            m_txtName = null;
             m_listItem = null;
             m_txtShow = null;
             m_btnMinus.Dispose();

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

@@ -120,7 +120,7 @@ namespace GFGGame
 
                     int[][] bonus = ActivityLuckybonusCfgArray.Instance.GetCfgByidAndnum(response.ActivityId, response.BonusKey).bonusArr;
                     BonusController.TryShowBonusList(bonus);
-
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -108,6 +108,7 @@ namespace GFGGame
                 {
                     List<ItemData> items = ItemUtil.CreateItemDataList(response.GotItemList);
                     BonusController.TryShowBonusList(items);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }
@@ -127,6 +128,7 @@ namespace GFGGame
                 {
                     List<ItemData> items = ItemUtil.CreateItemDataList(response.GotItemList);
                     BonusController.TryShowBonusList(items);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -67,6 +67,8 @@ namespace GFGGame
                         if (data != null)
                         {
                             PoemGalleryDataManager.Instance.UpdateRoleInfo(response.WorksList[i].WorksId, response.WorksList[i].AuthorName);
+                            PoemGalleryDataManager.Instance.UpdateFavoriteState(response.WorksList[i].WorksId, response.WorksList[i].CollectOrNot, response.WorksList[i].BeCollectedCount);
+                            PoemGalleryDataManager.Instance.UpdateVoteiteState(response.WorksList[i].WorksId, response.WorksList[i].LikeOrNot, response.WorksList[i].BelikedCount);
                         }
                         else
                         {
@@ -111,6 +113,8 @@ namespace GFGGame
                         if (data != null)
                         {
                             PoemGalleryDataManager.Instance.UpdateRoleInfo(response.RankList[i].WorksId, response.RankList[i].AuthorName, i + 1);
+                            PoemGalleryDataManager.Instance.UpdateFavoriteState(response.RankList[i].WorksId, response.RankList[i].CollectOrNot, response.RankList[i].BeCollectedCount);
+                            PoemGalleryDataManager.Instance.UpdateVoteiteState(response.RankList[i].WorksId, response.RankList[i].LikeOrNot, response.RankList[i].BelikedCount);
                         }
                         else
                         {

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

@@ -52,6 +52,7 @@ namespace GFGGame
                     EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
                     BonusController.TryShowBonusList(itemDatas);
                     EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -41,7 +41,11 @@ namespace GFGGame
             _ui.m_btnLuckyBox.onClick.Add(OnBtnLuckyBoxClick);
 
         }
-
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -54,6 +58,7 @@ namespace GFGGame
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
+            UpdateRedDot();
             Timers.inst.Add(1, 0, UpdateTime);
         }
         protected override void OnHide()
@@ -61,7 +66,11 @@ namespace GFGGame
             base.OnHide();
             Timers.inst.Remove(UpdateTime);
         }
-
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(ActivityThemeLuckyBoxView).FullName);
@@ -90,5 +99,9 @@ namespace GFGGame
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);
             _ui.m_txtTime.text = TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime);
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -90, 70);
+        }
     }
 }

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

@@ -1,4 +1,3 @@
-
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -11,7 +10,9 @@ namespace GFGGame
     public class BagView : BaseWindow
     {
         private UI_BagUI _ui;
+
         private ValueBarController _valueBarController;
+
         // private List<ItemView> _listItemViews = new List<ItemView>();
         public override void Dispose()
         {
@@ -51,14 +52,14 @@ namespace GFGGame
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tc_bjbj");
-
         }
+
         protected override void AddEventListener()
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateList);
         }
-        
+
         protected override void OnShown()
         {
             base.OnShown();
@@ -74,15 +75,18 @@ namespace GFGGame
             {
                 _ui.m_list.ScrollToView(0);
             }
+
             _ui.m_list.numItems = 0;
 
             base.OnHide();
         }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateList);
         }
+
         private void UpdateList()
         {
             _ui.m_list.numItems = BagDataManager.Instance.BagDatas.Count;
@@ -96,6 +100,18 @@ namespace GFGGame
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             item.m_txtCount.SetVar("count", itemData.num.ToString()).FlushVars();
             item.target.data = itemCfg;
+            //是礼包就加入红点
+            if ((itemCfg.itemType == ConstItemType.USEABLE &&
+                 itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
+                (itemCfg.itemType == ConstItemType.USEABLE &&
+                 itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
+            {
+                RedDotController.Instance.SetComRedDot(item.target, true);
+            }
+            else
+            {
+                RedDotController.Instance.SetComRedDot(item.target, false);
+            }
         }
 
         private void OnListItemClick(EventContext context)
@@ -128,6 +144,5 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(BagView).FullName);
         }
-
     }
 }

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

@@ -140,7 +140,7 @@ namespace GFGGame
                 longPressGesture2.interval = 0.1f;
                 longPressGesture2.once = false;
                 longPressGesture2.onAction.Add(OnLongPressReduce);
-                _listLongPress.Add(longPressGesture);
+                _listLongPress.Add(longPressGesture2);
             }
 
             uiItemChild.target.data = itemCfgChild;

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

@@ -128,10 +128,14 @@ namespace GFGGame
             }
             else if (_type == ActivityType.XSLB3)
             {
-                //5
+                //5摘星里面的 每日特惠
                 var data5 = LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5
                     .FirstOrDefault(a => a.IndexType == 1);
                 _pageIndex = data5 == null ? 0 : LimitedTimeGiftBoxDataManager.Instance.LtgGbItemData5.IndexOf(data5);
+                if (!LimitedTimeGiftBoxDataManager.Instance.IsOpenMeiRiTeHui)
+                {
+                    LimitedTimeGiftBoxDataManager.Instance.SetIsOpenMeiRiTeHui();
+                }
             }
         }
 

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

@@ -60,6 +60,8 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+
         }
         protected override void OnShown()
         {
@@ -72,6 +74,7 @@ namespace GFGGame
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateView();
+            UpdateRedDot();
         }
         private void UpdateTime(object param = null)
         {
@@ -271,6 +274,9 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_LUCKY_BOX, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+
         }
 
         private void OnClickBtnBack()
@@ -278,6 +284,12 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LuckyBoxActivityView).FullName);
         }
 
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
+        }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;

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

@@ -103,35 +103,35 @@ namespace GFGGame
             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;
-            // }
+            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);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -53,7 +53,7 @@ namespace GFGGame
             subType = 0;//MainStoryDataManager.GetChapterSubType(MainStoryDataManager.currentChapterCfgId);
             if (this.viewData != null)
             {
-                subType = (int)this.viewData;
+                subType = (int)(this.viewData as object[])[0];
             }
             _ui.m_listType.selectedIndex = subType;
             UpdateList();
@@ -96,7 +96,7 @@ namespace GFGGame
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             {
-                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, _ui.m_listType.selectedIndex });
+                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, new object[] { _ui.m_listType.selectedIndex } });
                 this.Hide();
             }
             else

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs

@@ -37,7 +37,7 @@ namespace GFGGame
                     {
                         index = 1;
                     }
-                    ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, index, null, true);
+                    ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW, new object[] { index }, null, true);
                 }
                 else
                 {

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

@@ -1014,7 +1014,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
             RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin);
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -10, 5);
-
+            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -10, 5);
+            RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
         }
 
         private void CheckGuide(object param)