zhaoyang 2 жил өмнө
parent
commit
a91d49dd45
33 өөрчлөгдсөн 65 нэмэгдсэн , 55 устгасан
  1. 4 4
      FGUIProject/assets/Arena/ArenaDanUpUI.xml
  2. 26 26
      FGUIProject/assets/Arena/ArenaUI.xml
  3. 1 1
      FGUIProject/assets/Arena/components/ComMyDanReward.xml
  4. 3 7
      FGUIProject/assets/Arena/components/ListDanRewardItem.xml
  5. 1 1
      FGUIProject/assets/Arena/components/ListFightRecordItem.xml
  6. 1 1
      FGUIProject/assets/Arena/components/ListRankItem.xml
  7. 2 2
      FGUIProject/assets/Arena/components/ListRankItem3.xml
  8. 2 2
      FGUIProject/assets/Arena/components/ListRankItem4.xml
  9. BIN
      FGUIProject/assets/Arena/images/tb_yz_1.png
  10. BIN
      FGUIProject/assets/Arena/images/tb_yz_10.png
  11. BIN
      FGUIProject/assets/Arena/images/tb_yz_11.png
  12. BIN
      FGUIProject/assets/Arena/images/tb_yz_12.png
  13. BIN
      FGUIProject/assets/Arena/images/tb_yz_13.png
  14. BIN
      FGUIProject/assets/Arena/images/tb_yz_14.png
  15. BIN
      FGUIProject/assets/Arena/images/tb_yz_2.png
  16. BIN
      FGUIProject/assets/Arena/images/tb_yz_3.png
  17. BIN
      FGUIProject/assets/Arena/images/tb_yz_4.png
  18. BIN
      FGUIProject/assets/Arena/images/tb_yz_5.png
  19. BIN
      FGUIProject/assets/Arena/images/tb_yz_6.png
  20. BIN
      FGUIProject/assets/Arena/images/tb_yz_7.png
  21. BIN
      FGUIProject/assets/Arena/images/tb_yz_8.png
  22. BIN
      FGUIProject/assets/Arena/images/tb_yz_9.png
  23. 14 0
      FGUIProject/assets/Arena/package.xml
  24. 1 1
      GameClient/Assets/Game/HotUpdate/Data/ArenaViewManager.cs
  25. 3 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ListDanRewardItem.cs
  26. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  27. 3 1
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs
  28. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs
  29. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0!a.png
  30. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0.png
  31. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1!a.png
  32. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1.png
  33. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes

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

@@ -8,11 +8,11 @@
     <image id="n6_jcej" name="n6" src="jcej1p" fileName="images/pmts_ditu.png" xy="0,43"/>
     <image id="n4_jcej" name="n4" src="jcej40" fileName="images/dwjj_btbt.png" xy="67,-22"/>
     <text id="n8_jcej" name="txtlastDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n9_jcej" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <loader id="n7_jcej" name="loaLastDanIcon" xy="440,214" size="200,200" group="n9_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale" color="#666666"/>
-    <group id="n9_jcej" name="n9" xy="440,214" size="200,249" advanced="true"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="440,214" size="200,200" group="n10_jcej" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n7_jcej" name="loaLastDanIcon" xy="415,161" pivot="0.5,0.5" size="250,250" group="n9_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale" color="#666666"/>
+    <group id="n9_jcej" name="n9" xy="415,161" size="250,302" advanced="true"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="415,161" size="250,250" group="n10_jcej" aspect="true" url="ui://4lc5fhlbe0505p" fill="scale"/>
     <text id="n3_psph" name="txtDanTitle" xy="474,419" pivot="0.5,0" size="132,44" group="n10_jcej" fontSize="32" color="#fef7f6" text="段位名字"/>
-    <group id="n10_jcej" name="n10" xy="440,214" size="200,249" advanced="true"/>
+    <group id="n10_jcej" name="n10" xy="415,161" size="250,302" advanced="true"/>
     <image id="n5_jcej" name="n5" src="jcej3z" fileName="images/pmts_ffbtbt.png" xy="422,540" group="n11_jcej"/>
     <list id="n1_psph" name="listFirstDanReward" xy="140,600" pivot="0.5,0" size="799,221" group="n11_jcej" layout="row" colGap="50" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>

+ 26 - 26
FGUIProject/assets/Arena/ArenaUI.xml

@@ -43,50 +43,50 @@
       <gearDisplay controller="c2" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="23,1454" group="n46_jcej"/>
-    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="168,1510" group="n46_jcej"/>
-    <loader id="n2_psph" name="loaDanIcon" xy="29,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
-    <text id="n7_psph" name="txtName" xy="174,1472" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
-    <text id="n9_psph" name="txtDanTitle" xy="174,1518" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
-    <text id="n8_psph" name="txtRank" xy="174,1550" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
-    <text id="n10_psph" name="txtFightScore" xy="174,1581" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
-    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="146,1584" size="29,29" group="n46_jcej">
+    <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="33,1454" group="n46_jcej"/>
+    <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="178,1510" group="n46_jcej"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="25,1448" size="172,172" group="n46_jcej" aspect="true" url="ui://4lc5fhlbe0505d" fill="scale"/>
+    <text id="n7_psph" name="txtName" xy="184,1472" size="122,41" group="n46_jcej" fontSize="30" color="#9a7c56" text="自己名字"/>
+    <text id="n9_psph" name="txtDanTitle" xy="184,1518" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位名称"/>
+    <text id="n8_psph" name="txtRank" xy="184,1550" size="90,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="段位排名"/>
+    <text id="n10_psph" name="txtFightScore" xy="184,1581" size="132,31" group="n46_jcej" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
+    <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="156,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="components/ComFightScore.xml" xy="125,1401" group="n46_jcej">
+    <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="135,1401" group="n46_jcej">
       <gearDisplay controller="c2" pages="1"/>
     </component>
-    <group id="n46_jcej" name="grpMyInfo" xy="23,1401" size="467,227" group="n20_psph"/>
-    <text id="n14_psph" name="txtMoneyCount" xy="780,1574" pivot="0.5,0" size="266,34" group="n20_psph" 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="746,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
-    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1616" group="n51_jcej">
+    <group id="n46_jcej" name="grpMyInfo" xy="25,1401" size="475,227" group="n20_psph"/>
+    <text id="n14_psph" name="txtMoneyCount" xy="790,1574" pivot="0.5,0" size="266,34" group="n20_psph" 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="756,1613" pivot="0.5,0" group="n51_jcej" scale="-1,1"/>
+    <component id="n17_psph" name="btnAddFightCount" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1616" group="n51_jcej">
       <Button icon="ui://4lc5fhlbjcej3a"/>
     </component>
-    <text id="n15_psph" name="txtFightCount" xy="805,1617" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数:10/10"/>
-    <group id="n51_jcej" name="n51" xy="743,1613" size="356,48" group="n20_psph"/>
-    <text id="n16_psph" name="txtRefreshCount" xy="805,1683" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新:10/10"/>
-    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="743,1682" group="n49_jcej"/>
-    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="841,1680" size="156,46" group="n49_jcej"/>
-    <group id="n49_jcej" name="n49" xy="743,1680" size="285,46" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="408,1565" group="n20_psph">
+    <text id="n15_psph" name="txtFightCount" xy="815,1617" size="223,41" group="n51_jcej" fontSize="30" color="#fbf6ed" align="center" text="剩余次数:10/10"/>
+    <group id="n51_jcej" name="n51" xy="753,1613" size="356,48" group="n20_psph"/>
+    <text id="n16_psph" name="txtRefreshCount" xy="815,1683" size="223,41" group="n49_jcej" fontSize="30" color="#fbf6ed" align="center" text="免费刷新:10/10"/>
+    <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1682" group="n49_jcej"/>
+    <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1680" size="156,46" group="n49_jcej"/>
+    <group id="n49_jcej" name="n49" xy="753,1680" size="285,46" group="n20_psph"/>
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1565" group="n20_psph">
       <Button title="快速挑战"/>
     </component>
-    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="68,1667" size="209,61" group="n20_psph" aspect="true">
+    <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,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="349,1635" group="n20_psph" aspect="true">
+    <component id="n11_psph" name="btnDress" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="359,1635" group="n20_psph" aspect="true">
       <Button title="我的搭配"/>
     </component>
-    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="67,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n4_psph" name="btnReward" src="psph1g" fileName="components/BtnRecord.xml" xy="77,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="425,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n5_psph" name="btnRank" src="psph1g" fileName="components/BtnRecord.xml" xy="435,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="783,1760" size="209,61" group="n20_psph" aspect="true">
+    <component id="n3_psph" name="btnRecord" src="psph1g" fileName="components/BtnRecord.xml" xy="793,1760" size="209,61" group="n20_psph" aspect="true">
       <Button title="比拼记录"/>
     </component>
-    <group id="n20_psph" name="grpBottom" xy="23,1401" size="1076,420" advanced="true">
+    <group id="n20_psph" name="grpBottom" xy="25,1401" size="1084,420" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
   </displayList>

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

@@ -9,7 +9,7 @@
       <item/>
       <item/>
     </list>
-    <loader id="n2_psph" name="loaDanIcon" xy="183,87" pivot="0.5,0.5" anchor="true" size="149,153" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n2_psph" name="loaDanIcon" xy="169,87" pivot="0.5,0.5" anchor="true" size="176,176" aspect="true" url="ui://4lc5fhlbe0505k" fill="scale"/>
     <loader id="n3_psph" name="loaSelf" xy="319,0" size="48,98" url="ui://4lc5fhlbjcej3o" autoSize="true"/>
     <text id="n5_u10a" name="n5" xy="524,63" size="220,49" fontSize="36" color="#c09c6d" text="尚未参与挑战">
       <gearDisplay controller="c1" pages="0"/>

+ 3 - 7
FGUIProject/assets/Arena/components/ListDanRewardItem.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="924,173" overflow="hidden">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n9_jcej" name="n9" src="jcej3v" fileName="images/dwjl_dedtp.png" xy="0,0"/>
-    <loader id="n10_jcej" name="loaRank" xy="164,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="62,63" pivot="0.5,0" size="201,54" fontSize="40" color="#a98860" align="center" text="灵感重构大">
-      <gearDisplay controller="c1" pages="0,4"/>
-    </text>
+    <loader id="n10_jcej" name="loaDanIcon" xy="26,11" pivot="0.5,0.5" size="150,150" group="n13_e050" aspect="true" url="ui://4lc5fhlbe0505j" align="center" vAlign="middle" fill="scale"/>
+    <text id="n12_e050" name="txtRank" xy="213,59" pivot="0.5,0" size="44,54" group="n13_e050" fontSize="40" color="#a98860" align="center" text="太"/>
+    <group id="n13_e050" name="n13" xy="26,11" size="231,150" advanced="true"/>
     <list id="n7_psph" name="listReward" xy="224,-24" size="772,222" layout="row" colGap="-20" defaultItem="ui://eg2y0ldpj48o98" align="center" vAlign="middle">
       <item/>
       <item/>

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

@@ -19,7 +19,7 @@
     <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://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n3_psph" name="loaDanIcon" xy="218,56" pivot="0.5,0.5" size="130,130" group="n11_psph" aspect="true" url="ui://4lc5fhlbe0505k" fill="scale"/>
     <text id="n14_jcej" name="n14" xy="423,71" pivot="0.5,0" anchor="true" size="71,46" group="n11_psph" 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="116,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" fontSize="36" color="#c09c6d" autoClearText="true" text="对手名字"/>

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

@@ -10,7 +10,7 @@
       <gearIcon controller="c1" pages="2,3" values="ui://4lc5fhlbjcej3l|ui://4lc5fhlbjcej3k" default="ui://4lc5fhlbjcej3m"/>
     </loader>
     <component id="n10_jcej" name="btnLook" src="jcej2w" fileName="components/BtnLook.xml" xy="173,64" scale="0.9,0.9"/>
-    <loader id="n12_jcej" name="loaDanIcon" xy="94,358" size="69,65" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n12_jcej" name="loaDanIcon" xy="92,354" pivot="0.5,0.5" size="73,73" aspect="true" url="ui://4lc5fhlbe0505n" fill="scale"/>
     <text id="n15_jcej" name="txtName" xy="68,242" pivot="0.5,0" size="122,41" fontSize="30" color="#927550" align="center" autoClearText="true" text="玩家名称"/>
     <text id="n13_jcej" name="txtDanRank" xy="30,323" size="136,34" fontSize="24" color="#927550" align="center" autoClearText="true" text="段位排名:1"/>
     <text id="n14_jcej" name="txtFightScore" xy="30,288" size="196,34" fontSize="24" color="#927550" letterSpacing="-2" text="竞技场战力:111111"/>

+ 2 - 2
FGUIProject/assets/Arena/components/ListRankItem3.xml

@@ -11,10 +11,10 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="330,71" group="n29_jcej"/>
     <text id="n15_psph" name="txtFightScore" xy="331,78" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="飞花令战力:--"/>
     <group id="n29_jcej" name="n29" xy="330,20" size="236,97" group="n18_psph"/>
-    <loader id="n16_psph" name="loaDanIcon" xy="600,20" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n16_psph" name="loaDanIcon" xy="573,11" pivot="0.5,0.5" size="130,130" group="n18_psph" aspect="true" url="ui://4lc5fhlbe0505l" fill="scale"/>
     <text id="n26_jcej" name="n26" xy="729,24" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
     <text id="n17_psph" name="txtDanRank" xy="760,58" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="729,24" size="122,90" group="n18_psph"/>
-    <group id="n18_psph" name="n18" xy="19,-18" size="832,230"/>
+    <group id="n18_psph" name="n18" xy="28,-18" size="823,230"/>
   </displayList>
 </component>

+ 2 - 2
FGUIProject/assets/Arena/components/ListRankItem4.xml

@@ -11,10 +11,10 @@
     <image id="n25_jcej" name="n25" src="jcej3n" fileName="images/jzsjzs_xxxtxt.png" xy="344,84" group="n29_jcej"/>
     <text id="n15_psph" name="txtFightScore" xy="345,91" size="209,39" group="n29_jcej" fontSize="28" color="#9b7c56" align="center" autoClearText="true" text="竞技场战力:--"/>
     <group id="n29_jcej" name="n29" xy="344,33" size="236,97" group="n18_psph"/>
-    <loader id="n16_psph" name="loaDanIcon" xy="617,33" size="99,98" group="n18_psph" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n16_psph" name="loaDanIcon" xy="588,18" pivot="0.5,0.5" size="130,130" group="n18_psph" aspect="true" url="ui://4lc5fhlbe0505l" fill="scale"/>
     <text id="n26_jcej" name="n26" xy="742,37" size="122,41" group="n27_jcej" fontSize="30" color="#c09c6d" text="段位排名"/>
     <text id="n17_psph" name="txtDanRank" xy="773,71" pivot="0.5,0" size="59,56" group="n27_jcej" fontSize="42" color="#c09c6d" align="center" letterSpacing="-2" bold="true" text="--"/>
     <group id="n27_jcej" name="n27" xy="742,37" size="122,90" group="n18_psph"/>
-    <group id="n18_psph" name="n18" xy="30,-6" size="834,230"/>
+    <group id="n18_psph" name="n18" xy="39,-6" size="825,230"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/Arena/images/tb_yz_1.png


BIN
FGUIProject/assets/Arena/images/tb_yz_10.png


BIN
FGUIProject/assets/Arena/images/tb_yz_11.png


BIN
FGUIProject/assets/Arena/images/tb_yz_12.png


BIN
FGUIProject/assets/Arena/images/tb_yz_13.png


BIN
FGUIProject/assets/Arena/images/tb_yz_14.png


BIN
FGUIProject/assets/Arena/images/tb_yz_2.png


BIN
FGUIProject/assets/Arena/images/tb_yz_3.png


BIN
FGUIProject/assets/Arena/images/tb_yz_4.png


BIN
FGUIProject/assets/Arena/images/tb_yz_5.png


BIN
FGUIProject/assets/Arena/images/tb_yz_6.png


BIN
FGUIProject/assets/Arena/images/tb_yz_7.png


BIN
FGUIProject/assets/Arena/images/tb_yz_8.png


BIN
FGUIProject/assets/Arena/images/tb_yz_9.png


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

@@ -172,6 +172,20 @@
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
     <component id="t6j15b" name="ComTheme.xml" path="/components/"/>
+    <image id="e0505c" name="tb_yz_14.png" path="/images/" exported="true"/>
+    <image id="e0505d" name="tb_yz_1.png" path="/images/" exported="true"/>
+    <image id="e0505e" name="tb_yz_2.png" path="/images/" exported="true"/>
+    <image id="e0505f" name="tb_yz_3.png" path="/images/" exported="true"/>
+    <image id="e0505g" name="tb_yz_4.png" path="/images/" exported="true"/>
+    <image id="e0505h" name="tb_yz_5.png" path="/images/" exported="true"/>
+    <image id="e0505i" name="tb_yz_6.png" path="/images/" exported="true"/>
+    <image id="e0505j" name="tb_yz_7.png" path="/images/" exported="true"/>
+    <image id="e0505k" name="tb_yz_8.png" path="/images/" exported="true"/>
+    <image id="e0505l" name="tb_yz_9.png" path="/images/" exported="true"/>
+    <image id="e0505m" name="tb_yz_10.png" path="/images/" exported="true"/>
+    <image id="e0505n" name="tb_yz_11.png" path="/images/" exported="true"/>
+    <image id="e0505o" name="tb_yz_12.png" path="/images/" exported="true"/>
+    <image id="e0505p" name="tb_yz_13.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/ArenaViewManager.cs

@@ -21,7 +21,7 @@ namespace GFGGame
         /// <param name="danLv"></param>
         public void UpdateDanIcon(GLoader loader, int danLv)
         {
-
+            loader.url = string.Format("ui://Arena/tb_yz_{0}", danLv);
         }
         /// <summary>
         /// 更新每一轮战斗结果

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

@@ -7,8 +7,7 @@ namespace UI.Arena
     public partial class UI_ListDanRewardItem
     {
         public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaRank;
+        public GLoader m_loaDanIcon;
         public GTextField m_txtRank;
         public GList m_listReward;
         public GImage m_imgGot;
@@ -59,16 +58,14 @@ namespace UI.Arena
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_loaRank = (GLoader)comp.GetChild("loaRank");
+            m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
             m_listReward = (GList)comp.GetChild("listReward");
             m_imgGot = (GImage)comp.GetChild("imgGot");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_loaRank = null;
+            m_loaDanIcon = null;
             m_txtRank = null;
             m_listReward = null;
             m_imgGot = null;

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

@@ -18,9 +18,9 @@ namespace UI.Main
         public UI_BtnModle m_btnFirstRecharge;
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
+        public GGroup m_grpLeagueAnswer;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
-        public GGroup m_grpLeagueAnswer;
         public GGroup m_grpList;
         public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
@@ -99,9 +99,9 @@ namespace UI.Main
             m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
+            m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
@@ -146,10 +146,10 @@ namespace UI.Main
             m_btnGiftBag1 = null;
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
+            m_grpLeagueAnswer = null;
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
-            m_grpLeagueAnswer = null;
             m_grpList = null;
             m_comListAd.Dispose();
             m_comListAd = null;

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

@@ -42,7 +42,7 @@ namespace GFGGame
             _ui.m_listUpDanReward.numItems = ArenaRankCfgArray.Instance.dataArray.Length - 1;
 
 
-            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comMyDanReward.m_loaDanIcon, 2);
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_comMyDanReward.m_loaDanIcon, ArenaDataManager.Instance.Grade);
             UpdateMyReward();
         }
 
@@ -100,6 +100,7 @@ namespace GFGGame
             }
             item.m_listReward.data = cfg.bonusWeeklyArr;
             item.m_listReward.numItems = cfg.bonusWeeklyArr.Length;
+            ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, cfg.grade);
             UI_ListDanRewardItem.ProxyEnd();
         }
         private void RenderListUpDanReward(int index, GObject obj)
@@ -107,6 +108,7 @@ namespace GFGGame
             ArenaRankCfg cfg = ArenaRankCfgArray.Instance.dataArray[ArenaRankCfgArray.Instance.dataArray.Length - 1 - index];
 
             UI_ListDanRewardItem item = UI_ListDanRewardItem.Proxy(obj);
+            ArenaViewManager.Instance.UpdateDanIcon(item.m_loaDanIcon, cfg.id);
             item.m_imgGot.visible = ArenaDataManager.Instance.HighestGrade >= cfg.id;
             item.m_txtRank.text = cfg.gradeName;
             if (item.m_listReward.data == null)

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

@@ -325,6 +325,7 @@ namespace GFGGame
             long fightScore = _dataManager.GetAllFightScore(_dataManager.DressupList);
             _ui.m_txtFightScore.text = string.Format("飞花令战力:{0}", fightScore);
             _ui.m_btnQuickFight.selected = _dataManager.QuickFight;
+            ArenaViewManager.Instance.UpdateDanIcon(_ui.m_loaDanIcon, _dataManager.Grade);
             ArenaViewManager.Instance.UpdateFightScore(_ui.m_comFightScore.target, _dataManager.DressupList);
         }
 

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


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


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


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


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