竞技场

FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -14,7 +14,7 @@
     <text id="n3_psph" name="txtDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n10_jcej" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#fef7f6" text="段位名字"/>
     <group id="n10_jcej" name="n10" xy="440,214" size="200,249" advanced="true"/>
     <image id="n5_jcej" name="n5" src="jcej3z" fileName="images/pmts_ffbtbt.png" xy="422,540" group="n11_jcej"/>
-    <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" scale="0.7,0.7" layout="row" colGap="50" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" colGap="50" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Arena/ArenaDressInfoUI.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="自己的搭配"/>
     <remark page="1" value="查看他人搭配"/>
   </controller>
-  <controller name="c2" pages="0,,1,,2," selected="1">
+  <controller name="c2" pages="0,,1,,2," selected="0">
     <remark page="0" value="主题一"/>
     <remark page="1" value="主题二"/>
     <remark page="2" value="主题三"/>
@@ -17,20 +17,20 @@
     </loader>
     <image id="n81_jcej" name="n81" src="jcej2q" fileName="images/jjsy_xzdik.png" xy="150,80" size="670,75" group="n79_psph"/>
     <component id="n74_psph" name="btn0" src="psph1e" fileName="components/BtnTab3.xml" xy="151,81" group="n79_psph">
-      <Button icon="ui://4lc5fhlbjcej2r" selectedIcon="ui://4lc5fhlbjcej2n" controller="c2" page="0"/>
+      <Button checked="true" icon="ui://4lc5fhlbjcej2r" selectedIcon="ui://4lc5fhlbjcej2n" controller="c2" page="0"/>
     </component>
     <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="375,81" size="224,77" group="n79_psph">
-      <Button checked="true" icon="ui://4lc5fhlbjcej2s" selectedIcon="ui://4lc5fhlbjcej2o" controller="c2" page="1"/>
+      <Button icon="ui://4lc5fhlbjcej2s" selectedIcon="ui://4lc5fhlbjcej2o" controller="c2" page="1"/>
     </component>
     <component id="n78_psph" name="btn2" src="psph1e" fileName="components/BtnTab3.xml" xy="599,81" size="224,77" group="n79_psph">
       <Button icon="ui://4lc5fhlbjcej2t" selectedIcon="ui://4lc5fhlbjcej2p" controller="c2" page="2"/>
     </component>
     <group id="n79_psph" name="n79" xy="150,80" size="673,78" advanced="true"/>
     <component id="n83_jcej" name="comValueInfo" src="jcej3t" fileName="components/ComValueInfo.xml" xy="18,236"/>
-    <component id="n14_psph" name="comListBg" src="psph16" fileName="components/comListType.xml" xy="850,40" size="230,1880">
+    <component id="n14_psph" name="comListBg" src="psph16" fileName="components/ComListType.xml" xy="850,40" size="230,1880">
       <relation target="" sidePair="height-height"/>
     </component>
-    <list id="n37_psph" name="list" xy="853,185" size="227,1734" overflow="scroll" lineGap="30" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
+    <list id="n37_psph" name="list" xy="853,185" size="227,1734" overflow="scroll" lineGap="30" defaultItem="ui://4lc5fhlbv4614r" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -48,16 +48,14 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
     <component id="n73_psph" name="btnDress" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="107,1725" group="n31_psph">
-      <relation target="" sidePair="bottom-bottom"/>
       <Button title="更换搭配"/>
     </component>
     <component id="n30_psph" name="btnRecommend" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="475,1724" group="n31_psph">
-      <relation target="" sidePair="bottom-bottom"/>
       <Button title="推荐搭配"/>
     </component>
     <group id="n31_psph" name="n31" xy="107,1724" size="712,97" advanced="true" layout="hz" colGap="26" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="center-center,bottom-bottom"/>
+      <relation target="" sidePair="bottom-bottom"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/Arena/ArenaRankUI.xml

@@ -27,8 +27,8 @@
     <group id="n17_psph" name="n17" xy="179,160" size="589,83" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <list id="n25_psph" name="listRank" xy="30,316" size="888,685" overflow="scroll" lineGap="20" defaultItem="ui://4lc5fhlbpsphy" autoClearItems="true" foldInvisibleItems="true">
-      <gearSize controller="c1" pages="1" values="888,821,1,1" default="888,685,1,1"/>
+    <list id="n25_psph" name="listRank" xy="30,291" size="888,710" overflow="scroll" lineGap="30" defaultItem="ui://4lc5fhlbpsphy" autoClearItems="true" foldInvisibleItems="true">
+      <gearSize controller="c1" pages="0,1" values="888,710,1,1|888,841,1,1"/>
       <relation target="" sidePair="bottom-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/Arena/components/Button15.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="119,119" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_ygap" name="n0" src="v4614y" fileName="images/hz_qhdzfz.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n1_ygap" name="icon" xy="12,12" size="95,95" aspect="true" url="ui://4lc5fhlbv4614z" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Arena/components/ComActionSelect.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="228,192">
+  <displayList>
+    <image id="n12_ygap" name="n12" src="v4614w" fileName="images/hz_hzhzmbmb.png" xy="18,0"/>
+    <component id="n13_ygap" name="btnNormal" src="v4614x" fileName="components/Button15.xml" xy="0,53" group="n18_ygap" aspect="true"/>
+    <component id="n14_ygap" name="btnAction" src="v4614x" fileName="components/Button15.xml" xy="109,53" group="n18_ygap" aspect="true"/>
+    <group id="n18_ygap" name="n18" xy="0,53" size="228,119" advanced="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/components/ComCostCurrency.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="202,46">
   <displayList>
-    <text id="n2_ojlz" name="n2" xy="0,2" size="63,42" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" text="消耗"/>
+    <text id="n2_ojlz" name="n2" xy="0,2" size="63,41" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" text="消耗"/>
     <loader id="n1_ojlz" name="loaIcon" xy="68,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="123,2" size="79,42" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
+    <text id="n6_j5a5" name="txtNeed" xy="123,2" size="79,41" group="n7_si5z" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
     <group id="n7_si5z" name="n7" xy="0,-2" size="202,50" advanced="true" layout="hz" colGap="5" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>

FGUIProject/assets/Arena/components/ComMyDanReward.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="970,173">
+<component size="970,173" overflow="hidden">
   <displayList>
     <image id="n4_jcej" name="n4" src="jcej3f" fileName="images/dwjl_zjzj.png" xy="0,0"/>
-    <list id="n0_psph" name="listReward" xy="348,8" size="769,222" scale="0.7,0.7" layout="row" overflow="scroll" colGap="50" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <list id="n0_psph" name="listReward" xy="260,-24" size="769,222" layout="row" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
     </list>
-    <loader id="n2_psph" name="loaDanIcon" xy="144,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://4lc5fhlbpsphz" fill="scale"/>
-    <loader id="n3_psph" name="loaSelf" xy="260,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="159,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <loader id="n3_psph" name="loaSelf" xy="275,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -1,47 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="277,254">
   <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="4,0" group="n92_jcej"/>
-    <text id="n82_jcej" name="txtFightScore" xy="44,7" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" autoClearText="true" text="竞技场战力：999"/>
-    <component id="n108_jcej" name="n108" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="14,13" size="29,29" group="n92_jcej">
-      <Button icon="ui://eg2y0ldpjcej2k"/>
+    <image id="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="0,0" size="288,56" group="n92_jcej" pkg="eg2y0ldp">
+      <relation target="n82_jcej" sidePair="width-width"/>
+    </image>
+    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" vars="true" text="竞技场战力：{value=000}"/>
+    <component id="n108_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="10,13" size="29,29" group="n92_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
-    <group id="n92_jcej" name="n92" xy="4,0" size="272,56"/>
-    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="7,70" group="n86_jcej"/>
-    <loader id="n84_jcej" name="scoreType" xy="6,72" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n85_jcej" name="txtScore" xy="61,72" size="124,54" group="n86_jcej" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
-    <group id="n86_jcej" name="n86" xy="6,70" size="204,57"/>
-    <image id="n93_jcej" name="n93" src="jcej2i" fileName="images/jjsy_bqdi.png" xy="6,139" group="n90_jcej"/>
-    <text id="n94_jcej" name="n94" xy="63,142" size="116,39" group="n90_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" text="标签加成"/>
-    <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="187,149" size="29,29" group="n90_jcej">
+    <group id="n92_jcej" name="n92" xy="0,0" size="288,56"/>
+    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="1,70" size="248,57" group="n86_jcej" pkg="eg2y0ldp"/>
+    <loader id="n84_jcej" name="scoreType" xy="0,72" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n85_jcej" name="txtScore" xy="80,72" size="124,54" group="n86_jcej" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
+    <group id="n86_jcej" name="n86" xy="0,70" size="249,57"/>
+    <image id="n93_jcej" name="n93" src="jcej2i" fileName="images/jjsy_bqdi.png" xy="4,139" group="n90_jcej" pkg="eg2y0ldp"/>
+    <text id="n94_jcej" name="n94" xy="58,142" size="116,39" group="n90_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" text="标签加成"/>
+    <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="185,149" size="29,29" group="n90_jcej">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="27,187" group="n90_jcej"/>
-    <text id="n89_jcej" name="txtTagScore" xy="178,187" pivot="0.5,0" size="19,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
-    <image id="n96_jcej" name="n96" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="35,229" group="n101_jcej"/>
-    <image id="n97_jcej" name="n97" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="51,229" group="n101_jcej"/>
-    <image id="n98_jcej" name="n98" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="67,229" group="n101_jcej"/>
-    <image id="n99_jcej" name="n99" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="83,229" group="n101_jcej"/>
-    <image id="n100_jcej" name="n100" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="99,229" group="n101_jcej"/>
-    <group id="n101_jcej" name="n101" xy="35,229" size="78,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
-    <image id="n102_jcej" name="n102" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="35,229" group="n107_jcej">
+    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n90_jcej"/>
+    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <image id="n96_jcej" name="n96" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="33,229" group="n101_jcej"/>
+    <image id="n97_jcej" name="n97" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="49,229" group="n101_jcej"/>
+    <image id="n98_jcej" name="n98" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="65,229" group="n101_jcej"/>
+    <image id="n99_jcej" name="n99" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="81,229" group="n101_jcej"/>
+    <image id="n100_jcej" name="n100" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="97,229" group="n101_jcej"/>
+    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <image id="n102_jcej" name="n102" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="33,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="1,2,3,4,5"/>
     </image>
-    <image id="n103_jcej" name="n103" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="51,229" group="n107_jcej">
+    <image id="n103_jcej" name="n103" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="49,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="2,3,4,5"/>
     </image>
-    <image id="n104_jcej" name="n104" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="67,229" group="n107_jcej">
+    <image id="n104_jcej" name="n104" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="65,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="3,4,5"/>
     </image>
-    <image id="n105_jcej" name="n105" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="83,229" group="n107_jcej">
+    <image id="n105_jcej" name="n105" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="81,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="4,5"/>
     </image>
-    <image id="n106_jcej" name="n106" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="99,229" group="n107_jcej">
+    <image id="n106_jcej" name="n106" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="97,229" group="n107_jcej">
       <gearDisplay controller="c1" pages="5"/>
     </image>
-    <group id="n107_jcej" name="n107" xy="35,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
-    <group id="n90_jcej" name="n90" xy="6,139" size="244,115"/>
-    <component id="n109_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="5,58" controller="c1,1"/>
+    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n90_jcej" name="n90" xy="4,139" size="244,115"/>
+    <component id="n109_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="5,58" controller="c1,1">
+      <gearDisplay controller="c2" pages="1"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListDanRewardItem.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="924,173">
+<component size="924,173" overflow="hidden">
   <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej3v" fileName="images/dwjl_dedtp.png" xy="0,0"/>
     <loader id="n10_jcej" name="loaRank" xy="126,86" pivot="0.5,0.5" anchor="true" size="88,87" autoSize="true">
       <gearIcon controller="c1" pages="1,2,3" values="ui://4lc5fhlbjcej3m|ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default=""/>
     </loader>
-    <text id="n6_psph" name="txtRank" xy="25,63" pivot="0.5,0" size="201,54" fontSize="40" color="#a98860" align="center" text="灵感重构大">
+    <text id="n6_psph" name="txtRank" xy="34,63" pivot="0.5,0" size="201,54" fontSize="40" color="#a98860" align="center" text="灵感重构大">
       <gearDisplay controller="c1" pages="0,4"/>
     </text>
-    <list id="n7_psph" name="listReward" xy="325,8" size="772,222" scale="0.7,0.7" layout="row" overflow="scroll" colGap="50" defaultItem="ui://eg2y0ldpj48o98">
+    <list id="n7_psph" name="listReward" xy="224,-24" size="772,222" layout="row" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" align="center" vAlign="middle">
       <item/>
       <item/>
       <item/>
     </list>
-    <image id="n11_jcej" name="imgGot" src="jcej3x" fileName="images/dwjl_ylqylq.png" xy="235,0"/>
+    <image id="n11_jcej" name="imgGot" src="jcej3x" fileName="images/dwjl_ylqylq.png" xy="249,0"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListPartsItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,240">
+  <displayList>
+    <image id="n4_qsvd" name="iconSelected" src="v4614s" fileName="components/hz_xzyfxz.png" xy="22,0" size="192,192"/>
+    <loader id="n1_k6he" name="icon" xy="35,13" pivot="0.5,0.5" size="166,166" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n6_8xpg" name="txtScore" xy="143,160" pivot="0.5,0" size="69,36" font="ui://eg2y0ldpwonotjc" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
+    <image id="n2_k6he" name="n2" src="v4614u" fileName="components/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>
+    <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,41" group="n11_wono" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
+    <group id="n11_wono" name="n11" xy="13,198" size="208,43"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/components/ListRankItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="258,430">
-  <controller name="c1" pages="0,,1,,2,,3," selected="1"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <image id="n6_jcej" name="n6" src="jcej43" fileName="images/phbphb_pbtdi.png" xy="0,0"/>
     <image id="n16_jcej" name="n16" src="jcej46" fileName="images/phbphb_xxt.png" xy="9,283"/>
@@ -10,7 +10,7 @@
     <loader id="n7_jcej" name="loaRank" xy="85,21" size="88,87" url="ui://4lc5fhlbjcej3m" autoSize="true">
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
-    <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="182,57" scale="0.9,0.9"/>
+    <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
     <loader id="n12_jcej" name="loaDanIcon" xy="94,358" size="69,65" url="ui://4lc5fhlbpsphz" fill="scale"/>
     <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
     <text id="n13_jcej" name="txtDanRank" xy="30,323" size="139,34" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排行：1"/>

FGUIProject/assets/Arena/components/ListRankItem0.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="888,170">
+<component size="888,530">
   <displayList>
-    <component id="n9_psph" name="ListRankItem" src="psphu" fileName="components/ListRankItem.xml" xy="315,0"/>
+    <component id="n9_psph" name="ListRankItem0" src="psphu" fileName="components/ListRankItem.xml" xy="315,0"/>
+    <component id="n10_v461" name="ListRankItem1" src="psphu" fileName="components/ListRankItem.xml" xy="0,150"/>
+    <component id="n13_v461" name="ListRankItem2" src="psphu" fileName="components/ListRankItem.xml" xy="630,150"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem1.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="888,0">
-  <displayList>
-    <component id="n9_psph" name="ListRankItem" src="psphu" fileName="components/ListRankItem.xml" xy="0,0"/>
-  </displayList>
+  <displayList/>
 </component>

FGUIProject/assets/Arena/components/ListRankItem2.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="888,430">
-  <displayList>
-    <component id="n9_psph" name="ListRankItem" src="psphu" fileName="components/ListRankItem.xml" xy="630,0"/>
-  </displayList>
+<component size="888,0">
+  <displayList/>
 </component>

FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej44" fileName="images/phbphb_phdi_1.png" xy="0,0"/>
     <text id="n12_psph" name="txtRank" xy="68,41" pivot="0.5,0" size="49,59" group="n18_psph" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#a98860" align="center" autoClearText="true" text="--"/>
-    <loader id="n16_psph" name="loaDanIcon" xy="615,20" size="99,98" group="n18_psph" url="ui://4lc5fhlbpsphz" fill="scale" clearOnPublish="true"/>
+    <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://4lc5fhlbpsphz" fill="scale" clearOnPublish="true"/>
     <text id="n26_jcej" name="n26" xy="729,24" size="122,41" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排行"/>
     <text id="n17_psph" name="txtDanRank" xy="770,58" pivot="0.5,0" size="40,56" group="n27_jcej" font="ui://eg2y0ldpweoktkb" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="729,24" size="122,90" group="n18_psph"/>
@@ -11,11 +11,11 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="299,71" group="n29_jcej"/>
     <text id="n15_psph" name="txtFightScore" xy="300,78" size="201,39" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
     <group id="n29_jcej" name="n29" xy="299,20" size="236,97" group="n18_psph"/>
-    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="152,-1" size="229,230" group="n30_jcej" scale="0.58,0.58"/>
-    <image id="n22_jcej" name="n22" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="168,20" group="n30_jcej"/>
-    <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="233,20" group="n30_jcej" scale="0.6,0.6"/>
-    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="230,84" group="n30_jcej" scale="0.9,0.9"/>
-    <group id="n30_jcej" name="n30" xy="152,-1" size="229,230" group="n18_psph"/>
-    <group id="n18_psph" name="n18" xy="68,-1" size="783,230"/>
+    <group id="n18_psph" name="n18" xy="68,20" size="783,98"/>
+    <component id="n31_v461" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="130,-18" size="229,230" group="n35_v461" scale="0.73,0.73"/>
+    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="151,9" group="n35_v461"/>
+    <component id="n33_v461" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="235,11" group="n35_v461" scale="0.7,0.7"/>
+    <component id="n34_v461" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="236,99" group="n35_v461" scale="0.9,0.9"/>
+    <group id="n35_v461" name="n35" xy="130,-18" size="229,230"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -2,20 +2,20 @@
 <component size="916,165">
   <displayList>
     <image id="n19_jcej" name="n19" src="jcej4d" fileName="images/phbphb_zjpm.png" xy="0,0"/>
-    <text id="n12_psph" name="txtRank" xy="71,54" pivot="0.5,0" size="49,59" group="n18_psph" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#a98860" align="center" autoClearText="true" text="--"/>
-    <loader id="n16_psph" name="loaDanIcon" xy="619,33" size="99,98" group="n18_psph" url="ui://4lc5fhlbpsphz" fill="scale"/>
-    <text id="n26_jcej" name="n26" xy="733,37" size="122,41" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排行"/>
-    <text id="n17_psph" name="txtDanRank" xy="774,71" pivot="0.5,0" size="40,56" group="n27_jcej" font="ui://eg2y0ldpweoktkb" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
-    <group id="n27_jcej" name="n27" xy="733,37" size="122,90" group="n18_psph"/>
-    <text id="n14_psph" name="txtName" xy="305,33" size="42,52" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
-    <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="303,84" group="n29_jcej"/>
-    <text id="n15_psph" name="txtArenaScore" xy="304,91" size="201,39" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
-    <group id="n29_jcej" name="n29" xy="303,33" size="236,97" group="n18_psph"/>
-    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="156,12" size="229,230" group="n30_jcej" scale="0.58,0.58"/>
-    <image id="n22_jcej" name="n22" src="jcej2c" fileName="images/jjsjs_txk_2.png" xy="172,33" group="n30_jcej"/>
-    <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="237,33" group="n30_jcej" scale="0.6,0.6"/>
-    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="234,97" group="n30_jcej" scale="0.9,0.9"/>
-    <group id="n30_jcej" name="n30" xy="156,12" size="229,230" group="n18_psph"/>
-    <group id="n18_psph" name="n18" xy="71,12" size="783,230"/>
+    <text id="n12_psph" name="txtRank" xy="81,54" pivot="0.5,0" size="49,59" group="n18_psph" font="ui://eg2y0ldpwonotjc" fontSize="44" color="#a98860" align="center" autoClearText="true" text="--"/>
+    <loader id="n16_psph" name="loaDanIcon" xy="617,33" size="99,98" group="n18_psph" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <text id="n14_psph" name="txtName" xy="312,33" size="42,51" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="38" color="#927550" align="center" autoClearText="true" text="--"/>
+    <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="310,84" group="n29_jcej"/>
+    <text id="n15_psph" name="txtArenaScore" xy="311,91" size="201,39" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力：--"/>
+    <group id="n29_jcej" name="n29" xy="310,33" size="236,97" group="n18_psph"/>
+    <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c09c6d" text="段位排行"/>
+    <text id="n17_psph" name="txtDanRank" xy="783,71" pivot="0.5,0" size="40,56" group="n27_jcej" font="ui://eg2y0ldpweoktkb" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
+    <group id="n27_jcej" name="n27" xy="742,37" size="122,90" group="n18_psph"/>
+    <component id="n13_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="141,-6" size="229,230" group="n30_jcej" scale="0.73,0.73"/>
+    <image id="n32_v461" name="n32" src="jcej33" fileName="images/jzsjzs_txktx.png" xy="162,21" group="n30_jcej"/>
+    <component id="n24_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="246,19" group="n30_jcej" scale="0.7,0.7"/>
+    <component id="n23_jcej" name="comLv" src="psphq" fileName="components/ComLv.xml" pkg="eg2y0ldp" xy="246,111" group="n30_jcej" scale="0.9,0.9"/>
+    <group id="n30_jcej" name="n30" xy="141,-6" size="229,230" group="n18_psph"/>
+    <group id="n18_psph" name="n18" xy="81,-6" size="783,230"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/package.xml

@@ -78,8 +78,6 @@
     <image id="jcej2e" name="bpjl_ktx_3.png" path="/images/"/>
     <image id="jcej2f" name="jjsjs_di.png" path="/images/"/>
     <image id="jcej2g" name="jjsjs_mbmb.png" path="/images/"/>
-    <image id="jcej2h" name="jjsy_zldi.png" path="/images/"/>
-    <image id="jcej2i" name="jjsy_bqdi.png" path="/images/"/>
     <image id="jcej2j" name="jjsy_btbtdi.png" path="/images/"/>
     <image id="jcej2l" name="jjsy_xx_1.png" path="/images/"/>
     <image id="jcej2m" name="jjsy_xx_2.png" path="/images/"/>
@@ -123,8 +121,7 @@
     <image id="jcej3o" name="xqfs_dwewjl.png" path="/images/"/>
     <image id="jcej3q" name="jzsjzs_anniu_2.png" path="/images/"/>
     <image id="jcej3r" name="jzsjzs_fhxz.png" path="/images/"/>
-    <image id="jcej3s" name="dz_hz_fsk_1.png" path="/images/" scale="9grid" scale9grid="50,14,100,28"/>
-    <component id="jcej3t" name="ComValueInfo.xml" path="/components/" exported="true"/>
+    <component id="jcej3t" name="ComValueInfo.xml" path="/components/"/>
     <component id="jcej3u" name="ComCardMask.xml" path="/components/"/>
     <image id="jcej3v" name="dwjl_dedtp.png" path="/images/"/>
     <image id="jcej3w" name="dwjl_btbt.png" path="/images/"/>
@@ -157,6 +154,15 @@
     <image id="jcej4o" name="jjcdi_jjxian.png" path="/images/"/>
     <image id="jcej4p" name="jjcdi_jjcdi.png" path="/images/"/>
     <component id="jcej4q" name="ComFightScore.xml" path="/components/"/>
+    <component id="v4614r" name="ListPartsItem.xml" path="/components/"/>
+    <image id="v4614s" name="hz_xzyfxz.png" path="/components/"/>
+    <image id="v4614t" name="hz_bcbc_1.png" path="/components/"/>
+    <image id="v4614u" name="hz_minzikuang.png" path="/components/"/>
+    <component id="v4614v" name="ComActionSelect.xml" path="/components/"/>
+    <image id="v4614w" name="hz_hzhzmbmb.png" path="/components/"/>
+    <component id="v4614x" name="Button15.xml" path="/components/"/>
+    <image id="v4614y" name="hz_qhdzfz.png" path="/components/"/>
+    <image id="v4614z" name="tz_yuexiazy.png" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/package.xml

@@ -238,9 +238,12 @@
     <image id="jcejtkl" name="hz_zdzddg_3.png" path="/components/"/>
     <image id="jcejtkm" name="hz_zdzddg_1.png" path="/components/"/>
     <image id="jcejtkn" name="hz_zdzddg_2.png" path="/components/"/>
-    <image id="jcej2k" name="jjsy_gth.png" path="/images/"/>
+    <image id="jcej2k" name="jjsy_gth.png" path="/images/" exported="true"/>
     <component id="jcejtko" name="RuleUI.xml" path="/" exported="true"/>
     <component id="jcejtkp" name="ComContent.xml" path="/components/"/>
+    <image id="jcej3s" name="dz_hz_fsk_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="50,14,100,28"/>
+    <image id="jcej2i" name="jjsy_bqdi.png" path="/imagesExport/" exported="true"/>
+    <image id="jcej2h" name="jjsy_zldi.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="68,14,136,28"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -11,9 +11,9 @@
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
     <image id="n50_f2bf" name="n50" src="f2bfey" fileName="images/dz_cdxzcdxz.png" xy="837,60" group="n51_f2bf"/>
-    <text id="n49_f2bf" name="txtDressLimit" xy="857,63" size="216,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
+    <text id="n49_f2bf" name="txtDressLimit" xy="855,63" size="216,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
     <group id="n51_f2bf" name="n51" xy="837,60" size="243,44" group="n38_8lqj"/>
-    <component id="n59_jcej" name="comValueInfo" src="jcej3t" fileName="components/ComValueInfo.xml" pkg="4lc5fhlb" xy="18,236" group="n38_8lqj"/>
+    <component id="n59_jcej" name="comValueInfo" src="v461f0" fileName="components/ComValueInfo.xml" xy="18,236" group="n38_8lqj"/>
     <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="components/comListType.xml" xy="850,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>

FGUIProject/assets/DressUp/components/ComFightScore.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="365,168">
+  <controller name="c1" exported="true" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n54_jcej" name="n54" src="v461f4" fileName="images/jjcdi_jjcdi.png" xy="0,0" pivot="0.5,0.5" scale="-1,1">
+      <gearSize controller="c1" pages="1" values="365,168,-1,-1" default="365,168,-1,1"/>
+    </image>
+    <image id="n55_jcej" name="n55" src="v461f5" fileName="images/jjcdi_jjxian.png" xy="19,53" group="n60_jcej"/>
+    <text id="n56_jcej" name="n56" xy="20,8" size="152,42" group="n60_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#f8f1db" text="竞技场战力"/>
+    <text id="n57_jcej" name="txtSuitScore" xy="20,60" size="126,32" group="n60_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#f8f1db" vars="true" text="搭配之力：{value=0}"/>
+    <text id="n58_jcej" name="txtClickScore" xy="20,87" size="169,32" group="n60_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#f8f1db" vars="true" text="卓越点击战力：{value=0}"/>
+    <text id="n59_jcej" name="txtCardScore" xy="20,114" size="126,32" group="n60_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#f8f1db" vars="true" text="卡牌战力：{value=0}"/>
+    <group id="n60_jcej" name="n60" xy="19,8" size="326,138" advanced="true">
+      <gearXY controller="c1" pages="0,1" values="19,8|19,19"/>
+    </group>
+  </displayList>
+</component>

FGUIProject/assets/DressUp/components/ComValueInfo.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="277,254">
+  <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="0,0" size="288,56" group="n92_jcej" pkg="eg2y0ldp">
+      <relation target="n82_jcej" sidePair="width-width"/>
+    </image>
+    <text id="n82_jcej" name="txtFightScore" xy="48,7" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" vars="true" text="竞技场战力：{value=000}"/>
+    <component id="n108_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="10,13" size="29,29" group="n92_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+    </component>
+    <group id="n92_jcej" name="n92" xy="0,0" size="288,56"/>
+    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="1,70" size="248,57" group="n86_jcej" pkg="eg2y0ldp"/>
+    <loader id="n84_jcej" name="scoreType" xy="0,72" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n85_jcej" name="txtScore" xy="80,72" size="124,54" group="n86_jcej" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
+    <group id="n86_jcej" name="n86" xy="0,70" size="249,57"/>
+    <image id="n93_jcej" name="n93" src="jcej2i" fileName="images/jjsy_bqdi.png" xy="4,139" group="n90_jcej" pkg="eg2y0ldp"/>
+    <text id="n94_jcej" name="n94" xy="58,142" size="116,39" group="n90_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" text="标签加成"/>
+    <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="185,149" size="29,29" group="n90_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k"/>
+    </component>
+    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n90_jcej"/>
+    <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
+    <image id="n96_jcej" name="n96" src="v461f1" fileName="images/jjsy_xx_2.png" xy="33,229" group="n101_jcej"/>
+    <image id="n97_jcej" name="n97" src="v461f1" fileName="images/jjsy_xx_2.png" xy="49,229" group="n101_jcej"/>
+    <image id="n98_jcej" name="n98" src="v461f1" fileName="images/jjsy_xx_2.png" xy="65,229" group="n101_jcej"/>
+    <image id="n99_jcej" name="n99" src="v461f1" fileName="images/jjsy_xx_2.png" xy="81,229" group="n101_jcej"/>
+    <image id="n100_jcej" name="n100" src="v461f1" fileName="images/jjsy_xx_2.png" xy="97,229" group="n101_jcej"/>
+    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <image id="n102_jcej" name="n102" src="v461f2" fileName="images/jjsy_xx_1.png" xy="33,229" group="n107_jcej">
+      <gearDisplay controller="c1" pages="1,2,3,4,5"/>
+    </image>
+    <image id="n103_jcej" name="n103" src="v461f2" fileName="images/jjsy_xx_1.png" xy="49,229" group="n107_jcej">
+      <gearDisplay controller="c1" pages="2,3,4,5"/>
+    </image>
+    <image id="n104_jcej" name="n104" src="v461f2" fileName="images/jjsy_xx_1.png" xy="65,229" group="n107_jcej">
+      <gearDisplay controller="c1" pages="3,4,5"/>
+    </image>
+    <image id="n105_jcej" name="n105" src="v461f2" fileName="images/jjsy_xx_1.png" xy="81,229" group="n107_jcej">
+      <gearDisplay controller="c1" pages="4,5"/>
+    </image>
+    <image id="n106_jcej" name="n106" src="v461f2" fileName="images/jjsy_xx_1.png" xy="97,229" group="n107_jcej">
+      <gearDisplay controller="c1" pages="5"/>
+    </image>
+    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <group id="n90_jcej" name="n90" xy="4,139" size="244,115"/>
+    <component id="n109_jcej" name="comFightScore" src="v461f3" fileName="components/ComFightScore.xml" xy="5,58" controller="c1,1">
+      <gearDisplay controller="c2" pages="1"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/DressUp/package.xml

@@ -191,6 +191,12 @@
     <image id="ygapex" name="hz_fenleitu_13.png" path="/imagesExport/" exported="true" atlas="1"/>
     <image id="f2bfey" name="dz_cdxzcdxz.png" path="/images/"/>
     <component id="psphez" name="ArenaDressUpFightUI.xml" path="/" exported="true"/>
+    <component id="v461f0" name="ComValueInfo.xml" path="/components/"/>
+    <image id="v461f1" name="jjsy_xx_2.png" path="/images/"/>
+    <image id="v461f2" name="jjsy_xx_1.png" path="/images/"/>
+    <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -57,8 +57,8 @@
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
     <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>
-      <property target="loaLockIcon" propertyId="1" value=""/>
-      <property target="icon1" propertyId="1" value=""/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv461j7"/>
     </component>
     <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="616,1195" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8ik"/>

FGUIProject/assets/Main/components/ButtonModle6.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="339,523" opaque="false" extention="Button">
+<component size="282,523" opaque="false" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <graph id="n2_lki4" name="holder" xy="168,260" size="0,0" touchable="false">
+    <graph id="n2_lki4" name="holder" xy="139,260" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <image id="n11_mzf8" name="n11" src="mzf8ik" fileName="images/zjm_tptp_1.png" xy="-71,18"/>
-    <graph id="n4_lki4" name="holder1" xy="168,260" size="0,0" touchable="false">
+    <graph id="n4_lki4" name="holder1" xy="139,260" size="0,0" touchable="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
-    <loader id="n10_mzf8" name="icon1" xy="262,3" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
+    <loader id="n10_mzf8" name="icon1" xy="205,3" size="77,256" url="ui://mfvz4q8kv482fs" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
-    <loader id="n8_v95q" name="loaLockIcon" xy="263,3" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
+    <loader id="n8_v95q" name="loaLockIcon" xy="206,3" size="76,255" url="ui://mfvz4q8kv95qhz" autoSize="true">
       <relation target="" sidePair="right-right,top-top"/>
     </loader>
     <loader id="n12_mzf8" name="n12" xy="70,22" size="130,502"/>

FGUIProject/assets/Main/package.xml

@@ -458,6 +458,7 @@
     <component id="psphj4" name="ComAllPerfect.xml" path="/components/"/>
     <component id="psphj5" name="ComClick.xml" path="/components/"/>
     <component id="jcejj6" name="ArenaFightResultUI.xml" path="/" exported="true"/>
+    <image id="v461j7" name="zjm_e_6.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -172,6 +172,7 @@ namespace GFGGame
             RoleInfoManager.Instance.Clear();
             DailyTaskDataManager.Instance.Clear();
             TravelDataManager.Instance.Clear();
+            ArenaDataManager.Instance.Clear();
             GameGlobal.zoneScene.GetComponent<SessionComponent>()?.Disconnect();
             GameGlobal.zoneScene.GetComponent<ServerInfosComponent>()?.ServerInfoList?.Clear();
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
@@ -243,6 +244,7 @@ namespace GFGGame
             TravelSProxy.ReqTravelInfo().Coroutine();
             TravelSProxy.ReqTravelGuideInfo().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
+            // ArenaSproxy.GetArenaInfos().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -1,13 +1,14 @@
 using System;
 using System.Collections.Generic;
+using ET;
 using FairyGUI;
 
 namespace GFGGame
 {
     public class ArenaDataManager : SingletonBase<ArenaDataManager>
     {
-        public List<int> ThemeList = new List<int>();//本周主题列表
-        public string Tag;//本周标签
+        public List<int> ThemeList = new List<int>() { 1, 2, 3 };//本周主题列表
+        public string Tag = "未央";//本周标签
         public int SeasonId = 1;// 赛季id
         public int Grade = 1;//本赛季段位
         public int Rank = 10000;//本赛季段位内排名
@@ -49,6 +50,9 @@ namespace GFGGame
         {
             DressupList.Clear();
             Targets.Clear();
+            RankDatasDic.Clear();
+            HistoryDatas.Clear();
+            HistoryDatas = null;
         }
 
         /// <summary>
@@ -84,22 +88,49 @@ namespace GFGGame
 
             foreach (int subType in itemDatasDic.Keys)
             {
+                int key = subType;
                 if (itemDatasDic.Count == 0) continue;
+                if (DressUpMenuItemCfg1Array.Instance.CheckIsSceneTypeBySubType(subType)) continue;
                 List<int> dressList = SortDressList(itemDatasDic[subType], scoreType, tags);
                 int max = subType == (int)ConstDressUpItemType.TE_SHU ? 3 : 1;
                 max = Math.Min(max, dressList.Count);
-                itemListDic[subType] = dressList.GetRange(0, max);
+                if (DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsTypeBySubType(subType))
+                {
+                    key = ConstDressUpItemType.TE_SHU;//饰品全放在一个列表里
+                }
+                if (!itemListDic.ContainsKey(key))
+                {
+                    itemListDic[key] = new List<int>();
+                }
+                itemListDic[key].AddRange(dressList.GetRange(0, max));
             }
-
-            if (itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) && itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG))
+            if (itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) &&
+            (!itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) ||
+            !itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) ||
+            !itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA)))
+            {
+                itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
+                itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
+                itemListDic.Remove(ConstDressUpItemType.NEI_DA);
+            }
+            else if (!itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) &&
+            (itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) &&
+            itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) &&
+            itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA)))
+            {
+                itemListDic.Remove(ConstDressUpItemType.LIAN_YI_QUN);
+            }
+            if (itemListDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemListDic.ContainsKey(ConstDressUpItemType.SHANG_YI) && itemListDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) && itemListDic.ContainsKey(ConstDressUpItemType.NEI_DA))
             {
                 bool hasTagLYQ = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], tags);
                 bool hasTagSY = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.SHANG_YI][0], tags);
                 bool hasTagXZ = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], tags);
+                bool hasTagND = ItemDataManager.CheckItemTagsRight(itemListDic[ConstDressUpItemType.NEI_DA][0], tags);
                 if (hasTagLYQ && !hasTagSY && !hasTagXZ)
                 {
                     itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
                     itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
+                    itemListDic.Remove(ConstDressUpItemType.NEI_DA);
                 }
                 else if (!hasTagLYQ && (hasTagSY || hasTagXZ))
                 {
@@ -110,10 +141,12 @@ namespace GFGGame
                     int scoreLYQ = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.LIAN_YI_QUN][0], scoreType, tags);
                     int scoreSY = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.SHANG_YI][0], scoreType, tags);
                     int scoreXZ = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.XIA_ZHUANG][0], scoreType, tags);
-                    if (scoreLYQ > scoreSY + scoreXZ)
+                    int scoreND = ItemDataManager.GetItemAdditionScore(itemListDic[ConstDressUpItemType.NEI_DA][0], scoreType, tags);
+                    if (scoreLYQ > scoreSY + scoreXZ + scoreND)
                     {
                         itemListDic.Remove(ConstDressUpItemType.SHANG_YI);
                         itemListDic.Remove(ConstDressUpItemType.XIA_ZHUANG);
+                        itemListDic.Remove(ConstDressUpItemType.NEI_DA);
                     }
                     else
                     {
@@ -121,11 +154,23 @@ namespace GFGGame
                     }
                 }
             }
+            ET.Log.Debug("scoreType:" + scoreType);
             List<int> itemList = new List<int>();
             foreach (int subType in itemListDic.Keys)
             {
-                itemList.AddRange(itemListDic[subType]);
+                ET.Log.Debug("subType:" + subType + "   item:" + itemListDic[subType]);
+                DressUpMenuItemDataManager.SortItemListByHighScore(itemListDic[subType]);
+                if (subType == ConstDressUpItemType.TE_SHU)
+                {
+                    int max = Math.Min(itemListDic[subType].Count, 5);
+                    itemList.AddRange(itemListDic[subType].GetRange(0, max));
+                }
+                else
+                {
+                    itemList.AddRange(itemListDic[subType]);
+                }
             }
+            // ET.Log.Debug("itemList:" + itemList);
             return itemList;
         }
         private List<int> SortDressList(List<int> dressList, int scoreType, string[] tags)
@@ -144,7 +189,31 @@ namespace GFGGame
         }
 
 
+        /// <summary>
+        /// 获取符合标签的服装总个数
+        /// </summary>
+        /// <param name="itemList">服装列表</param>
+        /// <param name="tags">标签</param>
+        /// <returns></returns>
+        public int GetTagsCount(List<int> itemList, string[] tags)
+        {
+            int count = 0;
+            for (int i = 0; i < itemList.Count; i++)
+            {
+                if (ItemDataManager.CheckItemTagsRight(itemList[i], tags))
+                {
+                    if (ItemUtilCS.GetItemSubType(itemList[i]) == ConstDressUpItemType.LIAN_YI_QUN)
+                    {
+                        count += 3;
+                    }
+                    {
+                        count++;
+                    }
+                }
 
+            }
+            return count;
+        }
 
         /*********************************************************************************************************************/
         /// <summary>
@@ -189,7 +258,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    itemSum += GetItemScoreSum(roleDatas[i].itemScoreList);
+                    itemSum += GetItemScoreSum(robotDatas[i].itemScoreList);
                     clickScore += GetRobotPerfectClickScore(robotDatas[i]) / (long)ConstScoreSystem.PART_SCORE;
                     skillScore += FightDataManager.Instance.GetSkillFightScore(itemSum, robotDatas[i].baseScore, robotDatas[i].cardId, robotDatas[i].cardScore, robotDatas[i].skillLvs);
                 }
@@ -236,6 +305,86 @@ namespace GFGGame
             return clickScore;
         }
 
+        /************************************************************************************************************/
+        public void SetTestInfo()
+        {
+            Targets.Add(ArenaSproxy.GetArenaTargetData(GetArenaTargetProto()));
+            Targets[0].RoleDressupList[0].cardId = 2000009;
+            Targets[0].RoleDressupList[0].cardScore = 100;
+            Targets[0].RoleDressupList[0].skillLvs = new List<int>() { 1, 1, 1 };
+            Targets[0].RoleDressupList[0].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
+            Targets[0].RoleDressupList[1].cardId = 2000009;
+            Targets[0].RoleDressupList[1].cardScore = 100;
+            Targets[0].RoleDressupList[1].skillLvs = new List<int>() { 1, 1, 1 };
+            Targets[0].RoleDressupList[1].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 }; Targets[0].RoleDressupList[2].cardId = 2000009;
+            Targets[0].RoleDressupList[2].cardScore = 100;
+            Targets[0].RoleDressupList[2].skillLvs = new List<int>() { 1, 1, 1 };
+            Targets[0].RoleDressupList[2].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
+            Targets.Add(ArenaSproxy.GetArenaTargetData(GetArenaTargetProto()));
+            Targets[1].RoleDressupList[0].cardId = 2000009;
+            Targets[1].RoleDressupList[0].cardScore = 100;
+            Targets[1].RoleDressupList[0].skillLvs = new List<int>() { 1, 1, 1 };
+            Targets[1].RoleDressupList[0].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
+            Targets[1].RoleDressupList[1].cardId = 2000009;
+            Targets[1].RoleDressupList[1].cardScore = 100;
+            Targets[1].RoleDressupList[1].skillLvs = new List<int>() { 1, 1, 1 };
+            Targets[1].RoleDressupList[1].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 }; Targets[1].RoleDressupList[2].cardId = 2000009;
+            Targets[1].RoleDressupList[2].cardScore = 100;
+            Targets[1].RoleDressupList[2].skillLvs = new List<int>() { 1, 1, 1 };
+            Targets[1].RoleDressupList[2].itemScoreList = new List<int>() { 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };
+            Targets.Add(ArenaSproxy.GetArenaTargetData(GetArenaTargetProto1()));
+            Targets[2].RobotDressupList[0] = ArenaSproxy.GetFightRobotData(GetArenaTargetProto1().RobotDressupInfo, 0);
+            Targets[2].RobotDressupList[1] = ArenaSproxy.GetFightRobotData(GetArenaTargetProto1().RobotDressupInfo, 0);
+            Targets[2].RobotDressupList[2] = ArenaSproxy.GetFightRobotData(GetArenaTargetProto1().RobotDressupInfo, 0);
+            DressupList.Add(new FightRoleData());
+            DressupList[0].tags = new string[] { Tag };
+            DressupList.Add(new FightRoleData());
+            DressupList.Add(new FightRoleData());
+            // DressupList[0].skillLvs = new List<int>() { 1, 1, 1 };
+            // DressupList[1].skillLvs = new List<int>() { 1, 1, 1 };
+            // DressupList[2].skillLvs = new List<int>() { 1, 1, 1 };
+
+        }
+        private ArenaTargetProto GetArenaTargetProto()
+        {
+            ArenaTargetProto proto = new ArenaTargetProto();
+            proto.Grade = 1;
+            proto.RankInGrade = 10000;
+            proto.Type = ArenaFightTargetType.PLAYER;
+            proto.RoleInfo = new OtherRoleInfoProto();
+            proto.RoleInfo.RoleName = "玩家";
+            proto.RoleInfo.HeadItemId = 5000002;
+            proto.RoleInfo.RoleLvl = 10;
+            ArenaDressupProto dressupProto0 = new ArenaDressupProto();
+            dressupProto0.CardId = 2000009;
+            dressupProto0.EquipIds = new List<int>(SuitCfgArray.Instance.GetCfg(201005).partsArr);
+            proto.PlayerDressupList.Add(dressupProto0);
+            ArenaDressupProto dressupProto1 = new ArenaDressupProto();
+            dressupProto1.CardId = 2000010;
+            dressupProto1.EquipIds = new List<int>(SuitCfgArray.Instance.GetCfg(201006).partsArr);
+            proto.PlayerDressupList.Add(dressupProto1);
+            ArenaDressupProto dressupProto2 = new ArenaDressupProto();
+            dressupProto2.CardId = 2000011;
+            dressupProto2.EquipIds = new List<int>(SuitCfgArray.Instance.GetCfg(201007).partsArr);
+            proto.PlayerDressupList.Add(dressupProto2);
+            return proto;
+        }
+        private ArenaTargetProto GetArenaTargetProto1()
+        {
+            ArenaTargetProto proto = new ArenaTargetProto();
+            proto.Grade = 1;
+            proto.RankInGrade = 10000;
+            proto.Type = ArenaFightTargetType.ROBOT;
+            proto.RoleInfo = new OtherRoleInfoProto();
+            proto.RoleInfo.RoleName = "机器人";
+            ArenaRobotProto robotProto = new ArenaRobotProto();
+            robotProto.RobotId = 5;
+            robotProto.Random = 9000;
+            robotProto.CardIdList = new List<int>() { 2000009, 2000010, 20000011 };
+            robotProto.SuitList = new List<int>() { 201011, 201012, 201013 };
+            proto.RobotDressupInfo = robotProto;
+            return proto;
 
+        }
     }
 }

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

@@ -119,20 +119,21 @@ namespace GFGGame
         /// <summary>
         /// 更新标签、战力、属性分数值
         /// </summary>
-        private void UpdateValue(GObject obj, int index, List<FightRoleData> roleDatas)
+        public void UpdateValue(GObject obj, int index, List<FightRoleData> roleDatas)
         {
             UI_ComValueInfo com = UI_ComValueInfo.Proxy(obj);
-            com.m_scoreType.url = ResPathUtil.GetScorePath(roleDatas[index].scoreType);
+            com.m_scoreType.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[index]);
             com.m_txtScore.text = FightDataManager.Instance.GetScore(roleDatas[index].itemScoreList).ToString();
-            com.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(index, roleDatas, null).ToString();
+            long fightScore = ArenaDataManager.Instance.GetAllFightScore(ArenaFightTargetType.PLAYER, roleDatas, null);
+            com.m_txtFightScore.SetVar("value", fightScore.ToString()).FlushVars(); ;
             com.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(roleDatas[index].itemList, roleDatas[index].tags).ToString();
-            int count = FightDataManager.Instance.GetTagsCount(roleDatas[index].itemList, roleDatas[index].tags);
+            int count = ArenaDataManager.Instance.GetTagsCount(roleDatas[index].itemList, roleDatas[index].tags);
             com.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
+            UpdateFightScore(com.m_comFightScore.target, roleDatas);
             if (index == 0)
             {
                 ItemUtil.UpdateTag(com.m_comTag, roleDatas[index].tags[0]);
             }
-            UpdateFightScore(com.m_comFightScore.target, roleDatas);
             if (com.m_btnTagRule.data == null)
             {
                 com.m_btnTagRule.onClick.Add(OnBtnRuleClick);
@@ -151,9 +152,9 @@ namespace GFGGame
         {
             List<long> fightScore = ArenaDataManager.Instance.GetFightScoreList(ArenaFightTargetType.PLAYER, roleDatas, null);
             UI_ComFightScore com = UI_ComFightScore.Proxy(obj);
-            com.m_txtSuitScore.SetVar("value", fightScore[0].ToString());
-            com.m_txtClickScore.SetVar("value", fightScore[1].ToString());
-            com.m_txtCardScore.SetVar("value", fightScore[2].ToString());
+            com.m_txtSuitScore.SetVar("value", fightScore[0].ToString()).FlushVars(); ;
+            com.m_txtClickScore.SetVar("value", fightScore[1].ToString()).FlushVars(); ;
+            com.m_txtCardScore.SetVar("value", fightScore[2].ToString()).FlushVars(); ;
             UI_ComFightScore.ProxyEnd();
         }
     }

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

@@ -164,22 +164,7 @@ namespace GFGGame
             }
             return score;
         }
-        /// <summary>
-        /// 获取符合标签的服装总个数
-        /// </summary>
-        /// <param name="itemList">服装列表</param>
-        /// <param name="tags">标签</param>
-        /// <returns></returns>
-        public int GetTagsCount(List<int> itemList, string[] tags)
-        {
-            int count = 0;
-            for (int i = 0; i < itemList.Count; i++)
-            {
-                if (ItemDataManager.CheckItemTagsRight(itemList[i], tags)) count++;
 
-            }
-            return count;
-        }
 
         //获取玩家战斗数据
         private FightRoleData GetMyFightRoleData()
@@ -219,13 +204,19 @@ namespace GFGGame
             {
                 _roleData.skillLvs = SkillDataManager.Instance.GetSkillLvs(_roleData.cardId);
             }
+            SetItemScoreList(_roleData);
+            ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
+            return _roleData;
+        }
 
+        public void SetItemScoreList(FightRoleData _roleData)
+        {
+            _roleData.itemScoreList.Clear();
             for (int i = 0; i < _roleData.itemList.Count; i++)
             {
                 int score = ItemDataManager.GetItemAdditionScore(_roleData.itemList[i], _roleData.scoreType);
                 _roleData.itemScoreList.Add(score);
             }
-            return _roleData;
         }
 
         //获取副本机器人战斗数据
@@ -281,13 +272,23 @@ namespace GFGGame
         /// </summary>
         /// <param name="arrayList"></param>
         /// <returns></returns>
-        public List<CardData> SortCardList(List<CardData> arrayList, List<int> itemList, int scoreType)
+        public List<CardData> SortCardList(List<CardData> cardList, List<int> itemList, int scoreType)
         {
             double itemSum = 0;
             for (int i = 0; i < itemList.Count; i++)
             {
                 itemSum += ItemDataManager.GetItemAdditionScore(itemList[i], scoreType);
             }
+            List<CardData> arrayList = new List<CardData>(cardList);
+            for (int i = arrayList.Count - 1; i >= 0; i--)
+            {
+                List<int> skillLvs = SkillDataManager.Instance.GetSkillLvs(arrayList[i].id);
+                if (skillLvs.Count == 0)
+                {
+                    ET.Log.Error("卡牌：" + arrayList[i].id + " 未配置技能");
+                    arrayList.RemoveAt(i);
+                }
+            }
             int baseScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
             arrayList.Sort((CardData a, CardData b) =>
             {
@@ -324,6 +325,7 @@ namespace GFGGame
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
             for (int j = 0; j < skillCfgs.Count; j++)
             {
+                // ET.Log.Debug("cardId:" + cardId + "  skillLvs:" + skillLvs.Count + "   skillCfgs:" + skillCfgs.Count + "   index:" + j);
                 PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLvs[j], skillCfgs[j].skillId);
                 if (skillLvlCfg == null) continue;
                 skillScore += skillBaseScore * skillLvlCfg.fightPowerParam / 10000;

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

@@ -35,6 +35,8 @@ namespace GFGGame
         /// </summary>
         public void SetEquipScoresWithPartId(FightRoleData roleData)
         {
+            roleData.pardScoreListDic.Clear();
+            roleData.pardListDic.Clear();
             for (int i = 0; i < roleData.itemList.Count; i++)
             {
                 FightScoreCfg[] typeCfgs = FightScoreCfgArray.Instance.dataArray;
@@ -174,7 +176,11 @@ namespace GFGGame
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
                 tagCount = Math.Min(ArenaTagCfgArray.Instance.dataArray.Length, tagCount);
-                double addition = ArenaTagCfgArray.Instance.GetCfg(tagCount).addition / 10000;
+                double addition = 0;
+                if (tagCount > 0)
+                {
+                    addition = ArenaTagCfgArray.Instance.GetCfg(tagCount).addition / 10000;
+                }
                 return (partScore + tagScore) * (1 + addition);
             }
             else

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

@@ -45,7 +45,7 @@ namespace GFGGame
                 {
                     isLianYiQun = true; break;
                 }
-                if (itemCfg.subType == ConstDressUpItemType.SHANG_YI && itemCfg.id != ConstItemID.DEFULT_NEI_DA)
+                if (itemCfg.subType == ConstDressUpItemType.SHANG_YI)
                 {
                     isShangYi = true;
                 }
@@ -214,11 +214,15 @@ namespace GFGGame
             int[] suitParts = suitCfg == null ? new int[] { } : suitCfg.partsArr;
             int shangyiId = itemsDic.ContainsKey(ConstDressUpItemType.SHANG_YI) && itemsDic[ConstDressUpItemType.SHANG_YI].Count > 0 ? itemsDic[ConstDressUpItemType.SHANG_YI][0] : 0;
             int xiazhuangId = itemsDic.ContainsKey(ConstDressUpItemType.XIA_ZHUANG) && itemsDic[ConstDressUpItemType.XIA_ZHUANG].Count > 0 ? itemsDic[ConstDressUpItemType.XIA_ZHUANG][0] : 0;
+            int neidaId = itemsDic.ContainsKey(ConstDressUpItemType.NEI_DA) && itemsDic[ConstDressUpItemType.NEI_DA].Count > 0 ? itemsDic[ConstDressUpItemType.NEI_DA][0] : 0;
             int lianyiqunId = itemsDic.ContainsKey(ConstDressUpItemType.LIAN_YI_QUN) && itemsDic[ConstDressUpItemType.LIAN_YI_QUN].Count > 0 ? itemsDic[ConstDressUpItemType.LIAN_YI_QUN][0] : 0;
-            if (shangyiId == fightCfg.needItemId || Array.IndexOf(suitParts, shangyiId) >= 0 || xiazhuangId == fightCfg.needItemId || Array.IndexOf(suitParts, xiazhuangId) >= 0)
+            if (shangyiId == fightCfg.needItemId || Array.IndexOf(suitParts, shangyiId) >= 0
+            || xiazhuangId == fightCfg.needItemId || Array.IndexOf(suitParts, xiazhuangId) >= 0
+            || neidaId == fightCfg.needItemId || Array.IndexOf(suitParts, neidaId) >= 0)
             {
                 recommendList.Add(shangyiId);
                 recommendList.Add(xiazhuangId);
+                recommendList.Add(neidaId);
             }
             else if (lianyiqunId == fightCfg.needItemId || Array.IndexOf(suitParts, lianyiqunId) >= 0)
             {
@@ -228,8 +232,9 @@ namespace GFGGame
             {
                 int shangyiScore = ItemDataManager.GetItemAdditionScore(shangyiId, InstanceZonesDataManager.currentScoreType);
                 int xiazhuangScore = ItemDataManager.GetItemAdditionScore(xiazhuangId, InstanceZonesDataManager.currentScoreType);
+                int neidaScore = ItemDataManager.GetItemAdditionScore(neidaId, InstanceZonesDataManager.currentScoreType);
                 int lianyiqunScore = ItemDataManager.GetItemAdditionScore(lianyiqunId, InstanceZonesDataManager.currentScoreType);
-                if (lianyiqunScore > (shangyiScore + xiazhuangScore))
+                if (lianyiqunScore > (shangyiScore + xiazhuangScore + neidaScore))
                 {
                     recommendList.Add(lianyiqunId);
                 }
@@ -237,6 +242,7 @@ namespace GFGGame
                 {
                     recommendList.Add(shangyiId);
                     recommendList.Add(xiazhuangId);
+                    recommendList.Add(neidaId);
                 }
             }
 

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

@@ -8,7 +8,9 @@ namespace UI.Arena
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GTextField m_txtFightScore;
+        public GButton m_btnFightScoreRule;
         public GLoader m_scoreType;
         public GTextField m_txtScore;
         public GButton m_btnTagRule;
@@ -63,7 +65,9 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
+            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_scoreType = (GLoader)comp.GetChild("scoreType");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_btnTagRule = (GButton)comp.GetChild("btnTagRule");
@@ -74,7 +78,9 @@ namespace UI.Arena
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_txtFightScore = null;
+            m_btnFightScoreRule = null;
             m_scoreType = null;
             m_txtScore = null;
             m_btnTagRule = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListRankItem1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListPartsItem.cs

@@ -4,18 +4,23 @@ using FairyGUI;
 
 namespace UI.Arena
 {
-    public partial class UI_ListRankItem1
+    public partial class UI_ListPartsItem
     {
         public GComponent target;
-        public UI_ListRankItem m_ListRankItem;
-        public const string URL = "ui://4lc5fhlbjcej4e";
+        public GImage m_iconSelected;
+        public GLoader m_icon;
+        public GLoader m_rarity;
+        public GLoader m_ScoreType;
+        public GTextField m_txtScore;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://4lc5fhlbv4614r";
         public const string PACKAGE_NAME = "Arena";
-        public const string RES_NAME = "ListRankItem1";
-        private static UI_ListRankItem1 _proxy;
+        public const string RES_NAME = "ListPartsItem";
+        private static UI_ListPartsItem _proxy;
 
-        public static UI_ListRankItem1 Create(GObject gObject = null)
+        public static UI_ListPartsItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListRankItem1();
+            var ui = new UI_ListPartsItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +29,11 @@ namespace UI.Arena
             return ui;
         }
 
-        public static UI_ListRankItem1 Proxy(GObject gObject = null)
+        public static UI_ListPartsItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListRankItem1();
+                _proxy = new UI_ListPartsItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,12 +60,21 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_ListRankItem = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("ListRankItem"));
+            m_iconSelected = (GImage)comp.GetChild("iconSelected");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_ScoreType = (GLoader)comp.GetChild("ScoreType");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_ListRankItem.Dispose();
-            m_ListRankItem = null;
+            m_iconSelected = null;
+            m_icon = null;
+            m_rarity = null;
+            m_ScoreType = null;
+            m_txtScore = null;
+            m_txtTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListRankItem1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListPartsItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c11b26cb1397cc2498e32f86f60cf8d1
+guid: 324f9b430612f1a419883d8fc90f97c3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -7,7 +7,9 @@ namespace UI.Arena
     public partial class UI_ListRankItem0
     {
         public GComponent target;
-        public UI_ListRankItem m_ListRankItem;
+        public UI_ListRankItem m_ListRankItem0;
+        public UI_ListRankItem m_ListRankItem1;
+        public UI_ListRankItem m_ListRankItem2;
         public const string URL = "ui://4lc5fhlbpsphv";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ListRankItem0";
@@ -55,12 +57,18 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_ListRankItem = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("ListRankItem"));
+            m_ListRankItem0 = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("ListRankItem0"));
+            m_ListRankItem1 = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("ListRankItem1"));
+            m_ListRankItem2 = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("ListRankItem2"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_ListRankItem.Dispose();
-            m_ListRankItem = null;
+            m_ListRankItem0.Dispose();
+            m_ListRankItem0 = null;
+            m_ListRankItem1.Dispose();
+            m_ListRankItem1 = null;
+            m_ListRankItem2.Dispose();
+            m_ListRankItem2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,9 +9,9 @@ namespace UI.Arena
         public GComponent target;
         public GTextField m_txtRank;
         public GLoader m_loaDanIcon;
-        public GTextField m_txtDanRank;
         public GTextField m_txtName;
         public GTextField m_txtArenaScore;
+        public GTextField m_txtDanRank;
         public GComponent m_comHead;
         public GButton m_btnLook;
         public GComponent m_comLv;
@@ -64,9 +64,9 @@ namespace UI.Arena
         {
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
-            m_txtDanRank = (GTextField)comp.GetChild("txtDanRank");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtArenaScore = (GTextField)comp.GetChild("txtArenaScore");
+            m_txtDanRank = (GTextField)comp.GetChild("txtDanRank");
             m_comHead = (GComponent)comp.GetChild("comHead");
             m_btnLook = (GButton)comp.GetChild("btnLook");
             m_comLv = (GComponent)comp.GetChild("comLv");
@@ -75,9 +75,9 @@ namespace UI.Arena
         {
             m_txtRank = null;
             m_loaDanIcon = null;
-            m_txtDanRank = null;
             m_txtName = null;
             m_txtArenaScore = null;
+            m_txtDanRank = null;
             m_comHead = null;
             m_btnLook = null;
             m_comLv = null;

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

@@ -11,7 +11,7 @@ namespace UI.DressUp
         public GGraph m_touchPad;
         public GButton m_btnBack;
         public GTextField m_txtDressLimit;
-        public GComponent m_comValueInfo;
+        public UI_ComValueInfo m_comValueInfo;
         public UI_comListType m_comListType1;
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
@@ -71,7 +71,7 @@ namespace UI.DressUp
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtDressLimit = (GTextField)comp.GetChild("txtDressLimit");
-            m_comValueInfo = (GComponent)comp.GetChild("comValueInfo");
+            m_comValueInfo = (UI_ComValueInfo)UI_ComValueInfo.Create(comp.GetChild("comValueInfo"));
             m_comListType1 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType1"));
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
@@ -87,6 +87,7 @@ namespace UI.DressUp
             m_touchPad = null;
             m_btnBack = null;
             m_txtDressLimit = null;
+            m_comValueInfo.Dispose();
             m_comValueInfo = null;
             m_comListType1.Dispose();
             m_comListType1 = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListRankItem2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComFightScore.cs

@@ -2,20 +2,23 @@
 
 using FairyGUI;
 
-namespace UI.Arena
+namespace UI.DressUp
 {
-    public partial class UI_ListRankItem2
+    public partial class UI_ComFightScore
     {
         public GComponent target;
-        public UI_ListRankItem m_ListRankItem;
-        public const string URL = "ui://4lc5fhlbjcej4f";
-        public const string PACKAGE_NAME = "Arena";
-        public const string RES_NAME = "ListRankItem2";
-        private static UI_ListRankItem2 _proxy;
+        public Controller m_c1;
+        public GTextField m_txtSuitScore;
+        public GTextField m_txtClickScore;
+        public GTextField m_txtCardScore;
+        public const string URL = "ui://mbo439wbv461f3";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ComFightScore";
+        private static UI_ComFightScore _proxy;
 
-        public static UI_ListRankItem2 Create(GObject gObject = null)
+        public static UI_ComFightScore Create(GObject gObject = null)
         {
-            var ui = new UI_ListRankItem2();
+            var ui = new UI_ComFightScore();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +27,11 @@ namespace UI.Arena
             return ui;
         }
 
-        public static UI_ListRankItem2 Proxy(GObject gObject = null)
+        public static UI_ComFightScore Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListRankItem2();
+                _proxy = new UI_ComFightScore();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,12 +58,17 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_ListRankItem = (UI_ListRankItem)UI_ListRankItem.Create(comp.GetChild("ListRankItem"));
+            m_c1 = comp.GetController("c1");
+            m_txtSuitScore = (GTextField)comp.GetChild("txtSuitScore");
+            m_txtClickScore = (GTextField)comp.GetChild("txtClickScore");
+            m_txtCardScore = (GTextField)comp.GetChild("txtCardScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_ListRankItem.Dispose();
-            m_ListRankItem = null;
+            m_c1 = null;
+            m_txtSuitScore = null;
+            m_txtClickScore = null;
+            m_txtCardScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListRankItem2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComFightScore.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: da24301ef0a55bd4b980a1ceab379988
+guid: f112ecac923aaa54d81de09c6fd603c7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,99 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_ComValueInfo
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GTextField m_txtFightScore;
+        public GButton m_btnFightScoreRule;
+        public GLoader m_scoreType;
+        public GTextField m_txtScore;
+        public GButton m_btnTagRule;
+        public GComponent m_comTag;
+        public GTextField m_txtTagScore;
+        public UI_ComFightScore m_comFightScore;
+        public const string URL = "ui://mbo439wbv461f0";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ComValueInfo";
+        private static UI_ComValueInfo _proxy;
+
+        public static UI_ComValueInfo Create(GObject gObject = null)
+        {
+            var ui = new UI_ComValueInfo();
+            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_ComValueInfo Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComValueInfo();
+            }
+            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_c2 = comp.GetController("c2");
+            m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
+            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
+            m_scoreType = (GLoader)comp.GetChild("scoreType");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_btnTagRule = (GButton)comp.GetChild("btnTagRule");
+            m_comTag = (GComponent)comp.GetChild("comTag");
+            m_txtTagScore = (GTextField)comp.GetChild("txtTagScore");
+            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_txtFightScore = null;
+            m_btnFightScoreRule = null;
+            m_scoreType = null;
+            m_txtScore = null;
+            m_btnTagRule = null;
+            m_comTag = null;
+            m_txtTagScore = null;
+            m_comFightScore.Dispose();
+            m_comFightScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComValueInfo.cs.meta

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

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

@@ -47,9 +47,14 @@ namespace GFGGame
                     for (int i = 0; i < response.ThemeList.Count; i++)
                     {
                         FightRoleData roleData = new FightRoleData();
+                        // roleData.name = RoleDataManager.roleName;
+                        // roleData.headId = RoleDataManager.headId;
+                        roleData.scoreType = ArenaDataManager.Instance.ThemeList[i];
                         roleData.cardId = response.DressupList.Count > i ? response.DressupList[i].CardId : 0;
                         roleData.itemList = response.DressupList.Count > i ? response.DressupList[i].EquipIds : new List<int>();
-
+                        FightDataManager.Instance.SetItemScoreList(roleData);
+                        ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
+                        if (i == 0) roleData.tags = new string[] { ArenaDataManager.Instance.Tag };
                         ArenaDataManager.Instance.DressupList.Add(roleData);
                     }
 
@@ -261,6 +266,8 @@ namespace GFGGame
                         list[i].cardScore = response.data[i].CardScore;
                         list[i].skillLvs = response.data[i].SkillLevel;
                         list[i].itemScoreList = response.data[i].SuitScore;
+                        FightDataManager.Instance.SetItemScoreList(list[i]);
+                        ScoreSystemData.Instance.SetEquipScoresWithPartId(list[i]);
                     }
                 }
             }
@@ -282,7 +289,7 @@ namespace GFGGame
             return arenaHistory;
         }
 
-        private static ArenaTargetData GetArenaTargetData(ArenaTargetProto arenaTargetProto)
+        public static ArenaTargetData GetArenaTargetData(ArenaTargetProto arenaTargetProto)
         {
             ArenaTargetData arenaTarget = new ArenaTargetData();
             arenaTarget.Grade = arenaTargetProto.Grade;
@@ -332,11 +339,12 @@ namespace GFGGame
             roleData.baseScore = RoleLevelCfgArray.Instance.GetCfg(roleInfo.roleLv).baseScore;
             roleData.cardId = dressupProto.CardId;
             roleData.itemList = dressupProto.EquipIds;
+
             if (index == 0) roleData.tags = new string[1] { ArenaDataManager.Instance.Tag };
 
             return roleData;
         }
-        private static FightRobotData GetFightRobotData(ArenaRobotProto robotProto, int index)
+        public static FightRobotData GetFightRobotData(ArenaRobotProto robotProto, int index)
         {
             ArenaRobotCfg robotCfg = ArenaRobotCfgArray.Instance.GetCfg(robotProto.RobotId);
             FightRobotData robotData = new FightRobotData();

GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -245,6 +245,18 @@ namespace GFGGame
             com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
             UI_ComCostCurrency.ProxyEnd();
         }
+        public static void SetItemNeedNum1(GObject obj, int itemId, int needNum)
+        {
+            UI_ComCostCurrency com = UI_ComCostCurrency.Proxy(obj);
+            long hasNum = ItemDataManager.GetItemNum(itemId);
+            // string strNeedNum = StringUtil.GetColorText(needNum.ToString(), hasNum < needNum ? "#D0A09B" : "#FBF6ED"); needNum.ToString();
+            com.m_txtNeed.text = needNum.ToString();
+
+
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemId);
+            com.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
+            UI_ComCostCurrency.ProxyEnd();
+        }
 
         public static void UpdateTag(GObject obj, string tag)
         {

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

@@ -26,7 +26,9 @@ namespace GFGGame
             packageName = UI_ArenaUI.PACKAGE_NAME;
             _ui = UI_ArenaDanRewardUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_listWeekDanReward.itemRenderer = RenderListWeekDanRewardItem;
             _ui.m_listUpDanReward.itemRenderer = RenderListUpDanReward;
@@ -51,6 +53,8 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_listUpDanReward.ScrollToView(0);
+            _ui.m_listWeekDanReward.ScrollToView(0);
         }
 
         protected override void RemoveEventListener()
@@ -84,6 +88,10 @@ namespace GFGGame
                     break;
                 }
             }
+            if (com.m_listReward.data == null)
+            {
+                com.m_listReward.itemRenderer = RenderListRewardItem;
+            }
             com.m_listReward.data = rewards;
             com.m_listReward.numItems = rewards.Length;
             UI_ComMyDanReward.ProxyEnd();
@@ -101,6 +109,7 @@ namespace GFGGame
                 item.m_listReward.itemRenderer = RenderListRewardItem;
             }
             item.m_listReward.data = cfg.bonusWeeklyArr;
+            item.m_listReward.numItems = cfg.bonusWeeklyArr.Length;
             UI_ListDanRewardItem.ProxyEnd();
         }
         private void RenderListUpDanReward(int index, GObject obj)
@@ -115,6 +124,7 @@ namespace GFGGame
                 item.m_listReward.itemRenderer = RenderListRewardItem;
             }
             item.m_listReward.data = cfg.bonusUpgradeArr;
+            item.m_listReward.numItems = cfg.bonusUpgradeArr.Length;
             UI_ListDanRewardItem.ProxyEnd();
         }
 
@@ -127,6 +137,8 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).SetComItemScale = 0.7f;
+            (obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

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

@@ -27,7 +27,9 @@ namespace GFGGame
             packageName = UI_ArenaUI.PACKAGE_NAME;
             _ui = UI_ArenaDanUpUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_listFirstDanReward.itemRenderer = RenderListItem;
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
@@ -89,6 +91,8 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).SetComItemScale = 0.7f;
+            (obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

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

@@ -1,10 +1,9 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using ET;
 using FairyGUI;
 using UI.Arena;
-using UI.CommonGame;
-using UI.DressUp;
+// using UI.DressUp;
 using UnityEngine;
 
 namespace GFGGame
@@ -14,7 +13,8 @@ namespace GFGGame
         private UI_ArenaDressInfoUI _ui;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
-
+        private DressUpObj _dressUpObj;
+        private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
         private List<FightRoleData> _roleDatas;//可能是自己的搭配，也可能是对方玩家的搭配
         // private List<FightRobotData> _robotDatas;//对方机器人搭配
         private int _themeIndex = 0;
@@ -28,6 +28,12 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+            _dressUpObj.Dispose();
+            for (int i = 0; i < _listLongPress.Count; i++)
+            {
+                _listLongPress[i].Dispose();
+            }
+            _listLongPress.Clear();
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -51,7 +57,7 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = RenderListItem;
 
-            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpFight"));
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneArenaDressUp"));
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }
@@ -73,7 +79,13 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+
+                GameObject sceneCopyObject = _sceneObject.transform.Find("CopyRole").gameObject;
+                _dressUpObj = new DressUpObj();
+                _dressUpObj.setSceneObj(sceneCopyObject, false, false);
+
             }
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -106,7 +118,7 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { _roleType, _themeIndex, _roleDatas, null }, true);
+            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, null } }, true);
         }
         private void OnBtnRecommendClick()
         {
@@ -114,46 +126,42 @@ namespace GFGGame
             {
                 int scoreType = ArenaDataManager.Instance.ThemeList[i];
                 FightRoleData roleData = ArenaDataManager.Instance.DressupList[i];
+                roleData.scoreType = scoreType;
                 roleData.itemList = ArenaDataManager.Instance.GetRecommentItemList(scoreType, roleData.tags);
                 roleData.cardId = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRarity(0), roleData.itemList, scoreType)[0].id;
+                roleData.cardScore = ItemDataManager.GetItemAdditionScore(roleData.cardId, roleData.scoreType, roleData.tags);
+                roleData.skillLvs = SkillDataManager.Instance.GetSkillLvs(roleData.cardId);
+                FightDataManager.Instance.SetItemScoreList(roleData);
+                ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
+                _roleDatas = ArenaDataManager.Instance.DressupList;
+                ArenaSproxy.ReqChangeArenaDressup(i, roleData.cardId, roleData.itemList).Coroutine();
+                Timers.inst.StartCoroutine(ScreenShotTex(i));
             }
-            _roleDatas = ArenaDataManager.Instance.DressupList;
             UpdateView();
         }
+        private IEnumerator ScreenShotTex(int index)
+        {
+
+            _dressUpObj.TakeOffAll();
+            _dressUpObj.PutOnItemList(_roleDatas[index].itemList);
+
+            GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
+            Camera camera = gameObject.GetComponent<Camera>();
+            ArenaViewManager.Instance.textureDic[index] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
+
+            yield return new WaitForEndOfFrame();
+        }
         private void UpdateView()
         {
-            if (_roleDatas != null)
-            {
-                _itemList = _roleDatas[_themeIndex].itemList;
-                _tags = _roleDatas[_themeIndex].tags;
-                UpdateValueInfo();
-                UpdateCardInfo(_roleDatas[_themeIndex].cardId);
-            }
-            // else
-            // {
-            //     _itemList = new List<int>(SuitCfgArray.Instance.GetSuitItems(_robotDatas[_themeIndex].showSuitId));
-            //     _tags = _roleDatas[_themeIndex].tags;
-            //     UpdateRobotValueInfo();
-            //     UpdateCardInfo(_roleDatas[_themeIndex].cardId);
-            // }
+            _itemList = _roleDatas[_themeIndex].itemList;
+            _tags = _roleDatas[_themeIndex].tags;
+            // UpdateValueInfo();
+            UpdateCardInfo(_roleDatas[_themeIndex].cardId);
+            ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _themeIndex, _roleDatas);
+
             MyDressUpHelper.dressUpObj.PutOnItemList(_itemList);
             _ui.m_list.numItems = _itemList.Count;
         }
-        private void UpdateValueInfo()
-        {
-            UI_ComValueInfo comValueInfo = UI_ComValueInfo.Proxy(_ui.m_comValueInfo.target);
-            comValueInfo.m_scoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _roleDatas[_themeIndex].scoreType);
-            comValueInfo.m_txtScore.text = FightDataManager.Instance.GetScore(_roleDatas[_themeIndex].itemScoreList).ToString();
-            comValueInfo.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(_roleType, _roleDatas, null).ToString();
-            comValueInfo.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(_itemList, _tags).ToString();
-            int count = FightDataManager.Instance.GetTagsCount(_itemList, _tags);
-            comValueInfo.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
-            if (_tags.Length > 0)
-            {
-                ItemUtil.UpdateTag(comValueInfo.m_comTag, _tags[0]);
-            }
-            UI_ComValueInfo.ProxyEnd();
-        }
 
         private void UpdateCardInfo(int cardId)
         {
@@ -165,24 +173,38 @@ namespace GFGGame
             _ui.m_comCard.m_c1.selectedIndex = 1;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardId);
             _ui.m_comCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardSmallPath(itemCfg.res);
-            _ui.m_comCard.m_loaScore.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + ArenaDataManager.Instance.ThemeList[_themeIndex]);
+            _ui.m_comCard.m_loaScore.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[_themeIndex]);
             RarityIconController.UpdateRarityIcon(_ui.m_comCard.m_loaRarity, cardId, false);
         }
         private void RenderListItem(int index, GObject obj)
         {
-            UI_PartsListItem item = UI_PartsListItem.Proxy(obj);
-            item.m_comAxtionSelect.target.visible = false;
-            item.m_imgNeed.visible = false;
-            item.m_imgNew.visible = false;
+            UI_ListPartsItem item = UI_ListPartsItem.Proxy(obj);
+            // item.m_comAxtionSelect.target.visible = false;
+            // item.m_imgNeed.visible = false;
+            // item.m_imgNew.visible = false;
             item.m_iconSelected.visible = true;
-
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemList[index]);
             item.m_txtTitle.text = itemCfg.name;
-            item.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + ArenaDataManager.Instance.ThemeList[_themeIndex]);
+            item.m_ScoreType.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[_themeIndex]);
+            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
+            item.m_txtScore.text = _roleDatas[_themeIndex].itemScoreList[index].ToString();
+            RarityIconController.UpdateRarityIcon(item.m_rarity, _itemList[index], false);
 
-            RarityIconController.UpdateRarityIcon(item.m_ScoreType, _itemList[index], false);
-            UI_PartsListItem.ProxyEnd();
+            if (item.target.data == null)
+            {
+                LongPressGesture longPressGesture = new LongPressGesture(item.target);
+                longPressGesture.once = true;
+                longPressGesture.onAction.Add(OnLongPress);
+                _listLongPress.Add(longPressGesture);
+            }
+            item.target.data = _itemList[index];
+            UI_ListPartsItem.ProxyEnd();
+        }
+        private void OnLongPress(EventContext context)
+        {
+            LongPressGesture gesture = (LongPressGesture)context.sender;
+            int itemId = (int)gesture.host.data;
+            GoodsItemTipsController.ShowItemTips(itemId);
         }
-
     }
 }

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

@@ -25,7 +25,9 @@ namespace GFGGame
             packageName = UI_ArenaUI.PACKAGE_NAME;
             _ui = UI_ArenaFightRecordUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
             _ui.m_list.itemRenderer = RenderListItem;
@@ -44,7 +46,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
         }
 
         protected override void RemoveEventListener()
@@ -91,6 +92,14 @@ namespace GFGGame
         {
 
             ArenaHistoryData historyData = (context.sender as GObject).data as ArenaHistoryData;
+            ArenaTargetData targetData = historyData.targetData;
+            if (targetData.Type == ArenaFightTargetType.ROBOT)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
+                return;
+            }
+            ViewManager.Show<ArenaDressInfoView>(new object[] { targetData.Type, 0, targetData.RoleDressupList, targetData.RobotDressupList }, new object[] { typeof(ArenaFightRecordView).FullName, null }, true);
+
         }
     }
 }

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

@@ -25,7 +25,9 @@ namespace GFGGame
             packageName = UI_ArenaUI.PACKAGE_NAME;
             _ui = UI_ArenaRankUpUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
         }

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.Arena;
@@ -35,7 +36,7 @@ namespace GFGGame
             _ui.m_listRank.itemRenderer = RenderListItem;
             _ui.m_listRank.scrollPane.onScroll.Add(OnListScroll);
             _ui.m_c1.onChanged.Add(OnTabChange);
-            _ui.m_c1.onChanged.Add(OnTabChange);
+            _ui.m_c2.onChanged.Add(OnTab1Change);
         }
         protected override void AddEventListener()
         {
@@ -54,7 +55,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
+            if (_ui.m_listRank.numItems > 0) _ui.m_listRank.ScrollToView(0);
         }
 
         protected override void RemoveEventListener()
@@ -64,44 +65,41 @@ namespace GFGGame
         }
         private void OnTabChange()
         {
-            if (_ui.m_c1.previsousIndex == 0 && _ui.m_c1.selectedIndex == 1 || _ui.m_c1.previsousIndex == 1 && _ui.m_c1.selectedIndex == 1)
+            if (_ui.m_c1.selectedIndex == 0)
             {
-                _rankType = ArenaRankType.FRIEND;
+                _ui.m_c2.selectedIndex = 0;
             }
-            else if (_ui.m_c1.previsousIndex == 0 && _ui.m_c1.selectedIndex == 0)//二级页签切换
+            else
             {
-                if (_ui.m_c2.selectedIndex == 1)
-                {
-                    _rankType = ArenaRankType.LAST_SEASON;
-                }
-                else
-                {
-                    _rankType = ArenaRankType.NOW_SEASON;
-                }
+                _rankType = ArenaRankType.FRIEND;
             }
-            else if (_ui.m_c1.previsousIndex == 1 && _ui.m_c1.selectedIndex == 0)
+            if (_ui.m_listRank.numItems > 0) _ui.m_listRank.ScrollToView(0);
+            ReqRankList(0);
+        }
+        private void OnTab1Change()
+        {
+            if (_ui.m_c2.selectedIndex == 0)
             {
-                _ui.m_c2.selectedIndex = 0;
                 _rankType = ArenaRankType.NOW_SEASON;
             }
-
+            else
+            {
+                _rankType = ArenaRankType.LAST_SEASON;
+            }
+            if (_ui.m_listRank.numItems > 0) _ui.m_listRank.ScrollToView(0);
+            ReqRankList(0);
         }
         private void OnListScroll()
         {
             int itemIndex = _ui.m_listRank.ChildIndexToItemIndex(0);
             if (itemIndex % 20 == 0)
             {
-                if (ArenaDataManager.Instance.RankDatasDic.ContainsKey(_rankType))
-                {
-                    if (ArenaDataManager.Instance.RankDatasDic[_rankType].Count < itemIndex)
-                    {
-                        ReqRankList(itemIndex);
-                    }
-                }
+                ReqRankList(itemIndex);
             }
         }
         private async void ReqRankList(int index)
         {
+            if (ArenaDataManager.Instance.RankDatasDic.ContainsKey(_rankType) && ArenaDataManager.Instance.RankDatasDic[_rankType].Count >= index) return;
             bool result = await ArenaSproxy.ReqArenaRank(_rankType, index, index + 19);
             if (result)
             {
@@ -124,26 +122,47 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             ArenaTargetData arenaData = null;
-            if (ArenaDataManager.Instance.RankDatasDic.ContainsKey(_rankType))
+            Dictionary<int, List<ArenaTargetData>> RankDatasDic = ArenaDataManager.Instance.RankDatasDic;
+            if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > index)
             {
-                if (ArenaDataManager.Instance.RankDatasDic[_rankType].Count > index)
-                {
-                    arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][index];
-                }
+                arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][index];
             }
-            if (index < 3)
+            if (index == 0)
             {
-                UpdateTopItem(index, arenaData, obj);
+                // int childIndex = _ui.m_listRank.ItemIndexToChildIndex(0);
+                int itemIndex0 = 0;
+                if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > itemIndex0)
+                {
+                    arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][itemIndex0];
+                }
+                GObject obj0 = obj.asCom.GetChildAt(itemIndex0);
+                UpdateTopItem(itemIndex0, arenaData, obj0);
+
+                int itemIndex1 = 1;
+                if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > itemIndex1)
+                {
+                    arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][itemIndex1];
+                }
+                GObject obj1 = obj.asCom.GetChildAt(itemIndex1);
+                UpdateTopItem(itemIndex1, arenaData, obj1);
+
+                int itemIndex2 = 2;
+                if (RankDatasDic.ContainsKey(_rankType) && RankDatasDic[_rankType].Count > itemIndex2)
+                {
+                    arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][itemIndex2];
+                }
+                GObject obj2 = obj.asCom.GetChildAt(itemIndex2);
+                UpdateTopItem(itemIndex2, arenaData, obj2);
             }
-            else
+            if (index > 2)
             {
                 UpdateOtherItem(arenaData, obj);
             }
         }
         private void UpdateTopItem(int index, ArenaTargetData arenaData, GObject obj)
         {
-            UI_ListRankItem item = UI_ListRankItem.Proxy(obj.asCom.GetChildAt(0));
-            item.m_c1.selectedIndex = index;
+            UI_ListRankItem item = UI_ListRankItem.Proxy(obj.asCom);
+            item.m_c1.selectedIndex = index + 1;
             if (arenaData == null)
             {
                 item.m_txtName.text = "--";
@@ -170,6 +189,13 @@ namespace GFGGame
                     RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, arenaData.RoleInfo.headRes);
                 }
             }
+            if (item.m_btnLook.data == null)
+            {
+                item.m_btnLook.onClick.Add(OnBtnLookClick);
+                item.m_comHead.onClick.Add(OnBtnLookClick);
+            }
+            item.m_btnLook.data = arenaData;
+            item.m_comHead.data = arenaData;
             UI_ListRankItem.ProxyEnd();
         }
 
@@ -182,10 +208,11 @@ namespace GFGGame
                 item.m_txtRank.text = "--";
                 item.m_txtName.text = "--";
                 item.m_txtFightScore.text = "竞技场战力：--";
-                item.m_txtDanRank.text = "段位排行：--";
+                item.m_txtDanRank.text = "--";
                 item.m_loaDanIcon.url = "";
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, 0);
                 RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, "");
+
             }
             else
             {
@@ -193,7 +220,7 @@ namespace GFGGame
                 item.m_txtName.text = arenaData.RoleInfo.roleName;
                 long fightScore = ArenaDataManager.Instance.GetAllFightScore(arenaData.Type, arenaData.RoleDressupList, arenaData.RobotDressupList);
                 item.m_txtFightScore.text = string.Format("竞技场战力：{0}", fightScore);
-                item.m_txtDanRank.text = string.Format("段位排行：{0}", arenaData.Grade);
+                item.m_txtDanRank.text = arenaData.Grade.ToString();
                 ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, arenaData.Grade);
                 RoleInfoManager.Instance.UpdateLv(item.m_comLv, arenaData.RoleInfo.roleLv);
                 if (arenaData.Type == ArenaFightTargetType.PLAYER)
@@ -205,7 +232,25 @@ namespace GFGGame
                     RoleInfoManager.Instance.UpdateNpcHead(item.m_comHead, arenaData.RoleInfo.headRes);
                 }
             }
+            if (item.m_btnLook.data == null)
+            {
+                item.m_btnLook.onClick.Add(OnBtnLookClick);
+                item.m_comHead.onClick.Add(OnBtnLookClick);
+            }
+            item.m_btnLook.data = arenaData;
+            item.m_comHead.data = arenaData;
+
             UI_ListRankItem3.ProxyEnd();
         }
+        private void OnBtnLookClick(EventContext context)
+        {
+            ArenaTargetData targetData = (context.sender as GObject).data as ArenaTargetData;
+            if (targetData.Type == ArenaFightTargetType.ROBOT)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
+                return;
+            }
+            ViewManager.Show<ArenaDressInfoView>(new object[] { targetData.Type, 0, targetData.RoleDressupList, targetData.RobotDressupList }, new object[] { typeof(ArenaView).FullName, null }, true);
+        }
     }
 }

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

@@ -27,7 +27,9 @@ namespace GFGGame
             packageName = UI_ArenaUI.PACKAGE_NAME;
             _ui = UI_ArenaResultQuickUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
             _ui.m_list.itemRenderer = RenderListItem;

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

@@ -66,6 +66,8 @@ namespace GFGGame
 
             _ui.m_listTarget.itemRenderer = RenderListTargetItem;
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+
+            ArenaDataManager.Instance.SetTestInfo();
         }
         protected override void AddEventListener()
         {
@@ -80,14 +82,14 @@ namespace GFGGame
             _arenaCfg = ArenaOpenCfgArray.Instance.GetCfg(ArenaDataManager.Instance.SeasonId);
 
             _valueBarController.OnShown();
-            for (int i = 0; i < ArenaDataManager.Instance.Targets.Count; i++)
-            {
-                ArenaTargetData targetData = ArenaDataManager.Instance.Targets[i];
-                if (targetData.Type == ArenaFightTargetType.PLAYER)
-                {
-                    await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.RoleDressupList);
-                }
-            }
+            // for (int i = 0; i < ArenaDataManager.Instance.Targets.Count; i++)
+            // {
+            //     ArenaTargetData targetData = ArenaDataManager.Instance.Targets[i];
+            //     if (targetData.Type == ArenaFightTargetType.PLAYER)
+            //     {
+            //         await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.RoleDressupList);
+            //     }
+            // }
 
             InstanceZonesDataManager.FightScene = ConstInstanceZonesType.Arena;
             if (_targetData == null)
@@ -113,6 +115,11 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
             _valueBarController.OnHide();
         }
 
@@ -170,7 +177,7 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, FightDataManager.Instance.roleData, null }, new object[] { typeof(ArenaView).FullName, _targetData });
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, null }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
         }
 
         private void OnBtnQuickFightClick()
@@ -181,6 +188,8 @@ namespace GFGGame
         {
             _targetData = null;
             _ui.m_c1.selectedIndex = 0;
+            GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
+            targetSceneObj.SetActive(false);
         }
 
         private async void OnBtnFightClick()
@@ -216,10 +225,8 @@ namespace GFGGame
                     myScores.Add(score);
                     targetScores.Add(targetScore);
                 }
-                // bool isWin = winCount >= 2;
 
                 ViewManager.Show<ArenaResultQuickView>();
-                // await ArenaSproxy.ReqArenaFight(isWin, _targetData, selfFightPower, targetFightPower, myScores, targetScores);
             }
             else
             {
@@ -249,7 +256,7 @@ namespace GFGGame
             long fightScore = ArenaDataManager.Instance.GetAllFightScore(ArenaFightTargetType.PLAYER, ArenaDataManager.Instance.DressupList, null);
             _ui.m_txtFightScore.text = string.Format("竞技场战力：{0}", fightScore);
             _ui.m_btnQuickFight.selected = ArenaDataManager.Instance.QuickFight;
-
+            ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, ArenaDataManager.Instance.DressupList);
         }
 
 
@@ -268,7 +275,7 @@ namespace GFGGame
             {
                 _ui.m_txtRefreshCount.visible = false;
                 _ui.m_comCostCurrent.target.visible = true;
-                ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
+                ItemUtil.SetItemNeedNum1(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes);
             }
         }
 
@@ -282,11 +289,14 @@ namespace GFGGame
                 MyDressUpHelper.dressUpObj.setSceneObj(mySceneObj, false, false);
 
                 GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
+                targetSceneObj.SetActive(false);
                 _targetDressUpObj.setSceneObj(targetSceneObj, false, false);
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(ArenaDataManager.Instance.DressupList[0].itemList);
             if (_ui.m_c1.selectedIndex == 1)
             {
+                GameObject targetSceneObj = _sceneObject.transform.Find("TargetRole").gameObject;
+                targetSceneObj.SetActive(true);
                 if (_targetData.Type == ArenaFightTargetType.PLAYER)
                 {
                     _targetDressUpObj.PutOnItemList(_targetData.RoleDressupList[0].itemList);
@@ -335,8 +345,10 @@ namespace GFGGame
             if (item.m_btnLook.data == null)
             {
                 item.m_btnLook.onClick.Add(OnBtnLookClick);
+                item.m_comHead.onClick.Add(OnBtnLookClick);
             }
             item.m_btnLook.data = targetData;
+            item.m_comHead.data = targetData;
             UI_ListTargetItem.Proxy();
         }
 
@@ -353,6 +365,11 @@ namespace GFGGame
         private void OnBtnLookClick(EventContext context)
         {
             ArenaTargetData targetData = (context.sender as GObject).data as ArenaTargetData;
+            if (targetData.Type == ArenaFightTargetType.ROBOT)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("玩家不在线");
+                return;
+            }
             ViewManager.Show<ArenaDressInfoView>(new object[] { targetData.Type, 0, targetData.RoleDressupList, targetData.RobotDressupList }, new object[] { typeof(ArenaView).FullName, _targetData }, true);
         }
     }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs

@@ -35,7 +35,7 @@ namespace GFGGame
         {
             base.OnShown();
             int id = (int)this.viewData;
-            string content = TextDescArray.Instance.GetCfg(id).text;
+            string content = TextDescCfgArray.Instance.GetCfg(id).text;
             _ui.m_comContent.m_txtContent.text = content;
 
             ViewManager.SetMaskAlpha(0.8f);

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

@@ -14,6 +14,7 @@ namespace GFGGame
     public class ArenaDressUpFightView : BaseView
     {
         private UI_ArenaDressUpFightUI _ui;
+        private DressUpObj _dressUpData = new DressUpObj();
         private ArenaDataManager _dataManager;
         public FightRoleData _roleData;
         // private int _fightID;
@@ -48,6 +49,7 @@ namespace GFGGame
             {
                 _listLongPress[i].Dispose();
             }
+            _dressUpData.Dispose();
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -63,7 +65,7 @@ namespace GFGGame
             _ui = UI_ArenaDressUpFightUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpFight"));
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneArenaDressUpFight"));
         }
 
         protected override void OnInit()
@@ -129,8 +131,11 @@ namespace GFGGame
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
+
+                GameObject copyObj = _sceneObject.transform.Find("CopyRole").gameObject;
+                _dressUpData.setSceneObj(copyObj);
             }
+            MyDressUpHelper.dressUpObj.PutOnItemList(_roleData.itemList);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 
             UpdateValueInfo();
@@ -173,6 +178,10 @@ namespace GFGGame
                     ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
                 });
             }
+            else
+            {
+                ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+            }
         }
 
         private void OnClickBtnHome()
@@ -186,23 +195,10 @@ namespace GFGGame
 
         private void UpdateValueInfo()
         {
-            UI_ComValueInfo comValueInfo = UI_ComValueInfo.Proxy(_ui.m_comValueInfo);
-            comValueInfo.m_scoreType.url = "ui://CommonGame/kp_sx_" + InstanceZonesDataManager.currentScoreType;
-            comValueInfo.m_txtScore.text = FightDataManager.Instance.GetScore(_roleData.itemScoreList).ToString();
-            comValueInfo.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(ArenaFightTargetType.PLAYER, _dataManager.DressupList, null).ToString();
-            comValueInfo.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(_roleData.itemList, _roleData.tags).ToString();
-            int count = FightDataManager.Instance.GetTagsCount(_roleData.itemList, _roleData.tags);
-            comValueInfo.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
-            if (_roleData.tags.Length > 0)
-            {
-                UI_ComTag item = UI_ComTag.Proxy(comValueInfo.m_comTag);
-                int tagType = TagCfgArray.Instance.GetCfg(_roleData.tags[0]).type;
-                item.m_txtTag.text = _roleData.tags[0];
-                item.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tagType);
-                UI_ComTag.ProxyEnd();
-            }
-            UI_ComValueInfo.ProxyEnd();
-            // GuideController.TryGuideDressUpFightViewBtnNext(_ui.m_btnNext);
+            FightDataManager.Instance.SetItemScoreList(_roleData);
+            ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
+            ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _dataManager.SelectThemeIndex, _dataManager.DressupList);
+
         }
 
         private void OnClickListType1Item(EventContext context)
@@ -345,30 +341,29 @@ namespace GFGGame
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
         }
 
         private void OnClickBtnNext()
         {
-            Timers.inst.StartCoroutine(ScreenShotTex());
+            if (!MyDressUpHelper.CheckPutOnFinish())
+            {
+                AlertUI.Show("换好衣服才能进行下一步哦~").SetRightButton(true, "好的");
+            }
+            else
+            {
+                Timers.inst.StartCoroutine(ScreenShotTex());
+            }
         }
 
         private IEnumerator ScreenShotTex()
         {
 
-            GameObject Role = _sceneObject.transform.Find("Role").gameObject;
-            GameObject CopyRoleParent = _sceneObject.transform.Find("CopyRole").gameObject;
-            Transform CopyRole = CopyRoleParent.transform.Find("Role");
-            if (CopyRole != null)
-            {
-                GameObject.DestroyImmediate(CopyRole.gameObject);
-            }
-            Transform transform = GameObject.Instantiate(Role, CopyRoleParent.transform.position, Quaternion.identity).transform;//实例化物体
-            transform.parent = CopyRoleParent.transform;
-            transform.name = "Role";
+            _dressUpData.TakeOffAll();
+            _dressUpData.PutOnItemList(MyDressUpHelper.dressUpObj.itemList);
 
-            GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
-            Camera camera = gameObject.GetComponent<Camera>();
+            Camera camera = _sceneObject.transform.Find("FightCamera").gameObject.GetComponent<Camera>();
             ArenaViewManager.Instance.textureDic[_dataManager.SelectThemeIndex] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
 
             yield return new WaitForEndOfFrame();
@@ -645,7 +640,7 @@ namespace GFGGame
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             typeItem.target.data = item2.id;
             // var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
-            // typeItem.m_imgNeed.visible = subType == item2.type;
+            typeItem.m_imgNeed.visible = false;
             typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
 
             UI.DressUp.UI_TypeItem.ProxyEnd();

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

@@ -413,7 +413,8 @@ namespace GFGGame
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
         }
 
         private void OnClickBtnClose()

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

@@ -103,7 +103,7 @@ namespace GFGGame
         {
             base.OnShown();
             roleData = FightDataManager.Instance.roleData;
-            ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
+            // ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
 
             _nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
 

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

@@ -129,7 +129,7 @@ namespace GFGGame
             {
                 RoleInfoManager.Instance.UpdateHead(_ui.m_targetHead, targetRoleData.headId, 0);
                 _ui.m_proScore.m_txtNpcScore.text = targetRoleData.name + " 0";
-                ScoreSystemData.Instance.SetEquipScoresWithPartId(targetRoleData);
+                // ScoreSystemData.Instance.SetEquipScoresWithPartId(targetRoleData);
                 _targetMainScore = ScoreSystemData.Instance.GetMainScore(targetRoleData);
                 _targetRoundTimes = ScoreSystemData.Instance.GetRoundTime(targetRoleData.cardId, targetRoleData.skillLvs);
             }
@@ -143,7 +143,7 @@ namespace GFGGame
 
             RoleInfoManager.Instance.UpdateHead(_ui.m_myHead, roleData.headId, 0);
             _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " 0";
-            ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
+            // ScoreSystemData.Instance.SetEquipScoresWithPartId(roleData);
             _mainScore = ScoreSystemData.Instance.GetMainScore(roleData);
             _roundTimes = ScoreSystemData.Instance.GetRoundTime(roleData.cardId, roleData.skillLvs);
 

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

@@ -482,7 +482,7 @@ namespace GFGGame
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
-            ViewManager.Show<ArenaView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<ArenaView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
         }
         private void OnClickBtnTravel()
         {
@@ -580,6 +580,7 @@ namespace GFGGame
             _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
             _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
+            _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
 
             _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false)
             || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));

GameClient/Assets/ResIn/Prefab/SceneArena.prefab

@@ -190,19 +190,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.73
+      value: -2.49
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.32
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.z
@@ -260,19 +260,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 2.71
+      value: 2.24
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.32
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.z

GameClient/Assets/ResIn/Prefab/SceneArenaDressUp.prefab

@@ -0,0 +1,389 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1148361598028691249
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5877254733391801254}
+  - component: {fileID: 1095836205521704273}
+  m_Layer: 0
+  m_Name: Bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5877254733391801254
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1148361598028691249}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6789252974363538597}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1095836205521704273
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1148361598028691249}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -999
+  m_Sprite: {fileID: 21300000, guid: 03cdae2317655b24e9b791c43f151e7a, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 12, y: 24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &1382333317567840377
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2934965860753742362}
+  m_Layer: 0
+  m_Name: CopyRole
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2934965860753742362
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382333317567840377}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3427358089976778040}
+  m_Father: {fileID: 6789252974363538597}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2135504065154407463
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8330110764557552440}
+  - component: {fileID: 1051733436616080236}
+  - component: {fileID: 6854520056618082555}
+  - component: {fileID: 8241307450413332938}
+  m_Layer: 0
+  m_Name: FightCamera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8330110764557552440
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135504065154407463}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6789252974363538597}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &1051733436616080236
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135504065154407463}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: -1
+  far clip plane: 2
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9.6
+  m_Depth: -2
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 23
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 1
+  m_AllowMSAA: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 0
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!114 &6854520056618082555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135504065154407463}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03a74e9be952781499f1c48566c89209, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!124 &8241307450413332938
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2135504065154407463}
+  m_Enabled: 1
+--- !u!1 &6789252974363538596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6789252974363538597}
+  m_Layer: 0
+  m_Name: SceneArenaDressUp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6789252974363538597
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6789252974363538596}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5877254733391801254}
+  - {fileID: 6789252972548977635}
+  - {fileID: 2934965860753742362}
+  - {fileID: 8330110764557552440}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2978124125425603437
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6789252974363538597}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &6789252972548977635 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 2978124125425603437}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6412076388096470454
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2934965860753742362}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &3427358089976778040 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 6412076388096470454}
+  m_PrefabAsset: {fileID: 0}

GameClient/Assets/ResIn/Prefab/SceneArenaDressUp.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4705df387963b4b4cbda30090137d3c2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/Prefab/SceneArenaDressUpFight.prefab

@@ -0,0 +1,385 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3270958908631963596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5272424991718203143}
+  m_Layer: 0
+  m_Name: CopyRole
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5272424991718203143
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3270958908631963596}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7699102870567231584}
+  m_Father: {fileID: 5591372854433669388}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5591372854433669389
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5591372854433669388}
+  m_Layer: 0
+  m_Name: SceneArenaDressUpFight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5591372854433669388
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5591372854433669389}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 648717468607016563}
+  - {fileID: 5591372855846626890}
+  - {fileID: 5272424991718203143}
+  - {fileID: 7270768326552441965}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8796825807392229099
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7270768326552441965}
+  - component: {fileID: 5182680727879188553}
+  - component: {fileID: 7464284760406400746}
+  - component: {fileID: 1839775417564747814}
+  m_Layer: 0
+  m_Name: FightCamera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7270768326552441965
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8796825807392229099}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5591372854433669388}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &5182680727879188553
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8796825807392229099}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: -1
+  far clip plane: 2
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9.6
+  m_Depth: -2
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 23
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 1
+  m_AllowMSAA: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 0
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!114 &7464284760406400746
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8796825807392229099}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03a74e9be952781499f1c48566c89209, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!124 &1839775417564747814
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8796825807392229099}
+  m_Enabled: 1
+--- !u!1 &9148350711561066481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 648717468607016563}
+  - component: {fileID: 1588996572767803225}
+  m_Layer: 0
+  m_Name: Bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &648717468607016563
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9148350711561066481}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5591372854433669388}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1588996572767803225
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9148350711561066481}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -999
+  m_Sprite: {fileID: 21300000, guid: 03cdae2317655b24e9b791c43f151e7a, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 12, y: 24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1001 &2140508081813045486
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5272424991718203143}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &7699102870567231584 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 2140508081813045486}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4248198995156371140
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5591372854433669388}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &5591372855846626890 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 4248198995156371140}
+  m_PrefabAsset: {fileID: 0}

GameClient/Assets/ResIn/Prefab/SceneArenaDressUpFight.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 707570dc9b409ab4bb3cabbb44959544
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/Prefab/SceneDressUp.prefab

@@ -1,103 +1,59 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &8934048990737965465
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8934048990737965464}
-  m_Layer: 0
-  m_Name: SceneDressUp
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8934048990737965464
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8934048990737965465}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 8934048988926551774}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &905284814300497488
+--- !u!1001 &2721400830508684605
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 8934048990737965464}
+    m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538596, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_Name
-      value: faxing
+      value: SceneDressUp
       objectReference: {fileID: 0}
-    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: lianyiqun
-      objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+    - target: {fileID: 6789252974363538597, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-      propertyPath: m_Name
-      value: Role
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
---- !u!4 &8934048988926551774 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
-  m_PrefabInstance: {fileID: 905284814300497488}
-  m_PrefabAsset: {fileID: 0}
+  m_SourcePrefab: {fileID: 100100000, guid: 4705df387963b4b4cbda30090137d3c2, type: 3}