소스 검색

竞技场

zhaoyang 2 년 전
부모
커밋
fc993fd57f
32개의 변경된 파일100개의 추가작업 그리고 293개의 파일을 삭제
  1. 56 20
      FGUIProject/assets/Arena/components/ComValueInfo.xml
  2. 1 3
      FGUIProject/assets/Arena/package.xml
  3. 0 0
      FGUIProject/assets/CommonGame/imagesExport/jjsy_xx_1.png
  4. 0 0
      FGUIProject/assets/CommonGame/imagesExport/jjsy_xx_2.png
  5. 2 0
      FGUIProject/assets/CommonGame/package.xml
  6. 1 1
      FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml
  7. 0 55
      FGUIProject/assets/DressUp/components/ComValueInfo.xml
  8. 1 1
      FGUIProject/assets/DressUp/package.xml
  9. 16 1
      FGUIProject/assets/Union/UnionChangeNameUI.xml
  10. 1 1
      FGUIProject/assets/Union/UnionChangeNoticeUI.xml
  11. 14 0
      FGUIProject/assets/Union/components/Button8.xml
  12. 1 0
      FGUIProject/assets/Union/package.xml
  13. 2 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ArenaDressUpFightUI.cs
  14. 0 80
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComFightScore.cs
  15. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComFightScore.cs.meta
  16. 0 102
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComValueInfo.cs
  17. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComValueInfo.cs.meta
  18. 5 4
      GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs
  19. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  20. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_atlas0_1.png
  24. BIN
      GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes
  25. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  27. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  29. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  30. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png
  31. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png
  32. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

+ 56 - 20
FGUIProject/assets/Arena/components/ComValueInfo.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="277,254">
-  <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
+  <controller name="c1" alias="标签数量" pages="0,,1,,2,,3,,4,,5,,6,,7,,8,,9,,10,,11,,12,,13,,14," selected="14"/>
   <controller name="c2" pages="0,,1," selected="0"/>
-  <controller name="c3" pages="0,,1," selected="0"/>
+  <controller name="c3" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n91_jcej" name="n91" src="jcej2h" fileName="imagesExport/jjsy_zldi.png" pkg="eg2y0ldp" xy="0,0" size="288,56" group="n92_jcej">
       <relation target="n82_jcej" sidePair="width-width"/>
@@ -21,30 +21,66 @@
     <component id="n87_jcej" name="btnTagRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="185,149" size="29,29" group="n90_jcej">
       <Button icon="ui://eg2y0ldpjcej2k"/>
     </component>
-    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="25,187" group="n90_jcej"/>
+    <component id="n88_jcej" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="15,187" group="n90_jcej"/>
     <text id="n89_jcej" name="txtTagScore" xy="176,187" pivot="0.5,0" size="19,36" group="n90_jcej" fontSize="26" color="#de867e" align="center" text="0"/>
-    <image id="n96_jcej" name="n96" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="33,229" group="n101_jcej"/>
-    <image id="n97_jcej" name="n97" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="49,229" group="n101_jcej"/>
-    <image id="n98_jcej" name="n98" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="65,229" group="n101_jcej"/>
-    <image id="n99_jcej" name="n99" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="81,229" group="n101_jcej"/>
-    <image id="n100_jcej" name="n100" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="97,229" group="n101_jcej"/>
-    <group id="n101_jcej" name="n101" xy="33,229" size="78,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
-    <image id="n102_jcej" name="n102" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="33,229" group="n107_jcej">
-      <gearDisplay controller="c1" pages="1,2,3,4,5"/>
+    <image id="n96_jcej" name="n96" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="16,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n97_jcej" name="n97" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="32,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n98_jcej" name="n98" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="48,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n99_jcej" name="n99" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="64,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n100_jcej" name="n100" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="80,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n110_rv09" name="n110" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="96,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n111_rv09" name="n111" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="112,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n112_rv09" name="n112" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="128,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n113_rv09" name="n113" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="144,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n114_rv09" name="n114" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="160,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n116_rv09" name="n116" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="176,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n117_rv09" name="n117" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="192,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n118_rv09" name="n118" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="208,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <image id="n119_rv09" name="n119" src="jcej2m" fileName="images/jjsy_xx_2.png" xy="224,229" group="n101_jcej" pkg="eg2y0ldp"/>
+    <group id="n101_jcej" name="n101" xy="16,229" size="222,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <image id="n102_jcej" name="n102" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="16,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="1,2,3,4,5,6,7,8,9,10,11,12,13,14"/>
     </image>
-    <image id="n103_jcej" name="n103" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="49,229" group="n107_jcej">
-      <gearDisplay controller="c1" pages="2,3,4,5"/>
+    <image id="n103_jcej" name="n103" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="32,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="2,3,4,5,6,7,8,9,10,11,12,13,14"/>
     </image>
-    <image id="n104_jcej" name="n104" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="65,229" group="n107_jcej">
-      <gearDisplay controller="c1" pages="3,4,5"/>
+    <image id="n104_jcej" name="n104" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="48,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="3,4,5,6,7,8,9,10,11,12,13,14"/>
     </image>
-    <image id="n105_jcej" name="n105" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="81,229" group="n107_jcej">
-      <gearDisplay controller="c1" pages="4,5"/>
+    <image id="n105_jcej" name="n105" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="64,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="4,5,6,7,8,9,10,11,12,13,14"/>
     </image>
-    <image id="n106_jcej" name="n106" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="97,229" group="n107_jcej">
-      <gearDisplay controller="c1" pages="5"/>
+    <image id="n106_jcej" name="n106" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="80,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="5,6,7,8,9,10,11,12,13,14"/>
     </image>
-    <group id="n107_jcej" name="n107" xy="33,229" size="0,0" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
+    <image id="n120_rv09" name="n120" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="96,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="6,7,8,9,10,11,12,13,14"/>
+    </image>
+    <image id="n121_rv09" name="n121" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="112,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="7,8,9,10,11,12,13,14"/>
+    </image>
+    <image id="n122_rv09" name="n122" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="128,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="8,9,10,11,12,13,14"/>
+    </image>
+    <image id="n123_rv09" name="n123" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="144,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="9,10,11,12,13,14"/>
+    </image>
+    <image id="n124_rv09" name="n124" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="160,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="10,11,12,13,14"/>
+    </image>
+    <image id="n125_rv09" name="n125" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="176,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="11,12,13,14"/>
+    </image>
+    <image id="n126_rv09" name="n126" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="192,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="12,13,14"/>
+    </image>
+    <image id="n127_rv09" name="n127" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="208,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="13,14"/>
+    </image>
+    <image id="n128_rv09" name="n128" src="jcej2l" fileName="images/jjsy_xx_1.png" xy="224,229" group="n107_jcej" pkg="eg2y0ldp">
+      <gearDisplay controller="c1" pages="14"/>
+    </image>
+    <group id="n107_jcej" name="n107" xy="16,229" size="222,14" group="n90_jcej" advanced="true" layout="hz" colGap="2" excludeInvisibles="true"/>
     <group id="n90_jcej" name="n90" xy="4,139" size="244,115" advanced="true">
       <gearDisplay controller="c3" pages="1"/>
     </group>

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

@@ -79,8 +79,6 @@
     <image id="jcej2f" name="jjsjs_di.png" path="/images/"/>
     <image id="jcej2g" name="jjsjs_mbmb.png" path="/images/"/>
     <image id="jcej2j" name="jjsy_btbtdi.png" path="/images/"/>
-    <image id="jcej2l" name="jjsy_xx_1.png" path="/images/"/>
-    <image id="jcej2m" name="jjsy_xx_2.png" path="/images/"/>
     <image id="jcej2n" name="jjsy_xzanniu_1.png" path="/images/"/>
     <image id="jcej2o" name="jjsy_xzanniu_2.png" path="/images/"/>
     <image id="jcej2p" name="jjsy_xzanniu_3.png" path="/images/"/>
@@ -121,7 +119,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/"/>
-    <component id="jcej3t" name="ComValueInfo.xml" path="/components/"/>
+    <component id="jcej3t" name="ComValueInfo.xml" path="/components/" exported="true"/>
     <component id="jcej3u" name="ComCardMask.xml" path="/components/"/>
     <image id="jcej3v" name="dwjl_dedtp.png" path="/images/"/>
     <image id="jcej3w" name="dwjl_btbt.png" path="/images/"/>

+ 0 - 0
FGUIProject/assets/Arena/images/jjsy_xx_1.png → FGUIProject/assets/CommonGame/imagesExport/jjsy_xx_1.png


+ 0 - 0
FGUIProject/assets/Arena/images/jjsy_xx_2.png → FGUIProject/assets/CommonGame/imagesExport/jjsy_xx_2.png


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

@@ -243,6 +243,8 @@
     <image id="jcej2h" name="jjsy_zldi.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="68,14,136,28"/>
     <image id="u2u3tkq" name="testBig.png" path="/imgItemIcon/" exported="true"/>
     <component id="u2u3tkr" name="ListTagItem.xml" path="/components/" exported="true"/>
+    <image id="jcej2l" name="jjsy_xx_1.png" path="/imagesExport/" exported="true"/>
+    <image id="jcej2m" name="jjsy_xx_2.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -16,7 +16,7 @@
     <graph id="n61_u2u3" name="grhCloseComFightScore" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n59_jcej" name="comValueInfo" src="v461f0" fileName="components/ComValueInfo.xml" xy="18,236" group="n38_8lqj"/>
+    <component id="n59_jcej" name="comValueInfo" src="jcej3t" fileName="components/ComValueInfo.xml" pkg="4lc5fhlb" xy="18,236" group="n38_8lqj"/>
     <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="components/comListType.xml" xy="850,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>

+ 0 - 55
FGUIProject/assets/DressUp/components/ComValueInfo.xml

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

+ 1 - 1
FGUIProject/assets/DressUp/package.xml

@@ -191,12 +191,12 @@
     <image id="ygapex" name="hz_fenleitu_13.png" path="/imagesExport/" exported="true" atlas="1"/>
     <image id="f2bfey" name="dz_cdxzcdxz.png" path="/images/"/>
     <component id="psphez" name="ArenaDressUpFightUI.xml" path="/" exported="true"/>
-    <component id="v461f0" name="ComValueInfo.xml" path="/components/"/>
     <image id="v461f1" name="jjsy_xx_2.png" path="/images/"/>
     <image id="v461f2" name="jjsy_xx_1.png" path="/images/"/>
     <component id="v461f3" name="ComFightScore.xml" path="/components/"/>
     <image id="v461f4" name="jjcdi_jjcdi.png" path="/images/"/>
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
+    <image id="rv09f6" name="jjsy_xx_1(1).png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 16 - 1
FGUIProject/assets/Union/UnionChangeNameUI.xml

@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="800,600"/>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="改徽章"/>
+    <remark page="1" value="改名字"/>
+  </controller>
+  <displayList>
+    <component id="n0_rv09" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="421,1320" size="237,46"/>
+    <list id="n1_rv09" name="listIcon" xy="183,749" size="756,487" layout="flow_hz" overflow="scroll" defaultItem="ui://tw70qm9drv091h"/>
+    <component id="n2_rv09" name="n2" src="rv091j" fileName="components/Button8.xml" xy="325,495">
+      <Button title="改徽章" controller="c1" page="0"/>
+    </component>
+    <component id="n3_rv09" name="n3" src="rv091j" fileName="components/Button8.xml" xy="520,495">
+      <Button title="改名字" controller="c1" page="1"/>
+    </component>
+  </displayList>
+</component>

+ 1 - 1
FGUIProject/assets/Union/UnionChangeNoticeUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <text id="n0_rv09" name="txtContent" xy="285,414" size="509,462" fontSize="30" vars="true" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]输入联盟名字,支持模糊搜索[/color]" maxLength="50"/>
-    <text id="n2_rv09" name="txtCount" xy="715,902" size="80,42" fontSize="30" autoSize="none" text="已输入{value=0}/{maxValue=0}"/>
+    <text id="n2_rv09" name="txtCount" xy="715,902" size="80,42" fontSize="30" vars="true" autoSize="none" text="已输入{value=0}/{maxValue=0}"/>
     <component id="n1_rv09" name="btnSave" src="rv091i" fileName="components/Button7.xml" xy="442,975"/>
   </displayList>
 </component>

+ 14 - 0
FGUIProject/assets/Union/components/Button8.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="196,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="196,60" aspect="true" url="ui://mk0fwx0xr9ritje" fill="scale">
+      <gearDisplay controller="button" pages="1"/>
+    </loader>
+    <text id="n3_u2u3" name="title" xy="71,7" pivot="0.5,0" size="53,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=0}">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <relation target="n4_u2u3" sidePair="width-width,height-height"/>
+</component>

+ 1 - 0
FGUIProject/assets/Union/package.xml

@@ -37,6 +37,7 @@
     <component id="rv091g" name="Button6.xml" path="/components/"/>
     <component id="rv091h" name="ListIconItem.xml" path="/components/"/>
     <component id="rv091i" name="Button7.xml" path="/components/"/>
+    <component id="rv091j" name="Button8.xml" path="/components/"/>
   </resources>
   <publish name=""/>
 </packageDescription>

+ 2 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ArenaDressUpFightUI.cs

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

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DressUp
-{
-    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://mbo439wbv461f3";
-        public const string PACKAGE_NAME = "DressUp";
-        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;
-        }
-    }
-}

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

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

+ 0 - 102
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComValueInfo.cs

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

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComValueInfo.cs.meta

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

+ 5 - 4
GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -86,7 +86,8 @@ namespace GFGGame
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
-            _ui.m_comValueInfo.m_btnFightScoreRule.onClick.Add(OnBtnFightScoreRule);
+            // _ui.m_comValueInfo.m_btnFightScoreRule.onClick.Add(OnBtnFightScoreRule);
+            _ui.m_comValueInfo.GetChild("btnFightScoreRule").onClick.Add(OnBtnFightScoreRule);
             _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
 
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
@@ -158,7 +159,7 @@ namespace GFGGame
 
             Timers.inst.Remove(CheckGuide);
             _ui.m_grhCloseComFightScore.visible = false;
-            _ui.m_comValueInfo.m_c2.selectedIndex = 0;
+            _ui.m_comValueInfo.GetController("c2").selectedIndex = 0;
 
         }
         protected override void RemoveEventListener()
@@ -211,7 +212,7 @@ namespace GFGGame
         }
         private void OnCloseComFightScore()
         {
-            _ui.m_comValueInfo.m_c2.selectedIndex = 0;
+            _ui.m_comValueInfo.GetController("c2").selectedIndex = 0;
             _ui.m_grhCloseComFightScore.visible = false;
         }
         private void OnClickBtnHome()
@@ -228,7 +229,7 @@ namespace GFGGame
             _roleData.itemList = MyDressUpHelper.dressUpObj.itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
-            ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo.target, _dataManager.SelectThemeIndex, _dataManager.DressupList);
+            ArenaViewManager.Instance.UpdateValue(_ui.m_comValueInfo, _dataManager.SelectThemeIndex, _dataManager.DressupList);
 
         }
 

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


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


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


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


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes