竞技场

FGUIProject/assets/Arena/ArenaDanRewardUI.xml

@@ -1,29 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://4lc5fhlbpsphb" designImageOffsetX="-53" designImageAlpha="0">
-  <controller name="c1" pages="0,,1," selected="1">
+<component size="1070,1367" designImage="ui://4lc5fhlbpsphb" designImageOffsetX="-53" designImageAlpha="0">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="每周段位奖励"/>
     <remark page="1" value="段位提升奖励"/>
   </controller>
   <displayList>
-    <image id="n1_psph" name="n1" src="uyuxzx" fileName="imagesExport/xc_xzdik.png" pkg="eg2y0ldp" xy="265,174" size="550,76"/>
-    <component id="n3_psph" name="btn0" src="psphj" fileName="components/BtnTab0.xml" xy="259,175">
-      <Button title="每周段位奖励" controller="c1" page="0"/>
+    <image id="n10_jcej" name="n10" src="jcej31" fileName="images/dwjl_didi.png" xy="0,0"/>
+    <image id="n12_jcej" name="n12" src="jcej3w" fileName="images/dwjl_btbt.png" xy="146,87"/>
+    <image id="n1_psph" name="n1" src="uyuxzx" fileName="imagesExport/xc_xzdik.png" pkg="eg2y0ldp" xy="251,174" size="550,76" group="n11_jcej"/>
+    <component id="n3_psph" name="btn0" src="psphj" fileName="components/BtnTab0.xml" xy="230,171" group="n11_jcej">
+      <Button checked="true" icon="ui://4lc5fhlbjcej3j" selectedIcon="ui://4lc5fhlbjcej3h" controller="c1" page="0"/>
     </component>
-    <component id="n4_psph" name="btn1" src="psphj" fileName="components/BtnTab0.xml" xy="540,175">
-      <Button title="段位提升奖励" controller="c1" page="1"/>
+    <component id="n4_psph" name="btn1" src="psphj" fileName="components/BtnTab0.xml" xy="526,171" group="n11_jcej">
+      <Button icon="ui://4lc5fhlbjcej3i" selectedIcon="ui://4lc5fhlbjcej3g" controller="c1" page="1"/>
     </component>
-    <list id="n7_psph" name="listWeekDanReward" xy="99,340" size="881,815" overflow="scroll" defaultItem="ui://4lc5fhlbpsphn" autoClearItems="true">
+    <group id="n11_jcej" name="n11" xy="230,171" size="592,82" advanced="true"/>
+    <list id="n7_psph" name="listWeekDanReward" xy="70,296" size="929,828" overflow="scroll" lineGap="30" defaultItem="ui://4lc5fhlbpsphn" autoClearItems="true">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
     </list>
-    <list id="n8_psph" name="listUpDanReward" xy="99,340" size="881,815" overflow="scroll" defaultItem="ui://4lc5fhlbpsphn" autoClearItems="true">
+    <list id="n8_psph" name="listUpDanReward" xy="70,296" size="929,956" overflow="scroll" lineGap="30" defaultItem="ui://4lc5fhlbpsphn" autoClearItems="true">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <component id="n9_psph" name="comMyDanReward" src="pspho" fileName="components/ComMyDanReward.xml" xy="101,1174"/>
+    <component id="n9_psph" name="comMyDanReward" src="pspho" fileName="components/ComMyDanReward.xml" xy="45,1161">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Arena/ArenaDressInfoUI.xml

@@ -4,26 +4,29 @@
     <remark page="0" value="自己的搭配"/>
     <remark page="1" value="查看他人搭配"/>
   </controller>
-  <controller name="c2" pages="0,,1,,2," selected="0">
+  <controller name="c2" pages="0,,1,,2," selected="2">
     <remark page="0" value="主题一"/>
     <remark page="1" value="主题二"/>
     <remark page="2" value="主题三"/>
   </controller>
+  <controller name="c3" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="5"/>
   <displayList>
     <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <loader id="n1_psph" name="loaBg" xy="0,0" size="1080,1920" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <component id="n74_psph" name="btn0" src="psph1e" fileName="components/BtnTab3.xml" xy="35,1608" group="n79_psph">
-      <Button controller="c2" page="0"/>
+    <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"/>
     </component>
-    <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="315,1608" group="n79_psph">
-      <Button controller="c2" page="1"/>
+    <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="375,81" size="224,77" group="n79_psph">
+      <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="595,1608" group="n79_psph">
-      <Button controller="c2" page="2"/>
+    <component id="n78_psph" name="btn2" src="psph1e" fileName="components/BtnTab3.xml" xy="599,81" size="224,77" group="n79_psph">
+      <Button checked="true" icon="ui://4lc5fhlbjcej2t" selectedIcon="ui://4lc5fhlbjcej2p" controller="c2" page="2"/>
     </component>
-    <group id="n79_psph" name="n79" xy="35,1608" size="840,82" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <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">
       <relation target="" sidePair="height-height"/>
     </component>
@@ -41,7 +44,9 @@
       <item/>
       <item/>
     </list>
-    <component id="n80_psph" name="comCard" src="psph1d" fileName="components/ComCard.xml" xy="22,1203"/>
+    <component id="n80_psph" name="comCard" src="psph1d" fileName="components/ComCard.xml" xy="34,1404">
+      <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="更换搭配"/>
@@ -52,7 +57,7 @@
     </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"/>
+      <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/Arena/ArenaFightRecordUI.xml

@@ -10,9 +10,8 @@
       <item/>
       <item/>
     </list>
-    <image id="n16_jcej" name="n16" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="276,1201" group="n19_jcej"/>
-    <text id="n17_jcej" name="n17" xy="305,1185" size="367,42" group="n19_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c2a680" text="保留本周最近20场比赛记录"/>
-    <image id="n18_jcej" name="n18" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="687,1201" group="n19_jcej"/>
-    <group id="n19_jcej" name="n19" xy="276,1185" size="425,42" advanced="true" layout="hz" colGap="15" excludeInvisibles="true"/>
+    <text id="n17_jcej" name="n17" xy="305,1185" size="367,41" group="n19_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#c2a680" text="保留本周最近20场比赛记录"/>
+    <image id="n20_jcej" name="n20" src="jcej1v" fileName="images/bpjly_zizs.png" xy="281,1200" group="n19_jcej"/>
+    <group id="n19_jcej" name="n19" xy="281,1185" size="416,41" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/ArenaResultQuickUI.xml

@@ -8,6 +8,7 @@
     <image id="n28_jcej" name="n28" src="jcej28" fileName="images/kstzjj_edji.png" xy="29,171" size="888,151"/>
     <text id="n17_psph" name="txtTargetName" xy="121,217" pivot="0.5,0" size="142,49" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#c09c6d" align="center" letterSpacing="-2" autoClearText="true" text="对手名字"/>
     <component id="n23_psph" name="comTargetHeadWithlv" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="273,122" pivot="0.5,0.5" group="n29_jcej" scale="0.75,0.75"/>
+    <image id="n38_jcej" name="n38" src="jcej2b" fileName="images/kstzjj_txk.png" xy="323,178" group="n29_jcej"/>
     <text id="n21_psph" name="n21" xy="507,195" size="71,46" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#c09c6d" align="right" autoClearText="true" text="排名"/>
     <text id="n30_jcej" name="txtTargetRank" xy="475,230" pivot="0.5,0" size="138,64" group="n29_jcej" font="ui://eg2y0ldpweoktkb" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" bold="true" autoClearText="true" text="10000"/>
     <text id="n22_psph" name="txtDantitle" xy="687,217" pivot="0.5,0" size="148,49" group="n29_jcej" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#cf8b80" align="right" text="段位名称"/>

FGUIProject/assets/Arena/ArenaUI.xml

@@ -16,16 +16,18 @@
     <loader id="n24_psph" name="loaScore2" xy="668,276" size="58,58" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
     <group id="n38_jcej" name="grpTheme" xy="354,276" size="372,58" group="n28_psph" advanced="true" layout="hz" colGap="10" excludeInvisibles="true"/>
     <image id="n41_jcej" name="n41" src="jcej36" fileName="images/jzsjzs_sjsjdi.png" xy="659,353" group="n42_jcej"/>
-    <text id="n27_psph" name="txtTime" xy="691,359" pivot="1,0" size="348,42" group="n42_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="right" text="赛季时间：01/05-05/21"/>
-    <component id="n21_psph" name="btnRule" src="jcej3p" fileName="components/BtnRule.xml" xy="1041,366" group="n42_jcej"/>
+    <text id="n27_psph" name="txtTime" xy="691,359" pivot="1,0" size="348,41" group="n42_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="right" text="赛季时间：01/05-05/21"/>
+    <component id="n21_psph" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="1041,366" size="29,29" group="n42_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k"/>
+    </component>
     <group id="n42_jcej" name="grpTime" xy="659,353" size="421,52" group="n28_psph"/>
     <group id="n28_psph" name="gtpTop" xy="-12,80" size="1092,325" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
-    <component id="n29_psph" name="btnReSelect" src="psph1k" fileName="components/BtnRelect.xml" xy="944,442" size="144,133">
+    <component id="n29_psph" name="btnReSelect" src="psph1k" fileName="components/BtnRelect.xml" xy="900,418" size="180,106">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="right-right,top-top"/>
-      <Button title="重新选择"/>
+      <Button icon="ui://4lc5fhlbjcej3r"/>
     </component>
     <component id="n30_psph" name="btnFight" src="psph1l" fileName="components/BtnFight.xml" xy="366,804" size="384,268" aspect="true">
       <gearDisplay controller="c1" pages="1"/>
@@ -42,11 +44,13 @@
     <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="42,1507" group="n46_jcej"/>
     <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="187,1563" group="n46_jcej"/>
     <loader id="n2_psph" name="loaDanIcon" xy="48,1517" size="149,153" group="n46_jcej" url="ui://4lc5fhlbpsphz" fill="scale"/>
-    <text id="n7_psph" name="txtName" xy="193,1525" size="122,42" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#9a7c56" text="自己名字"/>
-    <text id="n8_psph" name="txtRank" xy="193,1571" size="90,32" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位排名"/>
-    <text id="n9_psph" name="txtDanTitle" xy="193,1603" size="90,32" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
-    <text id="n10_psph" name="txtFightScore" xy="193,1634" size="145,32" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
-    <component id="n45_jcej" name="btnFightScoreRule" src="jcej3p" fileName="components/BtnRule.xml" xy="165,1637" group="n46_jcej"/>
+    <text id="n7_psph" name="txtName" xy="193,1525" size="122,41" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n8_psph" name="txtRank" xy="193,1571" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n9_psph" name="txtDanTitle" xy="193,1603" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n10_psph" name="txtFightScore" xy="193,1634" size="145,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
+    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="165,1637" size="29,29" group="n46_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k"/>
+    </component>
     <group id="n46_jcej" name="grpMyInfo" xy="42,1507" size="362,174" group="n20_psph"/>
     <text id="n14_psph" name="txtMoneyCount" xy="774,1627" pivot="0.5,0" size="276,34" group="n20_psph" font="ui://eg2y0ldpwonotjc" fontSize="24" color="#ffffff" align="center" strokeColor="#c5a973" strokeSize="2" text="今日和可获得xx次xx货币"/>
     <image id="n52_jcej" name="n52" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="727,1666" group="n51_jcej"/>
@@ -54,11 +58,11 @@
     <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="1035,1669" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <text id="n15_psph" name="txtFightCount" xy="789,1670" size="243,42" group="n51_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
+    <text id="n15_psph" name="txtFightCount" xy="789,1670" size="243,41" group="n51_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="剩余次数：10/10"/>
     <group id="n51_jcej" name="n51" xy="727,1666" size="353,48" group="n20_psph"/>
     <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="727,1732" group="n49_jcej"/>
     <image id="n50_jcej" name="n50" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="751,1743" group="n49_jcej"/>
-    <text id="n16_psph" name="txtRefreshCount" xy="788,1736" size="243,42" group="n49_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="788,1736" size="243,41" group="n49_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#fbf6ed" align="center" text="免费刷新：10/10"/>
     <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="1035,1735" group="n49_jcej"/>
     <component id="n18_psph" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="745,1733" size="237,46" group="n49_jcej"/>
     <group id="n49_jcej" name="n49" xy="727,1732" size="353,48" group="n20_psph"/>

FGUIProject/assets/Arena/components/BtnRule.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="29,29" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
-  <displayList>
-    <image id="n0_jcej" src="jcej2k" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/Arena/components/BtnTab0.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="280,82" extention="Button">
-  <controller name="c1" pages="0,,1," selected="0"/>
+<component size="296,82" extention="Button">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n4_psph" name="icon" xy="140,41" pivot="0.5,0.5" anchor="true" size="280,82" url="ui://4lc5fhlbpsphk" autoSize="true"/>
-    <text id="n5_psph" name="title" xy="-22,-5" size="324,92" fontSize="40" align="center" vAlign="middle" autoSize="none" text="">
+    <loader id="n4_psph" name="icon" xy="148,41" pivot="0.5,0.5" anchor="true" size="296,83" url="ui://4lc5fhlbjcej3h" autoSize="true"/>
+    <text id="n5_psph" name="title" xy="-22,-5" size="340,92" fontSize="40" align="center" vAlign="middle" autoSize="none" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>
-  <Button/>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Arena/components/BtnTab3.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="280,82" extention="Button">
+<component size="224,77" extention="Button">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_psph" name="icon" xy="140,41" pivot="0.5,0.5" anchor="true" size="280,82" url="ui://4lc5fhlbpsphk" fill="scaleFree">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
-    <text id="n5_psph" name="title" xy="-22,-5" size="324,92" fontSize="40" align="center" vAlign="middle" autoSize="none" text="">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
+    <loader id="n4_psph" name="icon" xy="112,38" pivot="0.5,0.5" anchor="true" size="118,39" url="ui://4lc5fhlbjcej2r" align="center" vAlign="middle" fill="scaleFree" autoSize="true"/>
   </displayList>
-  <Button/>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Arena/components/ComCard.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="346,352" overflow="hidden">
+<component size="222,281" overflow="hidden">
   <displayList>
-    <image id="n52_psph" name="n52" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="0,0"/>
-    <loader id="n51_psph" name="loaCard" xy="0,-55" size="346,638" aspect="true" url="ui://eg2y0ldppsphtke" fill="scale"/>
+    <image id="n53_jcej" name="n53" src="jcej2j" fileName="images/jjsy_btbtdi.png" xy="0,0"/>
+    <component id="n52_psph" name="comCard" src="jcej3u" fileName="components/ComCardMask.xml" xy="22,20"/>
+    <loader id="n54_jcej" name="loaScore" xy="22,20" size="42,42" aspect="true" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <loader id="n56_jcej" name="loaRarity" xy="159,20" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <text id="n57_jcej" name="txtCardName" xy="73,212" pivot="0.5,0" size="76,49" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#d48a89" align="center" text="梦影"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ComCardMask.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="76,76" overflow="hidden" mask="n53_jcej">
+<component size="178,178" overflow="hidden" mask="n52_psph">
   <displayList>
-    <image id="n53_jcej" name="n53" src="jcej2e" fileName="images/bpjl_ktx_3.png" xy="3,3" size="70,70"/>
-    <loader id="n51_psph" name="loaCard" xy="0,-15" size="76,140" aspect="true" url="ui://eg2y0ldppsphtke" fill="scale"/>
+    <loader id="n51_psph" name="loaCard" xy="-62,-106" size="346,638" aspect="true" url="ui://eg2y0ldppsphtke" fill="scale"/>
+    <image id="n52_psph" name="n52" src="jcej2j" fileName="images/jjsy_btbtdi.png" xy="0,0" size="178,178"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ComMyDanReward.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="879,226">
+<component size="970,173">
   <displayList>
-    <list id="n0_psph" name="listReward" xy="215,0" size="664,226" layout="row" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98" autoClearItems="true">
+    <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">
       <item/>
       <item/>
       <item/>
     </list>
-    <loader id="n2_psph" name="loaDanIcon" xy="36,23" size="149,153" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="102,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://4lc5fhlbpsphz" fill="scale"/>
     <text id="n1_psph" name="txtDan" xy="37,161" size="136,46" fontSize="34" autoClearText="true" text="段位名字"/>
-    <loader id="n3_psph" name="loaSelf" xy="167,-14" size="50,50"/>
+    <loader id="n3_psph" name="loaSelf" xy="180,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/ComResultCardMask.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="76,76" overflow="hidden" mask="n53_jcej">
+  <displayList>
+    <image id="n53_jcej" name="n53" src="jcej2e" fileName="images/bpjl_ktx_3.png" xy="3,3" size="70,70"/>
+    <loader id="n51_psph" name="loaCard" xy="0,-15" size="76,140" aspect="true" url="ui://eg2y0ldppsphtke" fill="scale"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="277,254">
+  <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
+  <displayList>
+    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="8,0" group="n86_jcej"/>
+    <loader id="n84_jcej" name="scoreType" xy="7,2" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n85_jcej" name="txtScore" xy="62,2" 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="7,0" size="204,57"/>
+    <image id="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="4,69" group="n92_jcej"/>
+    <text id="n82_jcej" name="txtFightScore" xy="17,76" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" autoClearText="true" text="竞技场战力：999"/>
+    <group id="n92_jcej" name="n92" xy="4,69" size="272,56"/>
+    <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">
+      <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">
+      <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">
+      <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">
+      <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">
+      <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">
+      <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"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/components/ListDanRewardItem.xml

@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="844,226">
+<component size="924,173">
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
-    <text id="n6_psph" name="txtRank" xy="75,90" size="23,46" fontSize="34" align="center" text="1"/>
-    <list id="n7_psph" name="listReward" xy="180,0" size="664,226" layout="row" overflow="scroll" defaultItem="ui://eg2y0ldpj48o98">
+    <image id="n9_jcej" name="n9" src="jcej3v" fileName="images/dwjl_dedtp.png" xy="0,0"/>
+    <loader id="n10_jcej" name="loaRank" xy="116,86" pivot="0.5,0.5" anchor="true" size="88,87" url="ui://4lc5fhlbjcej3m" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2,3" values="ui://4lc5fhlbjcej3m|ui://4lc5fhlbjcej3m|ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default=""/>
+    </loader>
+    <text id="n6_psph" name="txtRank" xy="71,63" pivot="0.5,0" size="91,54" fontSize="40" color="#a98860" align="center" text="4-50">
+      <gearDisplay controller="c1" pages="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">
       <item/>
       <item/>
       <item/>
     </list>
-    <loader id="n8_psph" name="loagot" xy="92,5" size="50,50"/>
+    <image id="n11_jcej" name="imgGot" src="jcej3x" fileName="images/dwjl_ylqylq.png" xy="196,0"/>
   </displayList>
 </component>

FGUIProject/assets/Arena/components/TypeItem.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="211,211">
-  <displayList>
-    <image id="n5_wono" name="n5" src="psph19" fileName="components/hz_yjmzdi_2.png" xy="19,0"/>
-    <loader id="n0_k6he" name="icon" xy="115,95" pivot="0.5,0.5" anchor="true" size="120,120" aspect="true" url="ui://mbo439wbq08xa" align="center" vAlign="middle" fill="scaleNoBorder" playing="false" clearOnPublish="true"/>
-    <image id="n6_wono" name="n6" src="psph1b" fileName="components/hz_yjmzdi_1.png" xy="37,168"/>
-    <text id="n7_wono" name="txtname" xy="81,167" pivot="0.5,0" size="68,44" font="ui://eg2y0ldpwonotjc" fontSize="32" color="#94703f" text="发型"/>
-  </displayList>
-</component>

FGUIProject/assets/Arena/package.xml

@@ -29,7 +29,6 @@
     <component id="pspht" name="ComDanInfo.xml" path="/components/"/>
     <component id="psphu" name="ComDanDetailInfo.xml" path="/components/"/>
     <component id="psphv" name="ListRankItem0.xml" path="/components/"/>
-    <image id="psphw" name="hl_ddandik.png" path="/images/" exported="true"/>
     <component id="psphx" name="ArenaResultQuickUI.xml" path="/" exported="true"/>
     <component id="psphy" name="ListRankItem1.xml" path="/components/"/>
     <image id="psphz" name="hqtjtbtb.png" path="/images/"/>
@@ -40,9 +39,6 @@
     <component id="psph15" name="ListFightRecordItem.xml" path="/components/"/>
     <component id="psph16" name="comListType.xml" path="/components/"/>
     <image id="psph17" name="hz_zdikuang_1.png" path="/images/" scale="9grid" scale9grid="56,23,112,46"/>
-    <component id="psph18" name="TypeItem.xml" path="/components/"/>
-    <image id="psph19" name="hz_yjmzdi_2.png" path="/images/"/>
-    <image id="psph1b" name="hz_yjmzdi_1.png" path="/images/"/>
     <image id="psph1c" name="hz_zdikuang_2.png" path="/images/"/>
     <component id="psph1d" name="ComCard.xml" path="/components/"/>
     <component id="psph1e" name="BtnTab3.xml" path="/components/"/>
@@ -86,18 +82,17 @@
     <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="jcej2k" name="jjsy_gth.png" path="/images/"/>
     <image id="jcej2l" name="jjsy_xx_1.png" path="/images/"/>
     <image id="jcej2m" name="jjsy_xx_2.png" path="/images/"/>
     <image id="jcej2n" name="jjsy_xzanniu_1.png" path="/images/"/>
     <image id="jcej2o" name="jjsy_xzanniu_2.png" path="/images/"/>
     <image id="jcej2p" name="jjsy_xzanniu_3.png" path="/images/"/>
-    <image id="jcej2q" name="jjsy_xzdik.png" path="/images/"/>
+    <image id="jcej2q" name="jjsy_xzdik.png" path="/images/" scale="9grid" scale9grid="164,18,328,36"/>
     <image id="jcej2r" name="jjsy_zizi_1.png" path="/images/"/>
     <image id="jcej2s" name="jjsy_zizi_2.png" path="/images/"/>
     <image id="jcej2t" name="jjsy_zizi_3.png" path="/images/"/>
     <component id="jcej2u" name="ComCardRecord.xml" path="/components/"/>
-    <component id="jcej2v" name="ComCardMask.xml" path="/components/"/>
+    <component id="jcej2v" name="ComResultCardMask.xml" path="/components/"/>
     <component id="jcej2w" name="BtnLook.xml" path="/components/"/>
     <image id="jcej2x" name="bpjly_xdi_1.png" path="/images/"/>
     <image id="jcej2y" name="bpjly_xdi_2.png" path="/images/"/>
@@ -127,8 +122,14 @@
     <image id="jcej3m" name="dwjl_dwj_1.png" path="/images/"/>
     <image id="jcej3n" name="jzsjzs_xxxtxt.png" path="/images/"/>
     <image id="jcej3o" name="xqfs_dwewjl.png" path="/images/"/>
-    <component id="jcej3p" name="BtnRule.xml" path="/components/"/>
     <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/"/>
+    <component id="jcej3t" name="ComValueInfo.xml" path="/components/" exported="true"/>
+    <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/"/>
+    <image id="jcej3x" name="dwjl_ylqylq.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/BtnRule.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="44,44" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_psph" src="vek88k" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
+    <loader id="n1_jcej" name="icon" xy="0,0" size="44,44" url="ui://eg2y0ldpvek88k" align="center" vAlign="middle" autoSize="true"/>
   </displayList>
+  <Button/>
+  <relation target="n1_jcej" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -238,6 +238,7 @@
     <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/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -7,26 +7,13 @@
     <graph id="n0_qsvd" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n27_bx8o" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,66" group="n38_8lqj" visible="false">
-      <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
-        <item title="1"/>
-        <item title="2"/>
-        <item title="3"/>
-        <item title="4"/>
-        <item title="5"/>
-      </ComboBox>
-    </component>
     <component id="n1_qsvd" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,60" group="n38_8lqj">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <text id="n52_psph" name="txtArenaScore" xy="34,207" size="230,41" group="n38_8lqj" fontSize="30" autoClearText="true" text="竞技产战力：999"/>
-    <image id="n16_8xpg" name="n16" src="j48o3z" fileName="images/dz_hz_fsk_1.png" xy="36,268" group="n33_j48o"/>
-    <loader id="n24_d4iw" name="scoreType" xy="35,270" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n14_vxw5" name="txtScore" xy="90,270" size="124,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
-    <group id="n33_j48o" name="n33" xy="35,268" size="204,57" group="n38_8lqj"/>
     <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"/>
     <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="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>
@@ -48,14 +35,10 @@
     <group id="n44_wono" name="n44" xy="46,1458" size="110,252" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <component id="n57_psph" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="44,349" group="n58_psph"/>
-    <component id="n56_psph" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="91,353" group="n58_psph"/>
-    <text id="n55_psph" name="txtTagCount" xy="202,350" size="21,41" group="n58_psph" fontSize="30" align="center" text="6"/>
-    <group id="n58_psph" name="n58" xy="44,349" size="179,44" group="n38_8lqj"/>
     <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="325,1728" group="n38_8lqj">
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <group id="n38_8lqj" name="graContent" xy="34,40" size="1276,1880" advanced="true"/>
+    <group id="n38_8lqj" name="graContent" xy="18,40" size="1292,1880" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -28,7 +28,7 @@
     <component id="q08x13" name="ComboBoxSuit_item.xml" path="/components/"/>
     <component id="q08x14" name="ComboBoxSuit_popup.xml" path="/components/"/>
     <component id="q08x15" name="ComboBoxSuit.xml" path="/components/"/>
-    <component id="k6he16" name="TypeItem.xml" path="/components/"/>
+    <component id="k6he16" name="TypeItem.xml" path="/components/" exported="true"/>
     <image id="k6he17" name="hz_bjanniu.png" path="/images/"/>
     <image id="k6he18" name="hz_dakai_1.png" path="/images/"/>
     <component id="k6he1v" name="PartsList.xml" path="/components/"/>

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

@@ -18,6 +18,7 @@ namespace GFGGame
         public List<ArenaTargetData> rankDatas = new List<ArenaTargetData>();//排行榜数据
         public List<ArenaHistoryData> historyDatas = new List<ArenaHistoryData>();//获取竞技场历史记录
 
+        public int SelectDressIndex = 0;//当前选中换装主题（ThemeList）的下标
         public int SelectTargetIndex = 0;//当前选中挑战对象的下标
         public int CurFightIndex = 0;//当前挑战的为第几场
 

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

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+using FairyGUI;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ArenaViewManager : SingletonBase<ArenaViewManager>
+    {
+        public Dictionary<int, Texture2D> textureDic = new Dictionary<int, Texture2D>();
+
+        public void Clear()
+        {
+            textureDic.Clear();
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnQuickFight.cs.meta → GameClient/Assets/Game/HotUpdate/Data/ArenaViewManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d22cf5c4a8612004eacd23e238d504ee
+guid: 1c5c189e99656074ea0a8e9c0187267a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -124,11 +125,43 @@ namespace GFGGame
             screenShot.Apply();
             camera.targetTexture = null;
             RenderTexture.active = null;
-            Object.Destroy(rt);
+            UnityEngine.Object.Destroy(rt);
             return screenShot;
 
         }
 
+        /// <summary>
+        /// 获取标签总分数
+        /// </summary>
+        /// <param name="itemList">服装列表</param>
+        /// <param name="tags">标签</param>
+        /// <returns></returns>
+        public int GetTagsScore(List<int> itemList, string[] tags)
+        {
+            int score = 0;
+            for (int i = 0; i < itemList.Count; i++)
+            {
+                score += ItemDataManager.GetItemTagScore(itemList[i], tags);
+            }
+            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;
+        }
+
         //获取玩家战斗数据
         public FightRoleData GetMyFightRoleData()
         {
@@ -226,6 +259,15 @@ namespace GFGGame
             return clickType;
         }
 
+        /// <summary>
+        /// 获取快速挑战结果
+        /// </summary>
+        /// <param name="myRoleData"></param>
+        /// <param name="targetType"></param>
+        /// <param name="targetRoleData"></param>
+        /// <param name="targetRobotData"></param>
+        /// <param name="_score"></param>
+        /// <param name="_targetScore"></param>
         public void GetQuickFightResult(FightRoleData myRoleData, int targetType, FightRoleData targetRoleData, FightRobotData targetRobotData, out int _score, out int _targetScore)
         {
             double score = 0;
@@ -298,5 +340,93 @@ namespace GFGGame
             targetMainScore += targetSkillScore;
 
         }
+
+        /// <summary>
+        /// 获取竞技场玩家战力
+        /// </summary>
+        /// <returns></returns>
+        public int GetArenaRoleFightScore(FightRoleData roleDatas)
+        {
+            //竞技场战力=搭配战力+卓越点击战力+卡牌战力
+            //搭配战力=第1套搭配所有部件主属性和+第2套搭配所有部件主属性和+第3套搭配所有部件主属性和
+            //卓越点击战力=卓越点击评分和/2.33
+            //技能战力=（第1套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能1当前等级对应的战力系数+（第1套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能2当前等级对应的战力系数+（第1套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能3当前等级对应的战力系数+（第2套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能1当前等级对应的战力系数+（第2套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能2当前等级对应的战力系数+（第2套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能3当前等级对应的战力系数+（第3套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能1当前等级对应的战力系数+（第3套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能2当前等级对应的战力系数+（第3套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能3当前等级对应的战力系数
+            double fightScore = 0;
+
+            double itemSum = GetItemScoreSum(roleDatas.itemScoreList);
+            double clickScore = GetPerfectClickScore(roleDatas) / ConstScoreSystem.PART_SCORE;
+            double skillScore = 0;
+            double skillBaseScore = itemSum + roleDatas.cardScore + roleDatas.baseScore;
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(roleDatas.cardId);
+            for (int j = 0; j < skillCfgs.Count; j++)
+            {
+                PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(roleDatas.skillLvs[j], skillCfgs[j].skillId);
+                if (skillLvlCfg == null) continue;
+                skillScore += skillBaseScore * skillLvlCfg.fightPowerParam / 10000;
+            }
+            fightScore = itemSum + clickScore + skillScore;
+
+            return (int)Math.Ceiling(fightScore);
+        }
+
+
+        /// <summary>
+        /// 获取竞技场机器人战力
+        /// </summary>
+        /// <returns></returns>
+        public int GetArenaRobotFightScore(List<FightRobotData> robotDatas)
+        {
+            double fightScore = 0;
+            for (int i = 0; i < robotDatas.Count; i++)
+            {
+                double itemSum = GetItemScoreSum(robotDatas[i].itemScoreList);
+                double clickScore = GetRobotPerfectClickScore(robotDatas[i]) / ConstScoreSystem.PART_SCORE;
+                double skillScore = 0;
+                double skillBaseScore = itemSum + robotDatas[i].cardScore + robotDatas[i].baseScore;
+                List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(robotDatas[i].cardId);
+                for (int j = 0; j < skillCfgs.Count; j++)
+                {
+                    PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(robotDatas[i].skillLvs[j], skillCfgs[i].skillId);
+                    if (skillLvlCfg == null) continue;
+                    skillScore += skillBaseScore * skillLvlCfg.fightPowerParam / 10000;
+                }
+                fightScore = itemSum + clickScore + skillScore;
+            }
+            return (int)Math.Ceiling(fightScore);
+        }
+
+        /// <summary>
+        /// 所有部件主属性和
+        /// </summary>
+        /// <returns></returns>
+        private double GetItemScoreSum(List<int> itemScoreList)
+        {
+            double scoreSum = 0;
+            for (int i = 0; i < itemScoreList.Count; i++)
+            {
+                scoreSum += itemScoreList[i];
+            }
+            return scoreSum;
+
+        }
+        private double GetPerfectClickScore(FightRoleData roleData)
+        {
+            double clickScore = 0;
+            foreach (int key in roleData.pardScoreListDic.Keys)
+            {
+                clickScore += ScoreSystemData.Instance.GetPartScore(roleData, key, ClickType.PREFACT_CLICK, 0);
+            }
+            return clickScore;
+        }
+        private double GetRobotPerfectClickScore(FightRobotData robotData)
+        {
+            double clickScore = 0;
+            FightScoreCfg[] scoreCfg = FightScoreCfgArray.Instance.dataArray;
+            for (int i = 0; i < scoreCfg.Length; i++)
+            {
+                clickScore += ScoreSystemData.Instance.GetRobotPartScore(robotData, i + 1, ClickType.PREFACT_CLICK, 0);
+            }
+            return clickScore;
+        }
     }
 }

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

@@ -413,92 +413,5 @@ namespace GFGGame
             }
             return null;
         }
-
-        /// <summary>
-        /// 获取竞技场玩家战力
-        /// </summary>
-        /// <returns></returns>
-        public int GetArenaRoleFightScore(List<FightRoleData> roleDatas)
-        {
-            //竞技场战力=搭配战力+卓越点击战力+卡牌战力
-            //搭配战力=第1套搭配所有部件主属性和+第2套搭配所有部件主属性和+第3套搭配所有部件主属性和
-            //卓越点击战力=卓越点击评分和/2.33
-            //技能战力=（第1套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能1当前等级对应的战力系数+（第1套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能2当前等级对应的战力系数+（第1套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能3当前等级对应的战力系数+（第2套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能1当前等级对应的战力系数+（第2套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能2当前等级对应的战力系数+（第2套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能3当前等级对应的战力系数+（第3套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能1当前等级对应的战力系数+（第3套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能2当前等级对应的战力系数+（第3套搭配所有部件主属性和+卡牌主属性+人物基础分）*技能3当前等级对应的战力系数
-            double fightScore = 0;
-            for (int i = 0; i < roleDatas.Count; i++)
-            {
-                double itemSum = GetItemScoreSum(roleDatas[i].itemScoreList);
-                double clickScore = GetPerfectClickScore(roleDatas[i]) / ConstScoreSystem.PART_SCORE;
-                double skillScore = 0;
-                double skillBaseScore = itemSum + roleDatas[i].cardScore + roleDatas[i].baseScore;
-                List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(roleDatas[i].cardId);
-                for (int j = 0; j < skillCfgs.Count; j++)
-                {
-                    PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(roleDatas[i].skillLvs[j], skillCfgs[i].skillId);
-                    if (skillLvlCfg == null) continue;
-                    skillScore += skillBaseScore * skillLvlCfg.fightPowerParam / 10000;
-                }
-                fightScore = itemSum + clickScore + skillScore;
-            }
-            return (int)Math.Ceiling(fightScore);
-        }
-        /// <summary>
-        /// 获取竞技场机器人战力
-        /// </summary>
-        /// <returns></returns>
-        public int GetArenaRobotFightScore(List<FightRobotData> robotDatas)
-        {
-            double fightScore = 0;
-            for (int i = 0; i < robotDatas.Count; i++)
-            {
-                double itemSum = GetItemScoreSum(robotDatas[i].itemScoreList);
-                double clickScore = GetRobotPerfectClickScore(robotDatas[i]) / ConstScoreSystem.PART_SCORE;
-                double skillScore = 0;
-                double skillBaseScore = itemSum + robotDatas[i].cardScore + robotDatas[i].baseScore;
-                List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(robotDatas[i].cardId);
-                for (int j = 0; j < skillCfgs.Count; j++)
-                {
-                    PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(robotDatas[i].skillLvs[j], skillCfgs[i].skillId);
-                    if (skillLvlCfg == null) continue;
-                    skillScore += skillBaseScore * skillLvlCfg.fightPowerParam / 10000;
-                }
-                fightScore = itemSum + clickScore + skillScore;
-            }
-            return (int)Math.Ceiling(fightScore);
-        }
-        /// <summary>
-        /// 所有部件主属性和
-        /// </summary>
-        /// <returns></returns>
-        private double GetItemScoreSum(List<int> itemScoreList)
-        {
-            double scoreSum = 0;
-            for (int i = 0; i < itemScoreList.Count; i++)
-            {
-                scoreSum += itemScoreList[i];
-            }
-            return scoreSum;
-
-        }
-        private double GetPerfectClickScore(FightRoleData roleData)
-        {
-            double clickScore = 0;
-            foreach (int key in roleData.pardScoreListDic.Keys)
-            {
-                clickScore += GetPartScore(roleData, key, ClickType.PREFACT_CLICK, 0);
-            }
-            return clickScore;
-        }
-        private double GetRobotPerfectClickScore(FightRobotData robotData)
-        {
-            double clickScore = 0;
-            FightScoreCfg[] scoreCfg = FightScoreCfgArray.Instance.dataArray;
-            for (int i = 0; i < scoreCfg.Length; i++)
-            {
-                clickScore += GetRobotPartScore(robotData, i + 1, ClickType.PREFACT_CLICK, 0);
-            }
-            return clickScore;
-        }
-
     }
 }

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

@@ -9,11 +9,13 @@ namespace UI.Arena
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public Controller m_c3;
         public GButton m_btnBack;
         public GLoader m_loaBg;
         public UI_BtnTab3 m_btn0;
         public UI_BtnTab3 m_btn1;
         public UI_BtnTab3 m_btn2;
+        public UI_ComValueInfo m_comValueInfo;
         public GComponent m_comListBg;
         public GList m_list;
         public UI_ComCard m_comCard;
@@ -68,11 +70,13 @@ namespace UI.Arena
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_c3 = comp.GetController("c3");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btn0 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn0"));
             m_btn1 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn1"));
             m_btn2 = (UI_BtnTab3)UI_BtnTab3.Create(comp.GetChild("btn2"));
+            m_comValueInfo = (UI_ComValueInfo)UI_ComValueInfo.Create(comp.GetChild("comValueInfo"));
             m_comListBg = (GComponent)comp.GetChild("comListBg");
             m_list = (GList)comp.GetChild("list");
             m_comCard = (UI_ComCard)UI_ComCard.Create(comp.GetChild("comCard"));
@@ -83,6 +87,7 @@ namespace UI.Arena
         {
             m_c1 = null;
             m_c2 = null;
+            m_c3 = null;
             m_btnBack = null;
             m_loaBg = null;
             m_btn0.Dispose();
@@ -91,6 +96,8 @@ namespace UI.Arena
             m_btn1 = null;
             m_btn2.Dispose();
             m_btn2 = null;
+            m_comValueInfo.Dispose();
+            m_comValueInfo = null;
             m_comListBg = null;
             m_list = null;
             m_comCard.Dispose();

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

@@ -7,7 +7,7 @@ namespace UI.Arena
     public partial class UI_ArenaFightRecordUI
     {
         public GComponent target;
-        public Controller m_c1;
+        public UI_ComTitle m_comTitle;
         public GList m_list;
         public const string URL = "ui://4lc5fhlbpsph3";
         public const string PACKAGE_NAME = "Arena";
@@ -56,12 +56,13 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_comTitle = (UI_ComTitle)UI_ComTitle.Create(comp.GetChild("comTitle"));
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_comTitle.Dispose();
+            m_comTitle = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,13 +7,14 @@ namespace UI.Arena
     public partial class UI_ArenaResultQuickUI
     {
         public GComponent target;
+        public UI_ComTitle m_comTitle;
         public GTextField m_txtTargetName;
+        public GComponent m_comTargetHeadWithlv;
+        public GTextField m_txtTargetRank;
+        public GTextField m_txtDantitle;
         public GList m_list;
         public GTextField m_txtMyFightScore;
         public GTextField m_txtTargetFightScore;
-        public GTextField m_txtTargetRank;
-        public GTextField m_txtDantitle;
-        public GComponent m_comTargetHeadWithlv;
         public GLoader m_loaResule;
         public const string URL = "ui://4lc5fhlbpsphx";
         public const string PACKAGE_NAME = "Arena";
@@ -62,24 +63,27 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
+            m_comTitle = (UI_ComTitle)UI_ComTitle.Create(comp.GetChild("comTitle"));
             m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
+            m_comTargetHeadWithlv = (GComponent)comp.GetChild("comTargetHeadWithlv");
+            m_txtTargetRank = (GTextField)comp.GetChild("txtTargetRank");
+            m_txtDantitle = (GTextField)comp.GetChild("txtDantitle");
             m_list = (GList)comp.GetChild("list");
             m_txtMyFightScore = (GTextField)comp.GetChild("txtMyFightScore");
             m_txtTargetFightScore = (GTextField)comp.GetChild("txtTargetFightScore");
-            m_txtTargetRank = (GTextField)comp.GetChild("txtTargetRank");
-            m_txtDantitle = (GTextField)comp.GetChild("txtDantitle");
-            m_comTargetHeadWithlv = (GComponent)comp.GetChild("comTargetHeadWithlv");
             m_loaResule = (GLoader)comp.GetChild("loaResule");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comTitle.Dispose();
+            m_comTitle = null;
             m_txtTargetName = null;
+            m_comTargetHeadWithlv = null;
+            m_txtTargetRank = null;
+            m_txtDantitle = null;
             m_list = null;
             m_txtMyFightScore = null;
             m_txtTargetFightScore = null;
-            m_txtTargetRank = null;
-            m_txtDantitle = null;
-            m_comTargetHeadWithlv = null;
             m_loaResule = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,9 +7,7 @@ namespace UI.Arena
     public partial class UI_ArenaResultUI
     {
         public GComponent target;
-        public UI_ListResultItem m_comResult0;
-        public UI_ListResultItem m_comResult1;
-        public UI_ListResultItem m_comResult2;
+        public GList m_list;
         public const string URL = "ui://4lc5fhlbpsph6";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaResultUI";
@@ -57,18 +55,11 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_comResult0 = (UI_ListResultItem)UI_ListResultItem.Create(comp.GetChild("comResult0"));
-            m_comResult1 = (UI_ListResultItem)UI_ListResultItem.Create(comp.GetChild("comResult1"));
-            m_comResult2 = (UI_ListResultItem)UI_ListResultItem.Create(comp.GetChild("comResult2"));
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comResult0.Dispose();
-            m_comResult0 = null;
-            m_comResult1.Dispose();
-            m_comResult1 = null;
-            m_comResult2.Dispose();
-            m_comResult2 = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,10 +10,11 @@ namespace UI.Arena
         public Controller m_c1;
         public GButton m_btnBack;
         public GComponent m_valueBar;
-        public GLoader m_loaScore0;
         public GComponent m_comTag;
+        public GLoader m_loaScore0;
         public GLoader m_loaScore1;
         public GLoader m_loaScore2;
+        public GGroup m_grpTheme;
         public GTextField m_txtTime;
         public GButton m_btnRule;
         public GGroup m_gtpTop;
@@ -25,18 +26,19 @@ namespace UI.Arena
         public GTextField m_txtRank;
         public GTextField m_txtDanTitle;
         public GTextField m_txtFightScore;
-        public UI_BtnRecord m_btnDress;
-        public UI_BtnQuickFight m_btnQuickFight;
-        public UI_BtnRecord m_btnRecord;
-        public UI_BtnRecord m_btnReward;
-        public UI_BtnRecord m_btnRank;
-        public UI_BtnRecord m_btnShop;
-        public GButton m_btnAddFightCount;
-        public UI_BtnRefresh m_btnRefresh;
+        public GButton m_btnFightScoreRule;
         public GTextField m_txtMoneyCount;
+        public UI_BtnRefresh m_btnAddFightCount;
         public GTextField m_txtFightCount;
         public GTextField m_txtRefreshCount;
+        public UI_BtnRefresh m_btnRefresh;
         public GComponent m_comCostCurrent;
+        public GButton m_btnQuickFight;
+        public UI_BtnRecord m_btnShop;
+        public GButton m_btnDress;
+        public UI_BtnRecord m_btnReward;
+        public UI_BtnRecord m_btnRank;
+        public UI_BtnRecord m_btnRecord;
         public GGroup m_grpBottom;
         public const string URL = "ui://4lc5fhlbpsph0";
         public const string PACKAGE_NAME = "Arena";
@@ -88,10 +90,11 @@ namespace UI.Arena
             m_c1 = comp.GetController("c1");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_loaScore0 = (GLoader)comp.GetChild("loaScore0");
             m_comTag = (GComponent)comp.GetChild("comTag");
+            m_loaScore0 = (GLoader)comp.GetChild("loaScore0");
             m_loaScore1 = (GLoader)comp.GetChild("loaScore1");
             m_loaScore2 = (GLoader)comp.GetChild("loaScore2");
+            m_grpTheme = (GGroup)comp.GetChild("grpTheme");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_gtpTop = (GGroup)comp.GetChild("gtpTop");
@@ -103,18 +106,19 @@ namespace UI.Arena
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
-            m_btnDress = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnDress"));
-            m_btnQuickFight = (UI_BtnQuickFight)UI_BtnQuickFight.Create(comp.GetChild("btnQuickFight"));
-            m_btnRecord = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnRecord"));
-            m_btnReward = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnReward"));
-            m_btnRank = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnRank"));
-            m_btnShop = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnShop"));
-            m_btnAddFightCount = (GButton)comp.GetChild("btnAddFightCount");
-            m_btnRefresh = (UI_BtnRefresh)UI_BtnRefresh.Create(comp.GetChild("btnRefresh"));
+            m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
             m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
+            m_btnAddFightCount = (UI_BtnRefresh)UI_BtnRefresh.Create(comp.GetChild("btnAddFightCount"));
             m_txtFightCount = (GTextField)comp.GetChild("txtFightCount");
             m_txtRefreshCount = (GTextField)comp.GetChild("txtRefreshCount");
+            m_btnRefresh = (UI_BtnRefresh)UI_BtnRefresh.Create(comp.GetChild("btnRefresh"));
             m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
+            m_btnQuickFight = (GButton)comp.GetChild("btnQuickFight");
+            m_btnShop = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnShop"));
+            m_btnDress = (GButton)comp.GetChild("btnDress");
+            m_btnReward = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnReward"));
+            m_btnRank = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnRank"));
+            m_btnRecord = (UI_BtnRecord)UI_BtnRecord.Create(comp.GetChild("btnRecord"));
             m_grpBottom = (GGroup)comp.GetChild("grpBottom");
         }
         public void Dispose(bool disposeTarget = false)
@@ -122,10 +126,11 @@ namespace UI.Arena
             m_c1 = null;
             m_btnBack = null;
             m_valueBar = null;
-            m_loaScore0 = null;
             m_comTag = null;
+            m_loaScore0 = null;
             m_loaScore1 = null;
             m_loaScore2 = null;
+            m_grpTheme = null;
             m_txtTime = null;
             m_btnRule = null;
             m_gtpTop = null;
@@ -139,25 +144,25 @@ namespace UI.Arena
             m_txtRank = null;
             m_txtDanTitle = null;
             m_txtFightScore = null;
-            m_btnDress.Dispose();
-            m_btnDress = null;
-            m_btnQuickFight.Dispose();
+            m_btnFightScoreRule = null;
+            m_txtMoneyCount = null;
+            m_btnAddFightCount.Dispose();
+            m_btnAddFightCount = null;
+            m_txtFightCount = null;
+            m_txtRefreshCount = null;
+            m_btnRefresh.Dispose();
+            m_btnRefresh = null;
+            m_comCostCurrent = null;
             m_btnQuickFight = null;
-            m_btnRecord.Dispose();
-            m_btnRecord = null;
+            m_btnShop.Dispose();
+            m_btnShop = null;
+            m_btnDress = null;
             m_btnReward.Dispose();
             m_btnReward = null;
             m_btnRank.Dispose();
             m_btnRank = null;
-            m_btnShop.Dispose();
-            m_btnShop = null;
-            m_btnAddFightCount = null;
-            m_btnRefresh.Dispose();
-            m_btnRefresh = null;
-            m_txtMoneyCount = null;
-            m_txtFightCount = null;
-            m_txtRefreshCount = null;
-            m_comCostCurrent = null;
+            m_btnRecord.Dispose();
+            m_btnRecord = null;
             m_grpBottom = null;
             if(disposeTarget && target != null)
             {

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

@@ -7,7 +7,10 @@ namespace UI.Arena
     public partial class UI_ComCard
     {
         public GComponent target;
-        public GLoader m_loaCard;
+        public UI_ComCardMask m_comCard;
+        public GLoader m_loaScore;
+        public GLoader m_loaRarity;
+        public GTextField m_txtCardName;
         public const string URL = "ui://4lc5fhlbpsph1d";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ComCard";
@@ -55,11 +58,18 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_loaCard = (GLoader)comp.GetChild("loaCard");
+            m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
+            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
+            m_txtCardName = (GTextField)comp.GetChild("txtCardName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaCard = null;
+            m_comCard.Dispose();
+            m_comCard = null;
+            m_loaScore = null;
+            m_loaRarity = null;
+            m_txtCardName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComCardMask
+    {
+        public GComponent target;
+        public GLoader m_loaCard;
+        public const string URL = "ui://4lc5fhlbjcej3u";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComCardMask";
+        private static UI_ComCardMask _proxy;
+
+        public static UI_ComCardMask Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardMask();
+            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_ComCardMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardMask();
+            }
+            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_loaCard = (GLoader)comp.GetChild("loaCard");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCard = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComCardMask.cs.meta

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

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

@@ -0,0 +1,72 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComCardRecord
+    {
+        public GComponent target;
+        public UI_ComResultCardMask m_comCardmask;
+        public const string URL = "ui://4lc5fhlbjcej2u";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComCardRecord";
+        private static UI_ComCardRecord _proxy;
+
+        public static UI_ComCardRecord Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardRecord();
+            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_ComCardRecord Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardRecord();
+            }
+            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_comCardmask = (UI_ComResultCardMask)UI_ComResultCardMask.Create(comp.GetChild("comCardmask"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comCardmask.Dispose();
+            m_comCardmask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComCardRecord.cs.meta

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

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

@@ -7,7 +7,8 @@ namespace UI.Arena
     public partial class UI_ComDanSimpleInfo
     {
         public GComponent target;
-        public GComponent m_comHeadWithLv;
+        public Controller m_c1;
+        public GComponent m_comHeadWith;
         public GTextField m_txtName;
         public GTextField m_txtDanTitle;
         public GTextField m_txtRank;
@@ -58,14 +59,16 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_comHeadWithLv = (GComponent)comp.GetChild("comHeadWithLv");
+            m_c1 = comp.GetController("c1");
+            m_comHeadWith = (GComponent)comp.GetChild("comHeadWith");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comHeadWithLv = null;
+            m_c1 = null;
+            m_comHeadWith = null;
             m_txtName = null;
             m_txtDanTitle = null;
             m_txtRank = null;

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComResultCardMask
+    {
+        public GComponent target;
+        public GLoader m_loaCard;
+        public const string URL = "ui://4lc5fhlbjcej2v";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComResultCardMask";
+        private static UI_ComResultCardMask _proxy;
+
+        public static UI_ComResultCardMask Create(GObject gObject = null)
+        {
+            var ui = new UI_ComResultCardMask();
+            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_ComResultCardMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComResultCardMask();
+            }
+            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_loaCard = (GLoader)comp.GetChild("loaCard");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaCard = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComResultCardMask.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnQuickFight.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComTitle.cs

@@ -4,37 +4,37 @@ using FairyGUI;
 
 namespace UI.Arena
 {
-    public partial class UI_BtnQuickFight
+    public partial class UI_ComTitle
     {
-        public GButton target;
-        public Controller m_c1;
-        public const string URL = "ui://4lc5fhlbpsph1i";
+        public GComponent target;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://4lc5fhlbjcej2z";
         public const string PACKAGE_NAME = "Arena";
-        public const string RES_NAME = "BtnQuickFight";
-        private static UI_BtnQuickFight _proxy;
+        public const string RES_NAME = "ComTitle";
+        private static UI_ComTitle _proxy;
 
-        public static UI_BtnQuickFight Create(GObject gObject = null)
+        public static UI_ComTitle Create(GObject gObject = null)
         {
-            var ui = new UI_BtnQuickFight();
+            var ui = new UI_ComTitle();
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GComponent)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_BtnQuickFight Proxy(GObject gObject = null)
+        public static UI_ComTitle Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_BtnQuickFight();
+                _proxy = new UI_ComTitle();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GComponent)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -55,11 +55,11 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_txtTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComTitle.cs.meta

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

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

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComValueInfo
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_scoreType;
+        public GTextField m_txtScore;
+        public GTextField m_txtFightScore;
+        public GButton m_btnTagRule;
+        public GComponent m_comTag;
+        public GTextField m_txtTagScore;
+        public const string URL = "ui://4lc5fhlbjcej3t";
+        public const string PACKAGE_NAME = "Arena";
+        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_scoreType = (GLoader)comp.GetChild("scoreType");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
+            m_btnTagRule = (GButton)comp.GetChild("btnTagRule");
+            m_comTag = (GComponent)comp.GetChild("comTag");
+            m_txtTagScore = (GTextField)comp.GetChild("txtTagScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_scoreType = null;
+            m_txtScore = null;
+            m_txtFightScore = null;
+            m_btnTagRule = null;
+            m_comTag = null;
+            m_txtTagScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -7,9 +7,11 @@ namespace UI.Arena
     public partial class UI_ListDanRewardItem
     {
         public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaRank;
         public GTextField m_txtRank;
         public GList m_listReward;
-        public GLoader m_loagot;
+        public GImage m_imgGot;
         public const string URL = "ui://4lc5fhlbpsphn";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ListDanRewardItem";
@@ -57,15 +59,19 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
+            m_loaRank = (GLoader)comp.GetChild("loaRank");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_listReward = (GList)comp.GetChild("listReward");
-            m_loagot = (GLoader)comp.GetChild("loagot");
+            m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_loaRank = null;
             m_txtRank = null;
             m_listReward = null;
-            m_loagot = null;
+            m_imgGot = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,15 +8,22 @@ namespace UI.Arena
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_ctrDan;
+        public Controller m_ctrResult;
+        public GTextField m_txttime;
         public GLoader m_loaResult;
         public GLoader m_loaResultIcon;
         public GLoader m_loaDanIcon;
-        public GTextField m_txttime;
+        public GTextField m_txtRank0;
         public GTextField m_txtRank;
         public GTextField m_txtTargetName;
         public GTextField m_txtTargetArenaScore;
+        public GButton m_btnLook;
         public GButton m_btnShow;
+        public GGroup m_grpSimpleInfo;
         public GList m_listResult;
+        public GTextField m_txtMyScore;
+        public GTextField m_txtTargetScore;
         public GGroup m_grpAllInfo;
         public const string URL = "ui://4lc5fhlbpsph15";
         public const string PACKAGE_NAME = "Arena";
@@ -66,29 +73,43 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_ctrDan = comp.GetController("ctrDan");
+            m_ctrResult = comp.GetController("ctrResult");
+            m_txttime = (GTextField)comp.GetChild("txttime");
             m_loaResult = (GLoader)comp.GetChild("loaResult");
             m_loaResultIcon = (GLoader)comp.GetChild("loaResultIcon");
             m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
-            m_txttime = (GTextField)comp.GetChild("txttime");
+            m_txtRank0 = (GTextField)comp.GetChild("txtRank0");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
             m_txtTargetArenaScore = (GTextField)comp.GetChild("txtTargetArenaScore");
+            m_btnLook = (GButton)comp.GetChild("btnLook");
             m_btnShow = (GButton)comp.GetChild("btnShow");
+            m_grpSimpleInfo = (GGroup)comp.GetChild("grpSimpleInfo");
             m_listResult = (GList)comp.GetChild("listResult");
+            m_txtMyScore = (GTextField)comp.GetChild("txtMyScore");
+            m_txtTargetScore = (GTextField)comp.GetChild("txtTargetScore");
             m_grpAllInfo = (GGroup)comp.GetChild("grpAllInfo");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_ctrDan = null;
+            m_ctrResult = null;
+            m_txttime = null;
             m_loaResult = null;
             m_loaResultIcon = null;
             m_loaDanIcon = null;
-            m_txttime = null;
+            m_txtRank0 = null;
             m_txtRank = null;
             m_txtTargetName = null;
             m_txtTargetArenaScore = null;
+            m_btnLook = null;
             m_btnShow = null;
+            m_grpSimpleInfo = null;
             m_listResult = null;
+            m_txtMyScore = null;
+            m_txtTargetScore = null;
             m_grpAllInfo = null;
             if(disposeTarget && target != null)
             {

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

@@ -0,0 +1,91 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ListRecordItem
+    {
+        public GComponent target;
+        public GLoader m_loaScore;
+        public GTextField m_txtMyFightScore;
+        public GComponent m_comMyHead;
+        public UI_ComCardRecord m_loaMyCard;
+        public UI_ComCardRecord m_loaTargetCard;
+        public GComponent m_comTargetHead;
+        public GTextField m_txtTargetFightScore;
+        public const string URL = "ui://4lc5fhlbpsphp";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ListRecordItem";
+        private static UI_ListRecordItem _proxy;
+
+        public static UI_ListRecordItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRecordItem();
+            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_ListRecordItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRecordItem();
+            }
+            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_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_txtMyFightScore = (GTextField)comp.GetChild("txtMyFightScore");
+            m_comMyHead = (GComponent)comp.GetChild("comMyHead");
+            m_loaMyCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaMyCard"));
+            m_loaTargetCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaTargetCard"));
+            m_comTargetHead = (GComponent)comp.GetChild("comTargetHead");
+            m_txtTargetFightScore = (GTextField)comp.GetChild("txtTargetFightScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaScore = null;
+            m_txtMyFightScore = null;
+            m_comMyHead = null;
+            m_loaMyCard.Dispose();
+            m_loaMyCard = null;
+            m_loaTargetCard.Dispose();
+            m_loaTargetCard = null;
+            m_comTargetHead = null;
+            m_txtTargetFightScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListRecordItem.cs.meta

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

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

@@ -10,11 +10,11 @@ namespace UI.Arena
         public GLoader m_loaScore;
         public GTextField m_txtMyFightScore;
         public GComponent m_comMyHead;
-        public GLoader m_loaMyCard;
-        public GLoader m_loaTargetCard;
+        public UI_ComCardRecord m_loaMyCard;
+        public UI_ComCardRecord m_loaTargetCard;
         public GComponent m_comTargetHead;
         public GTextField m_txtTargetFightScore;
-        public const string URL = "ui://4lc5fhlbpsphp";
+        public const string URL = "ui://4lc5fhlbjcej30";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ListResultItem";
         private static UI_ListResultItem _proxy;
@@ -64,8 +64,8 @@ namespace UI.Arena
             m_loaScore = (GLoader)comp.GetChild("loaScore");
             m_txtMyFightScore = (GTextField)comp.GetChild("txtMyFightScore");
             m_comMyHead = (GComponent)comp.GetChild("comMyHead");
-            m_loaMyCard = (GLoader)comp.GetChild("loaMyCard");
-            m_loaTargetCard = (GLoader)comp.GetChild("loaTargetCard");
+            m_loaMyCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaMyCard"));
+            m_loaTargetCard = (UI_ComCardRecord)UI_ComCardRecord.Create(comp.GetChild("loaTargetCard"));
             m_comTargetHead = (GComponent)comp.GetChild("comTargetHead");
             m_txtTargetFightScore = (GTextField)comp.GetChild("txtTargetFightScore");
         }
@@ -74,7 +74,9 @@ namespace UI.Arena
             m_loaScore = null;
             m_txtMyFightScore = null;
             m_comMyHead = null;
+            m_loaMyCard.Dispose();
             m_loaMyCard = null;
+            m_loaTargetCard.Dispose();
             m_loaTargetCard = null;
             m_comTargetHead = null;
             m_txtTargetFightScore = null;

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

@@ -8,10 +8,12 @@ namespace UI.Arena
     {
         public GComponent target;
         public GComponent m_comHead;
-        public GTextField m_txtDanTitle;
+        public GComponent m_comLv;
         public GTextField m_txtName;
+        public GTextField m_txtDanTitle;
         public GTextField m_txtRank;
         public GTextField m_txtFightScore;
+        public GButton m_btnLook;
         public const string URL = "ui://4lc5fhlbpsph1m";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ListTargetItem";
@@ -60,18 +62,22 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_comHead = (GComponent)comp.GetChild("comHead");
-            m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_comLv = (GComponent)comp.GetChild("comLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
+            m_btnLook = (GButton)comp.GetChild("btnLook");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comHead = null;
-            m_txtDanTitle = null;
+            m_comLv = null;
             m_txtName = null;
+            m_txtDanTitle = null;
             m_txtRank = null;
             m_txtFightScore = null;
+            m_btnLook = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,12 +9,9 @@ namespace UI.DressUp
         public GComponent target;
         public GLoader m_loaBg;
         public GGraph m_touchPad;
-        public GComboBox m_comboBox;
         public GButton m_btnBack;
-        public GTextField m_txtArenaScore;
-        public GLoader m_scoreType;
-        public GTextField m_txtScore;
         public GTextField m_txtDressLimit;
+        public GComponent m_comValueInfo;
         public UI_comListType m_comListType1;
         public UI_comListType m_comListType2;
         public UI_PartsList m_partsList;
@@ -22,9 +19,6 @@ namespace UI.DressUp
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnNext;
-        public GButton m_btnTagRule;
-        public GComponent m_comTag;
-        public GTextField m_txtTagCount;
         public GGroup m_graContent;
         public const string URL = "ui://mbo439wbpsphez";
         public const string PACKAGE_NAME = "DressUp";
@@ -75,12 +69,9 @@ namespace UI.DressUp
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_touchPad = (GGraph)comp.GetChild("touchPad");
-            m_comboBox = (GComboBox)comp.GetChild("comboBox");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_txtArenaScore = (GTextField)comp.GetChild("txtArenaScore");
-            m_scoreType = (GLoader)comp.GetChild("scoreType");
-            m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_txtDressLimit = (GTextField)comp.GetChild("txtDressLimit");
+            m_comValueInfo = (GComponent)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"));
@@ -88,21 +79,15 @@ namespace UI.DressUp
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnNext = (GButton)comp.GetChild("btnNext");
-            m_btnTagRule = (GButton)comp.GetChild("btnTagRule");
-            m_comTag = (GComponent)comp.GetChild("comTag");
-            m_txtTagCount = (GTextField)comp.GetChild("txtTagCount");
             m_graContent = (GGroup)comp.GetChild("graContent");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_touchPad = null;
-            m_comboBox = null;
             m_btnBack = null;
-            m_txtArenaScore = null;
-            m_scoreType = null;
-            m_txtScore = null;
             m_txtDressLimit = null;
+            m_comValueInfo = null;
             m_comListType1.Dispose();
             m_comListType1 = null;
             m_comListType2.Dispose();
@@ -114,9 +99,6 @@ namespace UI.DressUp
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnNext = null;
-            m_btnTagRule = null;
-            m_comTag = null;
-            m_txtTagCount = null;
             m_graContent = null;
             if(disposeTarget && target != null)
             {

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

@@ -44,11 +44,11 @@ namespace GFGGame
                     ArenaDataManager.Instance.HighestRank = response.HighestRankInGradeOfSeason;
 
                     ArenaDataManager.Instance.Clear();
-                    for (int i = 0; i < response.DressupList.Count; i++)
+                    for (int i = 0; i < response.ThemeList.Count; i++)
                     {
                         FightRoleData roleData = new FightRoleData();
-                        roleData.cardId = response.DressupList[i].CardId;
-                        roleData.itemList = response.DressupList[i].EquipIds;
+                        roleData.cardId = response.DressupList.Count > i ? response.DressupList[i].CardId : 0;
+                        roleData.itemList = response.DressupList.Count > i ? response.DressupList[i].EquipIds : new List<int>();
 
                         ArenaDataManager.Instance.DressupList.Add(roleData);
                     }
@@ -79,11 +79,11 @@ namespace GFGGame
         }
 
         //更换搭配
-        public static async ETTask ReqChangeArenaDressup(int index, FightRoleData roleData)
+        public static async ETTask<bool> ReqChangeArenaDressup(int index, int cardId, List<int> itemList)
         {
             ArenaDressupProto dressupInfo = new ArenaDressupProto();
-            dressupInfo.CardId = roleData.cardId;
-            dressupInfo.EquipIds = roleData.itemList;
+            dressupInfo.CardId = cardId;
+            dressupInfo.EquipIds = itemList;
 
             S2C_ChangeArenaDressup response = null;
             response = (S2C_ChangeArenaDressup)await MessageHelper.SendToServer(new C2S_ChangeArenaDressup() { Index = index, DressupInfo = dressupInfo });
@@ -91,9 +91,14 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ArenaDataManager.Instance.DressupList[index] = roleData;
+                    ArenaDataManager.Instance.DressupList[index].cardId = cardId;
+                    ArenaDataManager.Instance.DressupList[index].itemList = itemList;
+                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
+
+                    return true;
                 }
             }
+            return false;
         }
 
         //购买挑战次数

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

@@ -0,0 +1,844 @@
+using UI.DressUp;
+using FairyGUI;
+using UnityEngine;
+using System.Collections.Generic;
+using System;
+using ET;
+using System.Collections;
+using System.Threading.Tasks;
+using UI.Arena;
+using UI.CommonGame;
+
+namespace GFGGame
+{
+    public class ArenaDressUpFightView : BaseView
+    {
+        private UI_ArenaDressUpFightUI _ui;
+        private ArenaDataManager _dataManager;
+        public FightRoleData _roleData;
+        // private int _fightID;
+        // private int _levelID;
+        private float listType1X = 0;
+        private float partsListX = 0;
+        private DressUpListType currentListType;
+        private int[] _currentList2;
+        private GameObject _scenePrefab;
+        private GameObject _sceneObject;
+        private List<int> _currentList3 = new List<int>();
+        private List<int> _currentList4 = new List<int>();
+        private int _currentMenuType;
+        private int _currentSuitId;
+        // private StoryLevelCfg _levelCfg;
+        // private StoryFightCfg _fightCfg;
+
+        private const int SORT_BY_HIGH_SCORE = 0;
+        private const int SORT_BY_LOW_SCORE = 1;
+        private int _scoreIndex = SORT_BY_HIGH_SCORE;
+        private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+
+
+        public override void Dispose()
+        {
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+            for (int i = 0; i < _listLongPress.Count; i++)
+            {
+                _listLongPress[i].Dispose();
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            packageName = UI_ArenaDressUpFightUI.PACKAGE_NAME;
+            _ui = UI_ArenaDressUpFightUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpFight"));
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            _ui.m_btnSearch.visible = true;
+            _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
+            InitLists();
+            _ui.m_partsList.m_comboBoxRarity.onChanged.Add(OnComboBoxRarityChanged);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+
+            _ui.m_comListType1.m_listType.onClickItem.Add(OnClickListType1Item);
+            _ui.m_comListType2.m_listType.onClickItem.Add(OnClickListType2Item);
+            _ui.m_partsList.m_list.onClickItem.Add(OnClickPartsListItem);
+            _ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
+
+            _ui.m_touchPad.onClick.Add(OnTouchPad);
+            _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
+            _ui.m_btnNext.onClick.Add(OnClickBtnNext);
+            _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+
+            _ui.m_partsList2.m_comboBoxRarity.visible = false;
+            _ui.m_partsList2.m_imgTop.visible = true;
+            _ui.m_partsList.m_imgTop.visible = false;
+
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            // EventAgent.AddEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateValueInfo);
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _dataManager = ArenaDataManager.Instance;
+            _roleData = _dataManager.DressupList[_dataManager.SelectDressIndex];
+            InstanceZonesDataManager.currentScoreType = _dataManager.ThemeList[_dataManager.SelectDressIndex];
+            InstanceZonesDataManager.currentFightTags = _dataManager.DressupList[_dataManager.SelectDressIndex].tags;
+
+
+            _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
+
+
+            //一级菜单
+            _ui.m_comListType1.m_listType.RemoveChildrenToPool();
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 3;
+            float maxHeight = _ui.target.height - _ui.m_comListType1.m_listType.y - DressUpView.BOTTOM_BLANK;
+            if (_ui.m_comListType1.m_listType.height > maxHeight)
+            {
+                _ui.m_comListType1.m_listType.height = maxHeight;
+            }
+            _ui.m_comListType1.target.x = _ui.target.width;
+            _ui.m_comListType2.target.x = _ui.target.width;
+            _ui.m_partsList.target.x = _ui.target.width;
+            _ui.m_partsList2.target.x = _ui.target.width;
+            this.showListType1();
+            if (_sceneObject == null)
+            {
+                _sceneObject = GameObject.Instantiate(_scenePrefab);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+                MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
+            }
+            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+
+            UpdateValueInfo();
+            SendLog();
+            Timers.inst.AddUpdate(CheckGuide);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+            if (_sceneObject != null)
+            {
+                GameObject.Destroy(_sceneObject);
+                _sceneObject = null;
+            }
+
+            DressUpMenuItemDataManager.Clear();
+
+            Timers.inst.Remove(CheckGuide);
+
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            // EventAgent.RemoveEventListener(ConstMessage.CARD_CHOOSE, StartCalculateScore);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
+            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateValueInfo);
+
+        }
+        private void OnClickBtnBack()
+        {
+            AlertUI.Show("是否确定退出？")
+            .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
+            {
+                ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
+            });
+        }
+
+        private void OnClickBtnHome()
+        {
+            AlertUI.Show("是否返回？")
+           .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
+           {
+               GameController.GoBackToMainView();
+           });
+        }
+
+        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.score.ToString();
+            comValueInfo.m_txtFightScore.text = FightDataManager.Instance.GetArenaRoleFightScore(_roleData).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);
+        }
+
+        private void OnClickListType1Item(EventContext context)
+        {
+
+            // GuideController.HideGuide();
+            GObject typeItem = context.data as GObject;
+            int order = (int)typeItem.data;
+            DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[order - 1];
+            if (item1.subMenusArr.Length > 0)
+            {
+                this.showListType2(item1.subMenusArr);
+            }
+            else
+            {
+                if (this.showListParts(item1.type) == false)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                    return;
+                }
+                this.showListParts(item1.type);
+
+            }
+            this.hideListType1();
+            UpdateListPartsSelected();
+        }
+
+        private void OnClickListType2Item(EventContext context)
+        {
+
+            GObject typeItem = context.data as GObject;
+            int order = (int)typeItem.data;
+            DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[order - 1];
+
+            if (this.showListParts(item2.type) == false)
+            {
+
+                PromptController.Instance.ShowFloatTextPrompt("未获得此类部件");
+                return;
+
+            }
+            this.hideListType2();
+        }
+
+        private void OnClickPartsListItem(EventContext context)
+        {
+            if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
+            {
+                return;
+            }
+            GObject listItem = context.data as GObject;
+            int id = (int)listItem.data;
+            if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+            {
+                this.showListParts2(id);
+                this.hideListParts();
+                MyDressUpHelper.dressUpObj.PutOnItemList(MyDressUpHelper.GetSuitFightItems(id));
+                // MyDressUpHelper.dressUpObj.PutOnSuitCfg(id, false);
+            }
+            else
+            {
+                bool isOrnament = DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsType(id);
+                bool isDress = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+                bool isHasSame = MyDressUpHelper.dressUpObj.CheckSameTypeIsOn(id);
+                bool isMaxCount = MyDressUpHelper.GetCurrentOrnamentCount() >= GlobalCfgArray.globalCfg.dressLimitCount;
+                if (isOrnament && !isDress && !isHasSame && isMaxCount)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("饰品穿戴数量已达上限");
+                    return;
+                }
+                MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(id);
+                MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+            }
+            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
+            UpdateValueInfo();
+
+        }
+        private void OnClickSuitPartsListItem(EventContext context)
+        {
+            if (ViewManager.isViewOpen(typeof(DressUpItemTipsView).FullName))
+            {
+                return;
+            }
+            GObject listItem = (GObject)context.data as GObject;
+            int id = (int)listItem.data;
+
+            bool isOrnament = DressUpMenuItemCfg1Array.Instance.CheckIsOrnamentsType(id);
+            bool isDress = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+            bool isHasSame = MyDressUpHelper.dressUpObj.CheckSameTypeIsOn(id);
+            bool isMaxCount = MyDressUpHelper.GetCurrentOrnamentCount() >= GlobalCfgArray.globalCfg.dressLimitCount;
+            if (isOrnament && !isDress && !isHasSame && isMaxCount)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("饰品穿戴数量已达上限");
+                return;
+            }
+
+            MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(id);
+            MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+            UpdateListSuitPartsSelected();
+            UpdateValueInfo();
+        }
+        private void OnLongPress(EventContext context)
+        {
+            LongPressGesture gesture = (LongPressGesture)context.sender;
+            int itemId = (int)gesture.host.data;
+            GoodsItemTipsController.ShowItemTips(itemId);
+        }
+        private void OnTouchPad()
+        {
+            if (this.currentListType == DressUpListType.List4)
+            {
+                this.hideListParts2();
+                this.showListParts(ConstDressUpItemType.TAO_ZHUANG, true);
+            }
+            else if (this.currentListType == DressUpListType.List3)
+            {
+                if (_currentList2 != null)
+                {
+                    this.showListType2(_currentList2);
+                }
+                else
+                {
+                    this.showListType1();
+                }
+                this.hideListParts();
+            }
+            else if (this.currentListType == DressUpListType.List2)
+            {
+                this.showListType1();
+                this.hideListType2();
+            }
+        }
+
+
+        private void OnClickBtnDelete()
+        {
+            MyDressUpHelper.dressUpObj.TakeOffAll();
+            _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);
+
+        }
+
+        private async void OnClickBtnNext()
+        {
+            if (!MyDressUpHelper.CheckPutOnFinish())
+            {
+                AlertUI.Show("当前主题尚未穿戴完整")
+                    .SetRightButton(true, "好的");
+                return;
+            }
+
+            await DressUpFinishAsync();
+        }
+
+        private async Task DressUpFinishAsync()
+        {
+            Timers.inst.StartCoroutine(ScreenShotTex());
+
+            if (CardDataManager.GetCardListByRarity(0).Count > 0)
+            {
+                ViewManager.Show<StoryCardChoose>(InstanceZonesDataManager.currentScoreType);
+            }
+            else
+            {
+                bool result = await ArenaSproxy.ReqChangeArenaDressup(_dataManager.SelectDressIndex, 0, MyDressUpHelper.dressUpObj.itemList);
+                if (result)
+                {
+                    if (_dataManager.SelectDressIndex == _dataManager.ThemeList.Count - 1)//最后一个主题搭配好要返回竞技场主界面
+                    {
+                        OnClickBtnBack();
+                    }
+                    else
+                    {
+                        _dataManager.SelectDressIndex++;
+                        ViewManager.Show<ArenaDressUpFightView>();
+                    }
+                }
+            }
+        }
+        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";
+
+            GameObject gameObject = _sceneObject.transform.Find("FightCamera").gameObject;
+            Camera camera = gameObject.GetComponent<Camera>();
+            ArenaViewManager.Instance.textureDic[_dataManager.SelectDressIndex] = FightDataManager.Instance.GetPrintscreenNTexture(camera);
+
+            yield return new WaitForEndOfFrame();
+        }
+
+        private void OnClickBtnRecommend()
+        {
+            if (this.currentListType == DressUpListType.List4)
+            {
+                this.hideListParts2();
+                this.showListParts(ConstDressUpItemType.TAO_ZHUANG, true);
+            }
+            MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(_currentSuitId);
+            // InstanceZonesDataManager.usedRecommend = true;
+            // MyDressUpHelper.PutOnRecommendItems();
+            MyDressUpHelper.PutOnRecommendItems2();
+            _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
+
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
+
+        }
+
+        private void InitLists()
+        {
+            _ui.m_comListType2.m_listType.itemRenderer = ListType2Item;
+            _ui.m_partsList.m_list.itemRenderer = ListPartsItem;
+            _ui.m_partsList2.m_list.itemRenderer = ListParts2Item;
+            listType1X = _ui.m_comListType1.target.x;
+            partsListX = _ui.m_partsList.target.x - _ui.m_partsList.target.width;
+            //一级菜单
+            _ui.m_comListType1.m_listType.itemRenderer = ListType1Item;
+        }
+
+        private void showListType1()
+        {
+            _currentList2 = null;
+            currentListType = DressUpListType.List1;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 3;
+            GTween.To(_ui.target.width, listType1X, 0.5f)
+                .SetTarget(_ui.m_comListType1.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_comListType1.target.x = t.value.x;
+                });
+        }
+        private void hideListType1()
+        {
+            GTween.To(listType1X, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_comListType1.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_comListType1.target.x = t.value.x;
+                });
+        }
+
+        private void showListType2(int[] menuStrArr = null)
+        {
+            currentListType = DressUpListType.List2;
+            if (menuStrArr != null && menuStrArr.Length > 0)
+            {
+                int len = menuStrArr.Length;
+                _currentList2 = menuStrArr.Clone() as int[];
+                _ui.m_comListType2.m_listType.RemoveChildrenToPool();
+                _ui.m_comListType2.m_listType.numItems = len;
+                //_ui.m_listType2.ResizeToFit(_ui.m_listType2.numItems);
+                float maxHeight = _ui.target.height - _ui.m_comListType2.m_listType.y - DressUpView.BOTTOM_BLANK;
+                if (_ui.m_comListType2.m_listType.height > maxHeight)
+                {
+                    _ui.m_comListType2.m_listType.height = maxHeight;
+                }
+            }
+
+            GTween.To(_ui.target.width, listType1X, 0.5f)
+                .SetTarget(_ui.m_comListType2.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_comListType2.target.x = t.value.x;
+                });
+        }
+
+        private void hideListType2()
+        {
+            GTween.To(listType1X, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_comListType2.target)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_comListType2.target.x = t.value.x;
+                });
+        }
+
+        private bool showListParts(int type, bool selectItem = false)
+        {
+            _currentMenuType = type;
+
+            UpdatePartsListSort();
+            if (_ui.m_partsList.m_list.numItems <= 0) return false;
+            _ui.m_partsList.m_list.ResizeToFit(_ui.m_partsList.m_list.numItems);
+            float maxHeight = _ui.m_partsList.target.height - _ui.m_partsList.m_list.y;
+            if (_ui.m_partsList.m_list.height > maxHeight)
+            {
+                _ui.m_partsList.m_list.height = maxHeight;
+            }
+            if (selectItem)
+            {
+                int itemId = MyDressUpHelper.dressUpObj.GetItemIdBuyType(_currentMenuType);
+                if (itemId > 0)
+                {
+                    int index = _currentList3.IndexOf(itemId);
+                    _ui.m_partsList.m_list.ScrollToView(index);
+                }
+            }
+            currentListType = DressUpListType.List3;
+            GTween.To(_ui.target.width, partsListX, 0.5f)
+                .SetTarget(_ui.m_partsList)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsList.target.x = t.value.x;
+                });
+            UpdateListPartsSelected();
+            return true;
+        }
+        private void OnComboBoxRarityChanged()
+        {
+            _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
+            this.UpdatePartsListSort();
+        }
+        private void UpdatePartsListSort()
+        {
+
+            if (_currentMenuType == 0) return;
+
+            if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+            {
+                _currentList3 = DressUpMenuSuitDataManager.GetSuitIDList();
+                if (_scoreIndex == SORT_BY_HIGH_SCORE)
+                {
+                    _currentList3 = SuitUtil.SortSuitListByHighScore(_currentList3);
+                }
+                else if (_scoreIndex == SORT_BY_LOW_SCORE)
+                {
+                    _currentList3 = SuitUtil.SortSuitListByLowScore(_currentList3);
+                }
+                else
+                {
+                    _currentList3.Reverse();
+                }
+            }
+            else
+            {
+                _currentList3 = DressUpMenuItemDataManager.getItemDatasByType(_currentMenuType);
+                if (_scoreIndex == SORT_BY_HIGH_SCORE)
+                {
+                    _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3);
+                }
+                else if (_scoreIndex == SORT_BY_LOW_SCORE)
+                {
+                    _currentList3 = DressUpMenuItemDataManager.SortItemListByLowScore(_currentList3);
+                }
+                else
+                {
+                    _currentList3.Reverse();
+                }
+
+            }
+            if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
+            }
+            else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
+            {
+                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
+            }
+
+
+            _ui.m_partsList.m_list.RemoveChildrenToPool();
+            _ui.m_partsList.m_list.numItems = _currentList3.Count;
+
+        }
+        private void UpdateSuitPartsListSort()
+        {
+            if (_currentMenuType == 0) return;
+
+            _currentList4 = new List<int>(SuitCfgArray.Instance.GetSuitItems(_currentSuitId, true));
+
+            if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
+            {
+                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
+            }
+            else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
+            {
+                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
+            }
+
+            _ui.m_partsList2.m_list.RemoveChildrenToPool();
+            _ui.m_partsList2.m_list.numItems = _currentList4.Count;
+
+        }
+
+        private void hideListParts()
+        {
+            GTween.To(partsListX, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_partsList)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsList.target.x = t.value.x;
+                });
+        }
+        private void showListParts2(int suitId)
+        {
+            _currentSuitId = suitId;
+
+            _ui.m_partsList2.m_comboBoxRarity.items = new string[] { "高稀有度", "低稀有度", "最近获得" };
+
+            this.UpdateSuitPartsListSort();
+            _ui.m_partsList2.m_list.ResizeToFit(_ui.m_partsList2.m_list.numItems);
+            float maxHeight = _ui.m_partsList2.target.height - _ui.m_partsList2.m_list.y;// - DressUpView.BOTTOM_BLANK;
+            if (_ui.m_partsList2.m_list.height > maxHeight)
+            {
+                _ui.m_partsList2.m_list.height = maxHeight;
+            }
+            currentListType = DressUpListType.List4;
+            GTween.To(_ui.target.width, partsListX, 0.5f)
+                .SetTarget(_ui.m_partsList2)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsList2.target.x = t.value.x;
+                });
+
+        }
+
+        private void hideListParts2()
+        {
+            _currentMenuType = ConstDressUpItemType.TAO_ZHUANG;
+
+            GTween.To(partsListX, _ui.target.width, 0.5f)
+                .SetTarget(_ui.m_partsList2)
+                .OnUpdate((GTweener t) =>
+                {
+                    _ui.m_partsList2.target.x = t.value.x;
+                });
+        }
+        private void ListType1Item(int index, GObject item)
+        {
+            UI.DressUp.UI_TypeItem typeItem = UI.DressUp.UI_TypeItem.Proxy(item);
+            DressUpMenuItemCfg1 item1 = DressUpMenuItemCfg1Array.Instance.dataArray[index];
+            typeItem.m_icon.url = "ui://DressUp/hz_fenleitu_" + item1.id;
+            typeItem.m_txtname.text = item1.name;
+            //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
+            typeItem.target.data = item1.id;
+            typeItem.m_imgNeed.visible = false;
+            typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsFirstMenuNew(item1.id);
+            UI.DressUp.UI_TypeItem.ProxyEnd();
+        }
+
+        private void ListType2Item(int index, GObject item)
+        {
+            UI.DressUp.UI_TypeItem typeItem = UI.DressUp.UI_TypeItem.Proxy(item);
+            DressUpMenuItemCfg2 item2 = DressUpMenuItemCfg2Array.Instance.dataArray[_currentList2[index] - 1];
+            typeItem.m_icon.url = "ui://DressUp/hz_fenleituej_" + item2.id;
+            typeItem.m_txtname.text = item2.name;
+            //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_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
+
+            UI.DressUp.UI_TypeItem.ProxyEnd();
+        }
+
+        private void ListPartsItem(int index, GObject item)
+        {
+            UI_PartsListItem listItem = UI_PartsListItem.Proxy(item);
+            int id = (int)_currentList3[index];
+            string iconRes = "";
+            string partName = "";
+            string ext = "png";
+            if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(id);
+                iconRes = suitCfg.res;
+                partName = suitCfg.name;
+                listItem.m_iconSelected.visible = false;
+                listItem.m_txtScore.text = "" + SuitUtil.GetSuitScore(id);
+                RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, true);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
+                listItem.m_imgNew.visible = false;
+            }
+            else
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
+                iconRes = itemCfg.res;
+                partName = itemCfg.name;
+                listItem.m_iconSelected.visible = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+                listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _roleData.tags);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
+                bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);
+                listItem.m_imgNew.visible = isNew;
+                if (isNew)
+                {
+                    ItemProxy.ReqSetItemRead(id).Coroutine();
+                }
+                RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+            }
+            if (listItem.target.data == null)
+            {
+                LongPressGesture longPressGesture = new LongPressGesture(listItem.target);
+                longPressGesture.once = true;
+                longPressGesture.onAction.Add(OnLongPress);
+                _listLongPress.Add(longPressGesture);
+            }
+            listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
+            listItem.m_ScoreType.url = "ui://CommonGame/kp_sx_" + InstanceZonesDataManager.currentScoreType;
+            listItem.m_txtTitle.text = partName;
+            listItem.target.data = id;
+            listItem.m_imgNeed.visible = false;
+            UI_PartsListItem.ProxyEnd();
+        }
+        private void ListParts2Item(int index, GObject item)
+        {
+            UI_PartsListItem listItem = UI_PartsListItem.Proxy(item);
+            int id = (int)_currentList4[index];
+            string iconRes = "";
+            string partName = "";
+            string ext = "png";
+
+
+            if (listItem.target.data == null)
+            {
+                LongPressGesture longPressGesture = new LongPressGesture(listItem.target);
+                longPressGesture.once = true;
+                longPressGesture.onAction.Add(OnLongPress);
+                _listLongPress.Add(longPressGesture);
+            }
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
+            iconRes = itemCfg.res;
+            partName = itemCfg.name;
+            listItem.m_iconSelected.visible = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+            listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
+            RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
+            ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+
+            listItem.m_ScoreType.visible = true;
+            // int mainScore;
+            // int mainValuel;
+            // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
+            listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + InstanceZonesDataManager.currentScoreType);
+            listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _dataManager.DressupList[_dataManager.SelectDressIndex].tags);
+
+            listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
+            listItem.m_txtTitle.text = partName;
+            listItem.target.data = id;
+            // listItem.m_txtScore.visible = false;
+            //listItem.m_ScoreType.visible = true;
+            listItem.m_imgNeed.visible = false;
+            bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);
+            listItem.m_imgNew.visible = isNew;
+            if (isNew)
+            {
+                ItemProxy.ReqSetItemRead(id).Coroutine();
+            }
+            UI_PartsListItem.ProxyEnd();
+
+
+        }
+        private void UpdateListPartsSelected()
+        {
+            int count = _ui.m_partsList.m_list.numChildren;
+            int suitId = MyDressUpHelper.dressUpObj.suitId;
+
+            for (int i = 0; i < count; i++)
+            {
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(i));
+                int id = (int)listItem.target.data;
+                if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
+                {
+                    listItem.m_iconSelected.visible = suitId > 0 && id == suitId;
+                }
+                else
+                {
+                    bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//非套装金判断是否穿戴
+                    var isSceneType = DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id);
+                    bool isSuit = !isSceneType && suitId > 0 && SuitCfgArray.Instance.GetSuitIdOfItem(id) == suitId;//非场景类， 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
+                    bool isSceneSuit = isSceneType && suitId > 0 && isPutOn;//场景类， 若当前穿戴套装要判断item是否属已穿戴
+                    listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;
+                }
+                UI_PartsListItem.ProxyEnd();
+            }
+        }
+        private void UpdateListSuitPartsSelected()
+        {
+            int count = _ui.m_partsList2.m_list.numChildren;
+            int suitId = MyDressUpHelper.dressUpObj.suitId;
+
+            for (int i = 0; i < count; i++)
+            {
+                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList2.m_list.GetChildAt(i));
+                int id = (int)listItem.target.data;
+
+                bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//非套装金判断是否穿戴
+                var isSceneType = DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id);
+                bool isSuit = !isSceneType && suitId > 0 && SuitCfgArray.Instance.GetSuitIdOfItem(id) == suitId;//非场景类， 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
+                bool isSceneSuit = isSceneType && suitId > 0 && isPutOn;//场景类， 若当前穿戴套装要判断item是否属已穿戴
+                listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;
+                UI_PartsListItem.ProxyEnd();
+            }
+        }
+
+        private void OnClickBtnSearch()
+        {
+            ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
+        }
+
+        private void SendLog()
+        {
+
+        }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.AUTOPLAY_FIGHT) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+        }
+
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+        }
+    }
+}

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

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

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using FairyGUI;
 using UI.CommonGame;
 using UI.Main;
@@ -45,7 +46,7 @@ namespace GFGGame
             _ui.m_listCard.onClickItem.Add(OnListCardItemClick);
 
             _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
-            _ui.m_btnConfirm.onClick.Add(OnBtnComfirmClick);
+            _ui.m_btnConfirm.onClick.Add(OnBtnComfirmClickAsync);
         }
         protected override void OnShown()
         {
@@ -106,13 +107,35 @@ namespace GFGGame
         {
             UpdateView(_ui.m_listCard.selectedIndex);
         }
-        private void OnBtnComfirmClick()
+
+        private async void OnBtnComfirmClickAsync()
         {
             int cardId = cardList[_ui.m_listCard.selectedIndex].id;
-            List<PassivitySkillCfg> cfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
-            InstanceZonesDataManager.currentCardId = cfgs.Count > 0 ? cardId : -1;
+
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
+            {
+                ArenaDataManager dataManager = ArenaDataManager.Instance;
+                bool result = await ArenaSproxy.ReqChangeArenaDressup(dataManager.SelectDressIndex, cardId, MyDressUpHelper.dressUpObj.itemList);
+                if (result)
+                {
+                    if (dataManager.SelectDressIndex == dataManager.ThemeList.Count - 1)//最后一个主题搭配好要返回竞技场主界面
+                    {
+                        EventAgent.DispatchEvent(ConstMessage.CARD_CHOOSE);
+                    }
+                    else
+                    {
+                        dataManager.SelectDressIndex++;
+                        ViewManager.Show<ArenaDressUpFightView>();
+                    }
+                }
+            }
+            else
+            {
+                List<PassivitySkillCfg> cfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(cardId);
+                InstanceZonesDataManager.currentCardId = cfgs.Count > 0 ? cardId : -1;
+                EventAgent.DispatchEvent(ConstMessage.CARD_CHOOSE);
+            }
             this.Hide();
-            EventAgent.DispatchEvent(ConstMessage.CARD_CHOOSE);
         }
 
         private static List<CardData> SortCardList(List<CardData> arrayList)

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

@@ -20,7 +20,6 @@ namespace GFGGame
         private const int _range = 100;//圆圈随机范围
         // private const float _prefectScale = 0.866f;//完美缩放比
         private NTexture _nTexture;
-        private bool _stopFight = false;
         private float _time = 0;// 登峰造极按住的时间
         private int _prefectCount = 0;//卓越点击数量
 

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -262,9 +262,9 @@ namespace GFGGame
             }
         }
 
-        public static void GoBackFrom(string viewName)
+        public static void GoBackFrom(string fullViewName)
         {
-            string name = GetName(viewName);
+            string name = GetName(fullViewName);
             ViewManager.Hide(name);
             if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
             {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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