zhaoyang %!s(int64=2) %!d(string=hai) anos
pai
achega
1f569e8a50
Modificáronse 66 ficheiros con 1156 adicións e 230 borrados
  1. 5 5
      FGUIProject/assets/Arena/ArenaDanRewardUI.xml
  2. 1 1
      FGUIProject/assets/Arena/ArenaFightRecordUI.xml
  3. 33 29
      FGUIProject/assets/Arena/ArenaUI.xml
  4. 10 0
      FGUIProject/assets/Arena/components/ComAllScore.xml
  5. 7 0
      FGUIProject/assets/Arena/components/ComAllScoreResult.xml
  6. 17 0
      FGUIProject/assets/Arena/components/ComFightScore.xml
  7. 1 1
      FGUIProject/assets/Arena/components/ComMyDanReward.xml
  8. 11 7
      FGUIProject/assets/Arena/components/ComValueInfo.xml
  9. 5 5
      FGUIProject/assets/Arena/components/ListDanRewardItem.xml
  10. 14 12
      FGUIProject/assets/Arena/components/ListFightRecordItem.xml
  11. BIN=BIN
      FGUIProject/assets/Arena/images/dwjl_xzi_1.png
  12. BIN=BIN
      FGUIProject/assets/Arena/images/dwjl_xzi_2.png
  13. BIN=BIN
      FGUIProject/assets/Arena/images/jjcdi_jjcdi.png
  14. BIN=BIN
      FGUIProject/assets/Arena/images/jjcdi_jjxian.png
  15. 6 3
      FGUIProject/assets/Arena/package.xml
  16. 7 0
      FGUIProject/assets/CommonGame/RuleUI.xml
  17. 1 1
      FGUIProject/assets/CommonGame/components/BtnRule.xml
  18. 6 0
      FGUIProject/assets/CommonGame/components/ComContent.xml
  19. 0 0
      FGUIProject/assets/CommonGame/components/ComListReward.xml
  20. 3 1
      FGUIProject/assets/CommonGame/package.xml
  21. 26 0
      FGUIProject/assets/Main/ArenaFightResultUI.xml
  22. 1 1
      FGUIProject/assets/Main/MainUI.xml
  23. 2 2
      GameClient/Assets/Game/HotUpdate/Constant/ConstFightRoleType.cs
  24. 2 2
      GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs
  25. 79 11
      GameClient/Assets/Game/HotUpdate/Data/ArenaViewManager.cs
  26. 7 11
      GameClient/Assets/Game/HotUpdate/Data/VO/ArenaData.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/Data/VO/StoryFightResultData.cs
  28. 11 0
      GameClient/Assets/Game/HotUpdate/Data/VO/StoryFightResultData.cs.meta
  29. 2 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaResultQuickUI.cs
  30. 2 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaResultUI.cs
  31. 7 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs
  32. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComAllScore.cs
  33. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComAllScore.cs.meta
  34. 75 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComAllScoreResult.cs
  35. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComAllScoreResult.cs.meta
  36. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFightScore.cs
  37. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFightScore.cs.meta
  38. 7 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComValueInfo.cs
  39. 10 9
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListFightRecordItem.cs
  40. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs
  41. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs.meta
  42. 72 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs
  43. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs.meta
  44. 88 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ArenaFightResultUI.cs
  45. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ArenaFightResultUI.cs.meta
  46. 4 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  47. 20 53
      GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs
  48. 37 4
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs
  49. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanUpView.cs
  50. 14 41
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs
  51. 43 2
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaFightRecordView.cs
  52. 6 6
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs
  53. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultQuickView.cs
  54. 10 9
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultView.cs
  55. 5 0
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs
  56. 49 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs
  57. 11 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs.meta
  58. 116 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs
  59. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs.meta
  60. 7 0
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  61. BIN=BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  62. BIN=BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0!a.png
  63. BIN=BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0.png
  64. BIN=BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes
  65. BIN=BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  66. BIN=BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 5 - 5
FGUIProject/assets/Arena/ArenaDanRewardUI.xml

@@ -6,15 +6,15 @@
   </controller>
   <displayList>
     <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">
+    <image id="n12_jcej" name="n12" src="jcej3w" fileName="images/dwjl_btbt.png" xy="155,87"/>
+    <image id="n1_psph" name="n1" src="uyuxzx" fileName="imagesExport/xc_xzdik.png" pkg="eg2y0ldp" xy="260,174" size="550,76" group="n11_jcej"/>
+    <component id="n3_psph" name="btn0" src="psphj" fileName="components/BtnTab0.xml" xy="239,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="526,171" group="n11_jcej">
+    <component id="n4_psph" name="btn1" src="psphj" fileName="components/BtnTab0.xml" xy="535,171" group="n11_jcej">
       <Button icon="ui://4lc5fhlbjcej3i" selectedIcon="ui://4lc5fhlbjcej3g" controller="c1" page="1"/>
     </component>
-    <group id="n11_jcej" name="n11" xy="230,171" size="592,82" advanced="true"/>
+    <group id="n11_jcej" name="n11" xy="239,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/>

+ 1 - 1
FGUIProject/assets/Arena/ArenaFightRecordUI.xml

@@ -2,7 +2,7 @@
 <component size="978,1276" designImage="ui://4lc5fhlbpsphh" designImageOffsetX="-382" designImageAlpha="0">
   <displayList>
     <image id="n12_jcej" name="n12" src="jcej25" fileName="images/bpjl_di.png" xy="0,0"/>
-    <component id="n13_jcej" name="comTitle" src="jcej2z" fileName="components/ComTitle.xml" xy="299,40">
+    <component id="n13_jcej" name="comTitle" src="jcej2z" fileName="components/ComTitle.xml" xy="280,40">
       <property target="txtTitle" propertyId="0" value="比拼记录"/>
     </component>
     <list id="n11_psph" name="list" xy="25,153" size="898,1007" overflow="scroll" lineGap="10" defaultItem="ui://4lc5fhlbpsph15" autoClearItems="true">

+ 33 - 29
FGUIProject/assets/Arena/ArenaUI.xml

@@ -4,6 +4,7 @@
     <remark page="0" value="选对手"/>
     <remark page="1" value="展示对手"/>
   </controller>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <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"/>
@@ -41,50 +42,53 @@
       <item/>
       <item/>
     </list>
-    <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,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"/>
+    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="42,1454" group="n46_jcej"/>
+    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="187,1510" group="n46_jcej"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="48,1464" size="149,153" group="n46_jcej" url="ui://4lc5fhlbpsphz" fill="scale"/>
+    <text id="n7_psph" name="txtName" xy="193,1472" size="122,41" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n8_psph" name="txtRank" xy="193,1518" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n9_psph" name="txtDanTitle" xy="193,1550" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n10_psph" name="txtFightScore" xy="193,1581" 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,1584" size="29,29" group="n46_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+    </component>
+    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="ComFightScore.xml" xy="144,1401" group="n46_jcej">
+      <gearDisplay controller="c2" pages="1"/>
     </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"/>
-    <image id="n53_jcej" name="n53" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="751,1678" group="n51_jcej"/>
-    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="1035,1669" group="n51_jcej">
+    <group id="n46_jcej" name="grpMyInfo" xy="42,1401" size="467,227" group="n20_psph"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="774,1574" 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,1613" group="n51_jcej"/>
+    <image id="n53_jcej" name="n53" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="751,1625" group="n51_jcej"/>
+    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="1035,1616" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <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,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="jcej3y" fileName="components/ComCostCurrency.xml" xy="788,1733" group="n49_jcej"/>
-    <group id="n49_jcej" name="n49" xy="727,1732" size="353,48" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="427,1618" group="n20_psph">
+    <text id="n15_psph" name="txtFightCount" xy="789,1617" 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,1613" size="353,48" group="n20_psph"/>
+    <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="727,1679" group="n49_jcej"/>
+    <image id="n50_jcej" name="n50" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="751,1690" group="n49_jcej"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="788,1683" 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,1682" group="n49_jcej"/>
+    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="788,1680" group="n49_jcej"/>
+    <group id="n49_jcej" name="n49" xy="727,1679" size="353,48" group="n20_psph"/>
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="427,1565" group="n20_psph">
       <Button title="快速挑战"/>
     </component>
-    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="87,1720" size="209,61" group="n20_psph" aspect="true">
+    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="87,1667" size="209,61" group="n20_psph" aspect="true">
       <Button title="商店" icon="ui://4lc5fhlbjcej3q"/>
     </component>
-    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="368,1688" group="n20_psph" aspect="true">
+    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="368,1635" group="n20_psph" aspect="true">
       <Button title="我的搭配"/>
     </component>
-    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="86,1813" size="209,61" group="n20_psph" aspect="true">
+    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="86,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="段位奖励"/>
     </component>
-    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="444,1813" size="209,61" group="n20_psph" aspect="true">
+    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="444,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="排行榜"/>
     </component>
-    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="802,1813" size="209,61" group="n20_psph" aspect="true">
+    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="802,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="比拼记录"/>
     </component>
-    <group id="n20_psph" name="grpBottom" xy="42,1507" size="1038,367" advanced="true">
+    <group id="n20_psph" name="grpBottom" xy="42,1401" size="1038,420" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="606,170">
+  <displayList>
+    <image id="n17_jcej" name="n17" src="jcej23" fileName="images/bpjl_pkdi.png" xy="0,67"/>
+    <text id="n18_jcej" name="n18" xy="250,0" pivot="0.5,0" size="105,55" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#b18e60" vAlign="bottom" autoSize="none" text="总评分"/>
+    <text id="n19_jcej" name="txtMyFightScore" xy="100,71" pivot="1,0" size="154,69" fontSize="52" color="#d89393" text="10000"/>
+    <text id="n20_jcej" name="n20" xy="283,85" pivot="0.5,0" size="39,41" fontSize="30" color="#cc8a8a" text="VS"/>
+    <text id="n21_jcej" name="txtTargetFightScore" xy="351,71" size="154,69" fontSize="52" color="#d89393" text="10000"/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/Arena/components/ComAllScoreResult.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="606,378">
+  <displayList>
+    <component id="n17_jcej" name="comResult" src="jcej4n" fileName="ComResult.xml" xy="0,0"/>
+    <loader id="n22_jcej" name="loaResule" xy="186,176" size="225,202" url="ui://4lc5fhlbjcej2a" autoSize="true"/>
+  </displayList>
+</component>

+ 17 - 0
FGUIProject/assets/Arena/components/ComFightScore.xml

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

+ 1 - 1
FGUIProject/assets/Arena/components/ComMyDanReward.xml

@@ -8,6 +8,6 @@
       <item/>
     </list>
     <loader id="n2_psph" name="loaDanIcon" xy="144,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://4lc5fhlbpsphz" fill="scale"/>
-    <loader id="n3_psph" name="loaSelf" xy="223,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
+    <loader id="n3_psph" name="loaSelf" xy="260,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
   </displayList>
 </component>

+ 11 - 7
FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -2,13 +2,16 @@
 <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="n91_jcej" name="n91" src="jcej2h" fileName="images/jjsy_zldi.png" xy="4,0" group="n92_jcej"/>
+    <text id="n82_jcej" name="txtFightScore" xy="44,7" size="225,39" group="n92_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" autoClearText="true" text="竞技场战力:999"/>
+    <component id="n108_jcej" name="n108" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="14,13" size="29,29" group="n92_jcej">
+      <Button icon="ui://eg2y0ldpjcej2k"/>
+    </component>
+    <group id="n92_jcej" name="n92" xy="4,0" size="272,56"/>
+    <image id="n83_jcej" name="n83" src="jcej3s" fileName="images/dz_hz_fsk_1.png" xy="7,70" group="n86_jcej"/>
+    <loader id="n84_jcej" name="scoreType" xy="6,72" size="50,50" group="n86_jcej" url="ui://eg2y0ldp842s6h" fill="scale"/>
+    <text id="n85_jcej" name="txtScore" xy="61,72" size="124,54" group="n86_jcej" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999"/>
+    <group id="n86_jcej" name="n86" xy="6,70" size="204,57"/>
     <image id="n93_jcej" name="n93" src="jcej2i" fileName="images/jjsy_bqdi.png" xy="6,139" group="n90_jcej"/>
     <text id="n94_jcej" name="n94" xy="63,142" size="116,39" group="n90_jcej" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#a07943" text="标签加成"/>
     <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="187,149" size="29,29" group="n90_jcej">
@@ -39,5 +42,6 @@
     </image>
     <group id="n107_jcej" name="n107" xy="35,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
     <group id="n90_jcej" name="n90" xy="6,139" size="244,115"/>
+    <component id="n109_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="5,58" controller="c1,1"/>
   </displayList>
 </component>

+ 5 - 5
FGUIProject/assets/Arena/components/ListDanRewardItem.xml

@@ -3,17 +3,17 @@
   <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej3v" fileName="images/dwjl_dedtp.png" xy="0,0"/>
-    <loader id="n10_jcej" name="loaRank" xy="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 id="n10_jcej" name="loaRank" xy="126,86" pivot="0.5,0.5" anchor="true" size="88,87" autoSize="true">
+      <gearIcon controller="c1" pages="1,2,3" values="ui://4lc5fhlbjcej3m|ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default=""/>
     </loader>
-    <text id="n6_psph" name="txtRank" xy="71,63" pivot="0.5,0" size="91,54" fontSize="40" color="#a98860" align="center" text="4-50">
-      <gearDisplay controller="c1" pages="4"/>
+    <text id="n6_psph" name="txtRank" xy="25,63" pivot="0.5,0" size="201,54" fontSize="40" color="#a98860" align="center" text="灵感重构大">
+      <gearDisplay controller="c1" pages="0,4"/>
     </text>
     <list id="n7_psph" name="listReward" xy="325,8" size="772,222" scale="0.7,0.7" layout="row" overflow="scroll" colGap="50" defaultItem="ui://eg2y0ldpj48o98">
       <item/>
       <item/>
       <item/>
     </list>
-    <image id="n11_jcej" name="imgGot" src="jcej3x" fileName="images/dwjl_ylqylq.png" xy="196,0"/>
+    <image id="n11_jcej" name="imgGot" src="jcej3x" fileName="images/dwjl_ylqylq.png" xy="235,0"/>
   </displayList>
 </component>

+ 14 - 12
FGUIProject/assets/Arena/components/ListFightRecordItem.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="898,863">
-  <controller name="c1" pages="0,,1," selected="1"/>
+<component size="898,199">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="ctrDan" pages="0,,1,,2,,3," selected="0">
     <remark page="1" value="没变化"/>
     <remark page="2" value="段位提升"/>
     <remark page="3" value="段位下降"/>
   </controller>
   <controller name="ctrResult" pages="0,,1," selected="0">
-    <remark page="0" value="胜利"/>
-    <remark page="1" value="失败"/>
+    <remark page="0" value="失败"/>
+    <remark page="1" value="胜利"/>
   </controller>
   <displayList>
-    <text id="n4_psph" name="txttime" xy="45,0" pivot="0.5,0" size="203,36" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
+    <text id="n4_psph" name="txtTime" xy="45,0" pivot="0.5,0" size="203,36" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="26" color="#a99070" align="center" autoClearText="true" text="10分钟 发起挑战"/>
     <image id="n13_jcej" name="n13" src="jcej1u" fileName="images/bpjly_xixian.png" xy="18,13" size="862,14" group="n11_psph"/>
-    <loader id="n1_psph" name="loaResult" xy="5,47" size="888,151" group="n11_psph" url="ui://4lc5fhlbjcej2x" autoSize="true">
-      <gearIcon controller="ctrResult" pages="0" values="ui://4lc5fhlbjcej2x" default="ui://4lc5fhlbjcej2y"/>
+    <loader id="n1_psph" name="loaResult" xy="5,47" size="888,151" group="n11_psph" url="ui://4lc5fhlbjcej2y" autoSize="true">
+      <gearIcon controller="ctrResult" pages="1" values="ui://4lc5fhlbjcej2x" default="ui://4lc5fhlbjcej2y"/>
     </loader>
     <loader id="n2_psph" name="loaResultIcon" xy="172,99" size="42,42" group="n11_psph" url="ui://4lc5fhlbjcej1z" autoSize="true">
       <gearIcon controller="ctrDan" pages="2,3" values="ui://4lc5fhlbjcej21|ui://4lc5fhlbjcej20" default="ui://4lc5fhlbjcej1z"/>
     </loader>
     <loader id="n3_psph" name="loaDanIcon" xy="229,69" size="108,101" group="n11_psph" url="ui://4lc5fhlbpsphz" fill="scale"/>
-    <text id="n14_jcej" name="txtRank0" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
+    <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="34" color="#c09c6d" align="center" vars="true" text="排名"/>
     <text id="n5_psph" name="txtRank" xy="423,107" pivot="0.5,0" anchor="true" size="138,64" group="n11_psph" fontSize="48" color="#c09c6d" align="center" letterSpacing="-2" vars="true" bold="true" text="10000"/>
     <text id="n7_psph" name="txtTargetName" xy="582,69" size="148,49" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>
-    <text id="n8_psph" name="txtTargetArenaScore" xy="582,122" size="225,39" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#c09c6d" text="竞技场战力:999"/>
+    <text id="n8_psph" name="txtTargetFightScore" xy="582,122" size="225,39" group="n11_psph" font="ui://eg2y0ldpwonotjc" fontSize="28" color="#c09c6d" text="竞技场战力:999"/>
     <component id="n15_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="509,90" size="58,59" group="n11_psph"/>
     <component id="n9_psph" name="btnShow" src="psph14" fileName="components/BtnShow.xml" xy="832,97" size="37,46" group="n11_psph">
-      <Button checked="true" controller="c1" page="1"/>
+      <Button controller="c1" page="1"/>
       <property target="icon" propertyId="1" value="ui://4lc5fhlbjcej22"/>
     </component>
     <group id="n11_psph" name="grpSimpleInfo" xy="5,0" size="888,198" group="n12_psph" advanced="true"/>
@@ -36,8 +36,10 @@
       <item/>
       <item/>
     </list>
-    <component id="n27_jcej" name="n27" src="jcej4n" fileName="ComResult.xml" xy="146,692" group="n12_psph"/>
-    <group id="n12_psph" name="grpAllInfo" xy="0,0" size="898,862" advanced="true" layout="vt" excludeInvisibles="true"/>
+    <component id="n27_jcej" name="comResult" src="jcej4n" fileName="components/ComFightScoreResult.xml" xy="146,692" group="n12_psph">
+      <gearDisplay controller="c1" pages="1"/>
+    </component>
+    <group id="n12_psph" name="grpAllInfo" xy="5,0" size="888,198" advanced="true" layout="vt" excludeInvisibles="true"/>
   </displayList>
   <relation target="n12_psph" sidePair="height-height"/>
 </component>

BIN=BIN
FGUIProject/assets/Arena/images/dwjl_xzi_1.png


BIN=BIN
FGUIProject/assets/Arena/images/dwjl_xzi_2.png


BIN=BIN
FGUIProject/assets/Arena/images/jjcdi_jjcdi.png


BIN=BIN
FGUIProject/assets/Arena/images/jjcdi_jjxian.png


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

@@ -123,7 +123,7 @@
     <image id="jcej3o" name="xqfs_dwewjl.png" path="/images/"/>
     <image id="jcej3q" name="jzsjzs_anniu_2.png" path="/images/"/>
     <image id="jcej3r" name="jzsjzs_fhxz.png" path="/images/"/>
-    <image id="jcej3s" name="dz_hz_fsk_1.png" path="/images/"/>
+    <image id="jcej3s" name="dz_hz_fsk_1.png" path="/images/" scale="9grid" scale9grid="50,14,100,28"/>
     <component id="jcej3t" name="ComValueInfo.xml" path="/components/" exported="true"/>
     <component id="jcej3u" name="ComCardMask.xml" path="/components/"/>
     <image id="jcej3v" name="dwjl_dedtp.png" path="/images/"/>
@@ -152,8 +152,11 @@
     <image id="jcej4i" name="phbphb_bsjbt_1.png" path="/images/"/>
     <image id="jcej4j" name="phbphb_bsjbt_2.png" path="/images/"/>
     <component id="jcej4k" name="ListRankItem4.xml" path="/components/"/>
-    <component id="jcej4m" name="ComFightResult.xml" path="/components/"/>
-    <component id="jcej4n" name="ComFightScoreResult.xml" path="/components/"/>
+    <component id="jcej4m" name="ComAllScoreResult.xml" path="/components/"/>
+    <component id="jcej4n" name="ComAllScore.xml" path="/components/"/>
+    <image id="jcej4o" name="jjcdi_jjxian.png" path="/images/"/>
+    <image id="jcej4p" name="jjcdi_jjcdi.png" path="/images/"/>
+    <component id="jcej4q" name="ComFightScore.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 7 - 0
FGUIProject/assets/CommonGame/RuleUI.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,1000">
+  <displayList>
+    <component id="n0_jcej" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,995"/>
+    <component id="n2_jcej" name="comContent" src="jcejtkp" fileName="components/ComContent.xml" xy="30,71" size="902,860"/>
+  </displayList>
+</component>

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

@@ -4,6 +4,6 @@
   <displayList>
     <loader id="n1_jcej" name="icon" xy="0,0" size="44,44" url="ui://eg2y0ldpvek88k" align="center" vAlign="middle" autoSize="true"/>
   </displayList>
-  <Button/>
+  <Button mode="Check"/>
   <relation target="n1_jcej" sidePair="width-width,height-height"/>
 </component>

+ 6 - 0
FGUIProject/assets/CommonGame/components/ComContent.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="902,967" overflow="scroll">
+  <displayList>
+    <text id="n2_jcej" name="txtContent" xy="0,0" size="902,830" fontSize="34" color="#9f815f" autoSize="height" text="奖励规则:&#xD;&#xA;1.竞技场挑战时间为每周日12:00-次周六21:00&#xD;&#xA;2.竞技场结算时间为每周六21:00-周日12:00,该时间段无法发起挑战&#xD;&#xA;3.每周日12:00系统会根据段位和排名结算段位奖励,奖励通过邮件发放,奖励要求该周至少参与1次战斗&#xD;&#xA;4.每日前15次挑战胜利可获得5个小红花,失败获得3个&#xD;&#xA;兑换规则:&#xD;&#xA;1.本赛季只要1次周结算时达到指定段位,即可在竞技场商店中使用小红花兑换对应段位的衣服&#xD;&#xA;2.新赛季开始时,剩余的小红花将1:1转化为小黄花,小黄花可兑换以往赛季的衣服&#xD;&#xA;3.以往赛季衣服兑换所需的小黄花数量等于该衣服当季兑换所需的小红花数量&#xD;&#xA;4.兑换以往赛季衣服时,如果小黄花不足,小红花会自动按1:1转化为小黄花,但小黄花不能转化为小红花&#xD;&#xA;5.本赛季达到指定段位时,即可兑换相同段位条件的以往赛季衣服&#xD;&#xA;6.每个赛季的衣服在2个赛季后兑换所需的段位降低2档"/>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/CommonGame/ComListReward.xml → FGUIProject/assets/CommonGame/components/ComListReward.xml


+ 3 - 1
FGUIProject/assets/CommonGame/package.xml

@@ -141,7 +141,7 @@
     <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/" atlas="alone_npot"/>
     <component id="wet2tae" name="ComRewardItem.xml" path="/components/"/>
     <movieclip id="wet2td7" name="MovieClip2.jta" path="/effect/" atlas="alone_npot"/>
-    <component id="kztethp" name="ComListReward.xml" path="/"/>
+    <component id="kztethp" name="ComListReward.xml" path="/components/"/>
     <image id="kztethq" name="test.png" path="/imgItemIcon/" exported="true"/>
     <image id="kztethr" name="hyhy_btbt_1.png" path="/imagesExport/" exported="true"/>
     <image id="kzteths" name="gxhd_scjlscjl.png" path="/images/"/>
@@ -239,6 +239,8 @@
     <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/"/>
+    <component id="jcejtko" name="RuleUI.xml" path="/" exported="true"/>
+    <component id="jcejtkp" name="ComContent.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 26 - 0
FGUIProject/assets/Main/ArenaFightResultUI.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n11_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,119" pivot="0.5,0" size="265,601">
+      <relation target="n10_wono" sidePair="top-top"/>
+    </component>
+    <component id="n10_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="175,200" pivot="0.5,0.5" scale="1.1,1.1" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+  </displayList>
+  <transition name="t1">
+    <item time="0" type="Size" target="n8_wono" value="265,0"/>
+    <item time="0" type="XY" target="n10_wono" tween="true" startValue="175,200" endValue="129,200" duration="6" ease="Linear"/>
+    <item time="6" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
+  </transition>
+  <transition name="t0">
+    <item time="0" type="Size" target="n8_wono" value="265,0"/>
+    <item time="0" type="XY" target="n10_wono" value="175,200"/>
+  </transition>
+</component>

+ 1 - 1
FGUIProject/assets/Main/MainUI.xml

@@ -55,7 +55,7 @@
     </component>
     <group id="n57_oju1" name="grpList" xy="910,290" size="108,1393" group="n52_qqat" advanced="true"/>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
-    <component id="n73_mzf8" name="btn0" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
+    <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>
       <property target="loaLockIcon" propertyId="1" value=""/>
       <property target="icon1" propertyId="1" value=""/>

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Constant/ConstFightRoleType.cs

@@ -1,6 +1,6 @@
 public class FightRoleType
 {
 
-    public const int MINE = 0;
-    public const int TAEGET = 1;
+    public const int MINE = 0;//自己
+    public const int TAEGET = 1;//对手
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -16,8 +16,8 @@ namespace GFGGame
         public List<FightRoleData> DressupList = new List<FightRoleData>();//我的搭配列表
         public List<ArenaTargetData> Targets = new List<ArenaTargetData>();//对手
         public ArenaTargetData SelfData = new ArenaTargetData();//自己的排行榜信息
-        public Dictionary<int, List<ArenaTargetData>> rankDatasDic = new Dictionary<int, List<ArenaTargetData>>();//排行榜数据
-        public List<ArenaHistoryData> historyDatas = new List<ArenaHistoryData>();//获取竞技场历史记录
+        public Dictionary<int, List<ArenaTargetData>> RankDatasDic = new Dictionary<int, List<ArenaTargetData>>();//排行榜数据
+        public List<ArenaHistoryData> HistoryDatas = new List<ArenaHistoryData>();//获取竞技场历史记录
 
         /*************************************************************************************************************************************/
         public int SelectThemeIndex = 0;//当前选中换装主题(ThemeList)的下标

+ 79 - 11
GameClient/Assets/Game/HotUpdate/Data/ArenaViewManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using FairyGUI;
 using UI.Arena;
@@ -14,19 +15,33 @@ namespace GFGGame
             textureDic.Clear();
         }
 
+        /// <summary>
+        /// 更新段位图标
+        /// </summary>
+        /// <param name="loader"></param>
+        /// <param name="danLv"></param>
         public void UpdateDanIcon(GLoader loader, int danLv)
         {
 
         }
-        public void UpdateFightRoundResult(GObject obj, int index, out bool isWin)
+        /// <summary>
+        /// 更新每一轮战斗结果
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="index"></param>
+        /// <param name="myScores"></param>
+        /// <param name="targetScores"></param>
+        /// <param name="targetData"></param>
+        /// <param name="isWin"></param>
+        public void UpdateFightRoundResult(GObject obj, int index, List<long> myScores, List<long> targetScores, ArenaTargetData targetData, out bool isWin)
         {
             int scoreType = ArenaDataManager.Instance.ThemeList[index];
-            long myScore = ArenaDataManager.Instance.myFightScore[index];
+            long myScore = myScores[index];
             int myCardId = ArenaDataManager.Instance.DressupList[index].cardId;
             int myHeadId = ArenaDataManager.Instance.DressupList[index].headId;
 
-            long targetScore = ArenaDataManager.Instance.targetFightScore[index];
-            ArenaTargetData targetData = ArenaDataManager.Instance.Targets[index];
+            long targetScore = targetScores[index];
+            // ArenaTargetData targetData = ArenaDataManager.Instance.Targets[index];
             int targetCardId = 0;
             int targetHeadId = 0;
             string res = "";
@@ -62,14 +77,27 @@ namespace GFGGame
             isWin = myScore > targetScore;
             UI_ListResultItem.ProxyEnd();
         }
-        public void UpdateFightResult(GObject obj, List<long> myScores, List<long> targetScore)
+        /// <summary>
+        /// 更新战斗结算总分,含胜负
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="myScores"></param>
+        /// <param name="targetScore"></param>
+        public void UpdateAllScoreResult(GObject obj, List<long> myScores, List<long> targetScore)
         {
-            UI_ComFightResult com = UI_ComFightResult.Proxy(obj);
-            bool isWin = UpdateFightScoreResult(com.m_comResult.target, myScores, targetScore);
+            UI_ComAllScoreResult com = UI_ComAllScoreResult.Proxy(obj);
+            bool isWin = UpdateAllScore(com.m_comResult.target, myScores, targetScore);
             com.m_loaResule.url = isWin ? "ui://Arena/kstzjj_slsl" : "ui://Arena/kstzjj_shib";
-            UI_ComFightResult.ProxyEnd();
+            UI_ComAllScoreResult.ProxyEnd();
         }
-        public bool UpdateFightScoreResult(GObject obj, List<long> myScores, List<long> targetScore)
+        /// <summary>
+        /// 更新战斗结算总分
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <param name="myScores"></param>
+        /// <param name="targetScore"></param>
+        /// <returns></returns>
+        public bool UpdateAllScore(GObject obj, List<long> myScores, List<long> targetScore)
         {
             int winCount = 0;
             long myAllScore = 0;
@@ -80,13 +108,53 @@ namespace GFGGame
                 targetAllScore += targetScore[i];
                 if (myScores[i] > targetScore[i]) winCount++;
             }
-            UI_ComFightScoreResult com = UI_ComFightScoreResult.Proxy(obj);
+            UI_ComAllScore com = UI_ComAllScore.Proxy(obj);
             com.m_txtMyFightScore.text = myAllScore.ToString();
             com.m_txtTargetFightScore.text = targetAllScore.ToString();
-            UI_ComFightScoreResult.ProxyEnd();
+            UI_ComAllScore.ProxyEnd();
 
             bool isWin = winCount >= 2;
             return isWin;
         }
+        /// <summary>
+        /// 更新标签、战力、属性分数值
+        /// </summary>
+        private void UpdateValue(GObject obj, int index, List<FightRoleData> roleDatas)
+        {
+            UI_ComValueInfo com = UI_ComValueInfo.Proxy(obj);
+            com.m_scoreType.url = ResPathUtil.GetScorePath(roleDatas[index].scoreType);
+            com.m_txtScore.text = FightDataManager.Instance.GetScore(roleDatas[index].itemScoreList).ToString();
+            com.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(index, roleDatas, null).ToString();
+            com.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(roleDatas[index].itemList, roleDatas[index].tags).ToString();
+            int count = FightDataManager.Instance.GetTagsCount(roleDatas[index].itemList, roleDatas[index].tags);
+            com.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
+            if (index == 0)
+            {
+                ItemUtil.UpdateTag(com.m_comTag, roleDatas[index].tags[0]);
+            }
+            UpdateFightScore(com.m_comFightScore.target, roleDatas);
+            if (com.m_btnTagRule.data == null)
+            {
+                com.m_btnTagRule.onClick.Add(OnBtnRuleClick);
+            }
+            com.m_btnTagRule.data = 300002;
+            UI_ComValueInfo.ProxyEnd();
+        }
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<RuleView>(300002);
+        }
+        /// <summary>
+        /// 更新战力值
+        /// </summary>
+        public void UpdateFightScore(GObject obj, List<FightRoleData> roleDatas)
+        {
+            List<long> fightScore = ArenaDataManager.Instance.GetFightScoreList(ArenaFightTargetType.PLAYER, roleDatas, null);
+            UI_ComFightScore com = UI_ComFightScore.Proxy(obj);
+            com.m_txtSuitScore.SetVar("value", fightScore[0].ToString());
+            com.m_txtClickScore.SetVar("value", fightScore[1].ToString());
+            com.m_txtCardScore.SetVar("value", fightScore[2].ToString());
+            UI_ComFightScore.ProxyEnd();
+        }
     }
 }

+ 7 - 11
GameClient/Assets/Game/HotUpdate/Data/VO/ArenaData.cs

@@ -17,18 +17,14 @@ namespace GFGGame
     {
         public bool isWin = false;//是否胜利
         public bool IsChallenge = false;//是否发起挑战
-        public long FightTime;//战斗时间
-        public int Type;//类型,由ArenaFightTargetType定义
-        public OtherRoleInfoData RoleInfo; //对方玩家数据
-        public List<FightRoleData> RoleDressupList = new List<FightRoleData>();//搭配列表
-        public List<FightRobotData> RobotDressupList = new List<FightRobotData>();//机器人搭配列表
+        public long FightTime;//战斗时间,毫秒
         public int GradeChangeType = 0;//是否晋级 ArenaGradeChangeType
-        public List<long> SelfRoundScores = new List<long>();//自己3轮战斗分数
-        public List<long> OtherRoundScores = new List<long>();//对手3轮战斗分数
-        public int Grade = 1;//战斗后段位
-        public int Rank = 1;//战斗后排行
-        public List<long> SelfFightScores = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力
-        public List<long> TargetFightScores = new List<long>();// 对手 搭配战力,卓越点击战力,卡牌战力
+        public int Grade = 1;//自己战斗后段位
+        public int Rank = 1;//自己战斗后排行
+        public ArenaTargetData targetData;
+        public List<long> MyScores = new List<long>();//自己3轮战斗分数
+        public List<long> FightScores = new List<long>();//自己 搭配战力,卓越点击战力,卡牌战力
+        public List<long> TargetScores = new List<long>();//对手3轮战斗分数
 
     }
 }

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

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using GFGGame;
+
+public struct StoryFightResultData
+{
+    public bool Result;
+    public int Score;
+    public int Star;
+    public bool FirstPass;
+    public List<ItemData> BonusList;
+}

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

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

+ 2 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaResultQuickUI.cs

@@ -13,7 +13,7 @@ namespace UI.Arena
         public GTextField m_txtTargetRank;
         public GTextField m_txtDantitle;
         public GList m_list;
-        public UI_ComFightResult m_comResult;
+        public UI_ComAllScoreResult m_comResult;
         public const string URL = "ui://4lc5fhlbpsphx";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaResultQuickUI";
@@ -67,7 +67,7 @@ namespace UI.Arena
             m_txtTargetRank = (GTextField)comp.GetChild("txtTargetRank");
             m_txtDantitle = (GTextField)comp.GetChild("txtDantitle");
             m_list = (GList)comp.GetChild("list");
-            m_comResult = (UI_ComFightResult)UI_ComFightResult.Create(comp.GetChild("comResult"));
+            m_comResult = (UI_ComAllScoreResult)UI_ComAllScoreResult.Create(comp.GetChild("comResult"));
         }
         public void Dispose(bool disposeTarget = false)
         {

+ 2 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaResultUI.cs

@@ -8,7 +8,7 @@ namespace UI.Arena
     {
         public GComponent target;
         public GList m_list;
-        public UI_ComFightResult m_ComResult;
+        public UI_ComAllScoreResult m_ComResult;
         public const string URL = "ui://4lc5fhlbpsph6";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ArenaResultUI";
@@ -57,7 +57,7 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_list = (GList)comp.GetChild("list");
-            m_ComResult = (UI_ComFightResult)UI_ComFightResult.Create(comp.GetChild("ComResult"));
+            m_ComResult = (UI_ComAllScoreResult)UI_ComAllScoreResult.Create(comp.GetChild("ComResult"));
         }
         public void Dispose(bool disposeTarget = false)
         {

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

@@ -8,6 +8,7 @@ namespace UI.Arena
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GButton m_btnBack;
         public GComponent m_valueBar;
         public GComponent m_comTag;
@@ -27,6 +28,7 @@ namespace UI.Arena
         public GTextField m_txtDanTitle;
         public GTextField m_txtFightScore;
         public GButton m_btnFightScoreRule;
+        public UI_ComFightScore m_comFightScore;
         public GTextField m_txtMoneyCount;
         public GButton m_btnAddFightCount;
         public GTextField m_txtFightCount;
@@ -88,6 +90,7 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_comTag = (GComponent)comp.GetChild("comTag");
@@ -107,6 +110,7 @@ namespace UI.Arena
             m_txtDanTitle = (GTextField)comp.GetChild("txtDanTitle");
             m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             m_btnFightScoreRule = (GButton)comp.GetChild("btnFightScoreRule");
+            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
             m_txtMoneyCount = (GTextField)comp.GetChild("txtMoneyCount");
             m_btnAddFightCount = (GButton)comp.GetChild("btnAddFightCount");
             m_txtFightCount = (GTextField)comp.GetChild("txtFightCount");
@@ -124,6 +128,7 @@ namespace UI.Arena
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_btnBack = null;
             m_valueBar = null;
             m_comTag = null;
@@ -143,6 +148,8 @@ namespace UI.Arena
             m_txtDanTitle = null;
             m_txtFightScore = null;
             m_btnFightScoreRule = null;
+            m_comFightScore.Dispose();
+            m_comFightScore = null;
             m_txtMoneyCount = null;
             m_btnAddFightCount = null;
             m_txtFightCount = null;

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComAllScore.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComAllScore
+    {
+        public GComponent target;
+        public GTextField m_txtMyFightScore;
+        public GTextField m_txtTargetFightScore;
+        public const string URL = "ui://4lc5fhlbjcej4n";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComAllScore";
+        private static UI_ComAllScore _proxy;
+
+        public static UI_ComAllScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ComAllScore();
+            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_ComAllScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComAllScore();
+            }
+            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_txtMyFightScore = (GTextField)comp.GetChild("txtMyFightScore");
+            m_txtTargetFightScore = (GTextField)comp.GetChild("txtTargetFightScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtMyFightScore = null;
+            m_txtTargetFightScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 75 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComAllScoreResult.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComAllScoreResult
+    {
+        public GComponent target;
+        public UI_ComAllScore m_comResult;
+        public GLoader m_loaResule;
+        public const string URL = "ui://4lc5fhlbjcej4m";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComAllScoreResult";
+        private static UI_ComAllScoreResult _proxy;
+
+        public static UI_ComAllScoreResult Create(GObject gObject = null)
+        {
+            var ui = new UI_ComAllScoreResult();
+            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_ComAllScoreResult Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComAllScoreResult();
+            }
+            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_comResult = (UI_ComAllScore)UI_ComAllScore.Create(comp.GetChild("comResult"));
+            m_loaResule = (GLoader)comp.GetChild("loaResule");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comResult.Dispose();
+            m_comResult = null;
+            m_loaResule = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComFightScore.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComFightScore
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GTextField m_txtSuitScore;
+        public GTextField m_txtClickScore;
+        public GTextField m_txtCardScore;
+        public const string URL = "ui://4lc5fhlbjcej4q";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComFightScore";
+        private static UI_ComFightScore _proxy;
+
+        public static UI_ComFightScore Create(GObject gObject = null)
+        {
+            var ui = new UI_ComFightScore();
+            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_ComFightScore Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComFightScore();
+            }
+            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_txtSuitScore = (GTextField)comp.GetChild("txtSuitScore");
+            m_txtClickScore = (GTextField)comp.GetChild("txtClickScore");
+            m_txtCardScore = (GTextField)comp.GetChild("txtCardScore");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtSuitScore = null;
+            m_txtClickScore = null;
+            m_txtCardScore = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -8,12 +8,13 @@ namespace UI.Arena
     {
         public GComponent target;
         public Controller m_c1;
+        public GTextField m_txtFightScore;
         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 UI_ComFightScore m_comFightScore;
         public const string URL = "ui://4lc5fhlbjcej3t";
         public const string PACKAGE_NAME = "Arena";
         public const string RES_NAME = "ComValueInfo";
@@ -62,22 +63,25 @@ namespace UI.Arena
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_txtFightScore = (GTextField)comp.GetChild("txtFightScore");
             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");
+            m_comFightScore = (UI_ComFightScore)UI_ComFightScore.Create(comp.GetChild("comFightScore"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_txtFightScore = null;
             m_scoreType = null;
             m_txtScore = null;
-            m_txtFightScore = null;
             m_btnTagRule = null;
             m_comTag = null;
             m_txtTagScore = null;
+            m_comFightScore.Dispose();
+            m_comFightScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 10 - 9
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListFightRecordItem.cs

@@ -10,18 +10,18 @@ namespace UI.Arena
         public Controller m_c1;
         public Controller m_ctrDan;
         public Controller m_ctrResult;
-        public GTextField m_txttime;
+        public GTextField m_txtTime;
         public GLoader m_loaResult;
         public GLoader m_loaResultIcon;
         public GLoader m_loaDanIcon;
-        public GTextField m_txtRank0;
         public GTextField m_txtRank;
         public GTextField m_txtTargetName;
-        public GTextField m_txtTargetArenaScore;
+        public GTextField m_txtTargetFightScore;
         public GButton m_btnLook;
         public GButton m_btnShow;
         public GGroup m_grpSimpleInfo;
         public GList m_listResult;
+        public UI_ComAllScore m_comResult;
         public GGroup m_grpAllInfo;
         public const string URL = "ui://4lc5fhlbpsph15";
         public const string PACKAGE_NAME = "Arena";
@@ -73,18 +73,18 @@ namespace UI.Arena
             m_c1 = comp.GetController("c1");
             m_ctrDan = comp.GetController("ctrDan");
             m_ctrResult = comp.GetController("ctrResult");
-            m_txttime = (GTextField)comp.GetChild("txttime");
+            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_txtRank0 = (GTextField)comp.GetChild("txtRank0");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
-            m_txtTargetArenaScore = (GTextField)comp.GetChild("txtTargetArenaScore");
+            m_txtTargetFightScore = (GTextField)comp.GetChild("txtTargetFightScore");
             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_comResult = (UI_ComAllScore)UI_ComAllScore.Create(comp.GetChild("comResult"));
             m_grpAllInfo = (GGroup)comp.GetChild("grpAllInfo");
         }
         public void Dispose(bool disposeTarget = false)
@@ -92,18 +92,19 @@ namespace UI.Arena
             m_c1 = null;
             m_ctrDan = null;
             m_ctrResult = null;
-            m_txttime = null;
+            m_txtTime = null;
             m_loaResult = null;
             m_loaResultIcon = null;
             m_loaDanIcon = null;
-            m_txtRank0 = null;
             m_txtRank = null;
             m_txtTargetName = null;
-            m_txtTargetArenaScore = null;
+            m_txtTargetFightScore = null;
             m_btnLook = null;
             m_btnShow = null;
             m_grpSimpleInfo = null;
             m_listResult = null;
+            m_comResult.Dispose();
+            m_comResult = null;
             m_grpAllInfo = null;
             if(disposeTarget && target != null)
             {

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComContent.cs.meta

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

+ 72 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_RuleUI.cs.meta

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

+ 88 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ArenaFightResultUI.cs

@@ -0,0 +1,88 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ArenaFightResultUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GGraph m_btnClose;
+        public UI_ComResult m_comResult;
+        public UI_ComRoleResult m_comRoleResult;
+        public Transition m_t1;
+        public Transition m_t0;
+        public const string URL = "ui://mfvz4q8kjcejj6";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ArenaFightResultUI";
+        private static UI_ArenaFightResultUI _proxy;
+
+        public static UI_ArenaFightResultUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ArenaFightResultUI();
+            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_ArenaFightResultUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ArenaFightResultUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnClose = (GGraph)comp.GetChild("btnClose");
+            m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
+            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
+            m_t1 = comp.GetTransition("t1");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnClose = null;
+            m_comResult.Dispose();
+            m_comResult = null;
+            m_comRoleResult.Dispose();
+            m_comRoleResult = null;
+            m_t1 = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ArenaFightResultUI.cs.meta

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

+ 4 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -20,7 +20,7 @@ namespace UI.Main
         public UI_ButtonChange m_btnChange;
         public GGroup m_grpList;
         public GGroup m_grpLeft;
-        public UI_ButtonModle6 m_btn0;
+        public UI_ButtonModle6 m_btnArena;
         public UI_ButtonModle7 m_btn1;
         public UI_ButtonModle2 m_btnStudio;
         public UI_ButtonModle3 m_btnTravel;
@@ -94,7 +94,7 @@ namespace UI.Main
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
-            m_btn0 = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btn0"));
+            m_btnArena = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnArena"));
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
             m_btnStudio = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnStudio"));
             m_btnTravel = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnTravel"));
@@ -133,8 +133,8 @@ namespace UI.Main
             m_btnChange = null;
             m_grpList = null;
             m_grpLeft = null;
-            m_btn0.Dispose();
-            m_btn0 = null;
+            m_btnArena.Dispose();
+            m_btnArena = null;
             m_btn1.Dispose();
             m_btn1 = null;
             m_btnStudio.Dispose();

+ 20 - 53
GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -19,8 +19,8 @@ namespace GFGGame
         protected override async ETTask Run(Session session, SC_ArenaHistoryAdd message)
         {
             ArenaHistoryData historyData = ArenaSproxy.GetArenaHistoryData(message.history);
-            ArenaDataManager.Instance.historyDatas.Insert(0, historyData);
-            ArenaDataManager.Instance.historyDatas.RemoveAt(ArenaDataManager.Instance.historyDatas.Count - 1);
+            ArenaDataManager.Instance.HistoryDatas.Insert(0, historyData);
+            ArenaDataManager.Instance.HistoryDatas.RemoveAt(ArenaDataManager.Instance.HistoryDatas.Count - 1);
             await ETTask.CompletedTask;
         }
     }
@@ -192,11 +192,11 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    if (!ArenaDataManager.Instance.rankDatasDic.ContainsKey(rankType))
+                    if (!ArenaDataManager.Instance.RankDatasDic.ContainsKey(rankType))
                     {
-                        ArenaDataManager.Instance.rankDatasDic[rankType] = new List<ArenaTargetData>();
+                        ArenaDataManager.Instance.RankDatasDic[rankType] = new List<ArenaTargetData>();
                     }
-                    List<ArenaTargetData> rankDatas = ArenaDataManager.Instance.rankDatasDic[rankType];
+                    List<ArenaTargetData> rankDatas = ArenaDataManager.Instance.RankDatasDic[rankType];
                     for (int i = 0; i < response.ranks.Count; i++)
                     {
                         rankDatas.Add(GetArenaTargetData(response.ranks[i]));
@@ -217,10 +217,10 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ArenaDataManager.Instance.historyDatas.Clear();
+                    ArenaDataManager.Instance.HistoryDatas.Clear();
                     for (int i = 0; i < response.history.Count; i++)
                     {
-                        ArenaDataManager.Instance.historyDatas.Add(GetArenaHistoryData(response.history[i]));
+                        ArenaDataManager.Instance.HistoryDatas.Add(GetArenaHistoryData(response.history[i]));
                     }
                 }
             }
@@ -245,53 +245,20 @@ namespace GFGGame
             }
         }
 
-
-
-        public static ArenaHistoryData GetArenaHistoryData(ArenaHistoryProto arenaHistory)
+        public static ArenaHistoryData GetArenaHistoryData(ArenaHistoryProto arenaHistoryProto)
         {
-            ArenaHistoryData arenaTarget = new ArenaHistoryData();
-            arenaTarget.isWin = arenaHistory.IsWin;
-            arenaTarget.IsChallenge = arenaHistory.IsChallenge;
-            arenaTarget.FightTime = arenaHistory.FightTime;
-            arenaTarget.Type = arenaHistory.Type;
-
-            if (arenaTarget.Type == ArenaFightTargetType.PLAYER)
-            {
-                arenaTarget.RoleInfo.roleId = arenaHistory.RoleInfo.RoleId;
-                arenaTarget.RoleInfo.roleName = arenaHistory.RoleInfo.RoleName;
-                arenaTarget.RoleInfo.roleLv = arenaHistory.RoleInfo.RoleLvl;
-                arenaTarget.RoleInfo.headId = arenaHistory.RoleInfo.HeadItemId;
-            }
-            else
-            {
-                ArenaRobotCfg robotCfg = ArenaRobotCfgArray.Instance.GetCfg(arenaHistory.RobotDressupInfo.RobotId);
-
-                arenaTarget.RoleInfo.roleId = 0;
-                arenaTarget.RoleInfo.roleName = robotCfg.gradeName;
-                arenaTarget.RoleInfo.roleLv = robotCfg.level;
-                arenaTarget.RoleInfo.headRes = robotCfg.targetRes;
-            }
-            for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
-            {
-                if (arenaTarget.Type == ArenaFightTargetType.PLAYER)
-                {
-                    FightRoleData roleData = GetFightRoleData(arenaHistory.PlayerDressupList[i], arenaTarget.RoleInfo, i);
-                    arenaTarget.RoleDressupList.Add(roleData);
-                }
-                else if (arenaTarget.Type == ArenaFightTargetType.ROBOT)
-                {
-                    FightRobotData robotData = GetFightRobotData(arenaHistory.RobotDressupInfo, i);
-                    arenaTarget.RobotDressupList.Add(robotData);
-                }
-            }
-            arenaTarget.GradeChangeType = arenaHistory.GradeChangeType;
-            arenaTarget.SelfRoundScores = arenaHistory.SelfRandScore;
-            arenaTarget.OtherRoundScores = arenaHistory.TargetRandScore;
-            arenaTarget.Grade = arenaHistory.Grade;
-            arenaTarget.Rank = arenaHistory.Rank;
-            arenaTarget.SelfFightScores = arenaHistory.SelfFightPower;
-            arenaTarget.TargetFightScores = arenaHistory.TargetFightPower;
-            return arenaTarget;
+            ArenaHistoryData arenaHistory = new ArenaHistoryData();
+            arenaHistory.isWin = arenaHistoryProto.IsWin;
+            arenaHistory.IsChallenge = arenaHistoryProto.IsChallenge;
+            arenaHistory.FightTime = arenaHistoryProto.FightTime;
+            arenaHistory.Grade = arenaHistoryProto.Grade;
+            arenaHistory.Rank = arenaHistoryProto.Rank;
+            arenaHistory.targetData = GetArenaTargetData(arenaHistoryProto.target);
+            arenaHistory.GradeChangeType = arenaHistoryProto.GradeChangeType;
+            arenaHistory.MyScores = arenaHistoryProto.SelfRandScore;
+            arenaHistory.TargetScores = arenaHistoryProto.TargetRandScore;
+            arenaHistory.FightScores = arenaHistoryProto.SelfFightPower;
+            return arenaHistory;
         }
 
         private static ArenaTargetData GetArenaTargetData(ArenaTargetProto arenaTargetProto)

+ 37 - 4
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.Arena;
@@ -29,7 +30,7 @@ namespace GFGGame
 
             _ui.m_listWeekDanReward.itemRenderer = RenderListWeekDanRewardItem;
             _ui.m_listUpDanReward.itemRenderer = RenderListUpDanReward;
-            // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_comMyDanReward.m_listReward.itemRenderer = RenderListRewardItem;
         }
         protected override void AddEventListener()
         {
@@ -42,10 +43,9 @@ namespace GFGGame
             _ui.m_listWeekDanReward.numItems = ArenaRewardCfgArray.Instance.dataArray.Length;
             _ui.m_listUpDanReward.numItems = ArenaRankCfgArray.Instance.dataArray.Length;
 
-            _ui.m_comMyDanReward.m_listReward.itemRenderer = RenderListRewardItem;
-            _ui.m_comMyDanReward.m_listReward.numItems = 0;
-            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comMyDanReward.m_loaDanIcon, 2);
 
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comMyDanReward.m_loaDanIcon, 2);
+            UpdateMyReward();
         }
 
         protected override void OnHide()
@@ -58,12 +58,44 @@ namespace GFGGame
             base.RemoveEventListener();
         }
 
+        private void UpdateMyReward()
+        {
+            UI_ComMyDanReward com = UI_ComMyDanReward.Proxy(_ui.m_comMyDanReward.target);
+
+            ArenaViewManager.Instance.UpdateDanIcon(com.m_loaDanIcon, ArenaDataManager.Instance.Grade);
+
+            int[][] rewards = { };
+            ArenaRankCfg rankCfg = ArenaRankCfgArray.Instance.GetCfg(ArenaDataManager.Instance.Grade);
+            List<ArenaRewardCfg> rewardCfgs = ArenaRewardCfgArray.Instance.GetCfgsBygradeName(rankCfg.gradeName);
+            for (int i = 0; i < rewardCfgs.Count; i++)
+            {
+                ArenaRewardCfg rewardCfg = rewardCfgs[i];
+                int endRank = rewardCfg.rankInGrade == 0 ? rankCfg.num * rewardCfg.rangeInGrade / 10000 : rewardCfg.rankInGrade;
+                int startRank = 0;
+                if (i > 0)
+                {
+                    ArenaRewardCfg nextRewardCfg = rewardCfgs[i + 1];
+                    startRank = nextRewardCfg.rankInGrade == 0 ? rankCfg.num * nextRewardCfg.rangeInGrade / 10000 : nextRewardCfg.rankInGrade;
+                }
+
+                if (ArenaDataManager.Instance.Rank > startRank && ArenaDataManager.Instance.Rank <= endRank)
+                {
+                    rewards = rewardCfg.bonusWeeklyArr;
+                    break;
+                }
+            }
+            com.m_listReward.data = rewards;
+            com.m_listReward.numItems = rewards.Length;
+            UI_ComMyDanReward.ProxyEnd();
+
+        }
         private void RenderListWeekDanRewardItem(int index, GObject obj)
         {
             ArenaRewardCfg cfg = ArenaRewardCfgArray.Instance.dataArray[index];
 
             UI_ListDanRewardItem item = UI_ListDanRewardItem.Proxy(obj);
             item.m_txtRank.text = cfg.showName;
+            item.m_imgGot.visible = false;
             if (item.m_listReward.data == null)
             {
                 item.m_listReward.itemRenderer = RenderListRewardItem;
@@ -76,6 +108,7 @@ namespace GFGGame
             ArenaRankCfg cfg = ArenaRankCfgArray.Instance.dataArray[index];
 
             UI_ListDanRewardItem item = UI_ListDanRewardItem.Proxy(obj);
+            item.m_imgGot.visible = ArenaDataManager.Instance.HighestGrade >= cfg.id;
             item.m_txtRank.text = cfg.gradeName;
             if (item.m_listReward.data == null)
             {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanUpView.cs

@@ -36,7 +36,7 @@ namespace GFGGame
         {
             base.AddEventListener();
 
-            EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
+            // EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
         }
         protected override void OnShown()
         {

+ 14 - 41
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -16,11 +16,11 @@ namespace GFGGame
         private GameObject _sceneObject;
 
         private List<FightRoleData> _roleDatas;//可能是自己的搭配,也可能是对方玩家的搭配
-        private List<FightRobotData> _robotDatas;//对方机器人搭配
+        // private List<FightRobotData> _robotDatas;//对方机器人搭配
         private int _themeIndex = 0;
         private List<int> _itemList;
         private string[] _tags;
-        private int _roleType = 0;
+        private int _roleType = 0;//FightRoleType
         public override void Dispose()
         {
             if (_sceneObject != null)
@@ -66,7 +66,7 @@ namespace GFGGame
             _roleType = (int)(this.viewData as object[])[0];
             _themeIndex = (int)(this.viewData as object[])[1];
             _roleDatas = (this.viewData as object[])[2] as List<FightRoleData>;
-            _robotDatas = (this.viewData as object[])[3] as List<FightRobotData>;
+            // _robotDatas = (this.viewData as object[])[3] as List<FightRobotData>;
 
             _ui.m_c1.selectedIndex = _roleType;
             if (_sceneObject == null)
@@ -106,7 +106,7 @@ namespace GFGGame
         }
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { _roleType, _themeIndex, _roleDatas, _robotDatas }, true);
+            ViewManager.Show<ArenaDressUpFightView>(null, new object[] { _roleType, _themeIndex, _roleDatas, null }, true);
         }
         private void OnBtnRecommendClick()
         {
@@ -129,13 +129,13 @@ namespace GFGGame
                 UpdateValueInfo();
                 UpdateCardInfo(_roleDatas[_themeIndex].cardId);
             }
-            else
-            {
-                _itemList = new List<int>(SuitCfgArray.Instance.GetSuitItems(_robotDatas[_themeIndex].showSuitId));
-                _tags = _roleDatas[_themeIndex].tags;
-                UpdateRobotValueInfo();
-                UpdateCardInfo(_roleDatas[_themeIndex].cardId);
-            }
+            // else
+            // {
+            //     _itemList = new List<int>(SuitCfgArray.Instance.GetSuitItems(_robotDatas[_themeIndex].showSuitId));
+            //     _tags = _roleDatas[_themeIndex].tags;
+            //     UpdateRobotValueInfo();
+            //     UpdateCardInfo(_roleDatas[_themeIndex].cardId);
+            // }
             MyDressUpHelper.dressUpObj.PutOnItemList(_itemList);
             _ui.m_list.numItems = _itemList.Count;
         }
@@ -144,7 +144,7 @@ namespace GFGGame
             UI_ComValueInfo comValueInfo = UI_ComValueInfo.Proxy(_ui.m_comValueInfo.target);
             comValueInfo.m_scoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _roleDatas[_themeIndex].scoreType);
             comValueInfo.m_txtScore.text = FightDataManager.Instance.GetScore(_roleDatas[_themeIndex].itemScoreList).ToString();
-            comValueInfo.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(_roleType, _roleDatas, _robotDatas).ToString();
+            comValueInfo.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(_roleType, _roleDatas, null).ToString();
             comValueInfo.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(_itemList, _tags).ToString();
             int count = FightDataManager.Instance.GetTagsCount(_itemList, _tags);
             comValueInfo.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
@@ -154,25 +154,7 @@ namespace GFGGame
             }
             UI_ComValueInfo.ProxyEnd();
         }
-        private void UpdateRobotValueInfo()
-        {
-            UI_ComValueInfo comValueInfo = UI_ComValueInfo.Proxy(_ui.m_comValueInfo.target);
-            comValueInfo.m_scoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _robotDatas[_themeIndex].scoreType);
-            comValueInfo.m_txtScore.text = FightDataManager.Instance.GetScore(_robotDatas[_themeIndex].itemScoreList).ToString();
-            comValueInfo.m_txtFightScore.text = ArenaDataManager.Instance.GetAllFightScore(_roleType, _roleDatas, _robotDatas).ToString();
-            comValueInfo.m_txtTagScore.text = FightDataManager.Instance.GetTagsScore(_itemList, _tags).ToString();
-            int count = FightDataManager.Instance.GetTagsCount(_itemList, _tags);
-            comValueInfo.m_c1.selectedIndex = Math.Min(count, ArenaTagCfgArray.Instance.dataArray.Length);
-            if (_tags.Length > 0)
-            {
-                UI_ComTag item = UI_ComTag.Proxy(comValueInfo.m_comTag);
-                int tagType = TagCfgArray.Instance.GetCfg(_tags[0]).type;
-                item.m_txtTag.text = _tags[0];
-                item.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tagType);
-                UI_ComTag.ProxyEnd();
-            }
-            UI_ComValueInfo.ProxyEnd();
-        }
+
         private void UpdateCardInfo(int cardId)
         {
             if (cardId == 0)
@@ -197,16 +179,7 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemList[index]);
             item.m_txtTitle.text = itemCfg.name;
             item.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + ArenaDataManager.Instance.ThemeList[_themeIndex]);
-            if (_roleDatas != null)
-            {
-                item.m_txtScore.text = _robotDatas[_themeIndex].itemScoreList[index].ToString();
-            }
-            else
-            {
-                int score = ItemDataManager.GetItemBaseScoreValue(itemCfg.id, _robotDatas[_themeIndex].scoreType);
-                int tagScore = ItemDataManager.GetItemTagScore(itemCfg.id, _robotDatas[_themeIndex].tags);
-                item.m_txtScore.text = (score + tagScore).ToString();
-            }
+
             RarityIconController.UpdateRarityIcon(item.m_ScoreType, _itemList[index], false);
             UI_PartsListItem.ProxyEnd();
         }

+ 43 - 2
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaFightRecordView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             isfullScreen = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
+            _ui.m_list.itemRenderer = RenderListItem;
         }
         protected override void AddEventListener()
         {
@@ -37,13 +38,13 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_list.numItems = ArenaDataManager.Instance.HistoryDatas.Count;
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
+            if (_ui.m_list.numItems > 0) _ui.m_list.ScrollToView(0);
         }
 
         protected override void RemoveEventListener()
@@ -51,5 +52,45 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            ArenaHistoryData historyData = ArenaDataManager.Instance.HistoryDatas[index];
+            UI_ListFightRecordItem item = UI_ListFightRecordItem.Proxy(obj);
+            item.m_c1.selectedIndex = 0;
+            item.m_ctrResult.selectedIndex = historyData.isWin ? 1 : 0;
+            item.m_ctrDan.selectedIndex = historyData.GradeChangeType;
+            item.m_txtRank.text = historyData.targetData.RankInGrade.ToString();
+            item.m_txtTargetFightScore.text = string.Format("竞技场战力:{0}", ArenaDataManager.Instance.GetAllFightScore(historyData.targetData.Type, historyData.targetData.RoleDressupList, historyData.targetData.RobotDressupList));
+            ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, historyData.targetData.Grade);
+            TimeUtil.FormattingTime(historyData.FightTime, TimeHelper.ServerNow(), out int num, out string str);
+            str = num < 60 ? "刚刚" : str + "前";
+            item.m_txtTime.text = string.Format("{0} {1}", str, historyData.IsChallenge ? "发起挑战" : "接收挑战");
+            item.m_btnShow.data = historyData;
+            if (item.m_btnLook.data == null)
+            {
+                item.m_btnLook.onClick.Add(OnBtnLookClick);
+            }
+            item.m_btnLook.data = historyData;
+            if (item.m_listResult.data == null)
+            {
+                item.m_listResult.itemRenderer = RenderListResultItem;
+            }
+            item.m_listResult.data = historyData;
+            item.m_listResult.numItems = 3;
+            ArenaViewManager.Instance.UpdateAllScore(item.m_comResult.target, historyData.MyScores, historyData.TargetScores);
+            UI_ListFightRecordItem.ProxyEnd();
+        }
+
+        private void RenderListResultItem(int index, GObject obj)
+        {
+            ArenaHistoryData historyData = obj.parent.data as ArenaHistoryData;
+            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, historyData.MyScores, historyData.TargetScores, historyData.targetData, out bool isWin);
+        }
+        private void OnBtnLookClick(EventContext context)
+        {
+
+            ArenaHistoryData historyData = (context.sender as GObject).data as ArenaHistoryData;
+        }
     }
 }

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRankView.cs

@@ -47,7 +47,7 @@ namespace GFGGame
             base.OnShown();
             _rankType = 0;
             _ui.m_listRank.numItems = 100;
-            ArenaDataManager.Instance.rankDatasDic.Clear();
+            ArenaDataManager.Instance.RankDatasDic.Clear();
             ReqRankList(0);
         }
 
@@ -91,9 +91,9 @@ namespace GFGGame
             int itemIndex = _ui.m_listRank.ChildIndexToItemIndex(0);
             if (itemIndex % 20 == 0)
             {
-                if (ArenaDataManager.Instance.rankDatasDic.ContainsKey(_rankType))
+                if (ArenaDataManager.Instance.RankDatasDic.ContainsKey(_rankType))
                 {
-                    if (ArenaDataManager.Instance.rankDatasDic[_rankType].Count < itemIndex)
+                    if (ArenaDataManager.Instance.RankDatasDic[_rankType].Count < itemIndex)
                     {
                         ReqRankList(itemIndex);
                     }
@@ -124,11 +124,11 @@ namespace GFGGame
         private void RenderListItem(int index, GObject obj)
         {
             ArenaTargetData arenaData = null;
-            if (ArenaDataManager.Instance.rankDatasDic.ContainsKey(_rankType))
+            if (ArenaDataManager.Instance.RankDatasDic.ContainsKey(_rankType))
             {
-                if (ArenaDataManager.Instance.rankDatasDic[_rankType].Count > index)
+                if (ArenaDataManager.Instance.RankDatasDic[_rankType].Count > index)
                 {
-                    arenaData = ArenaDataManager.Instance.rankDatasDic[_rankType][index];
+                    arenaData = ArenaDataManager.Instance.RankDatasDic[_rankType][index];
                 }
             }
             if (index < 3)

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultQuickView.cs

@@ -55,7 +55,7 @@ namespace GFGGame
                 RoleInfoManager.Instance.UpdateNpcHead(_ui.m_comTargetHead, _targetData.RoleInfo.headRes);
             }
             _ui.m_list.numItems = ArenaDataManager.Instance.myScore.Count;
-            ArenaViewManager.Instance.UpdateFightScoreResult(_ui.m_comResult.target, ArenaDataManager.Instance.myScore, ArenaDataManager.Instance.targetScore);
+            ArenaViewManager.Instance.UpdateAllScore(_ui.m_comResult.target, ArenaDataManager.Instance.myScore, ArenaDataManager.Instance.targetScore);
         }
 
         protected override void OnHide()
@@ -71,7 +71,7 @@ namespace GFGGame
         }
         private void RenderListItem(int index, GObject obj)
         {
-            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, out bool isWin);
+            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, ArenaDataManager.Instance.myScore, ArenaDataManager.Instance.targetScore, _targetData, out bool isWin);
             if (isWin) _winCount++;
         }
 

+ 10 - 9
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaResultView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     public class ArenaResultView : BaseWindow
     {
         private UI_ArenaResultUI _ui;
-
+        private ArenaDataManager _dataManager;
         private int winCount = 0;
         private bool isFinallyFight = false;//是否最后一场战斗
         public override void Dispose()
@@ -44,7 +44,9 @@ namespace GFGGame
             base.OnShown();
             ViewManager.SetMaskAlpha(0);
             winCount = 0;
-            _ui.m_list.numItems = ArenaDataManager.Instance.CurFightIndex + 1;
+            _dataManager = ArenaDataManager.Instance;
+
+            _ui.m_list.numItems = _dataManager.CurFightIndex + 1;
 
             isFinallyFight = _ui.m_list.numItems == 3;
             _ui.m_ComResult.target.visible = isFinallyFight;
@@ -52,7 +54,7 @@ namespace GFGGame
 
             if (isFinallyFight)
             {
-                ArenaViewManager.Instance.UpdateFightResult(_ui.m_ComResult.target, ArenaDataManager.Instance.myScore, ArenaDataManager.Instance.targetScore);
+                ArenaViewManager.Instance.UpdateAllScoreResult(_ui.m_ComResult.target, _dataManager.myScore, _dataManager.targetScore);
             }
             else
             {
@@ -79,22 +81,21 @@ namespace GFGGame
         }
         private void RenderListItem(int index, GObject obj)
         {
-            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, out bool isWin);
+            ArenaViewManager.Instance.UpdateFightRoundResult(obj, index, _dataManager.myScore, _dataManager.targetScore, _dataManager.Targets[_dataManager.SelectTargetIndex], out bool isWin);
             if (isWin) winCount++;
         }
 
         private void StartNextRound(object param)
         {
-            ArenaDataManager dataManager = ArenaDataManager.Instance;
-            dataManager.CurFightIndex++;
-            ArenaTargetData targetData = dataManager.Targets[dataManager.SelectTargetIndex];
+            _dataManager.CurFightIndex++;
+            ArenaTargetData targetData = _dataManager.Targets[_dataManager.SelectTargetIndex];
             if (targetData.Type == ArenaFightTargetType.PLAYER)
             {
-                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, FightDataManager.Instance.roleData, targetData.RoleDressupList[dataManager.CurFightIndex], null }, null, true);
+                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, FightDataManager.Instance.roleData, targetData.RoleDressupList[_dataManager.CurFightIndex], null }, null, true);
             }
             else
             {
-                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, FightDataManager.Instance.roleData, null, targetData.RobotDressupList[dataManager.CurFightIndex] }, null, true);
+                ViewManager.Show<StoryFightTargetScoreView>(new object[] { targetData.Type, FightDataManager.Instance.roleData, null, targetData.RobotDressupList[_dataManager.CurFightIndex] }, null, true);
             }
         }
         private void FinishFightAsync()

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -62,6 +62,7 @@ namespace GFGGame
             _ui.m_btnQuickFight.onClick.Add(OnBtnQuickFightClick);
             _ui.m_btnReSelect.onClick.Add(OnBtnReSelectClick);
             _ui.m_btnFight.onClick.Add(OnBtnFightClick);
+            _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
 
             _ui.m_listTarget.itemRenderer = RenderListTargetItem;
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
@@ -120,6 +121,10 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ARENA_FIGHT_RESULT, UpdateView);
         }
+        private void OnBtnRuleClick()
+        {
+            ViewManager.Show<RuleView>(300001);
+        }
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(ArenaView).FullName);

+ 49 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs

@@ -0,0 +1,49 @@
+using System.Collections;
+using UnityEngine;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using System;
+
+namespace GFGGame
+{
+    public class RuleView : BaseWindow
+    {
+        private UI_RuleUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_RuleUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int id = (int)this.viewData;
+            string content = TextDescArray.Instance.GetCfg(id).text;
+            _ui.m_comContent.m_txtContent.text = content;
+
+            ViewManager.SetMaskAlpha(0.8f);
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+            ViewManager.SetMaskAlpha(0.6f);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/RuleView.cs.meta

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

+ 116 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs

@@ -0,0 +1,116 @@
+using FairyGUI;
+using UnityEngine;
+using UI.Main;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+
+    public class ArenaFightResultView : BaseView
+    {
+        private UI_ArenaFightResultUI _ui;
+
+        // private StoryLevelCfg _levelCfg;
+        // private StoryFightResultData _resultData;
+        private List<FightRoleData> roleDatas;
+        private List<ArenaTargetData> targetDatas;
+
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            _ui = UI_ArenaFightResultUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            _ui.m_btnClose.onClick.Add(OnClickBtnClose);
+
+            _ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("fightBg");
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int myScore = (int)(this.viewData as object[])[0];
+            int targetScore = (int)(this.viewData as object[])[0];
+            ArenaDataManager.Instance.myScore.Add(myScore);
+            ArenaDataManager.Instance.targetFightScore.Add(targetScore);
+
+            _ui.m_btnClose.enabled = false;
+
+            bool isWin = myScore > targetScore;
+            NTexture nTexture = new NTexture(FightDataManager.Instance.RoleTextuex);
+            _ui.m_comRoleResult.m_c1.selectedIndex = isWin ? 3 : 0;
+            _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
+            _ui.m_comRoleResult.m_comRole.m_imgRole.texture = nTexture;
+            _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 1;
+
+            _ui.m_comResult.m_c1.selectedIndex = isWin ? 3 : 0;
+            _ui.m_comResult.m_txtScore.text = myScore.ToString();
+            _ui.m_comResult.m_grpStar.visible = false;
+
+
+            _ui.m_t0.Play();//播放重置动画
+            _ui.m_comRoleResult.m_t0.Play();//播放重置动画
+            _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
+            {
+                if (isWin)
+                {
+                    _ui.m_comRoleResult.m_t3.Play(ShowResultView);
+                }
+                else
+                {
+                    _ui.m_comRoleResult.m_t0.Play(ShowResultView);
+                }
+            });
+
+        }
+        private void ShowResultView()
+        {
+            ViewManager.Show<ArenaResultView>();
+            _ui.m_btnClose.enabled = true;
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+            MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
+            _ui.m_comResult.target.height = 0;
+            _ui.m_t1.Stop(true, false);
+
+            if (ArenaDataManager.Instance.CurFightIndex == 2)
+            {
+                object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(ArenaView).FullName);
+                ViewManager.Show<ArenaView>(null, goBackDatas, true);
+            }
+        }
+
+        private void OnClickBtnClose(object param)
+        {
+            this.Hide();
+
+        }
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs.meta

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

+ 7 - 0
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -130,6 +130,7 @@ namespace GFGGame
             _ui.m_btnField.target.onClick.Add(OnClickBtnField);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
             _ui.m_btnPoem.target.onClick.Add(OnClickBtnPoem);
+            _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
 
             _btnStore.onClick.Add(OnClickBtnStore);
@@ -477,6 +478,12 @@ namespace GFGGame
 
             ViewManager.Show<PoemView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
+        private void OnClickBtnArena()
+        {
+            // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
+
+            ViewManager.Show<ArenaView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+        }
         private void OnClickBtnTravel()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);

BIN=BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/Arena/Arena_atlas0!a.png


BIN=BIN
GameClient/Assets/ResIn/UI/Arena/Arena_atlas0.png


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


BIN=BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes