zhaoyang 2 vuotta sitten
vanhempi
commit
1ba0a30259
32 muutettua tiedostoa jossa 788 lisäystä ja 27 poistoa
  1. 2 2
      FGUIProject/assets/Arena/ArenaDanUpUI.xml
  2. 62 4
      FGUIProject/assets/Arena/ArenaUI.xml
  3. 13 0
      FGUIProject/assets/Arena/components/BtnFight.xml
  4. 13 0
      FGUIProject/assets/Arena/components/BtnQuickFight.xml
  5. 13 0
      FGUIProject/assets/Arena/components/BtnRecord.xml
  6. 13 0
      FGUIProject/assets/Arena/components/BtnRefresh.xml
  7. 13 0
      FGUIProject/assets/Arena/components/BtnRelect.xml
  8. 3 1
      FGUIProject/assets/Arena/components/BtnTab3.xml
  9. 10 0
      FGUIProject/assets/Arena/components/ListTargetItem.xml
  10. 6 0
      FGUIProject/assets/Arena/package.xml
  11. 1 1
      FGUIProject/assets/CommonGame/components/ComHeadWithLv.xml
  12. 0 0
      FGUIProject/assets/CommonGame/components/ComTag.xml
  13. 2 2
      FGUIProject/assets/CommonGame/package.xml
  14. 5 5
      FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml
  15. 3 9
      GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs
  16. 18 0
      GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs
  17. 11 0
      GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs.meta
  18. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDanUpUI.cs
  19. 93 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs
  20. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnFight.cs
  21. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnFight.cs.meta
  22. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnQuickFight.cs
  23. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnQuickFight.cs.meta
  24. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRecord.cs
  25. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRecord.cs.meta
  26. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRefresh.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRefresh.cs.meta
  28. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRelect.cs
  29. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRelect.cs.meta
  30. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs
  31. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs.meta
  32. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes

+ 2 - 2
FGUIProject/assets/Arena/ArenaDanUpUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://4lc5fhlbpsphg" designImageOffsetX="-19" designImageAlpha="0">
-  <controller name="c1" pages="0,,1," selected="1">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="首次段位提升"/>
     <remark page="1" value="非首次段位提升"/>
   </controller>
@@ -12,6 +12,6 @@
       <item/>
       <item/>
     </list>
-    <text id="n3_psph" name="txtdanTitle" xy="472,1172" pivot="0.5,0" size="136,46" fontSize="34" text="段位名字"/>
+    <text id="n3_psph" name="txtDanTitle" xy="472,1172" pivot="0.5,0" size="136,46" fontSize="34" text="段位名字"/>
   </displayList>
 </component>

+ 62 - 4
FGUIProject/assets/Arena/ArenaUI.xml

@@ -1,11 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://4lc5fhlbpsph9" designImageOffsetX="-391">
-  <controller name="c1" pages="0,,1," selected="1">
+<component size="1080,1920" designImage="ui://4lc5fhlbpsph9" designImageOffsetX="-397">
+  <controller name="c1" pages="0,,1," selected="0">
     <remark page="0" value="选对手"/>
     <remark page="1" value="展示对手"/>
   </controller>
   <displayList>
-    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="-10,95" controller="c1,12"/>
+    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
+    <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="-12,95" group="n28_psph" controller="c1,12"/>
+    <loader id="n22_psph" name="loaScore0" xy="365,268" size="58,58" group="n28_psph" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <component id="n25_psph" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="437,279" group="n28_psph"/>
+    <loader id="n23_psph" name="loaScore1" xy="547,268" size="58,58" group="n28_psph" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <loader id="n24_psph" name="loaScore2" xy="619,268" size="58,58" group="n28_psph" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <text id="n27_psph" name="txtTime" xy="712,294" pivot="1,0" size="328,42" group="n28_psph" fontSize="30" align="right" text="赛季时间:01/05-05/21"/>
+    <component id="n21_psph" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="1049,288" group="n28_psph"/>
+    <group id="n28_psph" name="gtpTop" xy="-12,80" size="1105,256" advanced="true">
+      <relation target="" sidePair="top-top"/>
+    </group>
+    <component id="n29_psph" name="btnReSelect" src="psph1k" fileName="components/BtnRelect.xml" xy="944,338" size="144,133">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="right-right,top-top"/>
+      <Button title="重新选择"/>
+    </component>
+    <component id="n30_psph" name="btnFight" src="psph1l" fileName="components/BtnFight.xml" xy="464,853" size="188,170">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+      <Button title="开始挑战"/>
+    </component>
+    <list id="n36_psph" name="listTarget" xy="579,739" size="495,464" lineGap="19" defaultItem="ui://4lc5fhlbpsph1m">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="middle-middle,right-right"/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <loader id="n2_psph" name="loaDanIcon" xy="84,1459" size="149,153" group="n20_psph" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <text id="n7_psph" name="txtName" xy="372,1456" pivot="0.5,0" size="120,42" group="n20_psph" fontSize="30" align="center" text="自己名字"/>
+    <text id="n8_psph" name="txtRank" xy="396,1507" pivot="0.5,0" size="72,42" group="n20_psph" fontSize="30" align="center" text="6666"/>
+    <text id="n9_psph" name="txtDanTitle" xy="398,1553" pivot="0.5,0" size="72,41" group="n20_psph" fontSize="30" align="center" text="6666"/>
+    <text id="n10_psph" name="txtFightScore" xy="342,1596" pivot="0.5,0" size="189,42" group="n20_psph" fontSize="30" align="center" text="竞技战力6666"/>
+    <component id="n11_psph" name="btnDress" src="psph1g" fileName="components/BtnRecord.xml" xy="825,1492" size="209,61" group="n20_psph" aspect="true">
+      <Button title="我的搭配"/>
+    </component>
+    <component id="n13_psph" name="btnQuickFight" src="psph1i" fileName="components/BtnQuickFight.xml" xy="821,1559" size="219,62" group="n20_psph">
+      <Button title="快速挑战"/>
+    </component>
+    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="65,1718" size="209,61" group="n20_psph" aspect="true">
+      <Button title="比拼记录"/>
+    </component>
+    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="336,1717" size="209,61" group="n20_psph" aspect="true">
+      <Button title="段位奖励"/>
+    </component>
+    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="65,1803" size="209,61" group="n20_psph" aspect="true">
+      <Button title="排行榜"/>
+    </component>
+    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="335,1808" size="209,61" group="n20_psph" aspect="true">
+      <Button title="商店"/>
+    </component>
+    <component id="n17_psph" name="btnAddFightCount" src="si5ztip" fileName="components/Button16.xml" pkg="eg2y0ldp" xy="1009,1751" group="n20_psph"/>
+    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="1011,1825" size="69,68" group="n20_psph"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="779,1715" pivot="0.5,0" size="327,42" group="n20_psph" fontSize="30" align="center" text="今日和可获得xx次xx货币"/>
+    <text id="n15_psph" name="txtFightCount" xy="770,1766" size="233,42" group="n20_psph" fontSize="30" align="center" text="剩余次数:10/10"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="770,1821" size="233,42" group="n20_psph" fontSize="30" align="center" text="免费刷新:10/10"/>
+    <component id="n18_psph" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="770,1828" size="237,46" group="n20_psph"/>
+    <group id="n20_psph" name="grpBottom" xy="65,1456" size="1041,437" advanced="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
   </displayList>
 </component>

+ 13 - 0
FGUIProject/assets/Arena/components/BtnFight.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,82" 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>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Arena/components/BtnQuickFight.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,82" 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>
+  </displayList>
+  <Button mode="Check"/>
+</component>

+ 13 - 0
FGUIProject/assets/Arena/components/BtnRecord.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,82" 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>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Arena/components/BtnRefresh.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,82" 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>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/Arena/components/BtnRelect.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,82" 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>
+  </displayList>
+  <Button/>
+</component>

+ 3 - 1
FGUIProject/assets/Arena/components/BtnTab3.xml

@@ -2,7 +2,9 @@
 <component size="280,82" 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" autoSize="true"/>
+    <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>

+ 10 - 0
FGUIProject/assets/Arena/components/ListTargetItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="423,139">
+  <displayList>
+    <component id="n31_psph" name="comHead" src="psph10" fileName="components/ComHeadWithLv.xml" pkg="eg2y0ldp" xy="83,83" pivot="0.5,0.5" anchor="true" scale="0.6,0.6"/>
+    <text id="n35_psph" name="txtDanTitle" xy="36,0" pivot="0.5,0" size="91,41" fontSize="30" align="center" text="段位名"/>
+    <text id="n32_psph" name="txtName" xy="303,24" size="120,41" fontSize="30" text="对手名字"/>
+    <text id="n33_psph" name="txtRank" xy="268,59" size="120,41" fontSize="30" text="段位排行"/>
+    <text id="n34_psph" name="txtFightScore" xy="227,93" size="150,41" fontSize="30" text="竞技场战力"/>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/Arena/package.xml

@@ -47,6 +47,12 @@
     <component id="psph1d" name="ComCard.xml" path="/components/"/>
     <component id="psph1e" name="BtnTab3.xml" path="/components/"/>
     <image id="psph1f" name="b9677f930b91d918bb2d80bdee69fb1.png" path="/Designs/"/>
+    <component id="psph1g" name="BtnRecord.xml" path="/components/"/>
+    <component id="psph1i" name="BtnQuickFight.xml" path="/components/"/>
+    <component id="psph1j" name="BtnRefresh.xml" path="/components/"/>
+    <component id="psph1k" name="BtnRelect.xml" path="/components/"/>
+    <component id="psph1l" name="BtnFight.xml" path="/components/"/>
+    <component id="psph1m" name="ListTargetItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/CommonGame/components/ComHeadWithLv.xml

@@ -2,6 +2,6 @@
 <component size="229,230">
   <displayList>
     <component id="n1_psph" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" xy="0,0"/>
-    <component id="n2_psph" name="comLv" src="psphq" fileName="components/ComLv.xml" xy="149,148"/>
+    <component id="n2_psph" name="comLv" src="psphq" fileName="components/ComLv.xml" xy="150,159"/>
   </displayList>
 </component>

+ 0 - 0
FGUIProject/assets/CommonGame/components/ListTagItem.xml → FGUIProject/assets/CommonGame/components/ComTag.xml


+ 2 - 2
FGUIProject/assets/CommonGame/package.xml

@@ -100,7 +100,7 @@
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>
     <image id="j48o9a" name="kp_sjsj_di_4.png" path="/images/" exported="true" scale="9grid" scale9grid="68,7,20,14"/>
     <image id="j48o9b" name="yx_yilq.png" path="/images/"/>
-    <component id="ih7566" name="ListTagItem.xml" path="/components/" exported="true"/>
+    <component id="ih7566" name="ComTag.xml" path="/components/" exported="true"/>
     <image id="ih7562" name="fzd_bqbq_1.png" path="/imagesExport/" exported="true"/>
     <image id="ih7563" name="fzd_bqbq_2.png" path="/imagesExport/" exported="true"/>
     <image id="ih7564" name="fzd_bqbq_3.png" path="/imagesExport/" exported="true"/>
@@ -182,7 +182,7 @@
     <component id="si5ztim" name="Button1.xml" path="/components/"/>
     <component id="si5ztin" name="Button2.xml" path="/components/"/>
     <component id="si5ztio" name="Button3.xml" path="/components/"/>
-    <component id="si5ztip" name="Button16.xml" path="/components/"/>
+    <component id="si5ztip" name="Button16.xml" path="/components/" exported="true"/>
     <image id="orsttis" name="pfjl_ywc.png" path="/images/"/>
     <image id="orsttit" name="wpbb_di.png" path="/images/" exported="true"/>
     <image id="pu55tiw" name="pfjl_and.png" path="/images/"/>

+ 5 - 5
FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -19,7 +19,7 @@
     <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,42" group="n38_8lqj" fontSize="30" autoClearText="true" text="竞技产战力:999"/>
+    <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"/>
@@ -48,14 +48,14 @@
     <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>
-    <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/ListTagItem.xml" pkg="eg2y0ldp" xy="91,353" group="n58_psph"/>
-    <text id="n55_psph" name="txtTagCount" xy="202,350" size="21,42" group="n58_psph" fontSize="30" align="center" text="6"/>
-    <group id="n58_psph" name="n58" xy="44,349" size="179,44" group="n38_8lqj"/>
     <group id="n38_8lqj" name="graContent" xy="34,40" size="1276,1880" advanced="true"/>
   </displayList>
 </component>

+ 3 - 9
GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -30,15 +30,9 @@ namespace GFGGame
 
         public const int MINE = 0;
         public const int ENEMY = 1;
+        public const int ROBOT = 2;
     }
 
-    // public class CurrentTime
-    // {
-    //     public const int PART_ALL_FIGHT_BEGIN = 0;//对战开始
-    //     public const int PART_PREFACT_CLICK = 1;//每次优秀点击
-    //     public const int PART_FIGHT_BEGIN = 2;//每回合开始
-    //     public const int PART_FIGHT_END = 3;//每回合结束
-    // }
     public class ScoreSystemData : SingletonBase<ScoreSystemData>
     {
         private const float _prefectScale = 0.866f;//完美缩放比
@@ -92,8 +86,8 @@ namespace GFGGame
             var equipDatas = MyDressUpHelper.dressUpObj.itemList;
             int partScore = 0;
             double tagScore = 0;
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            // StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            // StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
 
             for (int i = 0; i < equipDatas.Count; i++)
             {

+ 18 - 0
GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class FightRoleData
+    {
+        public List<int> itemList;
+        public int cardId;
+
+    }
+    public class FightRobotData
+    {
+        public List<int> targetItemList;
+        public int targetBaseScore;
+        public int targetCardId;
+        public int targetCardScore;
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Data/VO/FightData.cs.meta

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDanUpUI.cs

@@ -10,7 +10,7 @@ namespace UI.Arena
         public Controller m_c1;
         public GLoader m_loaDanicon;
         public GList m_listFirstDanReward;
-        public GTextField m_txtdanTitle;
+        public GTextField m_txtDanTitle;
         public const string URL = "ui://4lc5fhlbpsph8";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaDanUpUI";
@@ -61,14 +61,14 @@ namespace UI.Arena
             m_c1 = comp.GetController("c1");
             m_loaDanicon = (GLoader)comp.GetChild("loaDanicon");
             m_listFirstDanReward = (GList)comp.GetChild("listFirstDanReward");
-            m_txtdanTitle = (GTextField)comp.GetChild("txtdanTitle");
+            m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaDanicon = null;
             m_listFirstDanReward = null;
-            m_txtdanTitle = null;
+            m_txtDanTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 93 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs

@@ -10,6 +10,34 @@ 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_loaScore1;
+        public GLoader m_loaScore2;
+        public GTextField m_txtTime;
+        public GButton m_btnRule;
+        public GGroup m_gtpTop;
+        public UI_BtnRelect m_btnReSelect;
+        public UI_BtnFight m_btnFight;
+        public GList m_listTarget;
+        public GLoader m_loaDanIcon;
+        public GTextField m_txtName;
+        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 GTextField m_txtMoneyCount;
+        public GTextField m_txtFightCount;
+        public GTextField m_txtRefreshCount;
+        public GComponent m_comCostCurrent;
+        public GGroup m_grpBottom;
         public const string URL = "ui://4lc5fhlbpsph0";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaUI";
@@ -60,12 +88,77 @@ 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_loaScore1 = (GLoader)comp.GetChild("loaScore1");
+            m_loaScore2 = (GLoader)comp.GetChild("loaScore2");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_gtpTop = (GGroup)comp.GetChild("gtpTop");
+            m_btnReSelect = (UI_BtnRelect)UI_BtnRelect.Create(comp.GetChild("btnReSelect"));
+            m_btnFight = (UI_BtnFight)UI_BtnFight.Create(comp.GetChild("btnFight"));
+            m_listTarget = (GList)comp.GetChild("listTarget");
+            m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            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_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
+            m_txtFightCount = (GTextField)comp.GetChild("txtFightCount");
+            m_txtRefreshCount = (GTextField)comp.GetChild("txtRefreshCount");
+            m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
+            m_grpBottom = (GGroup)comp.GetChild("grpBottom");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_btnBack = null;
             m_valueBar = null;
+            m_loaScore0 = null;
+            m_comTag = null;
+            m_loaScore1 = null;
+            m_loaScore2 = null;
+            m_txtTime = null;
+            m_btnRule = null;
+            m_gtpTop = null;
+            m_btnReSelect.Dispose();
+            m_btnReSelect = null;
+            m_btnFight.Dispose();
+            m_btnFight = null;
+            m_listTarget = null;
+            m_loaDanIcon = null;
+            m_txtName = null;
+            m_txtRank = null;
+            m_txtDanTitle = null;
+            m_txtFightScore = null;
+            m_btnDress.Dispose();
+            m_btnDress = null;
+            m_btnQuickFight.Dispose();
+            m_btnQuickFight = null;
+            m_btnRecord.Dispose();
+            m_btnRecord = 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_grpBottom = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnFight.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_BtnFight
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://4lc5fhlbpsph1l";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "BtnFight";
+        private static UI_BtnFight _proxy;
+
+        public static UI_BtnFight Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnFight();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnFight Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnFight();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnFight.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnQuickFight.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_BtnQuickFight
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://4lc5fhlbpsph1i";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "BtnQuickFight";
+        private static UI_BtnQuickFight _proxy;
+
+        public static UI_BtnQuickFight Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnQuickFight();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnQuickFight Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnQuickFight();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnQuickFight.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRecord.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_BtnRecord
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://4lc5fhlbpsph1g";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "BtnRecord";
+        private static UI_BtnRecord _proxy;
+
+        public static UI_BtnRecord Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnRecord();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnRecord Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnRecord();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRecord.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRefresh.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_BtnRefresh
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://4lc5fhlbpsph1j";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "BtnRefresh";
+        private static UI_BtnRefresh _proxy;
+
+        public static UI_BtnRefresh Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnRefresh();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnRefresh Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnRefresh();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRefresh.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRelect.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_BtnRelect
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://4lc5fhlbpsph1k";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "BtnRelect";
+        private static UI_BtnRelect _proxy;
+
+        public static UI_BtnRelect Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnRelect();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_BtnRelect Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnRelect();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_BtnRelect.cs.meta

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

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ListTargetItem
+    {
+        public GComponent target;
+        public GComponent m_comHead;
+        public GTextField m_txtDanTitle;
+        public GTextField m_txtName;
+        public GTextField m_txtRank;
+        public GTextField m_txtFightScore;
+        public const string URL = "ui://4lc5fhlbpsph1m";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ListTargetItem";
+        private static UI_ListTargetItem _proxy;
+
+        public static UI_ListTargetItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListTargetItem();
+            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_ListTargetItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListTargetItem();
+            }
+            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_comHead = (GComponent)comp.GetChild("comHead");
+            m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtRank = (GTextField)comp.GetChild("txtRank");
+            m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHead = null;
+            m_txtDanTitle = null;
+            m_txtName = null;
+            m_txtRank = null;
+            m_txtFightScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListTargetItem.cs.meta

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

BIN
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes