Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -8,11 +8,11 @@
     <image id="n6_jcej" name="n6" src="jcej1p" fileName="images/pmts_ditu.png" xy="0,43"/>
     <image id="n4_jcej" name="n4" src="jcej40" fileName="images/dwjj_btbt.png" xy="67,-22"/>
     <text id="n8_jcej" name="txtlastDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n9_jcej" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <loader id="n7_jcej" name="loaLastDanIcon" xy="440,214" size="200,200" group="n9_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale" color="#666666"/>
-    <group id="n9_jcej" name="n9" xy="440,214" size="200,249" advanced="true"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="440,214" size="200,200" group="n10_jcej" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n7_jcej" name="loaLastDanIcon" xy="415,161" pivot="0.5,0.5" size="250,250" group="n9_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale" color="#666666"/>
+    <group id="n9_jcej" name="n9" xy="415,161" size="250,302" advanced="true"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="415,161" size="250,250" group="n10_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale"/>
     <text id="n3_psph" name="txtDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n10_jcej" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <group id="n10_jcej" name="n10" xy="440,214" size="200,249" advanced="true"/>
+    <group id="n10_jcej" name="n10" xy="415,161" size="250,302" advanced="true"/>
     <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">
       <item/>

FGUIProject/assets/Arena/ArenaUI.xml

@@ -43,50 +43,50 @@
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="23,1454" group="n46_jcej"/>
-    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="168,1510" group="n46_jcej"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="29,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n7_psph" name="txtName" xy="174,1472" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
-    <text id="n9_psph" name="txtDanTitle" xy="174,1518" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
-    <text id="n8_psph" name="txtRank" xy="174,1550" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
-    <text id="n10_psph" name="txtFightScore" xy="174,1581" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
-    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="146,1584" size="29,29" group="n46_jcej">
+    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="33,1454" group="n46_jcej"/>
+    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="178,1510" group="n46_jcej"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="25,1448" size="172,172" group="n46_jcej" aspect="true" url="ui://4lc5fhlbe0505d" fill="scale"/>
+    <text id="n7_psph" name="txtName" xy="184,1472" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n9_psph" name="txtDanTitle" xy="184,1518" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n8_psph" name="txtRank" xy="184,1550" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n10_psph" name="txtFightScore" xy="184,1581" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
+    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="156,1584" size="29,29" group="n46_jcej">
       <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
-    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="125,1401" group="n46_jcej">
+    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="135,1401" group="n46_jcej">
       <gearDisplay controller="c2" pages="1"/>
     </component>
-    <group id="n46_jcej" name="grpMyInfo" xy="23,1401" size="467,227" group="n20_psph"/>
-    <text id="n14_psph" name="txtMoneyCount" xy="780,1574" pivot="0.5,0" size="266,34" group="n20_psph" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
-    <image id="n52_jcej" name="n52" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
-    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1616" group="n51_jcej">
+    <group id="n46_jcej" name="grpMyInfo" xy="25,1401" size="475,227" group="n20_psph"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="790,1574" pivot="0.5,0" size="266,34" group="n20_psph" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
+    <image id="n52_jcej" name="n52" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="756,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
+    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1616" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <text id="n15_psph" name="txtFightCount" xy="805,1617" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
-    <group id="n51_jcej" name="n51" xy="743,1613" size="356,48" group="n20_psph"/>
-    <text id="n16_psph" name="txtRefreshCount" xy="805,1683" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
-    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1682" group="n49_jcej"/>
-    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="841,1680" size="156,46" group="n49_jcej"/>
-    <group id="n49_jcej" name="n49" xy="743,1680" size="285,46" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="408,1565" group="n20_psph">
+    <text id="n15_psph" name="txtFightCount" xy="815,1617" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
+    <group id="n51_jcej" name="n51" xy="753,1613" size="356,48" group="n20_psph"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="815,1683" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
+    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1682" group="n49_jcej"/>
+    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1680" size="156,46" group="n49_jcej"/>
+    <group id="n49_jcej" name="n49" xy="753,1680" size="285,46" group="n20_psph"/>
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1565" group="n20_psph">
       <Button title="快速挑战"/>
     </component>
-    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="68,1667" size="209,61" group="n20_psph" aspect="true">
+    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,1667" size="209,61" group="n20_psph" aspect="true">
       <Button title="商店" icon="ui://4lc5fhlbjcej3q"/>
     </component>
-    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="349,1635" group="n20_psph" aspect="true">
+    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="359,1635" group="n20_psph" aspect="true">
       <Button title="我的搭配"/>
     </component>
-    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="67,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="77,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="段位奖励"/>
     </component>
-    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="425,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="435,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="排行榜"/>
     </component>
-    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="783,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="793,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="比拼记录"/>
     </component>
-    <group id="n20_psph" name="grpBottom" xy="23,1401" size="1076,420" advanced="true">
+    <group id="n20_psph" name="grpBottom" xy="25,1401" size="1084,420" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/Arena/components/ComMyDanReward.xml

@@ -9,7 +9,7 @@
       <item/>
       <item/>
     </list>
-    <loader id="n2_psph" name="loaDanIcon" xy="183,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="169,87" pivot="0.5,0.5" anchor="true" size="176,176" aspect="true" url="ui://4lc5fhlbe0505k" fill="scale"/>
     <loader id="n3_psph" name="loaSelf" xy="319,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
     <text id="n5_u10a" name="n5" xy="524,63" size="220,49" fontSize="36" color="#c09c6d" text="尚未参与挑战">
       <gearDisplay controller="c1" pages="0"/>

FGUIProject/assets/Arena/components/ListDanRewardItem.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="924,173" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej3v" fileName="images/dwjl_dedtp.png" xy="0,0"/>
-    <loader id="n10_jcej" name="loaRank" xy="164,86" pivot="0.5,0.5" anchor="true" size="88,87" autoSize="true">
-      <gearIcon controller="c1" pages="1,2,3" values="ui://4lc5fhlbjcej3m|ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default=""/>
-    </loader>
-    <text id="n6_psph" name="txtRank" xy="62,63" pivot="0.5,0" size="201,54" fontSize="40" color="#a98860" align="center" text="灵感重构大">
-      <gearDisplay controller="c1" pages="0,4"/>
-    </text>
+    <loader id="n10_jcej" name="loaDanIcon" xy="26,11" pivot="0.5,0.5" size="150,150" group="n13_e050" aspect="true" url="ui://4lc5fhlbe0505j" align="center" vAlign="middle" fill="scale"/>
+    <text id="n12_e050" name="txtRank" xy="213,59" pivot="0.5,0" size="44,54" group="n13_e050" fontSize="40" color="#a98860" align="center" text="太"/>
+    <group id="n13_e050" name="n13" xy="26,11" size="231,150" advanced="true"/>
     <list id="n7_psph" name="listReward" xy="224,-24" size="772,222" layout="row" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/Arena/components/ListFightRecordItem.xml

@@ -19,7 +19,7 @@
     <loader id="n2_psph" name="loaResultIcon" xy="172,99" size="42,42" group="n11_psph" url="ui://4lc5fhlbjcej1z" autoSize="true">
       <gearIcon controller="ctrDan" pages="2,3" values="ui://4lc5fhlbjcej21|ui://4lc5fhlbjcej20" default="ui://4lc5fhlbjcej1z"/>
     </loader>
-    <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n3_psph" name="loaDanIcon" xy="218,56" pivot="0.5,0.5" size="130,130" group="n11_psph" aspect="true" url="ui://4lc5fhlbe0505k" fill="scale"/>
     <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
     <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="116,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
     <text id="n7_psph" name="txtTargetName" xy="582,69" size="148,49" group="n11_psph" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>

FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -10,7 +10,7 @@
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
     <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
-    <loader id="n12_jcej" name="loaDanIcon" xy="94,358" size="69,65" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n12_jcej" name="loaDanIcon" xy="92,354" pivot="0.5,0.5" size="73,73" aspect="true" url="ui://4lc5fhlbe0505n" fill="scale"/>
     <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
     <text id="n13_jcej" name="txtDanRank" xy="30,323" size="136,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名：1"/>
     <text id="n14_jcej" name="txtFightScore" xy="30,288" size="196,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力：111111"/>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -11,10 +11,10 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="330,71" group="n29_jcej"/>
     <text id="n15_psph" name="txtFightScore" xy="331,78" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="飞花令战力：--"/>
     <group id="n29_jcej" name="n29" xy="330,20" size="236,97" group="n18_psph"/>
-    <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n16_psph" name="loaDanIcon" xy="573,11" pivot="0.5,0.5" size="130,130" group="n18_psph" aspect="true" url="ui://4lc5fhlbe0505l" fill="scale"/>
     <text id="n26_jcej" name="n26" xy="729,24" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
     <text id="n17_psph" name="txtDanRank" xy="760,58" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="729,24" size="122,90" group="n18_psph"/>
-    <group id="n18_psph" name="n18" xy="19,-18" size="832,230"/>
+    <group id="n18_psph" name="n18" xy="28,-18" size="823,230"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -11,10 +11,10 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="344,84" group="n29_jcej"/>
     <text id="n15_psph" name="txtFightScore" xy="345,91" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
     <group id="n29_jcej" name="n29" xy="344,33" size="236,97" group="n18_psph"/>
-    <loader id="n16_psph" name="loaDanIcon" xy="617,33" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n16_psph" name="loaDanIcon" xy="588,18" pivot="0.5,0.5" size="130,130" group="n18_psph" aspect="true" url="ui://4lc5fhlbe0505l" fill="scale"/>
     <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
     <text id="n17_psph" name="txtDanRank" xy="773,71" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="742,37" size="122,90" group="n18_psph"/>
-    <group id="n18_psph" name="n18" xy="30,-6" size="834,230"/>
+    <group id="n18_psph" name="n18" xy="39,-6" size="825,230"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/package.xml

@@ -172,6 +172,20 @@
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
     <component id="t6j15b" name="ComTheme.xml" path="/components/"/>
+    <image id="e0505c" name="tb_yz_14.png" path="/images/" exported="true"/>
+    <image id="e0505d" name="tb_yz_1.png" path="/images/" exported="true"/>
+    <image id="e0505e" name="tb_yz_2.png" path="/images/" exported="true"/>
+    <image id="e0505f" name="tb_yz_3.png" path="/images/" exported="true"/>
+    <image id="e0505g" name="tb_yz_4.png" path="/images/" exported="true"/>
+    <image id="e0505h" name="tb_yz_5.png" path="/images/" exported="true"/>
+    <image id="e0505i" name="tb_yz_6.png" path="/images/" exported="true"/>
+    <image id="e0505j" name="tb_yz_7.png" path="/images/" exported="true"/>
+    <image id="e0505k" name="tb_yz_8.png" path="/images/" exported="true"/>
+    <image id="e0505l" name="tb_yz_9.png" path="/images/" exported="true"/>
+    <image id="e0505m" name="tb_yz_10.png" path="/images/" exported="true"/>
+    <image id="e0505n" name="tb_yz_11.png" path="/images/" exported="true"/>
+    <image id="e0505o" name="tb_yz_12.png" path="/images/" exported="true"/>
+    <image id="e0505p" name="tb_yz_13.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/package.xml

@@ -112,7 +112,7 @@
     <image id="oq7r9k" name="zx_hogndian.png" path="/imagesExport/" exported="true"/>
     <component id="ojlzh" name="ComStar.xml" path="/components/" exported="true"/>
     <image id="pzq19p" name="cj_hd_xin.png" path="/imagesExport/" exported="true"/>
-    <image id="g3nf9q" name="jinbi_1.png" path="/imgItemIcon/"/>
+    <image id="g3nf9q" name="jinbi_1.png" path="/imgItemIcon/" exported="true"/>
     <component id="g3nf9r" name="FunctionOpenUI.xml" path="/" exported="true"/>
     <component id="eiwu9v" name="ComFunctionOpen.xml" path="/components/"/>
     <image id="tt1q9w" name="xjs_ditu_1.png" path="/images/"/>
@@ -353,6 +353,16 @@
     <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/"/>
+    <image id="e050tns" name="hlhdjficon_1.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050tnu" name="jiaozi.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to0" name="zhenzhu1.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to2" name="mzc.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to3" name="tb_huaqian.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to4" name="tb_lingchou.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to5" name="tb_yajigongxian.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to6" name="tb_yajijiangzhang.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
+    <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -46,7 +46,10 @@
     <group id="n88_ktf2" name="n88" xy="547,162" size="503,132" group="n52_qqat" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <relation target="" sidePair="right-right"/>
     </group>
-    <list id="n41_wg7t" name="list" xy="939,321" size="120,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" align="right" scrollItemToViewOnClick="false" foldInvisibleItems="true">
+    <image id="n91_jt8d" name="n91" src="jt8doy" fileName="imagesNew/db_qipaokuang.png" xy="743,1101" size="218,44" group="n93_jt8d"/>
+    <text id="n92_jt8d" name="n92" xy="748,1103" pivot="0.5,0" size="204,39" group="n93_jt8d" fontSize="28" color="#fef7f7" letterSpacing="-2" strokeColor="#836330" strokeSize="0.5" text="雅集夜宴进行中..."/>
+    <group id="n93_jt8d" name="grpLeagueAnswer" xy="743,1101" size="218,44" group="n52_qqat" advanced="true"/>
+    <list id="n41_wg7t" name="list" xy="940,321" size="120,1284" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" align="right" scrollItemToViewOnClick="false" foldInvisibleItems="true">
       <relation target="" sidePair="right-right"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
@@ -60,13 +63,10 @@
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
     </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="1001,1597" pivot="0.5,0" anchor="true" size="114,117" group="n57_oju1" visible="false">
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="1002,1597" pivot="0.5,0" anchor="true" size="114,117" group="n57_oju1" visible="false">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <image id="n91_jt8d" name="n91" src="jt8doy" fileName="imagesNew/db_qipaokuang.png" xy="733,1106" group="n93_jt8d"/>
-    <text id="n92_jt8d" name="n92" xy="749,1107" pivot="0.5,0" size="179,35" group="n93_jt8d" fontSize="25" color="#fef7f7" letterSpacing="-2" strokeColor="#836330" text="雅集夜宴进行中..."/>
-    <group id="n93_jt8d" name="grpLeagueAnswer" xy="733,1106" size="216,39" group="n57_oju1" advanced="true"/>
-    <group id="n57_oju1" name="grpList" xy="733,321" size="326,1393" group="n52_qqat" advanced="true">
+    <group id="n57_oju1" name="grpList" xy="940,321" size="120,1393" group="n52_qqat" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <component id="n90_vols" name="comListAd" src="volsos" fileName="components/ComAd.xml" xy="0,314" size="411,145" group="n89_vols"/>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -15,13 +15,14 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1" icon="ui://mfvz4q8kt31nj8"/>
     </component>
-    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-25,169" visible="false"/>
-    <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="879,175" visible="false"/>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true">
-      <ProgressBar value="100" max="100"/>
-    </component>
     <component id="n54_psph" name="comTargetCard" src="volsov" fileName="components/ComTargetSkillShow.xml" xy="1180,420" pivot="0.5,0.5" anchor="true" aspect="true" scale="0.3,0.3"/>
     <component id="n55_psph" name="comDeduction" src="psphix" fileName="components/ComDeduction.xml" xy="45,292" size="0,53"/>
+    <component id="n51_psph" name="myHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="214,225" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7" visible="false"/>
+    <component id="n52_psph" name="targetHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="932,225" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7" visible="false"/>
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="147,80" pivot="0,0.5" anchor="true" group="n66_e050">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <group id="n66_e050" name="n66" xy="99,63" size="948,276"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Scale" target="n54_psph" value="0.3,0.3"/>

FGUIProject/assets/Main/StorySkillUI.xml

@@ -11,6 +11,6 @@
   </displayList>
   <transition name="t1">
     <item time="0" type="Scale" target="n7_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,237" duration="12" ease="Linear"/>
+    <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,225" duration="12" ease="Linear"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -6,16 +6,16 @@
     <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="849,16" pivot="0.518,0.438" anchor="true" alpha="0.76">
       <relation target="n1_uj53" sidePair="right-right"/>
     </image>
-    <image id="n12_fqor" name="n12" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="-8,34" group="n16_fqor"/>
-    <image id="n13_fqor" name="n13" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="-2,39" group="n16_fqor"/>
-    <image id="n14_fqor" name="n14" src="qkjsk8" fileName="imagesNew/score.png" xy="43,40" group="n16_fqor"/>
-    <text id="n15_fqor" name="txtMineScore" xy="108,41" size="150,32" group="n16_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" vAlign="middle" letterSpacing="-6" bold="true" text="0123456789"/>
-    <group id="n16_fqor" name="n16" xy="-8,34" size="324,44"/>
-    <image id="n17_fqor" name="n17" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="526,34" pivot="0.5,0" group="n21_fqor" scale="-1,1"/>
-    <image id="n18_fqor" name="n18" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="812,39" group="n21_fqor"/>
-    <image id="n19_fqor" name="n19" src="qkjsk8" fileName="imagesNew/score.png" xy="739,40" group="n21_fqor"/>
-    <text id="n20_fqor" name="txtNpcScore" xy="700,41" pivot="1,0" size="38,32" group="n21_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" align="right" vAlign="middle" letterSpacing="-6" bold="true" text="01"/>
-    <group id="n21_fqor" name="n21" xy="526,34" size="324,44"/>
+    <image id="n12_fqor" name="n12" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="-8,40" group="n16_fqor"/>
+    <image id="n13_fqor" name="n13" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="-2,45" group="n16_fqor"/>
+    <image id="n14_fqor" name="n14" src="qkjsk8" fileName="imagesNew/score.png" xy="43,46" group="n16_fqor"/>
+    <text id="n15_fqor" name="txtMineScore" xy="108,47" size="150,32" group="n16_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" vAlign="middle" letterSpacing="-6" bold="true" text="0123456789"/>
+    <group id="n16_fqor" name="n16" xy="-8,40" size="324,44"/>
+    <image id="n17_fqor" name="n17" src="qkjskk" fileName="imagesNew/zdqp_dikuang.png" xy="526,40" pivot="0.5,0" group="n21_fqor" scale="-1,1"/>
+    <image id="n18_fqor" name="n18" src="qkjsl1" fileName="imagesNew/font_zdsz_picture.png" xy="812,45" group="n21_fqor"/>
+    <image id="n19_fqor" name="n19" src="qkjsk8" fileName="imagesNew/score.png" xy="739,46" group="n21_fqor"/>
+    <text id="n20_fqor" name="txtNpcScore" xy="700,47" pivot="1,0" size="38,32" group="n21_fqor" font="ui://mfvz4q8kqkjsny" fontSize="36" color="#fff6e3" align="right" vAlign="middle" letterSpacing="-6" bold="true" text="01"/>
+    <group id="n21_fqor" name="n21" xy="526,40" size="324,44"/>
     <graph id="n9_weok" name="holder" xy="770,15" pivot="0.5,0.5" anchor="true" size="100,100">
       <relation target="n1_uj53" sidePair="right-right"/>
     </graph>

FGUIProject/assets/Main/package.xml

@@ -646,7 +646,7 @@
     <component id="volsov" name="ComTargetSkillShow.xml" path="/components/"/>
     <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
-    <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/"/>
+    <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -21,7 +21,7 @@ namespace GFGGame
         /// <param name="danLv"></param>
         public void UpdateDanIcon(GLoader loader, int danLv)
         {
-
+            loader.url = string.Format("ui://Arena/tb_yz_{0}", danLv);
         }
         /// <summary>
         /// 更新每一轮战斗结果

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

@@ -592,7 +592,7 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
                 var hasAniRes = ResPathUtil.CheckDressUpAnimationResExist(suitCfg.aniRes);
                 var actionRes = hasAniRes ? suitCfg.aniRes : null;
-                DressUpUtil.UpdateBody(actionRes, _sceneObj, _needSetMask, _roleObj);
+                DressUpUtil.UpdateBody(actionRes, _sceneObj, false, _roleObj);
             }
             else
             {

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

@@ -0,0 +1,19 @@
+using FairyGUI;
+using UnityEngine;
+
+namespace GFGGame
+{
+
+    public class DressUpPart : MonoBehaviour
+    {
+        public TimerCallback OnTimer;
+
+        private void OnDestroy()
+        {
+            if(OnTimer != null)
+            {
+                Timers.inst.Remove(OnTimer);
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/DressUp/DressUpPart.cs.meta

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

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

@@ -173,7 +173,7 @@ namespace GFGGame
             if (!string.IsNullOrEmpty(actionRes))
             {
                 string resPath = ResPathUtil.GetDressUpAnimationPath(actionRes);
-                if (CheckGameObjExisted(parentObj, BODY_ANIMATION_NAME, resPath))
+                if (GetGameObjExisted(parentObj, BODY_ANIMATION_NAME, resPath) != null)
                 {
                     return;
                 }
@@ -181,7 +181,7 @@ namespace GFGGame
             else
             {
                 string resPath = ResPathUtil.GetDressUpPath(BODY_DEFAULT_RES_NAME, extPng);
-                if (CheckGameObjExisted(parentObj, BODY_SPRITE_NAME, resPath))
+                if (GetGameObjExisted(parentObj, BODY_SPRITE_NAME, resPath) != null)
                 {
                     return;
                 }
@@ -271,7 +271,12 @@ namespace GFGGame
                 addAniObj = AddAnimationObj(res, objName, parentObj, sortingOrder);
                 if (addAniObj != null && spriteObj != null)
                 {
-                    Timers.inst.Add(0.03f, 1, (obj) =>
+                    var dressUpPart = addAniObj.GetComponent<DressUpPart>();
+                    if(dressUpPart == null)
+                    {
+                        dressUpPart = addAniObj.AddComponent<DressUpPart>();
+                    }
+                    dressUpPart.OnTimer = (obj) =>
                     {
                         if (parentObj != null && parentObj.transform != null)
                         {
@@ -292,7 +297,8 @@ namespace GFGGame
                                 }
                             }
                         }
-                    });
+                    };
+                    Timers.inst.Add(0.03f, 1, dressUpPart.OnTimer);
                 }
             }
 
@@ -308,12 +314,13 @@ namespace GFGGame
             {
                 return null;
             }
-            if (CheckGameObjExisted(parentObj, objName, resPath))
+            var gameObj = GetGameObjExisted(parentObj, objName, resPath);
+            if (gameObj != null)
             {
-                return null;
+                return gameObj;
             }
             SpriteRenderer spr = null;
-            var gameObj = parentObj.transform.Find(objName)?.gameObject;
+            gameObj = parentObj.transform.Find(objName)?.gameObject;
             if (gameObj == null)
             {
                 gameObj = new GameObject(objName);
@@ -358,12 +365,13 @@ namespace GFGGame
             {
                 return null;
             }
-            if(CheckGameObjExisted(parentObj, objName, resPath))
+            var gameObj = GetGameObjExisted(parentObj, objName, resPath);
+            if (gameObj != null)
             {
-                return null;
+                return gameObj;
             }
             var prefab = GFGAsset.Load<GameObject>(resPath);
-            var gameObj = GameObject.Instantiate(prefab);
+            gameObj = GameObject.Instantiate(prefab);
             AddAssetReleaser(gameObj, resPath);
             if (objName == BODY_ANIMATION_NAME)
             {
@@ -390,19 +398,20 @@ namespace GFGGame
             return gameObj;
         }
 
-        private static void TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAniDir)
+        private static GameObject TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAniDir)
         {
             var resPath = ResPathUtil.GetDressUpEffectPath(res, inAniDir);
             if (!VEngine.Versions.Contains(resPath))
             {
-                return;
+                return null;
             }
-            if (CheckGameObjExisted(parentObj, objName, resPath))
+            var gameObj = GetGameObjExisted(parentObj, objName, resPath);
+            if (gameObj != null)
             {
-                return;
+                return gameObj;
             }
             GameObject effPre = GFGAsset.Load<GameObject>(resPath);
-            var gameObj = GameObject.Instantiate(effPre);
+            gameObj = GameObject.Instantiate(effPre);
             AddAssetReleaser(gameObj, resPath);
             gameObj.transform.SetParent(parentObj.transform, false);
             gameObj.name = objName;
@@ -412,6 +421,7 @@ namespace GFGGame
                 GameObject.Destroy(sortingGroup);
             }
             SetRenderersOrder(gameObj, sortingOrder + 1);//特效层默认高一个层级
+            return gameObj;
         }
 
         private static bool TryRemoveObj(GameObject parentObj, string objName)
@@ -433,11 +443,11 @@ namespace GFGGame
             return false;
         }
 
-        private static bool CheckGameObjExisted(GameObject parentObj, string objName, string resPath)
+        private static GameObject GetGameObjExisted(GameObject parentObj, string objName, string resPath)
         {
             if (parentObj == null)
             {
-                return false;
+                return null;
             }
             Transform transform = parentObj.transform.Find(objName);
             if (transform != null)
@@ -451,12 +461,12 @@ namespace GFGGame
                         if (assetReleaser.resPath == resPath)
                         {
 
-                            return true;
+                            return gameObj;
                         }
                     }
                 }
             }
-            return false;
+            return null;
         }
 
         public static GameObject CreateAnimationObj(string resPath)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListDanRewardItem.cs

@@ -7,8 +7,7 @@ namespace UI.Arena
     public partial class UI_ListDanRewardItem
     {
         public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaRank;
+        public GLoader m_loaDanIcon;
         public GTextField m_txtRank;
         public GList m_listReward;
         public GImage m_imgGot;
@@ -59,16 +58,14 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaRank = (GLoader)comp.GetChild("loaRank");
+            m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_listReward = (GList)comp.GetChild("listReward");
             m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaRank = null;
+            m_loaDanIcon = null;
             m_txtRank = null;
             m_listReward = null;
             m_imgGot = null;

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

@@ -18,9 +18,9 @@ namespace UI.Main
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
+        public GGroup m_grpLeagueAnswer;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
-        public GGroup m_grpLeagueAnswer;
         public GGroup m_grpList;
         public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
@@ -99,9 +99,9 @@ namespace UI.Main
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
+            m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
@@ -146,10 +146,10 @@ namespace UI.Main
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
+            m_grpLeagueAnswer = null;
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
-            m_grpLeagueAnswer = null;
             m_grpList = null;
             m_comListAd.Dispose();
             m_comListAd = null;

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

@@ -11,11 +11,11 @@ namespace UI.Main
         public GButton m_btnBack;
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
+        public UI_ComTargetSkillShow m_comTargetCard;
+        public UI_ComDeduction m_comDeduction;
         public GComponent m_myHead;
         public GComponent m_targetHead;
         public UI_ProgressBarTargetScore m_proScore;
-        public UI_ComTargetSkillShow m_comTargetCard;
-        public UI_ComDeduction m_comDeduction;
         public Transition m_t1;
         public Transition m_t2;
         public const string URL = "ui://mfvz4q8k8xpg3w";
@@ -69,11 +69,11 @@ namespace UI.Main
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
+            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
+            m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_myHead = (GComponent)comp.GetChild("myHead");
             m_targetHead = (GComponent)comp.GetChild("targetHead");
             m_proScore = (UI_ProgressBarTargetScore)UI_ProgressBarTargetScore.Create(comp.GetChild("proScore"));
-            m_comTargetCard = (UI_ComTargetSkillShow)UI_ComTargetSkillShow.Create(comp.GetChild("comTargetCard"));
-            m_comDeduction = (UI_ComDeduction)UI_ComDeduction.Create(comp.GetChild("comDeduction"));
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
         }
@@ -84,14 +84,14 @@ namespace UI.Main
             m_btnBack = null;
             m_btnSpeedUp = null;
             m_btnSkip = null;
-            m_myHead = null;
-            m_targetHead = null;
-            m_proScore.Dispose();
-            m_proScore = null;
             m_comTargetCard.Dispose();
             m_comTargetCard = null;
             m_comDeduction.Dispose();
             m_comDeduction = null;
+            m_myHead = null;
+            m_targetHead = null;
+            m_proScore.Dispose();
+            m_proScore = null;
             m_t1 = null;
             m_t2 = null;
             if(disposeTarget && target != null)

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

@@ -102,6 +102,7 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -90, 70);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTask, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
         }
     }
 }

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

@@ -42,7 +42,7 @@ namespace GFGGame
             _ui.m_listUpDanReward.numItems = ArenaRankCfgArray.Instance.dataArray.Length - 1;
 
 
-            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comMyDanReward.m_loaDanIcon, 2);
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comMyDanReward.m_loaDanIcon, ArenaDataManager.Instance.Grade);
             UpdateMyReward();
         }
 
@@ -100,6 +100,7 @@ namespace GFGGame
             }
             item.m_listReward.data = cfg.bonusWeeklyArr;
             item.m_listReward.numItems = cfg.bonusWeeklyArr.Length;
+            ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, cfg.grade);
             UI_ListDanRewardItem.ProxyEnd();
         }
         private void RenderListUpDanReward(int index, GObject obj)
@@ -107,6 +108,7 @@ namespace GFGGame
             ArenaRankCfg cfg = ArenaRankCfgArray.Instance.dataArray[ArenaRankCfgArray.Instance.dataArray.Length - 1 - index];
 
             UI_ListDanRewardItem item = UI_ListDanRewardItem.Proxy(obj);
+            ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, cfg.id);
             item.m_imgGot.visible = ArenaDataManager.Instance.HighestGrade >= cfg.id;
             item.m_txtRank.text = cfg.gradeName;
             if (item.m_listReward.data == null)

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

@@ -325,6 +325,7 @@ namespace GFGGame
             long fightScore = _dataManager.GetAllFightScore(_dataManager.DressupList);
             _ui.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
             _ui.m_btnQuickFight.selected = _dataManager.QuickFight;
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_loaDanIcon, _dataManager.Grade);
             ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, _dataManager.DressupList);
         }
 

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

@@ -182,6 +182,7 @@ namespace GFGGame
                 case ConstItemID.TRAVEL:
                 case ConstItemID.GALLERY_STORE_COST:
                 case ConstItemID.LEAGUE_CONTRIBUTION:
+                case ConstItemID.LUCKYBOX_COST_2:
                     button.m_imgAdd.visible = true;
                     break;
                 default:

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

@@ -115,6 +115,9 @@ namespace GFGGame
                 item.target.onClick.Add(OnBtnGetClick);
             }
             item.target.data = _getDatas[index].Type;
+
+            int y = index < 2 ? 98 : 30;
+            RedDotController.Instance.SetComRedDot(item.target, !_getDatas[index].IsGet, "", 0, y);
             UI_ListGiftGetItemTop.ProxyEnd();
         }
         private void RenderListBuyItem(int index, GObject obj)

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

@@ -72,6 +72,7 @@ namespace GFGGame
             _valueBarController.OnShown();
             _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
+            LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateView();
             UpdateRedDot();

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

@@ -130,7 +130,7 @@ namespace GFGGame
             _ui.m_comCard.m_loaProperty.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
             _ui.m_comCard.m_txtName.text = itemCfg.name;
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
-
+            _ui.m_t_open.Play();
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
                 LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);

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

@@ -93,6 +93,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, RefreshList);
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
         }
 
         private void RefreshList()