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

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

@@ -1,46 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1025">
+<component size="962,1116">
   <displayList>
-    <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">
+    <image id="n37_qdaz" name="n37" src="qdaztno" fileName="images/tanchuang_2.png" xy="-59,-31" size="1021,1169"/>
+    <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/>
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <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">
+    <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,669" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="597,667" 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,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">
+    <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,914" 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,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"/>
+    <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/CommonGame/package.xml

@@ -350,6 +350,9 @@
     <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/"/>
+    <image id="x8jztnp" name="back.png" path="/images/"/>
+    <image id="x8jztnq" name="wplb_db.png" path="/images/"/>
+    <image id="x8jztnr" name="lm_db_3.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -8,7 +8,7 @@
   <displayList>
     <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
-    <list id="n3_mbf1" name="listRewards" xy="93,65" size="662,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="90,65" size="670,131" layout="row" overflow="scroll" scroll="horizontal" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
       <item/>

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/LeagueAnsweringUI.xml

@@ -12,7 +12,7 @@
     <remark page="1" value="选择题"/>
     <remark page="2" value="填空题"/>
   </controller>
-  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="0">
+  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="1">
     <remark page="1" value="有人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="3" value="全部题目答完"/>
@@ -64,7 +64,9 @@
     <text id="n17_pvb4" name="txtResult" xy="602,470" size="271,42" group="n19_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#b68f52" align="center" autoSize="none" text="" input="true" prompt="[color=#A7957E]点此输入答案[/color]">
       <gearDisplay controller="ctrlQuestionType" pages="2"/>
     </text>
-    <graph id="n62_t6j1" name="n62" xy="607,509" size="269,2" group="n19_pvb4" type="rect" lineSize="0" fillColor="#ffb68f52"/>
+    <graph id="n62_t6j1" name="n62" xy="607,509" size="269,2" group="n19_pvb4" type="rect" lineSize="0" fillColor="#ffb68f52">
+      <gearDisplay controller="ctrlQuestionType" pages="2"/>
+    </graph>
     <group id="n19_pvb4" name="n19" xy="360,470" size="516,43" group="n15_pvb4" advanced="true">
       <gearDisplay controller="ctrlQuestionType" pages=""/>
       <gearXY controller="ctrlHasIcon" pages="0,1" values="360,470|229,470"/>
@@ -92,7 +94,7 @@
     <image id="n55_miy3" name="n55" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,424" group="n24_pvb4">
       <gearDisplay controller="ctrlResult" pages="3"/>
     </image>
-    <text id="n22_pvb4" name="txtInfo" xy="539,514" pivot="0.5,0" anchor="true" size="245,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="全部题目答完啦~">
+    <text id="n22_pvb4" name="txtInfo" xy="539,560" pivot="0.5,0" anchor="true" size="245,44" group="n24_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" text="全部题目答完啦~">
       <gearXY controller="ctrlResult" pages="0,1,2,3" values="539,514|539,560|539,560|539,417"/>
     </text>
     <image id="n53_miy3" name="n53" src="9jv65l" fileName="images/lm_dt_tsdk.png" xy="110,614" group="n54_miy3"/>

FGUIProject/assets/League/LeagueMemberAppointUI.xml

@@ -6,11 +6,11 @@
   </controller>
   <controller name="c2" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <image id="n7_wm60" name="n7" src="o9gh40" fileName="images/tanchuang.png" xy="0,0" size="1021,647" pkg="eg2y0ldp"/>
+    <image id="n7_wm60" name="n7" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,647"/>
     <image id="n10_o9gh" name="n10" src="o9gh4j" fileName="images/lm_biaotizi_6.png" xy="260,88"/>
     <component id="n17_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="911,26"/>
     <component id="n6_rv09" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="612,88" size="36,37">
-      <Button icon="ui://tw70qm9do9gh4b"/>
+      <Button icon="ui://eg2y0ldpo9gh4b"/>
     </component>
     <image id="n11_o9gh" name="n11" src="o9gh4h" fileName="images/lm_kuang_3.png" xy="60,149" group="n16_o9gh"/>
     <text id="n12_o9gh" name="n12" xy="270,151" size="60,39" group="n16_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" text="职位"/>
@@ -36,6 +36,6 @@
     <component id="n5_rv09" name="btnKick" src="rv091g" fileName="components/BtnBig.xml" pkg="mk0fwx0x" xy="410,520">
       <Button title="请离雅集"/>
     </component>
-    <image id="n18_o9gh" name="n18" src="wm603t" fileName="images/lm_zhuangshixian_duan.png" xy="132,480" pkg="eg2y0ldp"/>
+    <image id="n18_o9gh" name="n18" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,480"/>
   </displayList>
 </component>

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/League/package.xml

@@ -159,8 +159,8 @@
     <image id="9jv66q" name="lm_dt_cy_db.png" path="/images/" scale="9grid" scale9grid="85,298,170,596"/>
     <image id="9jv66r" name="lm_dt_cy_dk.png" path="/images/"/>
     <image id="9jv66s" name="lm_dt_db.png" path="/images/" scale="9grid" scale9grid="270,1549,540,182"/>
-    <image id="9jv66t" name="lm_dt_dhdk.png" path="/images/" scale="9grid" scale9grid="67,24,128,11"/>
-    <image id="9jv66u" name="lm_dt_dhdk2.png" path="/images/" scale="9grid" scale9grid="99,28,200,36"/>
+    <image id="9jv66t" name="lm_dt_dhdk.png" path="/images/" scale="9grid" scale9grid="23,24,226,11"/>
+    <image id="9jv66u" name="lm_dt_dhdk2.png" path="/images/" scale="9grid" scale9grid="9,27,366,36"/>
     <image id="9jv66v" name="lm_bq_xcm.png" path="/images/"/>
     <image id="9jv66w" name="lm_dt_icon_db.png" path="/images/"/>
     <image id="9jv66x" name="lm_biaoqian_1.png" path="/images/" exported="true"/>

FGUIProject/assets/Store/components/ComVipLv.xml

@@ -16,6 +16,5 @@
     <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,87" size="100,44" fontSize="32" color="#8c8580" ubb="true" vars="true" text="已满级"/>
   </displayList>
 </component>

FGUIProject/assets/Store/components/ProgressBar1.xml

@@ -7,7 +7,7 @@
     </image>
     <image id="n1_hhx9" name="bar" src="hhx9f" fileName="imagesNew/VipLevel_Progress_fill.png" xy="4,3" size="656,18" fillMethod="hz"/>
     <image id="n2_hhx9" name="n2" src="hhx9d" fileName="imagesNew/VipLevel_Progress_frame2.png" xy="0,0" fillMethod="hz"/>
-    <text id="n4_hhx9" name="txttitle" xy="576,21" pivot="1,0" size="71,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=100}"/>
+    <text id="n4_hhx9" name="txttitle" xy="551,21" pivot="1,0" size="96,39" fontSize="28" color="#8c8580" align="right" ubb="true" vars="true" text="[color=#5A3E16]{value=0}[/color]/{max=MAX}"/>
   </displayList>
   <ProgressBar titleType="valueAndmax"/>
 </component>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -5,7 +5,7 @@
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,264">
       <relation target="" sidePair="left-right"/>
     </image>
-    <text id="n19_nd17" name="LeftTime" xy="37,264" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
+    <text id="n19_nd17" name="LeftTime" xy="37,264" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text=""/>
     <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,257" size="61,61"/>
     <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,604">
       <relation target="" sidePair="left-left"/>

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/RedDotDataManager.cs

@@ -345,5 +345,50 @@ namespace GFGGame
             }
             return false;
         }
+        /// <summary>
+        /// 联盟-成员申请
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLeagueMemberJoinRed()
+        {
+            LeagueHotelCfg hotelCfg = LeagueHotelCfgArray.Instance.GetCfg(LeagueDataManager.Instance.HotelLevel);
+            return LeagueDataManager.Instance.ListApplyDatas.Count > 0 && LeagueDataManager.Instance.LeagueData.Num < hotelCfg.limit;
+        }
+
+        /// <summary>
+        /// 限时累充可领奖励红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLimiteChargeRewardRed()
+        {
+            if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            for (int i = 0; i < _rechargeCfgs.Count; i++)
+            {
+                if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)
+                {
+                    return true;
+                }
+            }
+            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;
+        }
     }
 }

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

@@ -30,8 +30,7 @@ namespace GFGGame
             VipCfg vipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv);
             if (vipCfg == null) return;
             VipCfg nextVipCfg = VipCfgArray.Instance.GetCfg(RoleDataManager.vipLv + 1);
-            com.m_txtTipsFull.visible = RoleDataManager.vipExp >= vipCfg.num && nextVipCfg == null;
-            com.m_grpTips.visible = nextVipCfg != null || RoleDataManager.vipExp < vipCfg.num;
+            com.m_grpTips.visible = nextVipCfg != null;
             if (com.m_btnRule.data == null)
             {
                 com.m_btnRule.onClick.Add(RuleController.ShowRuleView);
@@ -46,6 +45,13 @@ namespace GFGGame
                 com.m_txtTips.SetVar("exp", (vipCfg.num - RoleDataManager.vipExp).ToString()).FlushVars();
                 com.m_txtTips.SetVar("vipLv", (nextVipCfg.id).ToString()).FlushVars();
             }
+            else
+            {
+                com.m_proExp.target.max = vipCfg.num;
+                com.m_proExp.target.value = RoleDataManager.vipExp;
+                com.m_proExp.m_txttitle.SetVar("value", com.m_proExp.target.value.ToString()).FlushVars();
+                com.m_proExp.m_txttitle.SetVar("max", "MAX").FlushVars();
+            }
             UI_ComVipLv.ProxyEnd();
         }
 

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/FairyGUI/GenCode/Store/UI_ComVipLv.cs

@@ -13,7 +13,6 @@ namespace UI.Store
         public GTextField m_txtTips;
         public GGroup m_grpTips;
         public GButton m_btnRule;
-        public GTextField m_txtTipsFull;
         public const string URL = "ui://p9mtgheohhx91r";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "ComVipLv";
@@ -67,7 +66,6 @@ namespace UI.Store
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_grpTips = (GGroup)comp.GetChild("grpTips");
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_txtTipsFull = (GTextField)comp.GetChild("txtTipsFull");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -78,7 +76,6 @@ namespace UI.Store
             m_txtTips = null;
             m_grpTips = null;
             m_btnRule = null;
-            m_txtTipsFull = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -85,11 +85,12 @@ namespace GFGGame
         {
             var response =
                 (S2C_GetActivityBonus)await MessageHelper.SendToServer(new C2S_GetActivityBonus()
-                    { ActivityId = activityId, BonusId = bonusId });
+                { ActivityId = activityId, BonusId = bonusId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             //奖励弹窗
             BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.itemList));
             ActivityGlobalDataManager.Instance.AddActivityRewardInfo(activityId, bonusId);
+            EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
             return false;
         }
     }

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/LeagueSproxy.cs

@@ -427,6 +427,7 @@ namespace GFGGame
                 {
                     LeagueDataManager.Instance.ListApplyDatas.Remove(targetRoleId);
                 }
+                EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                 return true;
             }
             return false;

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/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/BagExchangeView.cs

@@ -14,6 +14,8 @@ namespace GFGGame
         private int _itemId;
         private long _count;
         private List<int[]> _itemList = new List<int[]>();
+        // private LongPressGesture _longPressAdd;
+        // private LongPressGesture _longPressMinus;
 
         public override void Dispose()
         {
@@ -78,11 +80,8 @@ namespace GFGGame
             _ui.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
             _ui.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            RarityIconController.UpdateRarityIcon(_ui.m_loaRarity, itemCfg.id, false);
-            _ui.m_loaRarity.visible = itemCfg.itemType == ConstItemType.DRESS_UP;
-            _ui.m_txtExchangeCount.visible = false;
-            _ui.m_comCost.target.visible = false;
-
+            _ui.m_txtRmbCost.visible = false;
+            
             UpdateThItemList(itemCfg);
             _ui.m_listItem.numItems = _itemList.Count; //itemCfg.itemsArr.Length;
             _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE &&
@@ -150,6 +149,7 @@ namespace GFGGame
             _ui.m_btnAdd.target.touchable = _count == hasCount ? false : true;
             _ui.m_btnMax.m_c1.selectedIndex = _count == hasCount ? 1 : 0;
             _ui.m_btnMax.target.touchable = _count == hasCount ? false : true;
+            _ui.m_txtExchangeCount.text = string.Format("x{0}", hasCount);
 
             _ui.m_txtShow.text = "选择使用数量";
             _ui.m_txtTips.text = string.Format("是否使用{0}个{1}？", _count, itemCfg.name);

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/DailyWelfare/DailyWelfareView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            // EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         protected override void OnShown()
@@ -79,6 +79,7 @@ namespace GFGGame
             {
                 Timers.inst.Add(1, 0, UpdateTime);
             }
+            UpdateRedDot();
         }
 
         protected override void OnHide()
@@ -90,6 +91,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         private void UpdateTime(object param)
         {
@@ -124,5 +126,9 @@ namespace GFGGame
         {
             ViewManager.Show<DailySupplyView>();
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnLimitChargeAddUp.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -40);
+        }
     }
 }

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

@@ -224,7 +224,8 @@ namespace GFGGame
                 _ui.m_comRightHead.target.visible = true;
                 _ui.m_imgFail.visible = false;
                 OtherRoleInfoData roleInfoData = _dataManager.GetMemberRoleInfo(_dataManager.LastAnswerRoleData.RightRoleId);
-                RoleInfoManager.Instance.UpdateHeadWithLv(_ui.m_comRightHead.target, roleInfoData.headId, roleInfoData.headBorderId, roleInfoData.roleLv);
+                ItemCfg headCfg = ItemCfgArray.Instance.GetCfg(roleInfoData.headId == 0 ? ConstItemID.HEADID : roleInfoData.headId);
+                _ui.m_comRightHead.m_loaIcon.url = ResPathUtil.GetHeadPath(headCfg.res);
                 _ui.m_txtInfo.text = string.Format("{0} 答对了！", roleInfoData.roleName);
                 _ui.m_holderHead.visible = true;
                 Timers.inst.Remove(UpdateResultTime);

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

@@ -46,6 +46,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateMember);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
 
         }
         protected override void OnShown()
@@ -54,7 +55,7 @@ namespace GFGGame
 
             UpdateMember();
             UpdateBtnRecruit();
-
+            UpdateRedDot();
         }
 
         protected override void OnHide()
@@ -68,6 +69,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_MEMBER_CHANGE, UpdateMember);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         private void OnBtnBackClick()
         {
@@ -286,5 +288,9 @@ namespace GFGGame
 
             return memberIds;
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnApplyList, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
+        }
     }
 }

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

@@ -46,6 +46,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateView);
             EventAgent.AddEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         protected override void OnShown()
         {
@@ -53,7 +54,7 @@ namespace GFGGame
             int myPos = LeagueDataManager.Instance.GetMyPos();
             _ui.m_btnChangeNotice.visible = myPos == LeaguePos.Owner || myPos == LeaguePos.SubOwner;
             UpdateView();
-
+            UpdateRedDot();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
         }
@@ -69,6 +70,7 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_INFO_CHANGE, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.LEAGUE_NUMBERIC_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         private void OnBtnBackClick()
@@ -165,5 +167,9 @@ namespace GFGGame
                 _ui.m_btnAnswer.m_txtTime.text = "进行中";
             }
         }
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnMember.target, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
+        }
     }
 }

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,11 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(LuckyBoxActivityView).FullName);
         }
 
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(), "", -18, 11);
+        }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;

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

@@ -1005,18 +1005,17 @@ namespace GFGGame
             // RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
             // RedDotDataManager.Instance.GetDailyLoginRed());
             RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
-            RedDotController.Instance.SetComRedDot(_btnTuJian,
-                RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
+            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
             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,
-                RedDotDataManager.Instance.GetStudioFilingRed(), "", -38);
-            RedDotController.Instance.SetComRedDot(_ui.m_headBar.target,
-                RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(),
-                "", -38);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", 10);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -38);
+            RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
+            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);
+
         }
 
         private void CheckGuide(object param)