Quellcode durchsuchen

删除无用资源

zhaoyang vor 2 Jahren
Ursprung
Commit
ae1c66c1b7
61 geänderte Dateien mit 37 neuen und 416 gelöschten Zeilen
  1. 0 1
      FGUIProject/assets/Card/components/ComFosterBottom.xml
  2. 0 17
      FGUIProject/assets/CommonGame/ApproachOfItemUI.xml
  3. 0 0
      FGUIProject/assets/CommonGame/Font/FANGZHENGYANSONG.TTF
  4. 0 0
      FGUIProject/assets/CommonGame/Font/NANSONG.TTF
  5. 0 0
      FGUIProject/assets/CommonGame/Font/SHUANGYUJUTI.TTF
  6. 0 0
      FGUIProject/assets/CommonGame/Font/SIMKAI.TTF
  7. 0 0
      FGUIProject/assets/CommonGame/Font/STZHONGS.TTF
  8. 0 0
      FGUIProject/assets/CommonGame/Font/YUNJINSONG.TTF
  9. 0 0
      FGUIProject/assets/CommonGame/Font/ZIHUN125.TTF
  10. 1 0
      FGUIProject/assets/CommonGame/GoodsItemTips.xml
  11. 3 3
      FGUIProject/assets/CommonGame/ItemExchangeUI.xml
  12. 0 13
      FGUIProject/assets/CommonGame/components/Button10.xml
  13. 0 28
      FGUIProject/assets/CommonGame/components/Button14.xml
  14. 0 11
      FGUIProject/assets/CommonGame/components/Button15.xml
  15. 1 1
      FGUIProject/assets/CommonGame/components/Button17.xml
  16. 1 1
      FGUIProject/assets/CommonGame/components/Button18.xml
  17. 0 19
      FGUIProject/assets/CommonGame/components/Button5.xml
  18. 1 3
      FGUIProject/assets/CommonGame/components/ComBg.xml
  19. 1 1
      FGUIProject/assets/CommonGame/components/ComTipsBase.xml
  20. 2 4
      FGUIProject/assets/CommonGame/components/ListSourceItem.xml
  21. BIN
      FGUIProject/assets/CommonGame/images/sc_czanniu_1.png
  22. BIN
      FGUIProject/assets/CommonGame/images/sc_czanniu_2.png
  23. BIN
      FGUIProject/assets/CommonGame/images/sc_tc_kuang_2.png
  24. BIN
      FGUIProject/assets/CommonGame/images/sc_xtxtxt.png
  25. BIN
      FGUIProject/assets/CommonGame/images/tctc_anniu_1.png
  26. BIN
      FGUIProject/assets/CommonGame/images/tctc_anniu_2.png
  27. BIN
      FGUIProject/assets/CommonGame/imagesExport/hz_kuangxian.png
  28. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_1.png
  29. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_2.png
  30. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_3.png
  31. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_4.png
  32. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_1.png
  33. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_2.png
  34. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_3.png
  35. BIN
      FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_4.png
  36. BIN
      FGUIProject/assets/CommonGame/imagesExport/zx_jq_djdikbti.png
  37. BIN
      FGUIProject/assets/CommonGame/imagesExport/zx_jq_tbdi_1.png
  38. BIN
      FGUIProject/assets/CommonGame/imagesExport/zx_jq_tbdi_2.png
  39. BIN
      FGUIProject/assets/CommonGame/imagesExport/zx_jq_zi_1.png
  40. BIN
      FGUIProject/assets/CommonGame/imgnew/tc_kuangk.png
  41. BIN
      FGUIProject/assets/CommonGame/imgnew/tc_tydikua_1.png
  42. 10 34
      FGUIProject/assets/CommonGame/package.xml
  43. 3 1
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  44. 3 1
      FGUIProject/assets/DressUp/DressUpUI.xml
  45. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs
  46. 0 77
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ApproachOfItemUI.cs
  47. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ApproachOfItemUI.cs.meta
  48. 0 89
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs
  49. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs.meta
  50. 0 74
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs
  51. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs.meta
  52. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonApproach.cs
  53. 10 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/PoemPhotoSProxy.cs
  54. 0 1
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  55. BIN
      GameClient/Assets/ResIn/UI/Card/Card_fui.bytes
  56. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  57. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  58. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  59. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  60. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  61. BIN
      GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes

+ 0 - 1
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -6,7 +6,6 @@
   <displayList>
     <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
     <component id="n67_lc71" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,621"/>
-    <loader id="n26_842s" name="loaRarity" xy="388,918" size="62,62" group="n30_842s" visible="false" url="ui://eg2y0ldp842s6n" autoSize="true"/>
     <text id="n27_842s" name="txtName" xy="540,902" pivot="0.5,0" anchor="true" size="244,79" group="n30_842s" fontSize="60" color="#fdfbf3" text="许墨萌牙"/>
     <image id="n28_842s" name="n28" src="842s6j" fileName="images/kp_xiantiao.png" xy="731,948" size="341,10" group="n30_842s"/>
     <image id="n29_842s" name="n29" src="842s6j" fileName="images/kp_xiantiao.png" xy="13,948" size="341,10" group="n30_842s" flip="hz"/>

+ 0 - 17
FGUIProject/assets/CommonGame/ApproachOfItemUI.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="678,508">
-  <displayList>
-    <loader id="n0_lwri" name="n0" xy="0,0" size="678,508" url="ui://mk0fwx0xlwri5u" fill="scaleFree"/>
-    <image id="n1_lwri" name="n1" src="lwri5x" fileName="images/hc_btkuang_1.png" xy="81,38"/>
-    <text id="n2_lwri" name="n2" xy="265,41" size="148,49" fontSize="36" color="#f9e4c2" text="获取途径"/>
-    <text id="n3_lwri" name="txtName" xy="253,124" size="167,41" fontSize="30" color="#9c8872" vars="true" text="* {v1=物品名称 }*">
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <list id="n4_lwri" name="listApproach" xy="114,200" size="450,237" overflow="scroll" lineGap="25" defaultItem="ui://eg2y0ldplwri5y" align="center" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <text id="n5_lwri" name="txtNone" xy="81,265" size="516,44" fontSize="32" color="#d2ba94" vars="true" text="当前无获取方式,敬请期待后续活动"/>
-  </displayList>
-</component>

+ 0 - 0
FGUIProject/assets/CommonGame/FANGZHENGYANSONG.TTF → FGUIProject/assets/CommonGame/Font/FANGZHENGYANSONG.TTF


+ 0 - 0
FGUIProject/assets/CommonGame/NANSONG.TTF → FGUIProject/assets/CommonGame/Font/NANSONG.TTF


+ 0 - 0
FGUIProject/assets/CommonGame/SHUANGYUJUTI.TTF → FGUIProject/assets/CommonGame/Font/SHUANGYUJUTI.TTF


+ 0 - 0
FGUIProject/assets/CommonGame/SIMKAI.TTF → FGUIProject/assets/CommonGame/Font/SIMKAI.TTF


+ 0 - 0
FGUIProject/assets/CommonGame/STZHONGS.TTF → FGUIProject/assets/CommonGame/Font/STZHONGS.TTF


+ 0 - 0
FGUIProject/assets/CommonGame/YUNJINSONG.TTF → FGUIProject/assets/CommonGame/Font/YUNJINSONG.TTF


+ 0 - 0
FGUIProject/assets/CommonGame/ZIHUN125.TTF → FGUIProject/assets/CommonGame/Font/ZIHUN125.TTF


+ 1 - 0
FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -9,5 +9,6 @@
     <group id="n17_ohbx" name="grpTips" xy="0,15" size="962,1086" advanced="true" layout="vt" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
+    <image id="n22_r9ri" name="n22" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="108,107" size="707,977"/>
   </displayList>
 </component>

+ 3 - 3
FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -9,7 +9,7 @@
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,130" group="n12_si5z"/>
     <loader id="n8_si5z" name="loaRarity" xy="40,164" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
     <loader id="n9_si5z" name="loaIcon" xy="165,253" pivot="0.5,0.5" anchor="true" size="200,200" group="n12_si5z" aspect="true" autoSize="true"/>
-    <image id="n10_si5z" name="n10" src="si5ztia" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
+    <image id="n10_si5z" name="n10" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="357,167" group="n12_si5z"/>
     <text id="n11_si5z" name="txtDesc" xy="375,189" size="506,166" group="n12_si5z" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <text id="n28_s5s9" name="txtExchangeCount" xy="230,314" pivot="1,0" size="69,49" group="n12_si5z" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#5c4e3f" strokeSize="2" text="x{count=20}"/>
     <group id="n12_si5z" name="n12" xy="40,58" size="866,313"/>
@@ -34,8 +34,8 @@
     </component>
     <group id="n20_si5z" name="n20" xy="124,882" size="714,89"/>
     <text id="n24_si5z" name="txtTips" xy="317,700" pivot="0.5,0" size="328,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具?"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="359,792" pivot="0.5,0" group="n26_si5z"/>
-    <group id="n26_si5z" name="n26" xy="317,700" size="328,138" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true">
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="359,791" pivot="0.5,0" group="n26_si5z"/>
+    <group id="n26_si5z" name="n26" xy="317,700" size="328,137" advanced="true" layout="vt" lineGap="40" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>

+ 0 - 13
FGUIProject/assets/CommonGame/components/Button10.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="380,105" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_ih75" name="n0" src="uo1t9n" fileName="images/tctc_anniu_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_ih75" name="title" xy="0,0" size="380,105" fontSize="46" color="#fff7e4" align="center" vAlign="middle" letterSpacing="2" autoSize="none" strokeColor="#ac904e" singleLine="true" text="确定">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

+ 0 - 28
FGUIProject/assets/CommonGame/components/Button14.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="240,80" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="c1" pages="0,,1," selected="0"/>
-  <displayList>
-    <image id="n0_10not" name="n0" src="10nota5" fileName="images/sc_czanniu_1.png" xy="0,0">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n9_10not" name="n9" src="10nota4" fileName="images/sc_czanniu_2.png" xy="0,0" group="n11_oeuo"/>
-    <text id="n10_10not" name="n10" xy="67,12" size="112,49" group="n11_oeuo" fontSize="36" color="#fdfaed" align="center" strokeColor="#989180" text="已售罄"/>
-    <group id="n11_oeuo" name="n11" xy="0,0" size="240,80" advanced="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </group>
-    <loader id="n1_10not" name="loaIcon" xy="21,10" size="60,60" group="n3_10not" visible="false" url="ui://eg2y0ldpg3nf9q" fill="scaleFree"/>
-    <text id="n2_10not" name="txtIcon" xy="24,15" pivot="0.5,0" size="40,49" group="n3_10not" fontSize="36" color="#fdfaed" strokeColor="#ac904e" strokeSize="2" text="¥"/>
-    <group id="n3_10not" name="grpIcon" xy="21,15" size="46,49" group="n8_10not" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n4_10not" name="txtOriginalPrice" xy="93,15" pivot="0.5,0" size="49,49" group="n6_10not" fontSize="36" color="#fdfaed" align="center" strokeColor="#ac904e" text="10"/>
-    <image id="n5_10not" name="n5" src="dmsi1h" fileName="images/sc_xtxtxt.png" xy="77,38" pivot="0.5,0" group="n6_10not"/>
-    <group id="n6_10not" name="grpOriginalPrice" xy="77,15" size="82,49" group="n8_10not" advanced="true"/>
-    <text id="n7_10not" name="txtPrice" xy="169,15" pivot="0.5,0" size="49,49" group="n8_10not" fontSize="36" color="#fdfaed" align="right" strokeColor="#ac904e" text="10"/>
-    <group id="n8_10not" name="n8" xy="21,15" size="197,49" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-    </group>
-  </displayList>
-  <Button/>
-</component>

+ 0 - 11
FGUIProject/assets/CommonGame/components/Button15.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="233,78" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_10not" name="n0" src="10nota4" fileName="images/sc_czanniu_2.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_10not" name="n1" xy="58,9" size="117,52" fontSize="38" color="#fdfaed" strokeColor="#989180" strokeSize="2" text="已售罄"/>
-  </displayList>
-  <Button/>
-</component>

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

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n2_r9ri" name="icon" xy="0,0" pivot="0.5,0.5" size="342,96" url="ui://eg2y0ldpr9ritjd" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,-2" size="342,96" font="ui://eg2y0ldpwonotja" fontSize="52" color="#fdf7e8" align="center" vAlign="middle" autoSize="none" singleLine="true" text="挑战十次">
+    <text id="n1_r9ri" name="title" xy="0,-2" size="342,96" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#fcf8f2" align="center" vAlign="middle" autoSize="none" singleLine="true" text="挑战十次">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

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

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n2_r9ri" name="icon" xy="-1,0" pivot="0.5,0.5" size="344,97" url="ui://eg2y0ldpr9ritjf" autoSize="true"/>
-    <text id="n1_r9ri" name="title" xy="0,-2" size="344,97" font="ui://eg2y0ldpwonotja" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" singleLine="true" text="挑战十次">
+    <text id="n1_r9ri" name="title" xy="0,-2" size="344,97" font="ui://eg2y0ldpwonotjc" fontSize="52" color="#f8eae5" align="center" vAlign="middle" autoSize="none" strokeColor="#c79a89" strokeSize="2" singleLine="true" text="挑战十次">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

+ 0 - 19
FGUIProject/assets/CommonGame/components/Button5.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="264,79" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="c1" pages="0,,1," selected="0"/>
-  <displayList>
-    <loader id="n4_10not" name="loaIcon" xy="70,9" size="60,60" group="n5_10not" url="ui://eg2y0ldpq08x4" autoSize="true">
-      <gearDisplay controller="c1" pages="1"/>
-    </loader>
-    <text id="n2_dmsi" name="n2" xy="74,7" size="52,64" group="n5_10not" fontSize="48" color="#8b6540" text="¥">
-      <gearDisplay controller="c1" pages="0"/>
-    </text>
-    <group id="n5_10not" name="n5" xy="70,7" size="60,64" group="n6_10not" advanced="true"/>
-    <text id="n1_d4iw" name="title" xy="130,7" size="64,64" group="n6_10not" fontSize="48" color="#8b6540" align="center" vAlign="middle" vars="true" singleLine="true" text="60">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <group id="n6_10not" name="n6" xy="70,7" size="124,64" advanced="true" layout="hz" excludeInvisibles="true"/>
-  </displayList>
-  <Button/>
-</component>

+ 1 - 3
FGUIProject/assets/CommonGame/components/ComBg.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="962,1137" overflow="hidden">
   <displayList>
-    <image id="n20_si5z" name="n20" src="si5ztid" fileName="imgnew/tc_tydikua_1.png" xy="0,2">
-      <relation target="" sidePair="top-top"/>
-    </image>
+    <image id="n23_r9ri" name="n23" src="r9ritjk" fileName="imgnew/tc_tydikua_1.png" xy="0,6"/>
     <image id="n21_si5z" name="n21" src="si5ztie" fileName="imgnew/tc_tydikua_3.png" xy="0,0">
       <relation target="" sidePair="top-top"/>
     </image>

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

@@ -6,7 +6,7 @@
     <image id="n7_si5z" name="n7" src="si5ztig" fileName="imgnew/tc_xiant.png" xy="56,122"/>
     <loader id="n8_si5z" name="loaIcon" xy="187,270" pivot="0.5,0.5" anchor="true" size="200,200" aspect="true" autoSize="true"/>
     <loader id="n6_ohbx" name="loaRarity" xy="249,156" size="44,94" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <image id="n10_si5z" name="n10" src="si5ztia" fileName="imgnew/tc_kuangk.png" xy="357,159"/>
+    <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162"/>
     <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
     <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="300,400" size="50,50" group="n19_si5z"/>

+ 2 - 4
FGUIProject/assets/CommonGame/components/ListSourceItem.xml

@@ -2,10 +2,8 @@
 <component size="866,149">
   <displayList>
     <image id="n25_si5z" name="n25" src="si5zti9" fileName="imgnew/tc_fzfjk.png" xy="0,0"/>
-    <text id="n22_ohbx" name="txtSourceName" xy="212,48" size="230,52" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
-    <component id="n23_ohbx" name="btnGo" src="lwri5y" fileName="components/ButtonApproach.xml" xy="640,39" size="198,70">
-      <Button title="前往"/>
-    </component>
+    <text id="n22_ohbx" name="txtSourceName" xy="212,48" size="230,51" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n23_ohbx" name="btnGo" src="r9ritjj" fileName="components/ButtonApproach.xml" xy="640,39" size="198,70"/>
     <image id="n24_si5z" name="n24" src="si5ztic" fileName="imgnew/tc_txbiao.png" xy="56,15" group="n27_si5z"/>
     <loader id="n26_si5z" name="loaIcon" xy="61,20" size="103,103" group="n27_si5z" aspect="true" url="ui://eg2y0ldpsi5ztii" fill="scale"/>
     <group id="n27_si5z" name="n27" xy="56,15" size="113,113"/>

BIN
FGUIProject/assets/CommonGame/images/sc_czanniu_1.png


BIN
FGUIProject/assets/CommonGame/images/sc_czanniu_2.png


BIN
FGUIProject/assets/CommonGame/images/sc_tc_kuang_2.png


BIN
FGUIProject/assets/CommonGame/images/sc_xtxtxt.png


BIN
FGUIProject/assets/CommonGame/images/tctc_anniu_1.png


BIN
FGUIProject/assets/CommonGame/images/tctc_anniu_2.png


BIN
FGUIProject/assets/CommonGame/imagesExport/hz_kuangxian.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_1.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_2.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_3.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sx_da_4.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_1.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_2.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_3.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_sxing_x_4.png


BIN
FGUIProject/assets/CommonGame/imagesExport/zx_jq_djdikbti.png


BIN
FGUIProject/assets/CommonGame/imagesExport/zx_jq_tbdi_1.png


BIN
FGUIProject/assets/CommonGame/imagesExport/zx_jq_tbdi_2.png


BIN
FGUIProject/assets/CommonGame/imagesExport/zx_jq_zi_1.png


BIN
FGUIProject/assets/CommonGame/imgnew/tc_kuangk.png


BIN
FGUIProject/assets/CommonGame/imgnew/tc_tydikua_1.png


+ 10 - 34
FGUIProject/assets/CommonGame/package.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="eg2y0ldp">
   <resources>
-    <image id="8xpgz" name="zx_jq_tbdi_1.png" path="/imagesExport/" exported="true"/>
-    <image id="8xpg11" name="zx_jq_tbdi_2.png" path="/imagesExport/" exported="true"/>
-    <image id="8xpg12" name="zx_jq_zi_1.png" path="/imagesExport/" exported="true"/>
     <component id="s2cc4g" name="GoodsItemTips.xml" path="/" exported="true"/>
     <image id="s2cc4h" name="zx_tsk_xian.png" path="/imagesExport/" exported="true"/>
     <image id="slb41d" name="hz_fanhui.png" path="/imagesExport/" exported="true"/>
@@ -28,11 +25,9 @@
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
     <component id="pal5w" name="Button4.xml" path="/components/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
-    <component id="d4iw59" name="Button5.xml" path="/components/" exported="true"/>
     <image id="ga165a" name="hz_ssuo.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
     <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
-    <image id="ga16f" name="zx_jq_djdikbti.png" path="/imagesExport/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
     <image id="fka77" name="cj_yihde.png" path="/imagesExport/" exported="true"/>
     <component id="tu965e" name="GetSuitItemUI.xml" path="/" exported="true"/>
@@ -60,17 +55,11 @@
     <image id="9xlo2" name="tzhc_fanhui.png" path="/imagesExport/" exported="true"/>
     <component id="9xlo8" name="ButtonBack1.xml" path="/components/" exported="true"/>
     <image id="lwri5v" name="hc_anniu_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="75,0,150,70"/>
-    <component id="lwri5w" name="ApproachOfItemUI.xml" path="/" exported="true"/>
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
-    <component id="lwri5y" name="ButtonApproach.xml" path="/components/" exported="true"/>
-    <font id="kst18" name="STZHONGS.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="kst18" name="STZHONGS.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
     <component id="qp4l60" name="ButtonHome.xml" path="/components/" exported="true"/>
-    <image id="pq5x62" name="kp_sxing_x_1.png" path="/imagesExport/" exported="true"/>
-    <image id="pq5x63" name="kp_sxing_x_4.png" path="/imagesExport/" exported="true"/>
     <image id="pq5x64" name="kp_xingx.png" path="/imagesExport/" exported="true"/>
-    <image id="pq5x65" name="kp_sxing_x_2.png" path="/imagesExport/" exported="true"/>
-    <image id="pq5x66" name="kp_sxing_x_3.png" path="/imagesExport/" exported="true"/>
     <image id="pq5x5z" name="kp_bejing_di.png" path="/images/" exported="true" scale="9grid" scale9grid="18,18,36,36"/>
     <image id="pq5x67" name="kp_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="pq5x68" name="kp_xingx_an.png" path="/imagesExport/" exported="true"/>
@@ -84,10 +73,6 @@
     <image id="842s6i" name="kp_sx_2.png" path="/imagesExport/" exported="true"/>
     <image id="842s6j" name="kp_sx_3.png" path="/imagesExport/" exported="true"/>
     <image id="842s6k" name="kp_sx_4.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6m" name="kp_sx_da_1.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6n" name="kp_sx_da_2.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6o" name="kp_sx_da_3.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6p" name="kp_sx_da_4.png" path="/imagesExport/" exported="true"/>
     <component id="842s6q" name="Button9.xml" path="/components/" exported="true"/>
     <image id="j539t" name="hc_kuang_3.png" path="/images/" exported="true" scale="9grid" scale9grid="42,12,84,24"/>
     <component id="l2by86" name="ComTips.xml" path="/components/" exported="true"/>
@@ -116,7 +101,7 @@
     <image id="9cth90" name="cj_hd_zik.png" path="/imagesExport/"/>
     <component id="ojlzk" name="ListPropertyItem.xml" path="/components/" exported="true"/>
     <component id="ih7596" name="ComFilterType.xml" path="/components/" exported="true"/>
-    <font id="j48o97" name="ZIHUN125.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="j48o97" name="ZIHUN125.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="j48o98" name="ComItem.xml" path="/components/" exported="true"/>
     <image id="j48o99" name="kp_sjsj_di_3.png" path="/images/" exported="true"/>
     <image id="j48o9a" name="kp_sjsj_di_4.png" path="/images/" exported="true" scale="9grid" scale9grid="68,7,20,14"/>
@@ -137,13 +122,9 @@
     <image id="srnc9i" name="hc_anniu_2.png" path="/images/"/>
     <image id="ehs93" name="yx_btzs.png" path="/images/" exported="true"/>
     <image id="ehs99" name="yx_xiant_1.png" path="/images/" exported="true" scale="9grid" scale9grid="212,2,424,4"/>
-    <image id="k6he1x" name="hz_kuangxian.png" path="/imagesExport/"/>
     <image id="q08xq" name="hz_tzkuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="86,88,172,176"/>
     <image id="q08xp" name="hz_tzkuang.png" path="/imagesExport/" exported="true"/>
     <image id="oq7r9k" name="zx_hogndian.png" path="/imagesExport/" exported="true"/>
-    <component id="uo1t9l" name="Button10.xml" path="/components/"/>
-    <image id="uo1t9n" name="tctc_anniu_1.png" path="/images/"/>
-    <image id="uo1t9o" name="tctc_anniu_2.png" path="/images/"/>
     <component id="ojlzh" name="ComStar.xml" path="/components/" exported="true"/>
     <image id="pzq19p" name="cj_hd_xin.png" path="/imagesExport/" exported="true"/>
     <image id="g3nf9q" name="jinbi_1.png" path="/imgItemIcon/"/>
@@ -161,13 +142,7 @@
     <image id="qdrt17" name="hd_sxicon_3.png" path="/imagesExport/" exported="true"/>
     <image id="qdrt18" name="hd_sxicon_4.png" path="/imagesExport/" exported="true"/>
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
-    <font id="k1kha2" name="SIMKAI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
-    <image id="10nota4" name="sc_czanniu_2.png" path="/images/"/>
-    <image id="10nota5" name="sc_czanniu_1.png" path="/images/"/>
-    <component id="10nota6" name="Button14.xml" path="/components/" exported="true"/>
-    <component id="10nota7" name="Button15.xml" path="/components/" exported="true"/>
-    <image id="dmsi1h" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
-    <image id="iftfta9" name="sc_tc_kuang_2.png" path="/images/"/>
+    <font id="k1kha2" name="SIMKAI.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="dcrotaa" name="Component2.xml" path="/components/"/>
     <image id="ohuntac" name="zhuxian_shuoto.png" path="/imagesExport/" exported="true"/>
     <movieclip id="lj7ea8" name="MovieClip1.jta" path="/effect/"/>
@@ -187,7 +162,7 @@
     <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
     <image id="gd29ti0" name="jingzhongh_bg.jpg" path="/bgimg/"/>
-    <font id="rkrwti1" name="SHUANGYUJUTI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="rkrwti1" name="SHUANGYUJUTI.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="q08xs" name="hz_xzkuang.png" path="/imagesExport/" exported="true"/>
     <component id="lh8v7" name="RewardPreviewUI.xml" path="/" exported="true"/>
     <component id="ohbxti3" name="ComTipsBase.xml" path="/components/"/>
@@ -196,10 +171,8 @@
     <image id="si5zti5" name="wpbb_fh.png" path="/imagesExport/" exported="true"/>
     <image id="si5zti8" name="tc_zszs.png" path="/imgnew/"/>
     <image id="si5zti9" name="tc_fzfjk.png" path="/imgnew/"/>
-    <image id="si5ztia" name="tc_kuangk.png" path="/imgnew/"/>
     <image id="si5ztib" name="tc_qianwang.png" path="/imgnew/"/>
     <image id="si5ztic" name="tc_txbiao.png" path="/imgnew/"/>
-    <image id="si5ztid" name="tc_tydikua_1.png" path="/imgnew/"/>
     <image id="si5ztie" name="tc_tydikua_3.png" path="/imgnew/"/>
     <image id="si5ztif" name="tc_tydikua_52.png" path="/imgnew/"/>
     <image id="si5ztig" name="tc_xiant.png" path="/imgnew/"/>
@@ -232,16 +205,19 @@
     <image id="uyuxtj6" name="xz_wss.png" path="/images/"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
-    <font id="wonotj9" name="YUNJINSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
-    <font id="wonotja" name="NANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="wonotj9" name="YUNJINSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="wonotja" name="NANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
-    <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="r9ritjd" name="anniuty2.png" path="/images/" exported="true"/>
     <image id="r9ritje" name="anniuty_1.png" path="/images/" exported="true"/>
     <image id="r9ritjf" name="anniuty.png" path="/images/" exported="true"/>
     <component id="r9ritjg" name="Button17.xml" path="/components/" exported="true"/>
     <component id="r9ritjh" name="Button18.xml" path="/components/" exported="true"/>
     <image id="r9ritji" name="anniuty3.png" path="/images/" exported="true"/>
+    <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
+    <image id="r9ritjk" name="tc_tydikua_1.png" path="/imgnew/"/>
+    <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 1
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -2,7 +2,9 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_qsvd" name="touchPad" xy="-34,13" size="1080,1920" alpha="0" type="rect"/>
+    <graph id="n0_qsvd" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <component id="n27_bx8o" name="comboBox" src="q08x15" fileName="components/ComboBoxSuit.xml" xy="271,66" group="n38_8lqj" visible="false">
       <ComboBox title="套装一" visibleItemCount="10" direction="down" autoClearItems="true">
         <item title="1"/>

+ 3 - 1
FGUIProject/assets/DressUp/DressUpUI.xml

@@ -2,7 +2,9 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n18_k6he" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect"/>
+    <graph id="n18_k6he" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <loader id="n31_8lqj" name="loaShow" xy="0,0" size="1080,1920" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComFosterBottom.cs

@@ -11,7 +11,6 @@ namespace UI.Card
         public Controller m_ctrlFullLv;
         public Controller m_ctrlTab;
         public GButton m_btnStory;
-        public GLoader m_loaRarity;
         public GTextField m_txtName;
         public GButton m_btnLv;
         public GButton m_btnStar;
@@ -87,7 +86,6 @@ namespace UI.Card
             m_ctrlFullLv = comp.GetController("ctrlFullLv");
             m_ctrlTab = comp.GetController("ctrlTab");
             m_btnStory = (GButton)comp.GetChild("btnStory");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnLv = (GButton)comp.GetChild("btnLv");
             m_btnStar = (GButton)comp.GetChild("btnStar");
@@ -119,7 +117,6 @@ namespace UI.Card
             m_ctrlFullLv = null;
             m_ctrlTab = null;
             m_btnStory = null;
-            m_loaRarity = null;
             m_txtName = null;
             m_btnLv = null;
             m_btnStar = null;

+ 0 - 77
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ApproachOfItemUI.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ApproachOfItemUI
-    {
-        public GComponent target;
-        public GTextField m_txtName;
-        public GList m_listApproach;
-        public GTextField m_txtNone;
-        public const string URL = "ui://eg2y0ldplwri5w";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ApproachOfItemUI";
-        private static UI_ApproachOfItemUI _proxy;
-
-        public static UI_ApproachOfItemUI Create(GObject gObject = null)
-        {
-            var ui = new UI_ApproachOfItemUI();
-            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_ApproachOfItemUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ApproachOfItemUI();
-            }
-            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_txtName = (GTextField)comp.GetChild("txtName");
-            m_listApproach = (GList)comp.GetChild("listApproach");
-            m_txtNone = (GTextField)comp.GetChild("txtNone");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_txtName = null;
-            m_listApproach = null;
-            m_txtNone = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

+ 0 - 89
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button14.cs

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_Button14
-    {
-        public GButton target;
-        public Controller m_c1;
-        public GLoader m_loaIcon;
-        public GTextField m_txtIcon;
-        public GGroup m_grpIcon;
-        public GTextField m_txtOriginalPrice;
-        public GGroup m_grpOriginalPrice;
-        public GTextField m_txtPrice;
-        public const string URL = "ui://eg2y0ldp10nota6";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "Button14";
-        private static UI_Button14 _proxy;
-
-        public static UI_Button14 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button14();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_Button14 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button14();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtIcon = (GTextField)comp.GetChild("txtIcon");
-            m_grpIcon = (GGroup)comp.GetChild("grpIcon");
-            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
-            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
-            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_loaIcon = null;
-            m_txtIcon = null;
-            m_grpIcon = null;
-            m_txtOriginalPrice = null;
-            m_grpOriginalPrice = null;
-            m_txtPrice = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

+ 0 - 74
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button5.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_Button5
-    {
-        public GButton target;
-        public Controller m_c1;
-        public GLoader m_loaIcon;
-        public const string URL = "ui://eg2y0ldpd4iw59";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "Button5";
-        private static UI_Button5 _proxy;
-
-        public static UI_Button5 Create(GObject gObject = null)
-        {
-            var ui = new UI_Button5();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_Button5 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Button5();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_loaIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonApproach.cs

@@ -8,7 +8,7 @@ namespace UI.CommonGame
     {
         public GButton target;
         public GImage m_bg;
-        public const string URL = "ui://eg2y0ldplwri5y";
+        public const string URL = "ui://eg2y0ldpr9ritjj";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ButtonApproach";
         private static UI_ButtonApproach _proxy;

+ 10 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/PoemPhotoSProxy.cs

@@ -127,6 +127,16 @@ namespace GFGGame
             using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(poemPhotoData.PictureTempUrl))
             {
                 yield return request.SendWebRequest();
+                if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError)
+                {
+                    ET.Log.Debug("Error: " + request.error);
+                    // while (!request.isDone)
+                    // {
+                    DownloadFile(poemPhotoData);
+                    yield return null;
+                    // }
+                }
+
                 Texture2D texture = (request.downloadHandler as DownloadHandlerTexture).texture;
                 poemPhotoData.Bytes = texture.EncodeToJPG();
                 poemPhotoData.Ntexture = new NTexture(texture);

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -150,7 +150,6 @@ namespace GFGGame
             _comFosterBottom.m_btnStory.visible = CardDataManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
             _comFosterBottom.m_btnUpLv.grayed = true;
             _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;
-            _comFosterBottom.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sx_da_" + _cardData.itemCfg.rarity);
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
             _valueBarController.OnShown();
 

BIN
GameClient/Assets/ResIn/UI/Card/Card_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_fui.bytes