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="1">
+  <controller name="c1" pages="0,,1,,2,,3," selected="2">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -23,7 +23,7 @@
     </component>
     <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="624,84" size="233,51">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
+      <Button title="已领取" icon="ui://eg2y0ldpnyhm6"/>
     </component>
     <component id="n6_mbf1" name="btnGo" src="9qpb4h" fileName="components/BtnStyle001.xml" pkg="eg2y0ldp" xy="648,80">
       <gearDisplay controller="c1" pages="3"/>

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -10,7 +10,7 @@
     <component id="n8_jcej" name="comLastDan" src="ofwu5q" fileName="components/ComDanIcon.xml" xy="204,160" pivot="0.5,0.5" size="250,302"/>
     <component id="n2_psph" name="comCurDan" src="ofwu5q" fileName="components/ComDanIcon.xml" xy="623,160" pivot="0.5,0.5" size="250,302" aspect="true" controller="c1,1"/>
     <image id="n5_jcej" name="n5" src="jcej3z" fileName="images/pmts_ffbtbt.png" xy="422,540" group="n11_jcej"/>
-    <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" colGap="50" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Arena/components/ComFightScore.xml

@@ -2,10 +2,10 @@
 <component size="365,168">
   <controller name="c1" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n54_jcej" name="n54" src="jcej4p" fileName="images/jjcdi_jjcdi.png" xy="0,0" pivot="0.5,0.5" scale="-1,1">
+    <image id="n54_jcej" name="n54" src="jcej4p" fileName="images/jjcdi_jjcdi.png" xy="0,0" pivot="0.5,0.5" scale="-1,1" pkg="eg2y0ldp">
       <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"/>
+    <image id="n55_jcej" name="n55" src="jcej4o" fileName="images/jjcdi_jjxian.png" xy="19,53" group="n60_jcej" pkg="eg2y0ldp"/>
     <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}"/>

FGUIProject/assets/Arena/package.xml

@@ -149,8 +149,6 @@
     <component id="jcej4k" name="ListRankItem4.xml" path="/components/"/>
     <component id="jcej4m" name="ComAllScoreResult.xml" path="/components/"/>
     <component id="jcej4n" name="ComAllScore.xml" path="/components/"/>
-    <image id="jcej4o" name="jjcdi_jjxian.png" path="/images/"/>
-    <image id="jcej4p" name="jjcdi_jjcdi.png" path="/images/"/>
     <component id="jcej4q" name="ComFightScore.xml" path="/components/"/>
     <component id="v4614r" name="ListPartsItem.xml" path="/components/"/>
     <image id="v4614s" name="hz_xzyfxz.png" path="/components/"/>

FGUIProject/assets/CommonGame/package.xml

@@ -338,7 +338,7 @@
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
     <component id="volstnd" name="ComIcon003.xml" path="/components/"/>
-    <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true"/>
+    <image id="volstne" name="lm_fl_db.png" path="/bgimg/" exported="true" scale="9grid" scale9grid="269,804,538,315"/>
     <component id="volstnf" name="BtnStyle005.xml" path="/components/" exported="true"/>
     <component id="volstng" name="BtnStyle006.xml" path="/components/" exported="true"/>
     <component id="volstnh" name="ComItem003.xml" path="/components/" exported="true"/>
@@ -368,6 +368,8 @@
     <image id="94m19t" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
     <image id="94m19w" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
+    <image id="jcej4p" name="jjcdi_jjcdi.png" path="/imagesNew/" exported="true"/>
+    <image id="jcej4o" name="jjcdi_jjxian.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/ComList.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="987,1514" overflow="scroll">
   <displayList>
-    <component id="n4_fqor" name="btnLimitChargeAddUp" src="qik1u" fileName="components/Button1.xml" xy="0,0" group="n30_idkd" controller="c1,1,c2,0">
-      <Button title="限时累充" icon="ui://t8nwuj7ivols1q"/>
-    </component>
-    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,351" group="n30_idkd" controller="c2,1">
+    <list id="n32_ofwu" name="listLimitCharge" xy="0,0" size="987,371" group="n30_idkd" overflow="hidden" defaultItem="ui://t8nwuj7iqik1u">
+      <item/>
+      <item/>
+    </list>
+    <component id="n5_fqor" name="btnSevenDayLogin" src="qik1u" fileName="components/Button1.xml" xy="0,382" group="n30_idkd" controller="c2,1">
       <Button title="一周黄历"/>
       <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols20"/>
       <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1z"/>
     </component>
-    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,702" group="n30_idkd" controller="c2,2">
+    <component id="n28_idkd" name="btnSign" src="qik1u" fileName="components/Button1.xml" xy="0,733" group="n30_idkd" controller="c2,2">
       <Button title="每日签到" icon="ui://t8nwuj7ivols1y"/>
       <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1y"/>
       <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols1m"/>
     </component>
-    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1053" group="n30_idkd" controller="c2,3">
+    <component id="n29_idkd" name="btnSupply" src="qik1u" fileName="components/Button1.xml" xy="0,1084" group="n30_idkd" controller="c2,3">
       <Button title="每日补给" icon="ui://t8nwuj7ivols1x"/>
       <property target="loaIcon" propertyId="1" value="ui://t8nwuj7ivols1x"/>
       <property target="loaTitle" propertyId="1" value="ui://t8nwuj7ivols21"/>
     </component>
-    <group id="n30_idkd" name="n30" xy="0,0" size="987,1393" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
+    <group id="n30_idkd" name="n30" xy="0,0" size="987,1424" advanced="true" layout="vt" lineGap="11" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/DailyWelfare/DailyWelfareUI.xml

@@ -2,9 +2,9 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n27_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" size="1235,2071" aspect="true">
+    <image id="n31_vols" name="n31" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-77,0" pivot="0.5,0" size="1235,2071">
       <relation target="" sidePair="width-width,height-height,top-top"/>
     </image>
     <image id="n32_vols" name="n32" src="vols1s" fileName="images/hdrk_biaotz.png" xy="232,67"/>
@@ -16,7 +16,7 @@
     </component>
     <group id="n3_fqor" name="grpTop" xy="0,80" size="1080,96"/>
     <component id="n4_fqor" name="comList" src="vols22" fileName="ComList.xml" xy="46,210" size="987,1709">
-      <relation target="" sidePair="height-height"/>
+      <relation target="n31_vols" sidePair="top-top,bottomext-bottom"/>
     </component>
     <image id="n34_vols" name="n34" src="vols1t" fileName="images/hdrk_zz.png" xy="43,1667">
       <relation target="" sidePair="center-center,bottom-bottom"/>

FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1041,216">
-  <controller name="c1" pages="0,,1,,2," selected="0">
+  <controller name="c1" pages="0,,1,,2," selected="2">
     <remark page="0" value="不可领取"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -29,7 +29,7 @@
     </component>
     <component id="n8_mbf1" name="btnGot" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="775,74" size="233,51">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://eg2y0ldpnyhm6"/>
+      <Button title="已领取" icon="ui://eg2y0ldpnyhm6"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -8,8 +8,9 @@
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <image id="n13_ofwu" name="n13" src="ofwuf8" fileName="images/huanzhuang_sz_db.png" xy="138,164"/>
-    <text id="n6_8xpg" name="txtScore" xy="146,156" pivot="0.5,0" size="66,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
+    <image id="n13_ofwu" name="n13" src="ofwuf8" fileName="images/huanzhuang_sz_db.png" xy="138,164" group="n14_ofwu"/>
+    <text id="n6_8xpg" name="txtScore" xy="146,156" pivot="0.5,0" size="66,44" group="n14_ofwu" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#e9e2d1" align="center" autoClearText="true" text="3500"/>
+    <group id="n14_ofwu" name="grpScore" xy="138,156" size="80,44" advanced="true"/>
     <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
     <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
     <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>

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="1">
+  <controller name="ctrlResult" pages="0,,1,,2,,3," selected="2">
     <remark page="1" value="有人答对题目"/>
     <remark page="2" value="没人答对题目"/>
     <remark page="3" value="全部题目答完"/>
@@ -64,12 +64,15 @@
     <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>
+    <image id="n63_ofwu" name="imgFault" src="9jv665" fileName="images/lm_dt_tb_x.png" xy="830,458" group="n19_pvb4">
+      <gearDisplay controller="ctrlQuestionType" pages="2"/>
+    </image>
     <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">
+    <group id="n19_pvb4" name="n19" xy="360,458" size="531,61" group="n15_pvb4" advanced="true">
       <gearDisplay controller="ctrlQuestionType" pages=""/>
-      <gearXY controller="ctrlHasIcon" pages="0,1" values="360,470|229,470"/>
+      <gearXY controller="ctrlHasIcon" pages="0,1" values="360,458|229,470"/>
     </group>
     <image id="n41_9jv6" name="n41" src="9jv65k" fileName="images/lm_dt_tsdb.png" xy="15,664" group="n42_9jv6"/>
     <text id="n40_9jv6" name="txtRightCount1" xy="58,667" size="184,41" group="n42_9jv6" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#915e15" align="center" letterSpacing="-2" ubb="true" vars="true" text="全员已答对[color=#AF5638]{value=0}[/color]题"/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="普通成员"/>
     <remark page="1" value="会长、副会长"/>
   </controller>
@@ -24,7 +24,7 @@
     <text id="n32_wm60" name="n32" xy="633,664" pivot="0.5,0" size="116,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="累计贡献"/>
     <text id="n33_wm60" name="n33" xy="853,664" pivot="0.5,0" size="60,39" group="n34_wm60" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#553c1d" align="center" text="状态"/>
     <group id="n34_wm60" name="n34" xy="0,662" size="1080,41"/>
-    <list id="n20_rv09" name="list" xy="68,705" size="941,796" overflow="scroll" defaultItem="ui://tw70qm9drv091n" autoClearItems="true">
+    <list id="n20_rv09" name="list" xy="68,705" size="941,809" overflow="scroll" defaultItem="ui://tw70qm9drv091n" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/League/components/Button20.xml

@@ -12,7 +12,7 @@
       <relation target="" sidePair="middle-middle,left-right"/>
     </text>
     <text id="n5_a0cf" name="txtTip" xy="89,59" pivot="0.5,0" size="10,35" font="ui://eg2y0ldpa0cftks" fontSize="25" color="#716660" text=""/>
-    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="27,53" pivot="0.5,0.5" scale="0.8,0.8" controller="c1,1">
+    <component id="n6_a0cf" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="35,53" pivot="0.5,0.5" scale="0.8,0.8" controller="c1,1">
       <relation target="" sidePair="center-center"/>
     </component>
   </displayList>

FGUIProject/assets/League/components/ListMemberItem.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="950,131">
+<component size="950,129">
   <displayList>
     <component id="n15_rv09" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="16,-21" group="n27_wm60" scale="0.65,0.65"/>
     <loader id="n17_rv09" name="loaTitle" xy="28,10" size="33,77" group="n27_wm60" url="ui://tw70qm9dwm603w" autoSize="true"/>
     <text id="n16_rv09" name="txtName" xy="169,41" size="200,39" group="n27_wm60" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#923c1a" align="center" text="玩家名字七个字"/>
-    <text id="n11_rv09" name="txtWeekContribuation" xy="454,41" pivot="0.5,0" size="17,38" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
-    <text id="n12_rv09" name="txtAllContribuation" xy="610,41" pivot="0.5,0" size="17,38" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
-    <text id="n18_rv09" name="txtState" xy="755,41" pivot="0.5,0" size="112,38" group="n27_wm60" fontSize="27" color="#865118" align="center" text="12小时前"/>
+    <text id="n11_rv09" name="txtWeekContribuation" xy="454,41" pivot="0.5,0" size="17,37" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
+    <text id="n12_rv09" name="txtAllContribuation" xy="610,41" pivot="0.5,0" size="17,37" group="n27_wm60" font="ui://eg2y0ldpa0cftks" fontSize="27" color="#66512c" align="center" vars="true" text="{value=0}"/>
+    <text id="n18_rv09" name="txtState" xy="760,41" pivot="0.5,0" size="109,37" group="n27_wm60" fontSize="27" color="#865118" align="center" text="12小时前"/>
     <component id="n19_rv09" name="btnAppoint" src="rv091l" fileName="components/Button10.xml" xy="871,28" group="n27_wm60"/>
-    <image id="n20_wm60" name="n20" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="9,117" group="n27_wm60"/>
-    <group id="n27_wm60" name="n27" xy="9,-21" size="931,230"/>
+    <image id="n20_wm60" name="n20" src="a0cf2u" fileName="images/lm_zhuangshixian.png" xy="35,117" size="880,12" group="n27_wm60"/>
+    <group id="n27_wm60" name="n27" xy="16,-21" size="921,230"/>
   </displayList>
 </component>

FGUIProject/assets/Main/ComSkillTips.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="365,168">
+  <displayList>
+    <image id="n20_ofwu" name="n20" src="jcej4p" fileName="imagesNew/jjcdi_jjcdi.png" pkg="eg2y0ldp" xy="0,0" pivot="0.5,0.5" group="n24_ofwu" flip="both"/>
+    <image id="n21_ofwu" name="n21" src="jcej4o" fileName="imagesNew/jjcdi_jjxian.png" pkg="eg2y0ldp" xy="19,68" group="n24_ofwu"/>
+    <text id="n22_ofwu" name="txtName" xy="16,22" size="152,41" group="n24_ofwu" fontSize="30" color="#f8f1db" text="飞花令战力"/>
+    <text id="n23_ofwu" name="txtSkillTips" xy="19,74" size="330,89" group="n24_ofwu" fontSize="22" color="#f8f1db" autoSize="none" text="搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力搭配战力"/>
+    <group id="n24_ofwu" name="n24" xy="0,0" size="365,168"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/ListCardSkillItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="108,108">
+<component size="108,108" extention="Button">
   <displayList>
     <image id="n16_ofwu" name="n16" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <component id="n14_ofwu" name="comSkill" src="ofwup1" fileName="ListCardSkillItemMask.xml" xy="6,6"/>
@@ -7,4 +7,5 @@
     <text id="n18_ofwu" name="txtLv" xy="80,65" pivot="0.5,0" size="20,44" group="n19_ofwu" fontSize="32" color="#fdfaf3" align="center" text="9"/>
     <group id="n19_ofwu" name="n19" xy="70,65" size="39,45"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="23,-365"/>
     <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
-    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
+    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
       <relation target="n5_cn27" sidePair="left-right"/>
     </loader>
     <text id="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
@@ -29,13 +29,14 @@
     <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
       <Button title="提升词牌"/>
     </component>
-    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,110" layout="row" overflow="scroll" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" overflow="scroll" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,52" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
+    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
     <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
     <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
+    <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="ComSkillTips.xml" xy="99,316" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListCardItem.xml

@@ -4,11 +4,11 @@
   <displayList>
     <component id="n9_wzce" name="comCardMask" src="wzce9v" fileName="components/ComCardMask.xml" xy="4,3" group="n23_ofwu"/>
     <image id="n8_sx2v" name="n8" src="sx2v9s" fileName="imagesStory/zd_tctcdikugn_1.png" xy="5,156" group="n23_ofwu"/>
-    <text id="n3_r1a9" name="txtName" xy="57,236" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" text="赵钱孙"/>
+    <text id="n3_r1a9" name="txtName" xy="57,236" pivot="0.5,0" size="105,46" group="n23_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="34" color="#6a5d56" align="center" text="赵钱孙"/>
     <text id="n12_wzce" name="txtLv" xy="153,192" pivot="1,0" size="51,34" group="n23_ofwu" fontSize="24" color="#fff9f1" align="right" leading="-8" ubb="true" vars="true" text="30级"/>
-    <text id="n18_v461" name="txtStarLv" xy="153,173" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
-    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="180,177" group="n19_v461"/>
-    <group id="n19_v461" name="n19" xy="153,173" size="53,34" group="n23_ofwu" advanced="true" layout="hz" excludeInvisibles="true">
+    <text id="n18_v461" name="txtStarLv" xy="152,173" pivot="1,0" size="27,34" group="n19_v461" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <image id="n17_v461" name="n17" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="177,177" group="n19_v461"/>
+    <group id="n19_v461" name="n19" xy="152,173" size="51,34" group="n23_ofwu" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
     <loader id="n7_sx2v" name="loaRarity" xy="168,13" size="40,85" group="n23_ofwu" aspect="true" url="ui://eg2y0ldpo9ghtli" fill="scaleMatchWidth"/>

FGUIProject/assets/Main/package.xml

@@ -495,7 +495,6 @@
     <image id="qkjskf" name="font_zdqp_back_dfzj.png" path="/imagesNew/"/>
     <image id="qkjskg" name="font_zdsz_dikuang.png" path="/imagesNew/"/>
     <image id="qkjskh" name="txk_dikuang.png" path="/imagesNew/"/>
-    <image id="qkjski" name="txk_LevelDikuang.png" path="/imagesNew/"/>
     <image id="qkjskj" name="zdpf_dikuang.png" path="/imagesNew/"/>
     <image id="qkjskk" name="zdqp_dikuang.png" path="/imagesNew/"/>
     <image id="qkjskl" name="zdqp_fail.png" path="/imagesNew/"/>
@@ -650,6 +649,7 @@
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
     <component id="ofwup0" name="ListCardSkillItem.xml" path="/"/>
     <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
+    <component id="ofwup2" name="ComSkillTips.xml" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -261,8 +261,79 @@ namespace GFGGame
         {
             return RoleInfoManager.Instance.newHeadBorderDatas.Count > 0;
         }
+        /// <summary>
+        /// 卡牌
+        /// </summary>
+        /// <returns></returns>
+        public bool GetCardRed()
+        {
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(CardDetailView), false)) return false;
+            List<CardData> cardDatas = CardDataManager.GetCardListByRarity(0);
+            for (int i = 0; i < cardDatas.Count; i++)
+            {
+                if (GetCardRed(cardDatas[i].id)) return true;
+            }
+            return false;
+        }
+        /// <summary>
+        /// 卡牌
+        /// </summary>
+        /// <returns></returns>
+        public bool GetCardRed(int cardId)
+        {
+            return GetCardStarReward(cardId) || GetCardUpStarRed(cardId) || GetCardSkillsRed(cardId) || GetCardUpLvRed(cardId);
+        }
 
         /// <summary>
+        /// 卡牌-升级红点
+        /// </summary>
+        /// <param name="cardId"></param>
+        /// <returns></returns>
+        public bool GetCardUpLvRed(int cardId)
+        {
+            CardData cardData = CardDataManager.GetCardDataById(cardId);
+            int maxLv = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).cardLeverLimit;
+            if (cardData.lv >= maxLv) return false;
+            if (cardData.lv == CardRarityCfgArray.Instance.GetCfg(cardData.itemCfg.rarity).maxCardLvl) return false;
+
+            int curExp = cardData.exp;
+            int needExp = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(cardData.itemCfg.rarity, cardData.lv).needExp;
+
+            int cardUpLvGoldsNeed = 0;
+            int[] materials = GlobalCfgArray.globalCfg.upgradeCardItemsArr;
+            for (int i = 0; i < materials.Length; i++)
+            {
+                int[] cardUpLvGolds = ItemCfgArray.Instance.GetCfg(materials[i]).cardUpLvGoldsArr[i];
+
+                for (int j = 0; j < ItemDataManager.GetItemNum(materials[i]); j++)
+                {
+                    cardUpLvGoldsNeed += cardUpLvGolds[1];
+                    curExp += ItemCfgArray.Instance.GetCfg(materials[i]).cardUpLvExp;
+                    if (curExp >= needExp && ItemDataManager.GetItemNum(cardUpLvGolds[0]) >= cardUpLvGoldsNeed) return true;
+                }
+            }
+            return false;
+
+        }
+        /// <summary>
+        /// 卡牌-升星红点
+        /// </summary>
+        /// <param name="cardId"></param>
+        /// <returns></returns>
+        public bool GetCardUpStarRed(int cardId)
+        {
+            CardData cardData = CardDataManager.GetCardDataById(cardId);
+            List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(cardId);
+            if (cardData.star >= starCfgs.Count) return false;
+            CardStarCfg starCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(cardId, cardData.star);
+            if (ItemDataManager.GetItemNum(starCfg.costID) < starCfg.costNum) return false;
+            for (int i = 0; i < starCfg.materiarsArr.Length; i++)
+            {
+                if (ItemDataManager.GetItemNum(starCfg.materiarsArr[i][0]) < starCfg.materiarsArr[i][1]) return false;
+            }
+            return true;
+        }
+        /// <summary>
         /// 卡牌-卡牌技能升级
         /// </summary>
         /// <param name="cardId"></param>
@@ -395,7 +466,11 @@ namespace GFGGame
             }
             return false;
         }
-
+        /// <summary>
+        /// 服装合成红点
+        /// </summary>
+        /// <param name="suitId"></param>
+        /// <returns></returns>
         public bool GetClothingSyntheticRed(int suitId)
         {
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
@@ -483,7 +558,14 @@ namespace GFGGame
 
             return RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold) && !MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), _month);
         }
-
+        /// <summary>
+        /// 联盟
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLeagueRed()
+        {
+            return GetLeagueMemberJoinRed() || LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin || GetLeagueGiftBoxRed() || GetLeaguePrayRed();
+        }
         /// <summary>
         /// 联盟-成员申请
         /// </summary>
@@ -508,7 +590,14 @@ namespace GFGGame
             }
             return false;
         }
-
+        /// <summary>
+        /// 联盟-雅集祈福
+        /// </summary>
+        /// <returns></returns>
+        public bool GetLeaguePrayRed()
+        {
+            return LeagueDataManager.Instance.GetPrayTimesByType(LeaguePrayType.First) == 0;
+        }
         /// <summary>
         /// 限时抽奖活动奖励
         /// </summary>
@@ -626,10 +715,18 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetLimiteChargeRewardRed()
         {
-            if (ActivityDataManager.Instance.actLimitChargeId == 0) return false;
-            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            List<ActivityInfo> _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
+            for (int i = 0; i < _limitChargeInfo.Count; i++)
+            {
+                if (GetLimiteChargeRewardRed(_limitChargeInfo[i].ActivityId)) return true;
+            }
+            return false;
+        }
+        public bool GetLimiteChargeRewardRed(int activityId)
+        {
+            ActivityInfo _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(activityId);
             if (_activityInfo == null) return false;
-            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            List<ActivityRechargeCfg> _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(activityId);
             for (int i = 0; i < _rechargeCfgs.Count; i++)
             {
                 if (_activityInfo.CountValue >= _rechargeCfgs[i].value && _activityInfo.GetRewards.IndexOf(_rechargeCfgs[i].id) < 0)

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

@@ -7,7 +7,7 @@ namespace UI.DailyWelfare
     public partial class UI_ComList
     {
         public GComponent target;
-        public UI_Button1 m_btnLimitChargeAddUp;
+        public GList m_listLimitCharge;
         public UI_Button1 m_btnSevenDayLogin;
         public UI_Button1 m_btnSign;
         public UI_Button1 m_btnSupply;
@@ -58,15 +58,14 @@ namespace UI.DailyWelfare
 
         private void Init(GComponent comp)
         {
-            m_btnLimitChargeAddUp = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLimitChargeAddUp"));
+            m_listLimitCharge = (GList)comp.GetChild("listLimitCharge");
             m_btnSevenDayLogin = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSevenDayLogin"));
             m_btnSign = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSign"));
             m_btnSupply = (UI_Button1)UI_Button1.Create(comp.GetChild("btnSupply"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnLimitChargeAddUp.Dispose();
-            m_btnLimitChargeAddUp = null;
+            m_listLimitCharge = null;
             m_btnSevenDayLogin.Dispose();
             m_btnSevenDayLogin = null;
             m_btnSign.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs

@@ -13,6 +13,7 @@ namespace UI.DressUp
         public GLoader m_rarity;
         public GLoader m_ScoreType;
         public GTextField m_txtScore;
+        public GGroup m_grpScore;
         public GImage m_imgNeed;
         public GImage m_imgNew;
         public GTextField m_txtTitle;
@@ -70,6 +71,7 @@ namespace UI.DressUp
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_ScoreType = (GLoader)comp.GetChild("ScoreType");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
@@ -83,6 +85,7 @@ namespace UI.DressUp
             m_rarity = null;
             m_ScoreType = null;
             m_txtScore = null;
+            m_grpScore = null;
             m_imgNeed = null;
             m_imgNew = null;
             m_txtTitle = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueAnsweringUI.cs

@@ -22,6 +22,7 @@ namespace UI.League
         public GTextField m_txtContent;
         public GList m_listResult;
         public GTextInput m_txtResult;
+        public GImage m_imgFault;
         public GTextField m_txtRightCount1;
         public GLoader m_loaIocn;
         public UI_ComHeadIcon m_comRightHead;
@@ -96,6 +97,7 @@ namespace UI.League
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_listResult = (GList)comp.GetChild("listResult");
             m_txtResult = (GTextInput)comp.GetChild("txtResult");
+            m_imgFault = (GImage)comp.GetChild("imgFault");
             m_txtRightCount1 = (GTextField)comp.GetChild("txtRightCount1");
             m_loaIocn = (GLoader)comp.GetChild("loaIocn");
             m_comRightHead = (UI_ComHeadIcon)UI_ComHeadIcon.Create(comp.GetChild("comRightHead"));
@@ -126,6 +128,7 @@ namespace UI.League
             m_txtContent = null;
             m_listResult = null;
             m_txtResult = null;
+            m_imgFault = null;
             m_txtRightCount1 = null;
             m_loaIocn = null;
             m_comRightHead.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComSkillTips
+    {
+        public GComponent target;
+        public GTextField m_txtName;
+        public GTextField m_txtSkillTips;
+        public const string URL = "ui://mfvz4q8kofwup2";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComSkillTips";
+        private static UI_ComSkillTips _proxy;
+
+        public static UI_ComSkillTips Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSkillTips();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComSkillTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSkillTips();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtSkillTips = (GTextField)comp.GetChild("txtSkillTips");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            m_txtSkillTips = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItem.cs

@@ -6,7 +6,7 @@ namespace UI.Main
 {
     public partial class UI_ListCardSkillItem
     {
-        public GComponent target;
+        public GButton target;
         public UI_ListCardSkillItemMask m_comSkill;
         public GTextField m_txtLv;
         public const string URL = "ui://mfvz4q8kofwup0";
@@ -18,9 +18,9 @@ namespace UI.Main
         {
             var ui = new UI_ListCardSkillItem();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -33,9 +33,9 @@ namespace UI.Main
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryCardChooseUI.cs

@@ -15,6 +15,7 @@ namespace UI.Main
         public GButton m_btnUpCard;
         public GList m_listSkill;
         public GTextField m_txtTips;
+        public UI_ComSkillTips m_comSkillTips;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -70,6 +71,7 @@ namespace UI.Main
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
             m_listSkill = (GList)comp.GetChild("listSkill");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_comSkillTips = (UI_ComSkillTips)UI_ComSkillTips.Create(comp.GetChild("comSkillTips"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,8 @@ namespace UI.Main
             m_btnUpCard = null;
             m_listSkill = null;
             m_txtTips = null;
+            m_comSkillTips.Dispose();
+            m_comSkillTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -210,6 +210,8 @@ namespace GFGGame
                     ArenaDataManager.Instance.LastTargetInfo.headRes = targetData.RoleInfo.headRes;
                     ArenaDataManager.Instance.BonusList = ItemUtil.CreateItemDataList(response.rewards);
                     ArenaDataManager.Instance.LastTargets = new List<ArenaTargetData>(ArenaDataManager.Instance.Targets);
+                    ArenaDataManager.Instance.RewardId = response.RewardId;
+
                     //更新新数据
                     ArenaDataManager.Instance.Targets.Clear();
                     for (int i = 0; i < response.targets.Count; i++)

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

@@ -74,6 +74,7 @@ namespace GFGGame
                     {
                         cardData.starRewardsState[response.KsStarBonus[i]] = response.VsStarBonus[i];
                     }
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }
@@ -110,6 +111,7 @@ namespace GFGGame
                     int[][] rewards = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(response.CardId, response.CardStar).rewardsArr;
                     BonusController.TryShowBonusList(rewards);
                     EventAgent.DispatchEvent(ConstMessage.CARD_STAR_REWARD);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -569,6 +569,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     PromptController.Instance.ShowFloatTextPrompt("祈福完成");
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -47,6 +47,7 @@ namespace GFGGame
                 {
                     SkillDataManager.Instance.UpdateCardSkill(response.CardId, response.SkillId, response.SkillLvl);
                     EventAgent.DispatchEvent(ConstMessage.CARD_UP_SKILL);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }
             }

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

@@ -46,11 +46,6 @@ namespace GFGGame
 
             this.clickBlankToClose = false;
 
-            _ui.m_c1.selectedIndex = rewardId > 0 ? 1 : 0;
-            if (rewardId > 0)
-            {
-                _ui.m_listFirstDanReward.numItems = cfg.bonusUpgradeArr.Length;
-            }
 
             cfg = ArenaRankCfgArray.Instance.GetCfg(curGrade);
             _ui.m_comCurDan.m_txtDanTitle.text = cfg.gradeName;
@@ -61,6 +56,11 @@ namespace GFGGame
             _ui.m_comLastDan.m_txtDanTitle.text = lastCfg.gradeName;
             ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comLastDan.m_loaDanIcon, lastCfg.id);
 
+            _ui.m_c1.selectedIndex = rewardId > 0 ? 1 : 0;
+            if (rewardId > 0)
+            {
+                _ui.m_listFirstDanReward.numItems = cfg.bonusUpgradeArr.Length;
+            }
             _ui.m_t0.Play(() =>
             {
                 this.clickBlankToClose = true;
@@ -88,7 +88,7 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).SetComItemScale = 0.7f;
+            (obj.data as ItemView).SetComItemScale = 0.85f;
             (obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }

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

@@ -105,7 +105,7 @@ namespace GFGGame
             listItem.m_loaBorder.url = "ui://CommonGame/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtLv.text = data.lv + "级";
             listItem.m_txtName.text = data.itemCfg.name;
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardSkillsRed(data.id) || RedDotDataManager.Instance.GetCardStarReward(data.id), "", 10, -4);
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 10, -4);
 
             listItem.m_txtStarLv.text = data.star.ToString();
             //           UI_ComStar comStar = UI_ComStar.Proxy(listItem.m_comStar);

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

@@ -133,7 +133,6 @@ namespace GFGGame
             this.UpdateUpSkillView();
             this.UpdateRedDot();
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
-            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
 
             List<CardStarCfg> cardStarCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
             for (int i = 0; i < cardStarCfgs.Count; i++)
@@ -151,7 +150,7 @@ namespace GFGGame
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
-            EventAgent.AddEventListener(ConstMessage.CARD_STAR_REWARD, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
 
         }
         private void ClearItemsCountList()
@@ -423,6 +422,7 @@ namespace GFGGame
                 }
                 return false;
             }
+
             if (IsUpLvLimit(itemId, false)) return false;
             itemsCount[index] = itemsCount[index] + 1;
             listItem.m_txtUseCount.text = itemsCount[index].ToString();
@@ -471,16 +471,19 @@ namespace GFGGame
         }
         private void OnClcikBtnAll()
         {
+            int cardUpLvGoldsNeed = 0;
             for (int i = 0; i < itemsCount.Count; i++)
             {
-                // if (IsUpLvLimit()) break;
+                int[] cardUpLvGolds = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]).cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1];
                 long itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
                 for (long j = 0; j < itemNum; j++)
                 {
-                    if (this.OnClickBtnPlusLvConsume(_comFosterBottom.m_listLvConsume.GetChildAt(i), false) == false)
+
+                    if (ItemDataManager.GetItemNum(cardUpLvGolds[0]) < cardUpLvGoldsNeed + cardUpLvGolds[1] || this.OnClickBtnPlusLvConsume(_comFosterBottom.m_listLvConsume.GetChildAt(i), false) == false)
                     {
                         break;
                     }
+                    cardUpLvGoldsNeed += cardUpLvGolds[1];
                 }
             }
         }
@@ -651,10 +654,11 @@ namespace GFGGame
             // listItem.m_btnPlus.data = cardStarCfg.materiarsArr[index][0];
             listItem.target.data = cardStarCfg.materiarsArr[index][0];
 
+            _comFosterBottom.m_btnUpStar.data = hasCount >= needCount && ItemDataManager.GetItemNum(cardStarCfg.costID) >= cardStarCfg.costNum ? 1 : 0;
+
             if (hasCount < needCount)
             {
                 //材料不足显示加号
-                _comFosterBottom.m_btnUpStar.data = 1;
                 listItem.m_btnPlus.visible = true;
             }
         }
@@ -748,7 +752,7 @@ namespace GFGGame
 
         private void UpdateUpSkillView()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
+            // RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
             _comFosterBottom.m_listSkill.numItems = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id).Count;
             _comFosterBottom.m_listSkill.selectedIndex = 0;
             _comFosterBottom.m_ctrlSkillCount.selectedIndex = _comFosterBottom.m_listSkill.numItems;
@@ -909,6 +913,14 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_ComFosterTop.m_btnStarReward, RedDotDataManager.Instance.GetCardStarReward(_cardData.id));
+
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnUpLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", -74, 60);
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnUpStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", -74, 60);
+
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnLv, RedDotDataManager.Instance.GetCardUpLvRed(_cardData.id), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnStar, RedDotDataManager.Instance.GetCardUpStarRed(_cardData.id), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id), "", 0, 0);
+
         }
         protected override void OnHide()
         {
@@ -929,7 +941,7 @@ namespace GFGGame
             // EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItemChange);
             EventAgent.RemoveEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
-            EventAgent.RemoveEventListener(ConstMessage.CARD_STAR_REWARD, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
 
         private void CheckGuide(object param)

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

@@ -12,6 +12,7 @@ namespace GFGGame
     {
         private UI_DailyWelfareUI _ui;
         private ValueBarController _valueBarController;
+        private List<ActivityInfo> _limitChargeInfo = new List<ActivityInfo>();
 
         private int _signCount;
         private int _month;
@@ -45,7 +46,8 @@ namespace GFGGame
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
             // _ui.m_list.itemRenderer = ListItemRender;
-            _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            // _ui.m_comList.m_btnLimitChargeAddUp.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            _ui.m_comList.m_listLimitCharge.itemRenderer = RenderListLimitChargeItem;
             _ui.m_comList.m_btnSevenDayLogin.target.onClick.Add(OnBtnSevenDayLoginClick);
             _ui.m_comList.m_btnSign.target.onClick.Add(OnBtnSignClick);
             _ui.m_comList.m_btnSupply.target.onClick.Add(OnBtnSupplyClick);
@@ -67,15 +69,11 @@ namespace GFGGame
             _ui.m_comList.m_btnSevenDayLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
-            _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
-            if (ActivityDataManager.Instance.actLimitChargeId > 0)
-            {
-                _ui.m_comList.m_btnLimitChargeAddUp.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
-                _ui.m_comList.m_btnLimitChargeAddUp.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
-            }
+            _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
+            _ui.m_comList.m_listLimitCharge.numItems = _limitChargeInfo.Count;
+            _ui.m_comList.m_listLimitCharge.ResizeToFit();
 
-            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            if (_limitChargeInfo.Count > 0)
             {
                 Timers.inst.Add(1, 0, UpdateTime);
             }
@@ -97,22 +95,48 @@ namespace GFGGame
         {
             if (ActivityDataManager.Instance.actLimitChargeId > 0)
             {
-                ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
-                long curTime = TimeHelper.ServerNow();
-                long endTime = activityInfo.EndTime;
-                if (curTime < endTime)
+                for (int i = 0; i < _limitChargeInfo.Count; i++)
                 {
-                    _ui.m_comList.m_btnLimitChargeAddUp.m_txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_limitChargeInfo[i].ActivityId);
+                    long curTime = TimeHelper.ServerNow();
+                    long endTime = activityInfo.EndTime;
+                    if (curTime < endTime)
+                    {
+                        GTextField txtTime = _ui.m_comList.m_listLimitCharge.GetChildAt(i).asCom.GetChild("txtTime").asTextField;
+                        txtTime.text = string.Format("剩余时间:{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+                    }
                 }
             }
         }
+        private void RenderListLimitChargeItem(int index, GObject obj)
+        {
+
+            // _ui.m_comList.m_btnLimitChargeAddUp.target.visible = ActivityDataManager.Instance.actLimitChargeId > 0;
+            UI_Button1 item = UI_Button1.Proxy(obj);
+            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_limitChargeInfo[index].ActivityId);
+            item.m_c1.selectedIndex = 1;
+            item.m_c2.selectedIndex = 0;
+            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            {
+                item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
+                item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+            }
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnBtnLimitChargeAddUpClick);
+            }
+            item.target.data = _limitChargeInfo[index].ActivityId;
+            UI_Button1.ProxyEnd();
+        }
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(DailyWelfareView).FullName);
         }
-        private void OnBtnLimitChargeAddUpClick()
+        private void OnBtnLimitChargeAddUpClick(EventContext context)
         {
-            ViewManager.Show<LimitChargeView>(null, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
+            GObject gObject = context.sender as GObject;
+
+            ViewManager.Show<LimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
         }
         private void OnBtnSevenDayLoginClick()
         {
@@ -128,7 +152,11 @@ namespace GFGGame
         }
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnLimitChargeAddUp.target, RedDotDataManager.Instance.GetLimiteChargeRewardRed(), "", -40);
+            for (int i = 0; i < _limitChargeInfo.Count; i++)
+            {
+                GComponent item = _ui.m_comList.m_listLimitCharge.GetChildAt(i).asCom;
+                RedDotController.Instance.SetComRedDot(item, RedDotDataManager.Instance.GetLimiteChargeRewardRed(_limitChargeInfo[i].ActivityId), "", -40);
+            }
             RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSevenDayLogin.target, RedDotDataManager.Instance.GetSevenDayLoginRed(), "", -40);
             RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSign.target, RedDotDataManager.Instance.DailySignRed(), "", -40);
             RedDotController.Instance.SetComRedDot(_ui.m_comList.m_btnSupply.target, RedDotDataManager.Instance.DailySupplyRed(), "", -40);

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

@@ -12,7 +12,7 @@ namespace GFGGame
     {
         private UI_LimitChargeUI _ui;
         private List<ActivityRechargeCfg> _rechargeCfgs;
-
+        private int _activityId = 0;
         private ActivityInfo _activityInfo;
 
         public override void Dispose()
@@ -37,9 +37,6 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(openCfg.res);
-
         }
         protected override void AddEventListener()
         {
@@ -51,11 +48,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
+            _activityId = (int)(this.viewData as object[])[0];
+            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             UpdateView();
 
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
-
             Timers.inst.Add(1, 0, UpdateTime);
 
         }
@@ -89,10 +85,10 @@ namespace GFGGame
 
         private void UpdateView()
         {
-            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(ActivityDataManager.Instance.actLimitChargeId);
+            _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
             _rechargeCfgs = SoreCfg(_rechargeCfgs);
             _ui.m_list.numItems = _rechargeCfgs.Count;
-            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(ActivityDataManager.Instance.actLimitChargeId);
+            ActivityOpenCfg openCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xslc_banner_" + openCfg.res);
         }
         private void RenderListItem(int index, GObject obj)
@@ -141,7 +137,7 @@ namespace GFGGame
         {
             GObject obj = context.sender as GObject;
             int id = (int)obj.data;
-            ActivityGlobalSProxy.ReqGetActivityBonus(ActivityDataManager.Instance.actLimitChargeId, id).Coroutine();
+            ActivityGlobalSProxy.ReqGetActivityBonus(_activityId, id).Coroutine();
         }
         private List<ActivityRechargeCfg> SoreCfg(List<ActivityRechargeCfg> rechargeCfgs)
         {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -750,7 +750,7 @@ namespace GFGGame
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_txtScore.visible = false;
+            listItem.m_grpScore.visible = false;
             //listItem.m_ScoreType.visible = true;
             listItem.m_imgNeed.visible = false;
 
@@ -794,7 +794,7 @@ namespace GFGGame
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, "png");
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_txtScore.visible = false;
+            listItem.m_grpScore.visible = false;
             //listItem.m_ScoreType.visible = true;
             listItem.m_imgNeed.visible = false;
             bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);

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

@@ -184,7 +184,7 @@ namespace GFGGame
             bool isAnswer = !string.IsNullOrEmpty(_dataManager.LastAnswerRoleData.MyAnswer) && _dataManager.LastAnswerRoleData.LastQuestionId == _dataManager.GetNumeriValue(LeagueNumericType.LeagueQuestionId);
             _ui.m_txtResult.text = isAnswer ? _dataManager.LastAnswerRoleData.MyAnswer : "";
             _ui.m_txtResult.enabled = !(isAnswer && _dataManager.LastAnswerRoleData.MyAnswer != questionCfg.answerCorrect);
-
+            _ui.m_imgFault.visible = isAnswer && _dataManager.LastAnswerRoleData.MyAnswer != questionCfg.answerCorrect;
             _ui.m_ctrlQuestionType.selectedIndex = questionCfg.type;
             if (questionCfg.type == 1)
             {
@@ -318,7 +318,9 @@ namespace GFGGame
             bool result = await LeagueSproxy.ReqAnswerQuestion(questionId, _ui.m_txtResult.text);
             if (result)
             {
+                LeagueQuestionCfg questionCfg = LeagueQuestionCfgArray.Instance.GetCfg(questionId);
                 _ui.m_txtResult.enabled = false;
+                _ui.m_imgFault.visible = _ui.m_txtResult.text != questionCfg.answerCorrect;
             }
         }
         private void RenderListJoinItem(int index, GObject obj)

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

@@ -36,7 +36,8 @@ namespace GFGGame
             _ui.m_btnMemberLog.onClick.Add(OnBtnMemberLogClick);
             _ui.m_btnExit.onClick.Add(OnBtnExitClick);
             _ui.m_btnExit1.onClick.Add(OnBtnExitClick);
-
+            _ui.m_comChairman.target.onClick.Add(OnShowOhterInfo);
+            _ui.m_comCoChairman.target.onClick.Add(OnShowOhterInfo);
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.SetVirtual();
 
@@ -201,6 +202,7 @@ namespace GFGGame
                 com.m_loaHeadBorder.url = "";
                 com.m_btnAppoint.visible = false;
                 com.m_loaTitle.url = "";
+                com.target.data = null;
             }
             else
             {
@@ -217,9 +219,23 @@ namespace GFGGame
                     com.m_btnAppoint.onClick.Add(OnBtnAppointClick);
                 }
                 com.m_btnAppoint.data = memberData;
+                com.target.data = roleId;
             }
             UI_ComLeader.Proxy();
         }
+
+        private async void OnShowOhterInfo(EventContext context)
+        {
+            GObject gObject = context.sender as GObject;
+            if (gObject.data == null)
+            {
+                return;
+            }
+            long roleId = (long)gObject.data;
+            OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(roleId);
+            OtherRoleInfoDetailData detailData = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
+            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData }, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void RenderListItem(int index, GObject obj)
         {
             LeagueMemberData memberData = _leagueData.LeagueMemberDatas[_memberIds[index]];
@@ -250,6 +266,11 @@ namespace GFGGame
                 item.m_btnAppoint.onClick.Add(OnBtnAppointClick);
             }
             item.m_btnAppoint.data = memberData;
+            if (item.m_comHead.data == null)
+            {
+                item.m_comHead.onClick.Add(OnShowOhterInfo);
+            }
+            item.m_comHead.data = memberData.RoleInfo.roleId;
             UI_ListMemberItem.ProxyEnd();
         }
 

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

@@ -89,6 +89,7 @@ namespace GFGGame
             }
             item.m_btnPray.target.data = type;
 
+            RedDotController.Instance.SetComRedDot(item.m_btnPray.target, type == LeaguePrayType.First && RedDotDataManager.Instance.GetLeaguePrayRed());
             UI_ComPary.ProxyEnd();
         }
 

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

@@ -207,15 +207,15 @@ namespace GFGGame
             item.m_holder.visible = isLock && canActive;
             if (isLock && canActive)
             {
-                GameObject gameObject;
-                GoWrapper wrapper;
+                GameObject gameObject = null;
+                GoWrapper wrapper = null;
                 if (_gameObjects.Count > index)
                 {
                     gameObject = _gameObjects[index];
                     wrapper = _wrappers[index];
                 }
                 string resPath = ResPathUtil.GetViewEffectPath("ui_league", "tea_nolearn");
-                SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject, out wrapper);
+                SceneController.AddObjectToView(gameObject, wrapper, item.m_holder, resPath, out gameObject, out wrapper);
 
                 if (_gameObjects.Count <= index)
                 {

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

@@ -41,6 +41,7 @@ namespace GFGGame
             _ui.m_btnShop.target.onClick.Add(OnBtnShopClick);
             _ui.m_btnParty.target.onClick.Add(OnBtnPartyClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
+            _ui.m_comHead.onClick.Add(OnShowOhterInfo);
         }
         protected override void AddEventListener()
         {
@@ -94,6 +95,13 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueChangeNoticeView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
+        private async void OnShowOhterInfo()
+        {
+            long roleId = LeagueDataManager.Instance.LeagueData.OwnerId;
+            OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(roleId);
+            OtherRoleInfoDetailData detailData = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
+            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData }, new object[] { typeof(LeagueView).FullName, null });
+        }
         private void OnBtnChatClick()
         {
             ViewManager.Show<LeagueChatView>();
@@ -177,6 +185,7 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnMember.target, RedDotDataManager.Instance.GetLeagueMemberJoinRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnGift.target, RedDotDataManager.Instance.GetLeagueGiftBoxRed(), "", -120, 100);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnPray.target, RedDotDataManager.Instance.GetLeaguePrayRed(), "", -70, 60);
         }
     }
 }

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

@@ -73,6 +73,7 @@ namespace GFGGame
             _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
             LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
+            UpGiftBox();
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateView();
             UpdateRedDot();
@@ -210,7 +211,7 @@ namespace GFGGame
                  bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME);
                  if (result)
                  {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
+                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId });
                      //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                  }
              });
@@ -231,7 +232,7 @@ namespace GFGGame
                 bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME);
                 if (result)
                 {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId }, true);
+                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId });
                     // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                 }
             });

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

@@ -43,6 +43,9 @@ namespace GFGGame
         private bool showGuide = false;
         public override void Dispose()
         {
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -79,9 +82,7 @@ namespace GFGGame
             {
                 SceneController.DestroyObjectFromView(lineObj[i], lineWrapper[i]);
             }
-            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
-            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+
             notClickComStars.Clear();
             clickComStars.Clear();
             dicGameobj.Clear();

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

@@ -13,7 +13,9 @@ namespace GFGGame
         private UI_StoryCardChooseUI _ui;
         private List<CardData> cardList = new List<CardData>();
         private static int _scoreType;
+        private int _selectedIndex = 0;
         private int _cardId = 0;//记录打开界面时的竞技场卡牌id
+        private int _skillId = 0;
 
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
@@ -86,17 +88,43 @@ namespace GFGGame
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             _ui.m_listSkill.data = skillCfgs;
             _ui.m_listSkill.numItems = skillCfgs.Count;
+            _ui.m_comSkillTips.target.visible = false;
+            _selectedIndex = index;
         }
-
         private void RenderListSkillItem(int index, GObject obj)
         {
             List<PassivitySkillCfg> skillCfgs = obj.parent.data as List<PassivitySkillCfg>;
             UI_ListCardSkillItem item = UI_ListCardSkillItem.Proxy(obj);
             item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfgs[index].res);
             item.m_txtLv.text = SkillDataManager.Instance.GetCardSkillLv(skillCfgs[index].cardId, skillCfgs[index].skillId).ToString();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnSkillItemClick);
+            }
+            item.target.data = index;// skillCfgs[index];
             UI_ListCardSkillItem.ProxyEnd();
         }
+        private void OnSkillItemClick(EventContext context)
+        {
+            GObject gObject = context.sender as GObject;
+            int index = (int)gObject.data;
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardList[_selectedIndex].id);
+
+            PassivitySkillCfg skillCfg = skillCfgs[index];
+            _ui.m_comSkillTips.target.visible = _skillId != skillCfg.skillId;
 
+            Vector2 posInA = _ui.m_listSkill.GetChildAt(index).asCom.position;
+            Vector2 posInB = _ui.m_listSkill.TransformPoint(posInA, _ui.target);
+            _ui.m_comSkillTips.target.SetPosition(posInB.x, posInB.y + 110, 0);
+
+            _ui.m_comSkillTips.m_txtName.text = skillCfg.name;
+            int skillLv = SkillDataManager.Instance.GetCardSkillLv(skillCfg.cardId, skillCfg.skillId);
+            PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
+            _ui.m_comSkillTips.m_txtSkillTips.text = skillLvlCfg.describe;
+
+            _skillId = skillCfg.skillId;
+
+        }
         private void RenderListCardItem(int index, GObject obj)
         {
             CardData cardData = cardList[index];
@@ -178,8 +206,8 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _skillId = 0;
             _ui.m_listCard.ScrollToView(0);
-
             Timers.inst.Remove(CheckGuide);
 
         }

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

@@ -947,14 +947,20 @@ namespace GFGGame
             {
                 item.m_loaRes.onClick.Add(OnBtnAdJump);
             }
-            item.m_loaRes.data = _adIds[index].jumpId;
+            item.m_loaRes.data = _adIds[index];
 
             UI_ListAdItem.ProxyEnd();
         }
         private void OnBtnAdJump(EventContext context)
         {
-            string jumpId = (context.sender as GObject).data.ToString();
-            ViewManager.Show($"GFGGame.{jumpId}");
+            GObject obj = context.sender as GObject;
+            AdCfg adCfg = obj.data as AdCfg;
+            object[] param = null;
+            if (adCfg.jumpId == nameof(LimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
+            ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
         }
         private void OnListAdScrollEnd()
         {
@@ -1018,13 +1024,14 @@ namespace GFGGame
             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 || RedDotDataManager.Instance.GetLeagueGiftBoxRed());
+            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
 
             RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnCiPai.target, RedDotDataManager.Instance.GetCardRed(), "", -10, 20);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_5!a.png.meta

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

GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_5.png.meta

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