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

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,-2" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,17" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,-2" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,0" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -8,6 +8,7 @@
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
+    <graph id="n3_e050" name="holder" xy="158,51" size="10,10" type="rect"/>
   </displayList>
   <Button/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>

FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992"/>
+    <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="897,16"/>
     <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
     <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>

FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0">
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,989">
       <relation target="" sidePair="height-height"/>
     </image>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <component id="n1_qik1" name="btnClose" src="e050tob" fileName="componentsBg/Component2.xml" xy="896,17"/>
     <loader id="n6_mbf1" name="loaTitle" xy="264,94" pivot="0.5,0" size="560,34" url="ui://eg2y0ldpmbf1tn6" autoSize="true"/>
   </displayList>
   <customProperty target="loaTitle" propertyId="1"/>

FGUIProject/assets/CommonGame/componentsBg/Component2.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="88,82">
+  <displayList>
+    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="0,0"/>
+  </displayList>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -318,7 +318,6 @@
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
     <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
-    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/" scale="9grid" scale9grid="254,247,510,329"/>
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
@@ -363,6 +362,7 @@
     <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"/>
+    <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/components/Component1.xml

@@ -8,7 +8,7 @@
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="84,16" size="221,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东">
+    <text id="n30_pjip" name="txtNeedName" xy="74,18" size="208,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东南飞飞">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <list id="n31_oixc" name="listTag" xy="24,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">
@@ -16,5 +16,6 @@
       <item/>
       <item/>
     </list>
+    <image id="n32_ofwu" name="imgGot" src="ofwuf7" fileName="imagesNew/tb_gou_yiyongyou.png" xy="262,14" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -196,7 +196,7 @@
     <component id="v461f3" name="ComFightScore.xml" path="/components/"/>
     <image id="v461f4" name="jjcdi_jjcdi.png" path="/images/"/>
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
-    <image id="rv09f6" name="jjsy_xx_1(1).png" path="/images/"/>
+    <image id="ofwuf7" name="tb_gou_yiyongyou.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/components/ComLeader.xml

@@ -6,7 +6,7 @@
     </component>
     <image id="n6_wm60" name="n6" src="wm6037" fileName="images/lm_db_touxiang.png" xy="0,0"/>
     <loader id="n10_wm60" name="loaHeadBorder" xy="157,180" pivot="0.5,0.5" anchor="true" size="230,203" scale="1.2,1.2" url="ui://eg2y0ldpwm60tl7" autoSize="true"/>
-    <loader id="n4_rv09" name="loaTitle" xy="69,100" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
+    <loader id="n4_rv09" name="loaTitle" xy="45,112" size="35,113" url="ui://tw70qm9dwm603p" autoSize="true" clearOnPublish="true"/>
     <image id="n8_wm60" name="n8" src="wm6035" fileName="images/lm_mz_db.png" xy="30,257" group="n11_wm60"/>
     <text id="n9_wm60" name="txtLvl" xy="41,259" pivot="0.5,0" size="35,44" group="n11_wm60" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffff" align="center" text="20"/>
     <group id="n11_wm60" name="n11" xy="30,257" size="300,55"/>

FGUIProject/assets/League/components/ListSkillItem.xml

@@ -3,9 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
-    <loader id="n23_miy3" name="loaIcon" xy="25,25" pivot="0.5,0.5" size="112,112" url="ui://eg2y0ldpu2u3tkq" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://eg2y0ldpu2u3tkq" default=""/>
-    </loader>
+    <loader id="n23_miy3" name="loaIcon" xy="22,22" pivot="0.5,0.5" size="115,115" url="ui://tw70qm9de05086" autoSize="true"/>
     <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
     <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
     <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>

FGUIProject/assets/League/package.xml

@@ -202,6 +202,12 @@
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
     <component id="vols81" name="ComLine.xml" path="/components/"/>
     <image id="duuf82" name="lm_zjm_lxdwh_db.png" path="/images/"/>
+    <image id="e05083" name="tb_jn_5.png" path="/images/" exported="true"/>
+    <image id="e05084" name="tb_jn_6.png" path="/images/" exported="true"/>
+    <image id="e05085" name="tb_jn_3.png" path="/images/" exported="true"/>
+    <image id="e05086" name="tb_jn_1.png" path="/images/" exported="true"/>
+    <image id="e05087" name="tb_jn_2.png" path="/images/" exported="true"/>
+    <image id="e05088" name="tb_jn_4.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n17_gbqo" 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"/>
+    </loader>
+    <graph id="n25_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n26_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n27_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
+    <component id="n14_ga16" name="itemOne" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,960">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <component id="n1_ga16" name="item0" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,475" group="n21_e050"/>
+    <component id="n5_ga16" name="item1" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,475" group="n21_e050"/>
+    <group id="n21_e050" name="n21" xy="210,300" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <component id="n6_ga16" name="item2" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,798" group="n22_e050"/>
+    <component id="n7_ga16" name="item3" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,798" group="n22_e050"/>
+    <component id="n8_ga16" name="item4" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,798" group="n22_e050"/>
+    <group id="n22_e050" name="n22" xy="45,623" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n9_ga16" name="item5" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,1121" group="n23_e050"/>
+    <component id="n10_ga16" name="item6" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,1121" group="n23_e050"/>
+    <component id="n11_ga16" name="item7" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,1121" group="n23_e050"/>
+    <group id="n23_e050" name="n23" xy="45,946" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n12_ga16" name="item8" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,1444" group="n24_e050"/>
+    <component id="n13_ga16" name="item9" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,1444" group="n24_e050"/>
+    <group id="n24_e050" name="n24" xy="210,1269" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <group id="n15_ga16" name="grpItems" xy="45,300" size="990,1319" advanced="true" layout="vt" lineGap="-27">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n14_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n15_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n14_ga16" value="0"/>
+    <item time="0" type="Alpha" target="n15_ga16" value="0"/>
+  </transition>
+</component>

FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n17_gbqo" 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"/>

FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -4,6 +4,15 @@
     <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
     </loader>
+    <graph id="n10_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n11_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n12_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
     <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>
     <image id="n6_duuf" name="n6" src="volstar" fileName="imageNews/zx_tx_hengxiang.png" xy="0,420" group="n9_duuf"/>
     <image id="n7_duuf" name="n7" src="volstav" fileName="imageNews/zx_tx_yuanquan.png" xy="28,381" group="n9_duuf"/>
@@ -14,7 +23,7 @@
     <component id="n0_qdrt" name="comCard" src="qdrt1a" fileName="components/ComCard.xml" xy="66,475" pivot="0.5,0.5" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1802">
+    <component id="n3_qdrt" name="btnPass" src="qdrt1c" fileName="components/Button4.xml" xy="917,1720">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button icon="ui://drx9d1usvolstbo"/>
     </component>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
@@ -10,6 +10,15 @@
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
+    <graph id="n54_e050" name="holder_star" xy="535,210" size="10,10">
+      <relation target="" sidePair="center-center,top-top"/>
+    </graph>
+    <graph id="n55_e050" name="holder_bg" xy="535,955" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <graph id="n56_e050" name="holder_cloud" xy="535,1810" size="10,10">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </graph>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="540,960">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
@@ -23,48 +32,50 @@
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
-    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="232,537" group="n19_l5nz"/>
-    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="449,224" group="n19_l5nz"/>
-    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="849,557" group="n19_l5nz"/>
-    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="419,676" group="n19_l5nz"/>
-    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="278,861" group="n19_l5nz"/>
-    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="828,1066" group="n19_l5nz"/>
-    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="253,1398" group="n19_l5nz"/>
-    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="618,1272" group="n19_l5nz"/>
-    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="586,1619" group="n19_l5nz"/>
-    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="901,438" group="n19_l5nz"/>
-    <group id="n19_l5nz" name="grpComStar0" xy="227,219" size="679,1405" advanced="true">
+    <component id="n12_l5nz" name="comStar1_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="205,477" group="n19_l5nz"/>
+    <component id="n13_l5nz" name="comStar1_0_1" src="l5nzq" fileName="components/ComStar.xml" xy="422,166" group="n19_l5nz"/>
+    <component id="n14_l5nz" name="comStar1_0_2" src="l5nzq" fileName="components/ComStar.xml" xy="822,642" group="n19_l5nz"/>
+    <component id="n15_l5nz" name="comStar1_0_3" src="l5nzq" fileName="components/ComStar.xml" xy="392,653" group="n19_l5nz"/>
+    <component id="n33_o139" name="comStar1_0_4" src="l5nzq" fileName="components/ComStar.xml" xy="251,928" group="n19_l5nz"/>
+    <component id="n34_o139" name="comStar1_0_5" src="l5nzq" fileName="components/ComStar.xml" xy="801,1066" group="n19_l5nz"/>
+    <component id="n35_o139" name="comStar1_0_6" src="l5nzq" fileName="components/ComStar.xml" xy="226,1404" group="n19_l5nz"/>
+    <component id="n36_o139" name="comStar1_0_7" src="l5nzq" fileName="components/ComStar.xml" xy="591,1272" group="n19_l5nz"/>
+    <component id="n37_o139" name="comStar1_0_8" src="l5nzq" fileName="components/ComStar.xml" xy="522,1705" group="n19_l5nz"/>
+    <component id="n51_e050" name="comStar1_0_9" src="l5nzq" fileName="components/ComStar.xml" xy="874,438" group="n19_l5nz"/>
+    <group id="n19_l5nz" name="grpComStar0" xy="200,161" size="679,1549" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="420,283" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="227,499" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="229,848" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="431,1035" group="n25_iakb"/>
-    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="186,1279" group="n25_iakb"/>
-    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="430,1471" group="n25_iakb"/>
-    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="610,644" group="n25_iakb"/>
-    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="832,903" group="n25_iakb"/>
-    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="779,1480" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="147,244" size="724,1275" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="476,261" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="261,534" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="215,882" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="517,1035" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="272,1368" group="n25_iakb"/>
+    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="516,1728" group="n25_iakb"/>
+    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="679,567" group="n25_iakb"/>
+    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="854,865" group="n25_iakb"/>
+    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="865,1426" group="n25_iakb"/>
+    <component id="n52_e050" name="comStar1_1_9" src="l5nzq" fileName="components/ComStar.xml" xy="833,146" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="210,141" size="660,1592" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="722,318" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="338,446" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="625,1568" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="198,708" group="n30_iakb"/>
-    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="341,1060" group="n30_iakb"/>
-    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="276,1365" group="n30_iakb"/>
-    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="819,1405" group="n30_iakb"/>
-    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="797,1132" group="n30_iakb"/>
-    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="708,665" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="159,279" size="699,1328" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="861,228" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="305,306" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="598,1749" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="201,766" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="492,1217" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="312,1475" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="835,1478" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="879,1091" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="587,574" group="n30_iakb"/>
+    <component id="n53_e050" name="comStar1_2_9" src="l5nzq" fileName="components/ComStar.xml" xy="626,867" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="196,223" size="688,1531" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
-      <relation target="" sidePair="left-center,top-middle"/>
+      <relation target="" sidePair="center-center,top-top"/>
     </group>
     <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -38,12 +38,14 @@
     <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
       <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
     </component>
-    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n61_vols">
-      <relation target="n58_vols" sidePair="left-left,top-top"/>
-    </image>
     <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数：{v1=0}">
       <relation target="" sidePair="center-center"/>
     </text>
+    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n84_e050"/>
+    <graph id="n83_e050" name="holder" xy="919,1675" size="10,10" group="n84_e050" type="rect"/>
+    <group id="n84_e050" name="grpSpecial" xy="865,1623" size="112,123" group="n61_vols" advanced="true">
+      <relation target="n58_vols" sidePair="right-right,top-top"/>
+    </group>
     <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>

FGUIProject/assets/LuckyBox/components/ComCard.xml

@@ -2,15 +2,15 @@
 <component size="948,970">
   <displayList>
     <graph id="n6_dcro" name="holder" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
-    <loader id="n2_qdrt" name="loaIcon" xy="332,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n2_qdrt" name="loaIcon" xy="299,294" pivot="0.5,0.5" size="350,350" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scaleMatchWidth"/>
     <text id="n5_qdrt" name="txtDiscribe" xy="473,1056" pivot="0.5,0" anchor="true" size="406,101" visible="false" fontSize="30" color="#c2a773" autoSize="none" text="赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王赵钱孙李周吴郑王"/>
     <image id="n12_duuf" name="n12" src="volstbk" fileName="imageNews/zx_zhuangshi_diaoshi.png" xy="645,164" group="n13_duuf"/>
     <loader id="n1_qdrt" name="loaType" xy="645,299" size="44,94" group="n13_duuf" url="ui://eg2y0ldpo9ghtll" fill="scaleMatchWidth" autoSize="true"/>
     <loader id="n3_qdrt" name="loaProperty" xy="645,242" size="44,44" group="n13_duuf" aspect="true" url="ui://eg2y0ldp842s6k" fill="scaleMatchWidth"/>
     <group id="n13_duuf" name="n13" xy="645,164" size="54,248"/>
-    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="336,880" size="332,50" group="n15_duuf"/>
-    <text id="n4_qdrt" name="txtName" xy="502,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
-    <group id="n15_duuf" name="n15" xy="336,878" size="332,54"/>
+    <image id="n14_duuf" name="n14" src="volstax" fileName="imageNews/zx_wp_baseboard.png" xy="308,880" size="332,50" group="n15_duuf"/>
+    <text id="n4_qdrt" name="txtName" xy="474,905" pivot="0.5,0.5" anchor="true" size="84,54" group="n15_duuf" fontSize="40" color="#915e15" text="服装"/>
+    <group id="n15_duuf" name="n15" xy="308,878" size="332,54"/>
     <graph id="n17_duuf" name="holder1" xy="473,484" size="1,1" visible="false" touchable="false" type="rect"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4," selected="3"/>
   <displayList>
-    <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
+    <graph id="n19_e050" name="holder" xy="192,187" size="10,10" group="n9_v95q" type="rect">
+      <gearDisplay controller="c1" pages="3,4"/>
+    </graph>
+    <image id="n10_v95q" name="n10" src="volstb2" fileName="imageNews/zx_wp_jin_bg.png" xy="42,57" pivot="0.5,0.5" group="n9_v95q">
+      <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n11_v95q" name="n11" src="v95q2v" fileName="images/cj_hd_hdh_2.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-    <image id="n12_v95q" name="n12" src="v95q2w" fileName="images/cj_hd_hdh_3.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
-    </image>
-    <image id="n13_v95q" name="n13" src="v95q2x" fileName="images/cj_hd_hdh_4.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <loader id="n3_ga16" name="icon" xy="115,120" size="158,158" group="n9_v95q" aspect="true" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <loader id="n4_ga16" name="rarity" xy="272,68" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="76,99" group="n9_v95q" visible="false"/>
-    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
+    <image id="n12_v95q" name="n12" src="volstay" fileName="imageNews/zx_wp_fen_bg.png" xy="98,117" pivot="0.5,0.5" group="n9_v95q">
+      <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
+    <image id="n18_e050" name="n18" src="volstb8" fileName="imageNews/zx_wp_lan_diguang.png" xy="87,90" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="67,268" group="n9_v95q">
+    <image id="n11_v95q" name="n11" src="volstb7" fileName="imageNews/zx_wp_lan_bg.png" xy="129,111" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="67,268" group="n9_v95q">
+    <image id="n13_v95q" name="n13" src="e050tf5" fileName="imageNews/zx_wp_lan_grey.png" xy="88,94" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <text id="n2_ga16" name="txtName" xy="106,268" pivot="0.5,0" size="172,39" group="n9_v95q" fontSize="28" color="#b0967d" align="center" text="岭南荔夏·闲">
-      <gearColor controller="c1" pages="0,1,2,3,4" values="#bf9e73,#000000|#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000"/>
-      <relation target="" sidePair="center-center"/>
+    <loader id="n3_ga16" name="icon" xy="194,195" pivot="0.5,0.5" anchor="true" size="116,116" group="n9_v95q" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scale" shrinkOnly="true">
+      <gearSize controller="c1" pages="1,2,3,4" values="98,98,1,1|100,100,1,1|116,116,1,1|180,180,1,1" default="158,158,1,1"/>
+    </loader>
+    <loader id="n4_ga16" name="rarity" xy="229,109" pivot="0.5,0" size="38,88" group="n9_v95q" aspect="true" url="ui://eg2y0ldpo9ghtll" align="center" fill="scale">
+      <gearXY controller="c1" pages="1,2,3,4" values="230,131|229,130|229,109|253,76" default="272,68"/>
+      <gearSize controller="c1" pages="1,2,3" values="26,59,1,1|26,60,1,1|38,88,1,1" default="42,96,1,1"/>
+    </loader>
+    <image id="n7_pzq1" name="imgNew" src="volstb5" fileName="imageNews/zx_wp_jin_jiaobiao.png" xy="90,121" pivot="0.5,0.5" size="77,44" group="n9_v95q" aspect="true" visible="false">
+      <gearXY controller="c1" pages="1,2,3,4" values="108,137|108,137|90,121|56,93" default="76,99"/>
+      <gearSize controller="c1" pages="1,2,3" values="63,36,1,1|63,36,1,1|77,44,1,1" default="91,52,1,1"/>
+    </image>
+    <image id="n20_e050" name="n20" src="volstb9" fileName="imageNews/zx_wp_mingcheng_bg.png" xy="192,289" pivot="0.5,0" anchor="true" size="133,32" group="n9_v95q">
+      <relation target="n21_e050" sidePair="width-width,center-center,middle-middle"/>
+    </image>
+    <text id="n21_e050" name="txtName" xy="195,305" pivot="0.5,0.5" anchor="true" size="96,29" group="n9_v95q" fontSize="20" color="#ffffff" align="center" letterSpacing="-2" text="孔雀东南飞">
+      <gearFontSize controller="c1" pages="4" values="28" default="20"/>
+      <relation target="n3_ga16" sidePair="center-center,top-bottom"/>
     </text>
-    <group id="n9_v95q" name="n9" xy="58,60" size="270,270"/>
+    <group id="n9_v95q" name="n9" xy="42,57" size="300,270"/>
   </displayList>
 </component>

FGUIProject/assets/LuckyBox/components/LuckyBoxBonusShowItem.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="350,350" pivot="0.5,0.5" anchor="true">
+  <displayList>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="175,157" pivot="0.5,0.5" anchor="true" controller="c1,3"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+  </transition>
+</component>

FGUIProject/assets/LuckyBox/package.xml

@@ -93,7 +93,7 @@
     <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
     <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
     <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
-    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/" scale="9grid" scale9grid="23,8,98,16"/>
     <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
     <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
     <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
@@ -155,6 +155,9 @@
     <component id="duuftec" name="Component3.xml" path="/components/"/>
     <image id="duuftf0" name="zx_title_1.png" path="/imageNews/" exported="true"/>
     <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
+    <component id="e050tf3" name="LuckBoxBonusShowUI.xml" path="/" exported="true"/>
+    <component id="e050tf4" name="LuckyBoxBonusShowItem.xml" path="/components/"/>
+    <image id="e050tf5" name="zx_wp_lan_grey.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -20,7 +20,7 @@
     <component id="n51_psph" name="myHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="214,228" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7"/>
     <component id="n52_psph" name="targetHead" src="o9ghtlq" fileName="components/ComHead2.xml" pkg="eg2y0ldp" xy="932,228" pivot="0.5,0.5" anchor="true" group="n66_e050" scale="0.7,0.7"/>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="147,83" pivot="0,0.5" anchor="true" group="n66_e050">
-      <ProgressBar value="100" max="100"/>
+      <ProgressBar value="50" max="100"/>
     </component>
     <group id="n66_e050" name="n66" xy="99,66" size="948,276"/>
   </displayList>

FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -2,6 +2,7 @@
 <component size="850,33" extention="ProgressBar">
   <displayList>
     <image id="n11_fqor" name="n11" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="-36,0"/>
+    <image id="n22_e050" name="n22" src="e050oz" fileName="imagesNew/jdt_shuangrenzd.png" xy="0,4"/>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,4"/>
     <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"/>

FGUIProject/assets/Main/package.xml

@@ -647,6 +647,7 @@
     <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/" scale="9grid" scale9grid="17,9,177,18"/>
+    <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <component id="n0_qik1" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0">
-      <property target="txtTitle" propertyId="0" value="黑金卡专属"/>
-    </component>
+    <image id="n15_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,992" group="n17_e050"/>
+    <component id="n16_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n17_e050"/>
+    <group id="n17_e050" name="n17" xy="0,0" size="1021,992"/>
     <image id="n6_qik1" name="n6" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,796"/>
     <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="黑金卡玩家，每月1日5点起，可免费领取黑金卡 专属单品，请注意及时领取，逾期失效。"/>
     <list id="n14_qik1" name="list" xy="147,176" size="809,590" layout="flow_hz" lineGap="10" colGap="20" defaultItem="ui://p9mtgheoqik1tcj" autoClearItems="true">

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

@@ -1,3 +1,4 @@
+using System;
 using ET;
 
 namespace GFGGame
@@ -11,6 +12,12 @@ namespace GFGGame
             return activityInfo == null ? 0 : TimeUtil.GetDay5(activityInfo.StartTime);
         }
 
+        public int GetActivityDay7MaxPassDay()
+        {
+            return Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
+                ActivityDay7DataManager.Instance.GetActivityDay7Day());
+        }
+
         public long GetScore()
         {
             return ItemDataManager.GetItemNum(ConstItemID.ACTIVITY_DAY_7_SCORE);
@@ -45,12 +52,16 @@ namespace GFGGame
         public bool CheckActivityDay7TaskRewrdCanGetByDay(int day)
         {
             //检查天数
-            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
+            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
             if (currentDay < day)
             {
                 return false;
             }
             var activity7DaysTaskCfg = Activity7DaysTaskCfgArray.Instance.GetCfg(day);
+            if(activity7DaysTaskCfg == null)
+            {
+                return false;
+            }
             var taskIdArr = activity7DaysTaskCfg.taskIdArr;
             foreach(int taskId in taskIdArr)
             {

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

@@ -35,8 +35,8 @@ namespace GFGGame
         public int CurFightIndex = 0;//当前挑战场次下标
         public List<long> myScore = new List<long>();//对战数据，三轮分数
         public List<long> targetScore = new List<long>();//对战数据，三轮分数
-        public List<long> myFightScore = new List<long>();//对战数据，竞技场战力，搭配战力,卓越点击战力,卡牌战力
-        public List<long> targetFightScore = new List<long>();//对战数据，对手竞技场战力，搭配战力,卓越点击战力,卡牌战力
+        public List<long> myFightPower = new List<long>();//对战数据，竞技场战力，搭配战力,卓越点击战力,卡牌战力
+        public List<long> targetFightPower = new List<long>();//对战数据，对手竞技场战力，搭配战力,卓越点击战力,卡牌战力
 
         /*************************************************************************************************************************************/
 
@@ -74,8 +74,8 @@ namespace GFGGame
             // TextureDic.Clear();
             myScore.Clear();
             targetScore.Clear();
-            myFightScore.Clear();
-            targetFightScore.Clear();
+            myFightPower.Clear();
+            targetFightPower.Clear();
             roundTime.Clear();
             targetRoundTime.Clear();
             // LastTargetInfo = null;

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

@@ -68,7 +68,7 @@ namespace GFGGame
             item.m_loaMyCard.m_comCardmask.m_loaCard.url = cardCfg == null ? "" : ResPathUtil.GetCardSmallPath(cardCfg.res);
             ItemCfg targetCardCfg = ItemCfgArray.Instance.GetCfg(targetCardId);
             item.m_loaTargetCard.m_comCardmask.m_loaCard.url = targetCardCfg == null ? "" : ResPathUtil.GetCardSmallPath(targetCardCfg.res);
-            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, myHeadId, myHeadBorderId);
+            RoleInfoManager.Instance.UpdateHead(item.m_comMyHead, RoleDataManager.headId, RoleDataManager.headBorderId);
             if (targetHeadId > 0)
             {
                 RoleInfoManager.Instance.UpdateHead(item.m_comTargetHead, targetHeadId, targetBorderId);
@@ -116,7 +116,7 @@ namespace GFGGame
             com.m_txtTargetFightScore.text = targetAllScore.ToString();
             UI_ComAllScore.ProxyEnd();
 
-            bool isWin = winCount >= 2;
+            bool isWin = myAllScore > targetAllScore;
             return isWin;
         }
         /// <summary>

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

@@ -125,6 +125,7 @@ namespace GFGGame
             _targetData.cardScore = fightCfg.targetCardScore;
             _targetData.tags = fightCfg.needTagsArr;
             _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
+            _targetData.itemScoreList.Clear();
             for (int i = 0; i < fightCfg.targetPartsScoreArr.Length; i++)
             {
                 _targetData.itemScoreList.Add(fightCfg.targetPartsScoreArr[i]);

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

@@ -50,8 +50,8 @@ namespace GFGGame
         public bool GetActivityDay7Red()
         {
             //任务奖励
-            var currentDay = ActivityDay7DataManager.Instance.GetActivityDay7Day();
-            for (var day = currentDay; day > 0; day--)
+            var maxDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
+            for (var day = maxDay; day > 0; day--)
             {
                 if (ActivityDay7DataManager.Instance.CheckActivityDay7TaskRewrdCanGetByDay(day))
                 {

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

@@ -23,6 +23,7 @@ namespace GFGGame
         public const int PART_PREFACT_CLICK = 8;//每次优秀点击
         public const int PART_FIGHT_BEGIN = 9;//每回合开始
         public const int PART_FIGHT_END = 10;//每回合结束
+        public const int ALL_PERFECT_START = 11;//登封造极开始
     }
 
 
@@ -300,6 +301,7 @@ namespace GFGGame
           || skillLvlCfg.beginTime == BeginTime.PART_PREFACT_CLICK && currentTime == BeginTime.PART_PREFACT_CLICK
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_END && currentTime == BeginTime.PART_FIGHT_END
+          || skillLvlCfg.beginTime == BeginTime.ALL_PERFECT_START && currentTime == BeginTime.ALL_PERFECT_START
           || skillLvlCfg.beginTime <= BeginTime.PART_SCORE_6 && currentTime == BeginTime.PART_FIGHT_BEGIN && partId == skillLvlCfg.beginTime)
             {
                 return true;

GameClient/Assets/Game/HotUpdate/Data/VO/ArenaData.cs

@@ -9,7 +9,7 @@ namespace GFGGame
         public int Type; //类型，由FightTargetType定义
         public OtherRoleInfoData RoleInfo = new OtherRoleInfoData(); //玩家数据
         public List<FightData> FightDatas = new List<FightData>();//搭配列表，与RobotDressupList只能存在一个，取决于Type
-        public List<long> FightScores = new List<long>();//搭配战力,卓越点击战力,卡牌战力
+        public List<long> FightPower = new List<long>();//搭配战力,卓越点击战力,卡牌战力
 
     }
 
@@ -24,7 +24,7 @@ namespace GFGGame
         public ArenaTargetData targetData;
         public List<long> MyScores = new List<long>();//自己3轮战斗分数
         public List<long> TargetScores = new List<long>();//对手3轮战斗分数
-        public List<long> FightScores = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力,对方的在targetData里
+        public List<long> FightPower = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力,对方的在targetData里
 
     }
 }

GameClient/Assets/Game/HotUpdate/Effect.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b35b8e2b0a0f19b4fb3a72e1d19c58c3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs

@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class AutoRotation : MonoBehaviour
+{
+    public Vector3 EulerAngleSpeed;
+    public bool running = true;
+
+    void Update()
+    {
+        if (running && EulerAngleSpeed != Vector3.zero)
+        {
+            transform.localRotation = Quaternion.Euler(EulerAngleSpeed * Time.deltaTime) * transform.localRotation;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Effect/AutoRotation.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxBonusUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf16";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxTaskUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf1d";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_BtnStyle006
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public const string URL = "ui://eg2y0ldpvolstng";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "BtnStyle006";
+        private static UI_BtnStyle006 _proxy;
+
+        public static UI_BtnStyle006 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnStyle006();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnStyle006 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnStyle006();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComBg000
     {
         public GComponent target;
+        public GImage m_imgBg;
         public GButton m_btnClose;
         public GTextField m_txtTitle;
         public const string URL = "ui://eg2y0ldpqik1tcb";
@@ -56,11 +57,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_imgBg = (GImage)comp.GetChild("imgBg");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
             m_btnClose = null;
             m_txtTitle = null;
             if(disposeTarget && target != null)

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

@@ -7,7 +7,8 @@ namespace UI.CommonGame
     public partial class UI_ComBg001
     {
         public GComponent target;
-        public GButton m_btnClose;
+        public GImage m_imgBg;
+        public UI_Component2 m_btnClose;
         public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpmbf1tn5";
         public const string PACKAGE_NAME = "CommonGame";
@@ -56,11 +57,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (UI_Component2)UI_Component2.Create(comp.GetChild("btnClose"));
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
+            m_btnClose.Dispose();
             m_btnClose = null;
             m_loaTitle = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Component2
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public const string URL = "ui://eg2y0ldpe050tob";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            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_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            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_btnClose = (GButton)comp.GetChild("btnClose");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -10,6 +10,7 @@ namespace UI.DressUp
         public Controller m_c1;
         public GTextField m_txtNeedName;
         public GList m_listTag;
+        public GImage m_imgGot;
         public const string URL = "ui://mbo439wbpjip31";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "Component1";
@@ -60,12 +61,14 @@ namespace UI.DressUp
             m_c1 = comp.GetController("c1");
             m_txtNeedName = (GTextField)comp.GetChild("txtNeedName");
             m_listTag = (GList)comp.GetChild("listTag");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_txtNeedName = null;
             m_listTag = null;
+            m_imgGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -18,8 +18,10 @@ namespace UI.LuckyBox
         public UI_ComCost m_comCostTen;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
-        public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
+        public GImage m_imgSpecial;
+        public GGraph m_holder;
+        public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
@@ -78,8 +80,10 @@ namespace UI.LuckyBox
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -97,8 +101,10 @@ namespace UI.LuckyBox
             m_comCostTen = null;
             m_btnBuyOne = null;
             m_btnBuyTen = null;
-            m_imgSpecial = null;
             m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_holder;
         public GLoader m_icon;
         public GLoader m_rarity;
         public GImage m_imgNew;
@@ -60,6 +61,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -68,6 +70,7 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_holder = null;
             m_icon = null;
             m_rarity = null;
             m_imgNew = null;

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

@@ -0,0 +1,136 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckBoxBonusShowUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
+        public UI_LuckyBoxBonusShowItem m_itemOne;
+        public UI_LuckyBoxBonusShowItem m_item0;
+        public UI_LuckyBoxBonusShowItem m_item1;
+        public UI_LuckyBoxBonusShowItem m_item2;
+        public UI_LuckyBoxBonusShowItem m_item3;
+        public UI_LuckyBoxBonusShowItem m_item4;
+        public UI_LuckyBoxBonusShowItem m_item5;
+        public UI_LuckyBoxBonusShowItem m_item6;
+        public UI_LuckyBoxBonusShowItem m_item7;
+        public UI_LuckyBoxBonusShowItem m_item8;
+        public UI_LuckyBoxBonusShowItem m_item9;
+        public GGroup m_grpItems;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://drx9d1use050tf3";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckBoxBonusShowUI";
+        private static UI_LuckBoxBonusShowUI _proxy;
+
+        public static UI_LuckBoxBonusShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckBoxBonusShowUI();
+            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_LuckBoxBonusShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckBoxBonusShowUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
+            m_itemOne = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("itemOne"));
+            m_item0 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item0"));
+            m_item1 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item7"));
+            m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
+            m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
+            m_grpItems = (GGroup)comp.GetChild("grpItems");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
+            m_itemOne.Dispose();
+            m_itemOne = null;
+            m_item0.Dispose();
+            m_item0 = null;
+            m_item1.Dispose();
+            m_item1 = null;
+            m_item2.Dispose();
+            m_item2 = null;
+            m_item3.Dispose();
+            m_item3 = null;
+            m_item4.Dispose();
+            m_item4 = null;
+            m_item5.Dispose();
+            m_item5 = null;
+            m_item6.Dispose();
+            m_item6 = null;
+            m_item7.Dispose();
+            m_item7 = null;
+            m_item8.Dispose();
+            m_item8 = null;
+            m_item9.Dispose();
+            m_item9 = null;
+            m_grpItems = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckyBoxBonusShowItem
+    {
+        public GComponent target;
+        public UI_Component2 m_comIcon;
+        public Transition m_t0;
+        public const string URL = "ui://drx9d1use050tf4";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckyBoxBonusShowItem";
+        private static UI_LuckyBoxBonusShowItem _proxy;
+
+        public static UI_LuckyBoxBonusShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckyBoxBonusShowItem();
+            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_LuckyBoxBonusShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckyBoxBonusShowItem();
+            }
+            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_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comIcon.Dispose();
+            m_comIcon = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,6 +8,9 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
         public UI_ComCard m_comCard;
         public GButton m_btnPass;
         public Transition m_t_open;
@@ -60,6 +63,9 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
             m_btnPass = (GButton)comp.GetChild("btnPass");
             m_t_open = comp.GetTransition("t_open");
@@ -68,6 +74,9 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
             m_comCard.Dispose();
             m_comCard = null;
             m_btnPass = null;

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

@@ -10,6 +10,9 @@ namespace UI.LuckyBox
         public Controller m_ctrlBuyType;
         public Controller m_ctrlRewardsType;
         public GLoader m_bg;
+        public GGraph m_holder_star;
+        public GGraph m_holder_bg;
+        public GGraph m_holder_cloud;
         public GButton m_btnBack;
         public UI_ComStar m_comStar0_0_0;
         public UI_ComStar m_comStar0_1_0;
@@ -34,6 +37,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_7;
         public UI_ComStar m_comStar1_1_8;
+        public UI_ComStar m_comStar1_1_9;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
@@ -44,6 +48,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_6;
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_8;
+        public UI_ComStar m_comStar1_2_9;
         public GGroup m_grpComStar2;
         public GMovieClip m_effEnd;
         public const string URL = "ui://drx9d1usl5nzm";
@@ -96,6 +101,9 @@ namespace UI.LuckyBox
             m_ctrlBuyType = comp.GetController("ctrlBuyType");
             m_ctrlRewardsType = comp.GetController("ctrlRewardsType");
             m_bg = (GLoader)comp.GetChild("bg");
+            m_holder_star = (GGraph)comp.GetChild("holder_star");
+            m_holder_bg = (GGraph)comp.GetChild("holder_bg");
+            m_holder_cloud = (GGraph)comp.GetChild("holder_cloud");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_comStar0_0_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_0_0"));
             m_comStar0_1_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar0_1_0"));
@@ -120,6 +128,7 @@ namespace UI.LuckyBox
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
             m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
+            m_comStar1_1_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_9"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
@@ -130,6 +139,7 @@ namespace UI.LuckyBox
             m_comStar1_2_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_6"));
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
+            m_comStar1_2_9 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_9"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_effEnd = (GMovieClip)comp.GetChild("effEnd");
         }
@@ -138,6 +148,9 @@ namespace UI.LuckyBox
             m_ctrlBuyType = null;
             m_ctrlRewardsType = null;
             m_bg = null;
+            m_holder_star = null;
+            m_holder_bg = null;
+            m_holder_cloud = null;
             m_btnBack = null;
             m_comStar0_0_0.Dispose();
             m_comStar0_0_0 = null;
@@ -184,6 +197,8 @@ namespace UI.LuckyBox
             m_comStar1_1_7 = null;
             m_comStar1_1_8.Dispose();
             m_comStar1_1_8 = null;
+            m_comStar1_1_9.Dispose();
+            m_comStar1_1_9 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;
@@ -203,6 +218,8 @@ namespace UI.LuckyBox
             m_comStar1_2_7 = null;
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8 = null;
+            m_comStar1_2_9.Dispose();
+            m_comStar1_2_9 = null;
             m_grpComStar2 = null;
             m_effEnd = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBlackCardRewardUI.cs

@@ -7,7 +7,8 @@ namespace UI.Store
     public partial class UI_StoreBlackCardRewardUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://p9mtgheoqik1tc8";
         public const string PACKAGE_NAME = "Store";
@@ -56,12 +57,14 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

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

@@ -351,7 +351,7 @@ namespace GFGGame
             arenaHistory.Grade = arenaHistoryProto.Grade;
             arenaHistory.Rank = arenaHistoryProto.Rank;
             arenaHistory.targetData = GetArenaTargetData(arenaHistoryProto.target);
-            arenaHistory.FightScores = arenaHistoryProto.SelfFightPower;
+            arenaHistory.FightPower = arenaHistoryProto.SelfFightPower;
             arenaHistory.GradeChangeType = arenaHistoryProto.GradeChangeType;
             arenaHistory.MyScores = arenaHistoryProto.SelfRandScore;
             arenaHistory.TargetScores = arenaHistoryProto.TargetRandScore;
@@ -365,7 +365,7 @@ namespace GFGGame
             arenaTarget.Grade = arenaTargetProto.Grade;
             arenaTarget.RankInGrade = arenaTargetProto.RankInGrade;
             arenaTarget.Type = arenaTargetProto.Type;
-            arenaTarget.FightScores = arenaTargetProto.FightPower;
+            arenaTarget.FightPower = arenaTargetProto.FightPower;
             if (arenaTarget.Type == FightTargetType.PLAYER)
             {
                 arenaTarget.RoleInfo = RoleDataManager.GetOtherRoleInfoData(arenaTargetProto.RoleInfo);

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

@@ -151,6 +151,11 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     RoleDataManager.headId = response.HeadItemId;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].RoleInfo.headId = RoleDataManager.headId;
+                    }
+
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_HEAD);
                     return true;
                 }
@@ -167,6 +172,10 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     RoleDataManager.headBorderId = response.HeadBorderItemId;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        LeagueDataManager.Instance.LeagueData.LeagueMemberDatas[RoleDataManager.roleId].RoleInfo.headBorderId = RoleDataManager.headBorderId;
+                    }
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_HEAD);
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -55,9 +55,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            var min = Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
-                ActivityDay7DataManager.Instance.GetActivityDay7Day());
-            onClickDayIndex = Math.Max(0, min - 1);
+            var maxDay = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
+            onClickDayIndex = Math.Max(0, maxDay - 1);
             SetScoreList();
             SetScore();
             SetDayList();
@@ -134,7 +133,7 @@ namespace GFGGame
         {
             if (!(context.sender is GObject typeItem)) return;
             //检查天数
-            var day = ActivityDay7DataManager.Instance.GetActivityDay7Day();
+            var day = ActivityDay7DataManager.Instance.GetActivityDay7MaxPassDay();
             if (day < (int)typeItem.data + 1)
             {
                 PromptController.Instance.ShowFloatTextPrompt("未到开启时间");

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

@@ -32,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

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

@@ -3,6 +3,7 @@ using ET;
 using FairyGUI;
 using UI.ActivityThemeLuckyBox;
 using UnityEngine;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -32,7 +33,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
-
+            _ui.m_btnClose.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {

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

@@ -63,7 +63,7 @@ namespace GFGGame
             item.m_txtTargetName.text = historyData.targetData.RoleInfo.roleName;
             item.m_txtRank.text = historyData.targetData.RankInGrade.ToString();
 
-            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightScores));
+            item.m_txtTargetFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.FightPower));
             ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, historyData.targetData.Grade);
             TimeUtil.FormattingTime(historyData.FightTime, TimeHelper.ServerNow(), out int num, out string str);
             str = str == "秒" ? "刚刚" : num + str + "前";

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

@@ -242,7 +242,7 @@ namespace GFGGame
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
                     //上榜的玩家一定战斗过，可以直接计算
-                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores));
+                    item.m_txtFightScore.text = string.Format("飞花令战力：{0}", ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower));
                     RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
                 }
                 else
@@ -300,10 +300,10 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == FightTargetType.PLAYER)
                 {
-                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightScores);
+                    long fightScore = _rankType != ArenaRankType.LAST_SEASON && rank > 100 && isSelf ? ArenaDataManager.Instance.GetAllFightScore(ArenaDataManager.Instance.DressupList) : ArenaDataManager.Instance.GetAllFightScore(arenaData.FightPower);
                     //上榜的玩家一定战斗过，可以直接计算
                     item.m_txtFightScore.text = string.Format("飞花令战力：{0}", fightScore);
-                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.headId, arenaData.RoleInfo.headBorderId);
+                    RoleInfoManager.Instance.UpdateHead(item.m_comHead, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headId : arenaData.RoleInfo.headId, arenaData.RoleInfo.roleId == RoleDataManager.roleId ? RoleDataManager.headBorderId : arenaData.RoleInfo.headBorderId);
                 }
                 else
                 {

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

@@ -99,8 +99,8 @@ namespace GFGGame
                 _dataManager.CurFightIndex = 0;
                 _dataManager.myScore.Clear();
                 _dataManager.targetScore.Clear();
-                _dataManager.myFightScore.Clear();
-                _dataManager.targetFightScore.Clear();
+                _dataManager.myFightPower.Clear();
+                _dataManager.targetFightPower.Clear();
 
                 UpdateTargetList();
             }
@@ -269,34 +269,31 @@ namespace GFGGame
         {
             _dataManager.myScore.Clear();
             _dataManager.targetScore.Clear();
-            _dataManager.myFightScore.Clear();
-            _dataManager.targetFightScore.Clear();
+            _dataManager.myFightPower.Clear();
+            _dataManager.targetFightPower.Clear();
 
-            int winCount = 0;
             if (_targetData.Type == FightTargetType.PLAYER)
             {
                 await ArenaSproxy.ReqArenaFightAttr(_targetData.RoleInfo.roleId, _targetData.FightDatas);
             }
+            long allScore = 0;
+            long targetAllScore = 0;
             for (int i = 0; i < _dataManager.ThemeList.Count; i++)
             {
-                long score = 0;
-                long targetScore = 0;
-
-
-                FightDataManager.Instance.GetQuickFightResult(i, _dataManager.DressupList[i], _targetData.FightDatas[i], out score, out targetScore);
+                FightDataManager.Instance.GetQuickFightResult(i, _dataManager.DressupList[i], _targetData.FightDatas[i], out long score, out long targetScore);
 
+                allScore += score;
+                targetAllScore += targetScore;
                 _dataManager.myScore.Add(score);
                 _dataManager.targetScore.Add(targetScore);
-                if (score > targetScore) winCount++;
             }
 
-            _dataManager.myFightScore = _dataManager.GetFightScoreList(_dataManager.DressupList);
-            _dataManager.targetFightScore = _dataManager.GetFightScoreList(_targetData.FightDatas);
-            bool result = await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
+            _dataManager.myFightPower = _dataManager.GetFightScoreList(_dataManager.DressupList);
+            _dataManager.targetFightPower = _dataManager.GetFightScoreList(_targetData.FightDatas);
+            bool result = await ArenaSproxy.ReqArenaFight(allScore > targetAllScore, _targetData, _dataManager.myFightPower, _dataManager.targetFightPower, _dataManager.myScore, _dataManager.targetScore);
 
             if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0 && _showOtherTargetGuide < 0)
             {
-
                 _showOtherTargetGuide = result ? 1 : 0;
             }
             return result;

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

@@ -152,16 +152,19 @@ namespace GFGGame
                 {
                     _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetItemName(_fightCfg.needItemId);
                     _ui.m_compNeed.target.data = _fightCfg.needItemId;
+                    _ui.m_compNeed.m_imgGot.visible = ItemDataManager.GetItemNum(_fightCfg.needItemId) > 0;
                 }
                 else if (_fightCfg.needSuitId > 0)
                 {
                     _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetSuitName(_fightCfg.needSuitId);
                     _ui.m_compNeed.target.data = _fightCfg.needSuitId;
+                    _ui.m_compNeed.m_imgGot.visible = DressUpMenuSuitDataManager.CheckHaveSuit(_fightCfg.needSuitId);
                 }
                 else
                 {
                     _ui.m_compNeed.m_c1.selectedIndex = 1;
                     _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
+                    _ui.m_compNeed.m_imgGot.visible = false;
                 }
             }
             InstanceZonesDataManager.currentScoreType = _fightCfg.scoreType;

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

@@ -183,6 +183,7 @@ namespace GFGGame
             UI_ListSkillItem item = UI_ListSkillItem.Proxy(obj);
             item.m_loaScore.url = ResPathUtil.GetScorePath(skillCfgs[index].score);
             item.m_txtScore.text = "+" + skillCfgs[index].value.ToString();
+            item.m_loaIcon.url = string.Format("ui://League/tb_jn_{0}", _type);
             bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) || SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
             item.m_imgLock.visible = isLock;
             bool canActive = true;

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

@@ -0,0 +1,145 @@
+using UnityEngine;
+using FairyGUI;
+using UI.LuckyBox;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace GFGGame
+{
+    public class LuckyBoxBonusShowView : BaseWindow
+    {
+        private UI_LuckBoxBonusShowUI _ui;
+        private List<ItemData> _rewardList = new List<ItemData>();
+        private List<GameObject> _gameobjects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        private GameObject _gameobject;
+        private GoWrapper _wrapper;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private int _effectIndex = 0;
+        public override void Dispose()
+        {
+            base.Dispose();
+            for (int i = 0; i < _gameobjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
+
+            }
+            SceneController.DestroyObjectFromView(_gameobject, _wrapper);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LuckBoxBonusShowUI.PACKAGE_NAME;
+            _ui = UI_LuckBoxBonusShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.onClick.Add(this.Hide);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
+
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_liuxing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_star, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_UI");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_bg, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_cloud");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_cloud, resPath2, out _gameObject2, out _wrapper2);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _rewardList.AddRange(this.viewData as List<ItemData>);
+            _effectIndex = 0;
+            if (_rewardList.Count == 1)
+            {
+                _ui.m_c1.selectedIndex = 0;
+                UpdateItem(_ui.m_itemOne.target, 0);
+            }
+            else
+            {
+                _ui.m_c1.selectedIndex = 1;
+                for (int i = 0; i < _rewardList.Count; i++)
+                {
+                    UpdateItem(_ui.target.GetChild("item" + i).asCom, i);
+                }
+            }
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _rewardList.Clear();
+        }
+
+        private void UpdateItem(GComponent com, int index)
+        {
+            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(com);
+
+            ItemData itemData = _rewardList[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
+            item.m_comIcon.m_txtName.text = itemCfg.name;
+            item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
+            if (itemCfg.rarity > 2)
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02");
+                if (_effectIndex > _gameobjects.Count)
+                {
+                    GameObject gameObject = _gameobjects[_effectIndex];
+                    GoWrapper wrapper = _wrappers[_effectIndex];
+                    SceneController.AddObjectToView(gameObject, wrapper, item.m_comIcon.m_holder, resPath, out gameObject, out wrapper);
+                }
+                else
+                {
+                    SceneController.AddObjectToView(null, null, item.m_comIcon.m_holder, resPath, out GameObject gameObject, out GoWrapper wrapper);
+                    _gameobjects.Add(gameObject);
+                    _wrappers.Add(wrapper);
+                }
+                _effectIndex++;
+            }
+            int count = 0;
+            bool isFirst = false;
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                if (_rewardList[i].id == itemData.id) count++;
+                if (count == 1 && i == index) isFirst = true;
+            }
+            item.m_comIcon.m_imgNew.visible = count == ItemDataManager.GetItemNum(itemData.id) && isFirst;
+            item.m_t0.Play();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(ShowItemTips);
+            }
+            item.target.data = itemCfg.id;
+            UI_LuckyBoxBonusShowItem.ProxyEnd();
+        }
+
+        private void ShowItemTips(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int itemID = (int)obj.data;
+
+            GoodsItemTipsController.ShowItemTips(itemID);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs.meta

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

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

@@ -9,8 +9,9 @@ namespace GFGGame
     public class LuckyBoxNewCardView : BaseWindow
     {
         private UI_LuckyBoxNewCardUI _ui;
-        private List<int> _newCardList = new List<int>();
-        private List<ItemData> _newDressList = new List<ItemData>();
+        // private List<int> _newCardList = new List<int>();
+        // private List<ItemData> _newDressList = new List<ItemData>();
+        private int _cardId;
         public override void Dispose()
         {
             if (_ui != null)
@@ -29,7 +30,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.onClick.Add(OnClickBtnBg);
+            _ui.m_loaBg.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {
@@ -39,17 +40,15 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
-            _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
-            _newDressList = new List<ItemData>((this.viewData as object[])[1] as List<ItemData>);
+            _cardId = (int)this.viewData;
+            // _newCardList = new List<int>((this.viewData as object[])[0] as List<int>);
             updateView();
 
         }
         private void updateView()
         {
-            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_newCardList[0]);
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(_cardId);
             _ui.m_loaBg.url = ResPathUtil.GetCardPath(cfg.res);
-            _newCardList.RemoveAt(0);
         }
         protected override void OnHide()
         {
@@ -63,19 +62,5 @@ namespace GFGGame
 
         }
 
-        private void OnClickBtnBg()
-        {
-            if (_newCardList.Count == 0)
-            {
-                this.Hide();
-                if (_newDressList.Count > 0)
-                {
-                    ViewManager.Show<LuckyBoxNewDressView>(_newDressList);
-                }
-                return;
-            }
-            updateView();
-
-        }
     }
 }

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

@@ -12,8 +12,9 @@ namespace GFGGame
     {
         private UI_LuckyBoxNewDressUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
-        // private List<ItemData> _newRewardList = new List<ItemData>();
-        // private List<ItemData> _oldRewardList = new List<ItemData>();
+        private List<ItemData> _rewardParamList = new List<ItemData>();
+        private List<ItemData> _newRewardList = new List<ItemData>();
+        private List<ItemData> _oldRewardList = new List<ItemData>();
         // private List<ItemData> _showRewardList = new List<ItemData>();
 
         // private int _type = 0;//弹窗类型：0可跳过，1：首次获得物品不可跳过,2首次获得物品不可跳过,不弹获得套装界面
@@ -24,12 +25,21 @@ namespace GFGGame
         private GoWrapper wrapper1;
         private GameObject gameObject2;
         private GoWrapper wrapper2;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
         public override void Dispose()
         {
             base.Dispose();
             SceneController.DestroyObjectFromView(gameObject, wrapper);
             SceneController.DestroyObjectFromView(gameObject1, wrapper1);
             SceneController.DestroyObjectFromView(gameObject2, wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -49,46 +59,53 @@ namespace GFGGame
 
 
             _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
-            _ui.m_btnPass.onClick.Add(OnClickBtnPass);
+            _ui.m_btnPass.onClick.Add(Hide);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
 
+
+
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zs");
             SceneController.AddObjectToView(gameObject, null, _ui.m_comCard.m_holder, resPath, out gameObject, out wrapper);
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_liuxing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_star, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "CK_UI");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_bg, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_cloud");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_cloud, resPath2, out _gameObject2, out _wrapper2);
         }
         protected override void OnShown()
         {
             base.OnShown();
-
-            _rewardList = this.viewData as List<ItemData>;
+            _rewardParamList.Clear();
+            _rewardParamList.AddRange(this.viewData as List<ItemData>);
+            _rewardList.AddRange(this.viewData as List<ItemData>);
             _ui.m_btnPass.visible = false;
-            // _newRewardList.Clear();
-            // _oldRewardList.Clear();
-            // for (int i = 0; i < _rewardList.Count; i++)
-            // {
-            //     if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
-            //     {
-            //         _newRewardList.Add(_rewardList[i]);
-            //     }
-            //     else
-            //     {
-            //         _oldRewardList.Add(_rewardList[i]);
-            //     }
-            // }
-            // if (LuckyBoxDataManager.Instance.luckyBoxId > 0)//必展示必掉奖励
-            // {
-            //     int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-            //     List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-            //     _newRewardList.AddRange(itemDatas);
-            //     LuckyBoxDataManager.Instance.luckyBoxId = 0;
-            // }
+            _newRewardList.Clear();
+            _oldRewardList.Clear();
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
+                {
+                    _newRewardList.Add(_rewardList[i]);
+                }
+                else
+                {
+                    _oldRewardList.Add(_rewardList[i]);
+                }
+            }
+
             LuckyBoxDataManager.Instance.luckyBoxId = 0;
 
             UpdateView();
         }
         private void UpdateView()
         {
-            // _ui.m_btnPass.visible = _newRewardList.Count <= 1;
-            // _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
+            _ui.m_btnPass.visible = _newRewardList.Count <= 1;
+            _rewardList = _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
 
             if (_rewardList.Count - 1 < 0) return;
             ItemData itemdata = _rewardList[_rewardList.Count - 1];
@@ -130,7 +147,17 @@ 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 (itemCfg.itemType == ConstItemType.CARD)
+            {
+                _ui.m_t_open.Play(() =>
+                {
+                    ViewManager.Show<LuckyBoxNewCardView>(itemCfg.id);
+                });
+            }
+            else
+            {
+                _ui.m_t_open.Play();
+            }
             if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
                 LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);
@@ -141,22 +168,11 @@ namespace GFGGame
 
         private void OnClickBg()
         {
-            if (_rewardList.Count == 0)
+            if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
             {
-                //     // if (_type == (int)FirstGetCardViewType.JUMP)
-                //     // {
-                //     ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0] as List<ItemData>, _rewardList });
-                //     // }
-                //     // else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
-                //     // {
-                //     //     GetSuitItemController.TryShow(0);
-
-                //     // }
                 this.Hide();
                 return;
             }
-
-
             _ui.m_t_close.Play(() =>
             {
                 _ui.m_comCard.m_holder.visible = false;
@@ -188,18 +204,14 @@ namespace GFGGame
             }
             return false;
         }
-        private void OnClickBtnPass()
-        {
 
-            ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0], _rewardList });
-            this.Hide();
-        }
         protected override void OnHide()
         {
             _ui.m_t_close.Stop(true, false);
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();
             base.OnHide();
+            ViewManager.Show<LuckyBoxBonusShowView>(_rewardParamList);
         }
     }
 }

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

@@ -25,6 +25,12 @@ namespace GFGGame
         private Dictionary<int, List<GoWrapper>> dicWraper = new Dictionary<int, List<GoWrapper>>();
         private List<GameObject> lineObj = new List<GameObject>();
         private List<GoWrapper> lineWrapper = new List<GoWrapper>();
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
         private GObject curComStar;//当前选中的星星
         private Vector2 lastPos;//鼠标的上一个位置，每颗星星初始时默认为Vector2.right;
 
@@ -73,6 +79,9 @@ 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();
@@ -90,7 +99,16 @@ namespace GFGGame
             _ui.m_btnBack.visible = false;
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
-
+            UpdateEffect();
+        }
+        private void UpdateEffect()
+        {
+            string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_liuxing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_star, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_thing");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_bg, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "bg_cloud");
+            SceneController.AddObjectToView(null, null, _ui.m_holder_cloud, resPath2, out _gameObject2, out _wrapper2);
         }
         protected override void OnShown()
         {
@@ -144,16 +162,6 @@ namespace GFGGame
                 gcom1.scale = new Vector2(scale, scale);
                 gcom1.rotation = rotation;
 
-                // GComponent gcom2 = CreateEffect(comStar, 3, "ui_ck_xs");
-                // gcom2.visible = false;
-                // comStar.target.AddChildAt(gcom2, 3);
-
-                // GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
-                // gcom3.visible = false;
-                // comStar.target.AddChildAt(gcom3, 4);
-
-
-
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
                 comStars.Add(star);
 
@@ -340,7 +348,8 @@ namespace GFGGame
             {
 
                 RemoveListener();
-                ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
+                // ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
+                ViewManager.Show<LuckyBoxNewDressView>(_rewardList);
                 this.Hide();
             }
         }

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

@@ -14,21 +14,12 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
 
-        //private GameObject _gameObject;
-        //private GoWrapper _wrapper;
-        //private GameObject _gameObject1;
-        //private GoWrapper _wrapper1;
-        //private GameObject _gameObject2;
-        //private GoWrapper _wrapper2;
-        //private GameObject _gameObject3;
-        //private GoWrapper _wrapper3;
-
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
         private DressUpObjUI _dressUpObjUIXiHe;
 
-        //private GameObject _scenePrefab;
-        //private GameObject _sceneObject;
-        //private GoWrapper _wrapper4;
-        //private DressUpObj _dressUpObj;
         private DressUpObjUI _dressUpObjUIChangXi;
 
         private bool isActiveBoxOpen = false;
@@ -57,11 +48,8 @@ namespace GFGGame
                 _dressUpObjUIChangXi.Dispose();
                 _dressUpObjUIChangXi = null;
             }
-
-            //SceneController.DestroyObjectFromView(_gameObject, _wrapper);
-            //SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            //SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            //SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
 
             if (_ui != null)
             {
@@ -222,6 +210,14 @@ namespace GFGGame
 
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            GGraph holder = comBox.m_btnBuyTen.GetChild("holder").asGraph;
+            holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            comBox.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "Button_Glow");
+            SceneController.AddObjectToView(null, null, holder, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "but_text_dc");
+            SceneController.AddObjectToView(null, null, comBox.m_holder, resPath1, out _gameObject1, out _wrapper1);
+
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
@@ -267,6 +263,13 @@ namespace GFGGame
             }
             UI_ComBox1.ProxyEnd();
         }
+
+        private void UpdateEffect()
+        {
+
+
+
+        }
         private void CheckTime(object param = null)
         {
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;

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

@@ -17,6 +17,7 @@ namespace GFGGame
         private int _curIndex;//当前评分index
         private int _score;//当前总分数
         private int _skillScore = 0;//当前卡牌技能分
+        private int _allSkillScore = 0;//当前卡牌技能叠加分，加到部件里的分，（部件开始、完美点击）
         private int _partScore = 0;//当前部件分+技能评分（_skillScore）
         private int _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
         private double _mainScore;//总主属性分
@@ -250,17 +251,22 @@ namespace GFGGame
                     CheckPartBeginSkill(null);
                     break;
                 case BeginTime.PART_FIGHT_BEGIN:
+                    _allSkillScore += _skillScore;
                     //这里不把技能分加到总分里，因为技能分会算到部件分里
                     PartScoreStart();
                     break;
                 case BeginTime.PART_PREFACT_CLICK:
-                    _score += _skillScore;
+                    _allSkillScore += _skillScore;
                     PartScoreResultStart(ClickType.PREFACT_CLICK);
                     break;
                 case BeginTime.PART_FIGHT_END:
                     _score += _skillScore;
                     UpdateProgress();
                     break;
+                case BeginTime.ALL_PERFECT_START:
+                    _score += _skillScore;
+                    AllCirclePlayStart();//完美八连击
+                    break;
             }
         }
         private void CheckPartBeginSkill(object param)
@@ -308,7 +314,7 @@ namespace GFGGame
         {
             // if (_isAllPerfect) return;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length) return;
-            _skillScore = 0;
+            // _skillScore = 0;
             _ui.m_comClick.target.touchable = false;
             int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
@@ -332,7 +338,7 @@ namespace GFGGame
             _ui.m_comClick.target.touchable = false;
 
             PartScoreResultEnd();
-            _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _skillScore);
+            _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _allSkillScore);
             _score += _partScore;
             _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
@@ -349,6 +355,7 @@ namespace GFGGame
                     _ui.m_comClick.m_comResult.m_txtCount2.text = _partScore.ToString();
                     break;
             }
+            _allSkillScore = 0;
         }
 
         private void PartScoreResultEnd()
@@ -396,7 +403,9 @@ namespace GFGGame
             {
                 if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)//0)// 
                 {
-                    AllCirclePlayStart();//完美八连击
+                    _currentTime = BeginTime.ALL_PERFECT_START;
+                    // AllCirclePlayStart();//完美八连击
+                    SkillScoreStart(null);
                 }
                 else
                 {

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

@@ -205,7 +205,7 @@ namespace GFGGame
             _ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
             _ui.m_comClick.m_comAllPerfect.target.visible = false;
             // _ui.m_LoaMask.visible = false;
-            _ui.m_proScore.m_comBar.target.width = 0;
+            _ui.m_proScore.m_comBar.target.width = _ui.m_proScore.m_comBar.target.width / 2;
             _ui.m_btnSkip.visible = InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena;
 
 
@@ -220,7 +220,7 @@ namespace GFGGame
                 _targetMainScore = ScoreSystemData.Instance.GetRobotMainScore(targetData);
             }
 
-            _ui.m_proScore.m_txtNpcScore.text = targetData.name + " 0";
+            _ui.m_proScore.m_txtNpcScore.text = " 0";
             _targetRoundTimes = ScoreSystemData.Instance.GetRoundTime(targetData.cardId, targetData.skillLvs);
 
 
@@ -316,6 +316,13 @@ namespace GFGGame
 
             UpdateSkill1();
         }
+        private void CheckAllPerfectClickSkill()
+        {
+            _currentTime = BeginTime.ALL_PERFECT_START;
+
+            UpdateSkill0();
+        }
+
         private void CheckPartFightEndSkill()
         {
             _skillScore = 0;
@@ -424,6 +431,9 @@ namespace GFGGame
                 case BeginTime.PART_FIGHT_END:
                     UpdateProgress(OnePartScoreEnd);
                     break;
+                case BeginTime.ALL_PERFECT_START:
+                    UpdateProgress(AllCirclePlayStart);
+                    break;
             }
         }
 
@@ -530,7 +540,7 @@ namespace GFGGame
             _ui.m_proScore.m_txtMineScore.text = " " + _score;
             _ui.m_proScore.m_txtNpcScore.text = " " + _targetScore;
 
-            double proportion = _score + _targetScore == 0 ? 0 : _score / (_score + _targetScore);
+            double proportion = _score + _targetScore == 0 ? 0.5 : _score / (_score + _targetScore);
             float width = (float)(proportion * _ui.m_proScore.target.width);
             width = width > _ui.m_proScore.m_comBar.target.initWidth ? _ui.m_proScore.m_comBar.target.initWidth : width;
             GTween.To(_ui.m_proScore.m_comBar.target.width, width, 0.3f).SetTarget(_ui.m_proScore.m_comBar).OnUpdate((GTweener t) =>
@@ -548,8 +558,8 @@ namespace GFGGame
             {
                 if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)// 0)// 
                 {
-                    _ui.m_comClick.m_comAllPerfect.target.visible = true;
-                    AllCirclePlayStart();//完美八连击
+                    CheckAllPerfectClickSkill();
+                    // AllCirclePlayStart();//完美八连击
                 }
                 else
                 {

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

@@ -30,8 +30,8 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_comBg.GetChild("btnClose").asCom.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

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

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

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

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