Sfoglia il codice sorgente

Merge remote-tracking branch 'remotes/origin/zhaoyang' into guodong

guodong 3 anni fa
parent
commit
00c51294f2
100 ha cambiato i file con 1638 aggiunte e 33 eliminazioni
  1. 6 0
      FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml
  2. 20 0
      FGUIProject/assets/ClothingFoster/SuitFosterUI.xml
  3. 32 0
      FGUIProject/assets/ClothingFoster/SuitListUI.xml
  4. 11 0
      FGUIProject/assets/ClothingFoster/SuitPropertyShowUI.xml
  5. 12 0
      FGUIProject/assets/ClothingFoster/SuitRewardUI.xml
  6. 37 0
      FGUIProject/assets/ClothingFoster/SuitUI.xml
  7. 19 0
      FGUIProject/assets/ClothingFoster/components/Button2.xml
  8. 14 0
      FGUIProject/assets/ClothingFoster/components/Button3.xml
  9. 8 0
      FGUIProject/assets/ClothingFoster/components/Button4.xml
  10. 13 0
      FGUIProject/assets/ClothingFoster/components/Button5.xml
  11. 8 0
      FGUIProject/assets/ClothingFoster/components/Button6.xml
  12. 11 0
      FGUIProject/assets/ClothingFoster/components/Button7.xml
  13. 11 0
      FGUIProject/assets/ClothingFoster/components/ComboBox1.xml
  14. 9 0
      FGUIProject/assets/ClothingFoster/components/ComboBox1_item.xml
  15. 16 0
      FGUIProject/assets/ClothingFoster/components/ComboBox1_popup.xml
  16. 15 0
      FGUIProject/assets/ClothingFoster/components/ListFosterItem.xml
  17. 8 0
      FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml
  18. 7 0
      FGUIProject/assets/ClothingFoster/components/ListPropertyAddItem.xml
  19. 6 0
      FGUIProject/assets/ClothingFoster/components/ListPropertyShowItem.xml
  20. 7 0
      FGUIProject/assets/ClothingFoster/components/ListRewardItem.xml
  21. 14 0
      FGUIProject/assets/ClothingFoster/components/ListSuitItem.xml
  22. 11 0
      FGUIProject/assets/ClothingFoster/images/ProgressBar1.xml
  23. BIN
      FGUIProject/assets/ClothingFoster/images/images/sc_bjtu.png
  24. BIN
      FGUIProject/assets/ClothingFoster/images/images/tujian_tzk_1.png
  25. BIN
      FGUIProject/assets/ClothingFoster/images/images/tujian_tztub_1.png
  26. BIN
      FGUIProject/assets/ClothingFoster/images/images/tujian_tzxian.png
  27. BIN
      FGUIProject/assets/ClothingFoster/images/images/tujian_zkda.png
  28. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_anniu_1(1).png
  29. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_anniu_1.png
  30. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_diban_1.png
  31. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_diban_2.png
  32. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_jdt_1.png
  33. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_jdt_2.png
  34. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_suoan.png
  35. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_xzdg.png
  36. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_xzdg_1.png
  37. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_zkanniu(1).png
  38. BIN
      FGUIProject/assets/ClothingFoster/images/tujian_zkanniu.png
  39. BIN
      FGUIProject/assets/ClothingFoster/images/zhuxian_shuoto.png
  40. 45 0
      FGUIProject/assets/ClothingFoster/package.xml
  41. 15 0
      FGUIProject/assets/CommonGame/components/ComConsumeCurrency.xml
  42. 3 2
      FGUIProject/assets/CommonGame/package.xml
  43. 3 11
      FGUIProject/assets/DressUp/DressUpFightUI.xml
  44. 14 0
      FGUIProject/assets/DressUp/componentsDialog/Button2.xml
  45. 15 0
      FGUIProject/assets/DressUp/componentsDialog/ButtonAutoPlay.xml
  46. BIN
      FGUIProject/assets/DressUp/images/hz_zdzddg_1.png
  47. BIN
      FGUIProject/assets/DressUp/images/hz_zdzddg_2.png
  48. BIN
      FGUIProject/assets/DressUp/images/hz_zdzddg_3.png
  49. BIN
      FGUIProject/assets/DressUp/imagesDialog/dhjm_gn_2.png
  50. BIN
      FGUIProject/assets/DressUp/imagesDialog/dhjm_gn_5.png
  51. 7 0
      FGUIProject/assets/DressUp/package.xml
  52. 1 6
      FGUIProject/assets/Main/GMPanelUI.xml
  53. 4 0
      FGUIProject/assets/Main/StoryFightSingleScoreUI.xml
  54. 4 0
      FGUIProject/assets/Main/StoryFightTargetScoreUI.xml
  55. 25 0
      FGUIProject/assets/Main/components/ComBtn.xml
  56. 6 6
      FGUIProject/assets/Main/components/comClickCircle.xml
  57. 14 0
      FGUIProject/assets/Main/componentsDialog/ButtonSpeedUp1.xml
  58. BIN
      FGUIProject/assets/Main/images/zd_jsjs_1.png
  59. BIN
      FGUIProject/assets/Main/images/zd_jsjs_2.png
  60. BIN
      FGUIProject/assets/Main/images/zjm_gongg.png
  61. BIN
      FGUIProject/assets/Main/images/zjm_haoy.png
  62. BIN
      FGUIProject/assets/Main/images/zjm_jshu.png
  63. BIN
      FGUIProject/assets/Main/images/zjm_pengyq.png
  64. BIN
      FGUIProject/assets/Main/images/zjm_renwu.png
  65. BIN
      FGUIProject/assets/Main/images/zjm_shangc.png
  66. BIN
      FGUIProject/assets/Main/images/zjm_tiangong.png
  67. BIN
      FGUIProject/assets/Main/images/zjm_tujian.png
  68. BIN
      FGUIProject/assets/Main/images/zjm_yjian.png
  69. 4 0
      FGUIProject/assets/Main/package.xml
  70. 7 1
      GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs
  71. 6 0
      GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs
  72. 4 4
      GameClient/Assets/Game/HotUpdate/Data/FunctionOpenDataManager.cs
  73. 84 2
      GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs
  74. 60 0
      GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs
  75. 11 0
      GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs.meta
  76. 44 0
      GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs
  77. 11 0
      GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs.meta
  78. 12 1
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs
  79. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster.meta
  80. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_Button7.cs
  81. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_Button7.cs.meta
  82. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_item.cs
  83. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_item.cs.meta
  84. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_popup.cs
  85. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_popup.cs.meta
  86. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListFosterItem.cs
  87. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListFosterItem.cs.meta
  88. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListMaterialsItem.cs
  89. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListMaterialsItem.cs.meta
  90. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyAddItem.cs
  91. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyAddItem.cs.meta
  92. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyShowItem.cs
  93. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyShowItem.cs.meta
  94. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs
  95. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs.meta
  96. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListSuitItem.cs
  97. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListSuitItem.cs.meta
  98. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs
  99. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs.meta
  100. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterUI.cs

+ 6 - 0
FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <list id="n0_py5g" name="listPrppertyLast" xy="508,570" size="200,300" overflow="scroll"/>
+  </displayList>
+</component>

+ 20 - 0
FGUIProject/assets/ClothingFoster/SuitFosterUI.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <text id="n0_py5g" name="txtTitle" xy="479,589" size="122,41" fontSize="30" text="服装养护"/>
+    <text id="n1_py5g" name="txtDiscribe" xy="455,689" size="359,41" fontSize="30" text="浆洗浆洗浆洗浆洗浆洗浆洗"/>
+    <list id="n4_py5g" name="listPropertyAdd" xy="197,843" size="721,169" layout="row" colGap="20" defaultItem="ui://uicwtr5bpy5gt" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n8_py5g" name="listMaterials" xy="178,1047" size="821,289" layout="row" defaultItem="ui://uicwtr5bpy5gu" align="center">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n9_py5g" name="btnFoster" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="356,1450"/>
+    <component id="n10_j5a5" name="ComConsume" src="ojlz61" fileName="components/ComConsumeCurrency.xml" pkg="eg2y0ldp" xy="416,1378"/>
+  </displayList>
+</component>

+ 32 - 0
FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240"/>
+    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,73"/>
+    <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,43"/>
+    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207">
+      <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
+        <item title="1"/>
+        <item title="2"/>
+        <item title="3"/>
+      </ComboBox>
+    </component>
+    <component id="n4_py5g" name="btnNotGet" src="py5g1" fileName="components/Button2.xml" xy="124,207">
+      <Button checked="true" title="未获得"/>
+    </component>
+    <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="372,207">
+      <Button title="已获得"/>
+    </component>
+    <list id="n9_py5g" name="listSuit" xy="168,332" size="722,1544" layout="flow_hz" overflow="scroll" lineGap="48" colGap="55" defaultItem="ui://uicwtr5bpy5g8" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 11 - 0
FGUIProject/assets/ClothingFoster/SuitPropertyShowUI.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <list id="n1_py5g" name="listPropertyShow" xy="234,608" size="621,568" lineGap="20" defaultItem="ui://uicwtr5bpy5gv">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 12 - 0
FGUIProject/assets/ClothingFoster/SuitRewardUI.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <list id="n2_py5g" name="listReward" xy="232,461" size="616,998" overflow="scroll" defaultItem="ui://uicwtr5bpy5gw">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 37 - 0
FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n0_pjip" name="bg" xy="0,-240" size="1080,2400" url="ui://eg2y0ldpj539i"/>
+    <graph id="n1_pjip" name="holder" xy="389,623" pivot="0.5,0.5" size="394,268" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <image id="n4_pjip" name="n4" src="py5gi" fileName="images/images/tujian_tzk_1.png" xy="373,125">
+      <relation target="n3_pjip" sidePair="center-center,middle-middle"/>
+    </image>
+    <text id="n3_pjip" name="txtName" xy="360,154" size="387,52" fontSize="38" color="#a17472" align="center" autoSize="none" text="分类名称"/>
+    <loader id="n18_py5g" name="loaRarity" xy="963,295" size="50,50"/>
+    <loader id="n7_pjip" name="btnRight" xy="969,912" size="72,95" url="ui://uicwtr5bpy5gk">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n8_pjip" name="btnLeft" xy="49,912" pivot="0.5,0.5" size="72,95" scale="-1,1" url="ui://uicwtr5bpy5gk">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <component id="n12_py5g" name="btnFoster" src="py5gm" fileName="components/Button5.xml" xy="382,1178">
+      <Button checked="true" controller="c1" page="0"/>
+    </component>
+    <component id="n13_py5g" name="btnRenew" src="py5gm" fileName="components/Button5.xml" xy="565,1182">
+      <Button controller="c1" page="1"/>
+    </component>
+    <component id="n17_py5g" name="btnReward" src="py5go" fileName="components/Button7.xml" xy="898,1221"/>
+    <component id="n16_py5g" name="btnPropertyShow" src="py5gn" fileName="components/Button6.xml" xy="990,1442"/>
+    <list id="n11_py5g" name="listProperty" xy="145,1424" size="819,68" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n15_py5g" name="listFoster" xy="211,1681" size="716,42" layout="row" overflow="scroll" defaultItem="ui://uicwtr5bj5a512" align="center"/>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/ClothingFoster/components/Button2.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,56" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_pjip" name="n0" src="py5g2" fileName="images/tujian_anniu_1.png" xy="0,0" size="210,56">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_pjip" name="title" xy="0,0" size="141,56" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="abc">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <image id="n2_pjip" name="n2" src="py5g3" fileName="images/tujian_xzdg.png" xy="146,9">
+      <gearDisplay controller="button" pages="1,3"/>
+    </image>
+    <image id="n3_pjip" name="n3" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="146,9">
+      <gearDisplay controller="button" pages="0,2"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

+ 14 - 0
FGUIProject/assets/ClothingFoster/components/Button3.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,56" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n2_pjip" name="n2" src="py5g2" fileName="images/tujian_anniu_1.png" xy="0,0" size="210,56">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n3_pjip" name="title" xy="0,0" size="160,56" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <image id="n4_pjip" name="n4" src="py5g6" fileName="images/tujian_zkanniu.png" xy="157,2"/>
+  </displayList>
+  <Button/>
+</component>

+ 8 - 0
FGUIProject/assets/ClothingFoster/components/Button4.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,40" extention="Button">
+  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="2"/>
+  <displayList>
+    <component id="n3_py5g" name="n3" src="j5a512" fileName="components/ListFosterItem.xml" xy="29,-1"/>
+  </displayList>
+  <Button/>
+</component>

+ 13 - 0
FGUIProject/assets/ClothingFoster/components/Button5.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,40" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="29,-1">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="29,-1">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 8 - 0
FGUIProject/assets/ClothingFoster/components/Button6.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="40,40" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n3_py5g" name="n3" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="-1,-1"/>
+  </displayList>
+  <Button/>
+</component>

+ 11 - 0
FGUIProject/assets/ClothingFoster/components/Button7.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="40,40" extention="Button">
+  <controller name="get" pages="4,不可领取,5,可领取" selected="0"/>
+  <displayList>
+    <image id="n3_py5g" name="n3" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="-1,-1"/>
+    <image id="n4_py5g" name="n4" src="py5g3" fileName="images/tujian_xzdg.png" xy="-1,-1">
+      <gearDisplay controller="get" pages="5"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

+ 11 - 0
FGUIProject/assets/ClothingFoster/components/ComboBox1.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="342,70" extention="ComboBox">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <displayList>
+    <image id="n0_pjip" name="n0" src="j5a5y" fileName="images/tujian_anniu_1.png" xy="66,0" size="210,56" group="n3_rc07"/>
+    <text id="n1_pjip" name="title" xy="73,0" size="152,56" group="n3_rc07" fontSize="30" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="默认分类"/>
+    <image id="n2_pjip" name="n2" src="j5a5z" fileName="images/tujian_zkanniu.png" xy="221,2" group="n3_rc07"/>
+    <group id="n3_rc07" name="n3" xy="66,0" size="210,56"/>
+  </displayList>
+  <ComboBox dropdown="ui://uicwtr5bj5a510"/>
+</component>

+ 9 - 0
FGUIProject/assets/ClothingFoster/components/ComboBox1_item.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="280,58" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n2_pjip" name="title" xy="68,0" pivot="0.5,0" size="144,39" fontSize="28" color="#fddeb6" align="center" vAlign="middle" singleLine="true" text="自定义套装"/>
+    <image id="n3_pjip" name="imgLine" src="q08xp" fileName="imagesExport/hz_tzkuang.png" pkg="eg2y0ldp" xy="0,56"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 16 - 0
FGUIProject/assets/ClothingFoster/components/ComboBox1_popup.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="342,348">
+  <displayList>
+    <image id="n0_pjip" name="n0" src="q08xq" fileName="imagesExport/hz_tzkuang_1.png" pkg="eg2y0ldp" xy="0,0" size="342,348">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <list id="n1_pjip" name="list" xy="29,24" size="284,297" overflow="scroll" scrollBarFlags="128" defaultItem="ui://uicwtr5bj5a511" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+  <relation target="n1_pjip" sidePair="height-height"/>
+</component>

+ 15 - 0
FGUIProject/assets/ClothingFoster/components/ListFosterItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="42,42">
+  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="2"/>
+  <displayList>
+    <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="0,0">
+      <gearDisplay controller="finish" pages="3"/>
+    </image>
+    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
+      <gearDisplay controller="finish" pages="2"/>
+    </image>
+    <image id="n5_py5g" name="n5" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
+      <gearDisplay controller="finish" pages="1"/>
+    </image>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,122">
+  <displayList>
+    <loader id="n5_py5g" name="loaIcon" xy="7,0" size="80,80" aspect="true" fill="scale"/>
+    <text id="n7_py5g" name="txtNeed" xy="0,77" size="10,42" fontSize="30" ubb="true" text=""/>
+    <text id="n6_py5g" name="txtHas" xy="60,80" size="10,42" fontSize="30" ubb="true" text=""/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/ClothingFoster/components/ListPropertyAddItem.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="170,105">
+  <displayList>
+    <component id="n2_py5g" name="comProperty" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="0,0"/>
+    <text id="n3_py5g" name="txtAdd" xy="56,63" size="58,42" fontSize="30" text="+20"/>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/ClothingFoster/components/ListPropertyShowItem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="200,50">
+  <displayList>
+    <text id="n0_py5g" name="txtShow" xy="0,0" size="156,42" fontSize="30" text="衣服:20%"/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/ClothingFoster/components/ListRewardItem.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="456,241">
+  <displayList>
+    <text id="n0_py5g" name="txtDiscribe" xy="0,72" size="63,41" fontSize="30" text="完成"/>
+    <component id="n1_py5g" name="ComReward" src="j48o98" fileName="components/ComItem.xml" pkg="eg2y0ldp" xy="264,0" size="192,243"/>
+  </displayList>
+</component>

+ 14 - 0
FGUIProject/assets/ClothingFoster/components/ListSuitItem.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="316,505">
+  <displayList>
+    <loader id="n11_pjip" name="bg" xy="0,0" size="316,505" url="ui://uicwtr5bpy5g9"/>
+    <loader id="n12_pjip" name="loaderPic" xy="12,11" size="292,396" touchable="false" fill="scaleFree"/>
+    <text id="n13_pjip" name="txtName" xy="39,420" size="238,41" fontSize="30" color="#986a41" align="center" autoSize="height" autoClearText="true" text="示例"/>
+    <component id="n15_pjip" name="progBar" src="py5ga" fileName="images/ProgressBar1.xml" xy="8,483" touchable="false">
+      <ProgressBar value="10" max="10"/>
+    </component>
+    <loader id="n16_pjip" name="rarity" xy="265,10" size="44,94" touchable="false" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
+    <image id="n17_pjip" name="imgLockBg" src="py5gd" fileName="images/tujian_suoan.png" xy="0,1"/>
+    <image id="n18_pjip" name="imgLock" src="py5ge" fileName="images/zhuxian_shuoto.png" xy="122,232"/>
+  </displayList>
+</component>

+ 11 - 0
FGUIProject/assets/ClothingFoster/images/ProgressBar1.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="232,6" extention="ProgressBar">
+  <displayList>
+    <image id="n0_pjip" name="n0" src="py5gb" fileName="images/tujian_jdt_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_pjip" name="bar" src="py5gc" fileName="images/tujian_jdt_2.png" xy="0,0"/>
+    <text id="n2_pjip" name="title" xy="245,-11" size="66,29" fontSize="20" color="#b3805e" vAlign="middle" autoClearText="true" text="00/10"/>
+  </displayList>
+  <ProgressBar titleType="valueAndmax"/>
+</component>

BIN
FGUIProject/assets/ClothingFoster/images/images/sc_bjtu.png


BIN
FGUIProject/assets/ClothingFoster/images/images/tujian_tzk_1.png


BIN
FGUIProject/assets/ClothingFoster/images/images/tujian_tztub_1.png


BIN
FGUIProject/assets/ClothingFoster/images/images/tujian_tzxian.png


BIN
FGUIProject/assets/ClothingFoster/images/images/tujian_zkda.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_anniu_1(1).png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_anniu_1.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_diban_1.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_diban_2.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_jdt_1.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_jdt_2.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_suoan.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_xzdg.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_xzdg_1.png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_zkanniu(1).png


BIN
FGUIProject/assets/ClothingFoster/images/tujian_zkanniu.png


BIN
FGUIProject/assets/ClothingFoster/images/zhuxian_shuoto.png


+ 45 - 0
FGUIProject/assets/ClothingFoster/package.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="uicwtr5b">
+  <resources>
+    <component id="py5g0" name="SuitListUI.xml" path="/" exported="true"/>
+    <component id="py5g1" name="Button2.xml" path="/components/"/>
+    <image id="py5g2" name="tujian_anniu_1.png" path="/images/" scale="9grid" scale9grid="53,15,106,30"/>
+    <image id="py5g3" name="tujian_xzdg.png" path="/images/"/>
+    <image id="py5g4" name="tujian_xzdg_1.png" path="/images/"/>
+    <component id="py5g5" name="Button3.xml" path="/components/"/>
+    <image id="py5g6" name="tujian_zkanniu.png" path="/images/"/>
+    <image id="py5g7" name="tujian_diban_2.png" path="/images/"/>
+    <component id="py5g8" name="ListSuitItem.xml" path="/components/"/>
+    <image id="py5g9" name="tujian_diban_1.png" path="/images/"/>
+    <component id="py5ga" name="ProgressBar1.xml" path="/images/"/>
+    <image id="py5gb" name="tujian_jdt_1.png" path="/images/"/>
+    <image id="py5gc" name="tujian_jdt_2.png" path="/images/" scale="tile"/>
+    <image id="py5gd" name="tujian_suoan.png" path="/images/"/>
+    <image id="py5ge" name="zhuxian_shuoto.png" path="/images/"/>
+    <component id="py5gf" name="SuitUI.xml" path="/" exported="true"/>
+    <image id="py5gg" name="sc_bjtu.png" path="/images/images/" atlas="alone_npot"/>
+    <image id="py5gh" name="tujian_tzxian.png" path="/images/images/"/>
+    <image id="py5gi" name="tujian_tzk_1.png" path="/images/images/"/>
+    <image id="py5gj" name="tujian_tztub_1.png" path="/images/images/"/>
+    <image id="py5gk" name="tujian_zkda.png" path="/images/images/"/>
+    <component id="py5gl" name="Button4.xml" path="/components/"/>
+    <component id="py5gm" name="Button5.xml" path="/components/"/>
+    <component id="py5gn" name="Button6.xml" path="/components/"/>
+    <component id="py5go" name="Button7.xml" path="/components/"/>
+    <component id="py5gp" name="SuitFosterUI.xml" path="/" exported="true"/>
+    <component id="py5gq" name="SuitPropertyShowUI.xml" path="/" exported="true"/>
+    <component id="py5gr" name="SuitRewardUI.xml" path="/" exported="true"/>
+    <component id="py5gs" name="SuitFosterFinishUI.xml" path="/" exported="true"/>
+    <component id="py5gt" name="ListPropertyAddItem.xml" path="/components/"/>
+    <component id="py5gu" name="ListMaterialsItem.xml" path="/components/"/>
+    <component id="py5gv" name="ListPropertyShowItem.xml" path="/components/"/>
+    <component id="py5gw" name="ListRewardItem.xml" path="/components/"/>
+    <component id="j5a5x" name="ComboBox1.xml" path="/components/" exported="true"/>
+    <image id="j5a5y" name="tujian_anniu_1(1).png" path="/images/" scale="9grid" scale9grid="53,15,106,30"/>
+    <image id="j5a5z" name="tujian_zkanniu(1).png" path="/images/"/>
+    <component id="j5a510" name="ComboBox1_popup.xml" path="/components/"/>
+    <component id="j5a511" name="ComboBox1_item.xml" path="/components/"/>
+    <component id="j5a512" name="ListFosterItem.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true"/>
+</packageDescription>

+ 15 - 0
FGUIProject/assets/CommonGame/components/ComConsumeCurrency.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,42">
+  <displayList>
+    <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" xy="60,3"/>
+    <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="70,-9" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n6_j5a5" name="txtNeed" xy="130,0" size="73,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" text="9993"/>
+    <text id="n7_j5a5" name="txtHas" xy="219,0" size="39,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" ubb="true" text="99">
+      <relation target="n8_j5a5" sidePair="left-right"/>
+    </text>
+    <text id="n8_j5a5" name="n8" xy="201,0" size="21,39" fontSize="28" color="#ffffff" text="/">
+      <relation target="n6_j5a5" sidePair="left-right"/>
+    </text>
+  </displayList>
+</component>

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

@@ -118,7 +118,7 @@
     <image id="m9wm8r" name="gxhd_btbt.png" path="/images/"/>
     <image id="m9wm8s" name="gxhd_gd_dik.png" path="/images/"/>
     <image id="m9wm8t" name="gxhd_bjbj.png" path="/bgimg/" exported="true" atlas="alone_npot"/>
-    <component id="m9wm8u" name="ListRewardItem.xml" path="/components/"/>
+    <component id="m9wm8u" name="ListRewardItem.xml" path="/components/" exported="true"/>
     <image id="m9wm8v" name="ts_canghaiym.png" path="/images/"/>
     <image id="m9wm8w" name="ts_jiyuet.png" path="/images/"/>
     <image id="ighs8x" name="hd_suanc.png" path="/imagesExport/" exported="true"/>
@@ -148,7 +148,7 @@
     <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"/>
-    <component id="c21g9j" name="ListRewardItem1.xml" path="/components/"/>
+    <component id="c21g9j" name="ListRewardItem1.xml" path="/components/" exported="true"/>
     <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"/>
@@ -167,6 +167,7 @@
     <image id="tt1q9x" name="xjs_ditu_2.png" path="/images/"/>
     <image id="tt1q9y" name="xjs_ditu_3.png" path="/images/"/>
     <image id="tc539z" name="zx_jqgka_stjl.png" path="/images/"/>
+    <component id="ojlz61" name="ComConsumeCurrency.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -80,19 +80,11 @@
     <text id="n26_bx8o" name="txtRecommendCount" xy="293,1843" size="327,44" group="n38_8lqj" fontSize="32" color="#fff7d4" align="center" vars="true" strokeColor="#c89c5d" text="今日剩余次数:{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
+    <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="172,1623" group="n38_8lqj">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </component>
     <group id="n38_8lqj" name="graContent" xy="0,0" size="1303,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
-    <loader id="n35_8lqj" name="loaShow" xy="0,0" size="1080,1920" visible="false">
-      <relation target="" sidePair="width-width,height-height"/>
-    </loader>
-    <component id="n36_8lqj" name="btnShow" src="f4xv3o" fileName="components/Button6.xml" xy="27,1015" visible="false">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button icon="ui://mbo439wbrc0744"/>
-    </component>
-    <component id="n37_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="27,1015">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <Button icon="ui://mbo439wbrc0743"/>
-    </component>
   </displayList>
 </component>

+ 14 - 0
FGUIProject/assets/DressUp/componentsDialog/Button2.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="270,48" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n5_jj0m" name="n5" src="jj0m5k" fileName="images/hz_zdzddg_3.png" xy="24,0"/>
+    <image id="n3_jj0m" name="n3" src="jj0m5l" fileName="images/hz_zdzddg_1.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n4_jj0m" name="n4" src="jj0m5j" fileName="images/hz_zdzddg_2.png" xy="-1,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

+ 15 - 0
FGUIProject/assets/DressUp/componentsDialog/ButtonAutoPlay.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="118,140" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nmnb" name="n0" src="njn25h" fileName="imagesDialog/dhjm_gn_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_nmnb" name="n1" src="njn25i" fileName="imagesDialog/dhjm_gn_5.png" xy="0,0" size="126,153">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

BIN
FGUIProject/assets/DressUp/images/hz_zdzddg_1.png


BIN
FGUIProject/assets/DressUp/images/hz_zdzddg_2.png


BIN
FGUIProject/assets/DressUp/images/hz_zdzddg_3.png


BIN
FGUIProject/assets/DressUp/imagesDialog/dhjm_gn_2.png


BIN
FGUIProject/assets/DressUp/imagesDialog/dhjm_gn_5.png


+ 7 - 0
FGUIProject/assets/DressUp/package.xml

@@ -169,6 +169,13 @@
     <image id="nz0t5d" name="pz_pzanniu.png" path="/images/"/>
     <image id="9ico5e" name="pz_sxsx_2.png" path="/images/"/>
     <image id="9ico5f" name="pz_sxsx_1.png" path="/images/"/>
+    <component id="njn25g" name="ButtonAutoPlay.xml" path="/componentsDialog/"/>
+    <image id="njn25h" name="dhjm_gn_2.png" path="/imagesDialog/"/>
+    <image id="njn25i" name="dhjm_gn_5.png" path="/imagesDialog/"/>
+    <component id="jj0mdk" name="Button2.xml" path="/componentsDialog/"/>
+    <image id="jj0m5j" name="hz_zdzddg_2.png" path="/images/"/>
+    <image id="jj0m5k" name="hz_zdzddg_3.png" path="/images/"/>
+    <image id="jj0m5l" name="hz_zdzddg_1.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 6
FGUIProject/assets/Main/GMPanelUI.xml

@@ -2,12 +2,7 @@
 <component size="600,600">
   <displayList>
     <loader id="n0_d4iw" name="bg" xy="0,0" size="600,600" url="ui://mk0fwx0xq08x4" fill="scaleFree"/>
-    <component id="n11_c5sc" name="btnGetAllDressUpItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="45,51" size="332,46">
-      <Button title="获取所有换装部件" titleFontSize="30"/>
-    </component>
-    <component id="n13_c5sc" name="btnGetAllCardItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="45,108" size="330,46">
-      <Button title="获取所有卡牌" titleFontSize="30"/>
-    </component>
+    <component id="n11_c5sc" name="ComBtn" src="lqp0dm" fileName="components/ComBtn.xml" xy="45,51"/>
     <richtext id="n3_c5sc" name="n3" xy="70,456" size="132,36" group="n14_g926" fontSize="26" color="#999999" text="添加物品:"/>
     <graph id="n5_c5sc" name="n5" xy="249,451" size="219,42" group="n14_g926" type="rect" lineSize="0" fillColor="#ffd0cfdb">
       <relation target="n4_c5sc" sidePair="width-width,height-height,center-center,middle-middle"/>

+ 4 - 0
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -19,5 +19,9 @@
       <relation target="" sidePair="bottom-bottom"/>
       <ProgressBar max="100"/>
     </component>
+    <component id="n36_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="915,1627">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button title="x1"/>
+    </component>
   </displayList>
 </component>

+ 4 - 0
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -57,5 +57,9 @@
       <property target="icon" propertyId="1" value="ui://mfvz4q8kv3k9cp"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv3k9cf"/>
     </component>
+    <component id="n38_jj0m" name="btnSpeedUp" src="jj0mdl" fileName="componentsDialog/ButtonSpeedUp1.xml" xy="943,1546">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button title="x1"/>
+    </component>
   </displayList>
 </component>

+ 25 - 0
FGUIProject/assets/Main/components/ComBtn.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="500,400" overflow="scroll">
+  <displayList>
+    <component id="n11_c5sc" name="btnGetAllDressUpItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,0" size="332,46">
+      <Button title="获取所有换装部件" titleFontSize="30"/>
+    </component>
+    <component id="n13_c5sc" name="btnGetAllCardItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,66" size="330,46">
+      <Button title="获取所有卡牌" titleFontSize="30"/>
+    </component>
+    <component id="n14_lqp0" name="btnSetLv" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,132" size="330,46">
+      <Button title="设置玩家等级" titleFontSize="30"/>
+    </component>
+    <text id="n17_lqp0" name="txtRoleLv" xy="332,134" size="119,42" fontSize="30" autoSize="none" text="99" input="true" prompt="[color=#B6A688]99[/color]" maxLength="3"/>
+    <component id="n15_lqp0" name="btnSetChapter" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,198" size="330,46">
+      <Button title="设置玩家章节" titleFontSize="30"/>
+    </component>
+    <text id="n18_lqp0" name="txtChapter" xy="333,199" size="44,42" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
+    <text id="n19_lqp0" name="txtChapterLv" xy="411,199" size="42,42" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
+    <component id="n20_lqp0" name="btnAll" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,267" size="330,46">
+      <Button title="666账号" titleFontSize="30"/>
+    </component>
+    <text id="n21_lqp0" name="n21" xy="377,199" size="34,42" fontSize="30" text="章"/>
+    <text id="n24_lqp0" name="n24" xy="454,200" size="34,42" fontSize="30" text="关"/>
+  </displayList>
+</component>

+ 6 - 6
FGUIProject/assets/Main/components/comClickCircle.xml

@@ -7,17 +7,17 @@
     <component id="n7_vuz5" name="ComScoreResult" src="vuz5bi" fileName="components/ComScoreResult.xml" xy="-7,-8" visible="false"/>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n11_vuz5" label="big" tween="true" startValue="1,1" endValue="0.5,0.5" duration="12" label2="small" ease="Linear"/>
+    <item time="0" type="Scale" target="n11_vuz5" label="big" tween="true" startValue="1,1" endValue="0.5,0.5" duration="15" label2="small" ease="Linear"/>
     <item time="0" type="Visible" target="n12_vuz5" value="true"/>
-    <item time="12" type="Scale" target="n11_vuz5" label="small" tween="true" startValue="0.5,0.5" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="24" type="Visible" target="n12_vuz5" value="false"/>
+    <item time="15" type="Scale" target="n11_vuz5" label="small" tween="true" startValue="0.5,0.5" endValue="0,0" duration="14" ease="Linear"/>
+    <item time="29" type="Visible" target="n12_vuz5" value="false"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Alpha" target="n7_vuz5" value="1"/>
     <item time="0" type="Visible" target="n12_vuz5" value="false"/>
     <item time="0" type="Visible" target="n7_vuz5" value="true"/>
-    <item time="0" type="XY" target="n7_vuz5" tween="true" startValue="-7,-8" endValue="-7,-259" duration="12" ease="Linear"/>
-    <item time="6" type="Alpha" target="n7_vuz5" tween="true" startValue="1" endValue="0" duration="6" ease="Linear"/>
-    <item time="12" type="Visible" target="n7_vuz5" value="false"/>
+    <item time="0" type="XY" target="n7_vuz5" tween="true" startValue="-7,-8" endValue="-7,-259" duration="19" ease="Linear"/>
+    <item time="9" type="Alpha" target="n7_vuz5" tween="true" startValue="1" endValue="0" duration="10" ease="Linear"/>
+    <item time="19" type="Visible" target="n7_vuz5" value="false"/>
   </transition>
 </component>

+ 14 - 0
FGUIProject/assets/Main/componentsDialog/ButtonSpeedUp1.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="117,117" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_nmnb" name="n0" src="jj0mdg" fileName="images/zd_jsjs_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n2_jj0m" name="n2" src="jj0mdf" fileName="images/zd_jsjs_2.png" xy="41,6"/>
+    <text id="n1_nmnb" name="title" xy="68,-2" size="39,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" strokeColor="#677444" singleLine="true" text="x2">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

BIN
FGUIProject/assets/Main/images/zd_jsjs_1.png


BIN
FGUIProject/assets/Main/images/zd_jsjs_2.png


BIN
FGUIProject/assets/Main/images/zjm_gongg.png


BIN
FGUIProject/assets/Main/images/zjm_haoy.png


BIN
FGUIProject/assets/Main/images/zjm_jshu.png


BIN
FGUIProject/assets/Main/images/zjm_pengyq.png


BIN
FGUIProject/assets/Main/images/zjm_renwu.png


BIN
FGUIProject/assets/Main/images/zjm_shangc.png


BIN
FGUIProject/assets/Main/images/zjm_tiangong.png


BIN
FGUIProject/assets/Main/images/zjm_tujian.png


BIN
FGUIProject/assets/Main/images/zjm_yjian.png


+ 4 - 0
FGUIProject/assets/Main/package.xml

@@ -368,6 +368,10 @@
     <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
     <image id="n1knde" name="beijing2_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
+    <image id="jj0mdf" name="zd_jsjs_2.png" path="/images/"/>
+    <image id="jj0mdg" name="zd_jsjs_1.png" path="/images/"/>
+    <component id="jj0mdl" name="ButtonSpeedUp1.xml" path="/componentsDialog/"/>
+    <component id="lqp0dm" name="ComBtn.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 7 - 1
GameClient/Assets/Game/HotUpdate/Constant/ConstFunctionId.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace GFGGame
 {
-	public class ConstFunctionId
+    public class ConstFunctionId
     {
         /// <summary>
         /// 服装店
@@ -29,5 +29,11 @@ namespace GFGGame
         /// 套装合成礼盒
         /// </summary>
         public const string TAO_ZHUANG_HE_CHENG = "TAO_ZHUANG_HE_CHENG";
+
+        /// <summary>
+        /// 自动战斗
+        /// </summary>
+        public const string FUNCTION_AUTOPLAY_FIGHT = "FUNCTION_AUTOPLAY_FIGHT";
+
     }
 }

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -21,6 +21,12 @@ namespace GFGGame
         public const string NUMERIC_CHANGE = "NUMERIC_CHANGE";
 
 
+        public const string GET_SUIT_INFOS = "GET_SUIT_INFOS";
+        public const string MAINTAIN_SUIT = "MAINTAIN_SUIT";
+        public const string GET_MAINTAIN_SUIT_BONUS = "GET_MAINTAIN_SUIT_BONUS";
+        public const string MAKE_NEW_SUIT = "MAKE_NEW_SUIT";
+
+
 
     }
 }

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Data/FunctionOpenDataManager.cs

@@ -9,11 +9,11 @@ namespace GFGGame
         /// <summary>
         /// 根据功能名检测功能是否开启
         /// </summary>
-        /// <param name="viewName"></param>
+        /// <param name="functionId"></param>
         /// <returns></returns>
-        public bool CheckIsFunOpenBgViewName(string viewName, bool showTips = true)
+        public bool CheckIsFunOpenById(string functionId, bool showTips = true)
         {
-            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(viewName);
+            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(functionId);
             if (cfg == null)
             {
                 // Debug.LogWarning("g功能.xlsx  功能开启_FunctionOpenCfg  未添加  " + viewName + "  的配置");
@@ -22,7 +22,7 @@ namespace GFGGame
             if (cfg.parentId != null && cfg.parentId != "")
             {
                 //先检查父功能是否开启
-                if (!CheckIsFunOpenBgViewName(cfg.parentId))
+                if (!CheckIsFunOpenById(cfg.parentId))
                 {
                     return false;
                 }

+ 84 - 2
GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -15,6 +15,8 @@ namespace GFGGame
     }
     public class PhotographDataManager : SingletonBase<PhotographDataManager>
     {
+        public List<GameObject> itemGameObjs = new List<GameObject>();
+
         public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
         public Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
 
@@ -126,10 +128,62 @@ namespace GFGGame
         }
 
 
-        public void SetLayer(GameObject parentObj, int layer, string state)
+        public void SetLayer(GameObject hitGameObj, string state)
+        {
+            if (state != "refresh")
+            {
+                int index = itemGameObjs.IndexOf(hitGameObj);
+                if (state != "top")
+                {
+                    if (index < 0)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("未选中任物品");
+                        return;
+                    }
+                    if (index == 0 && state == "down")
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("已经在最下层了");
+                        return;
+                    }
+                    if (index == itemGameObjs.Count - 1 && state == "up")
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("已经在最上层了");
+                        return;
+                    }
+                }
+                GameObject gameObject = itemGameObjs[index];
+                itemGameObjs.RemoveAt(index);
+                if (state == "up")
+                {
+                    itemGameObjs.Insert((index + 1), gameObject);
+
+                }
+                else if (state == "down")
+                {
+                    itemGameObjs.Insert((index - 1), gameObject);
+
+                }
+                else if (state == "top")
+                {
+                    itemGameObjs.Add(gameObject);
+                }
+                else
+                {
+                    PromptController.Instance.ShowFloatTextPrompt(state + "操作失败");
+                    return;
+                }
+            }
+
+            for (int i = 0; i < itemGameObjs.Count; i++)
+            {
+                PhotographDataManager.Instance.ChangeLayer(itemGameObjs[i], i * 100, state);
+            }
+
+        }
+        private void ChangeLayer(GameObject parentObj, int layer, string state)
         {
             int count = 0;
-            if (state == "up")
+            if (state == "up" || state == "top")
             {
                 count = layer - GetMinLayer(parentObj);
             }
@@ -212,5 +266,33 @@ namespace GFGGame
             }
         }
 
+
+
+        public void AddItemGameObject(GameObject parentGameObj, bool setLayer)
+        {
+            itemGameObjs.Add(parentGameObj);
+
+            if (setLayer)
+            {
+                int index = itemGameObjs.Count - 1;
+                PhotographDataManager.Instance.ChangeLayer(itemGameObjs[index], index * 100, "up");
+            }
+            itemGameObjs.Sort((GameObject a, GameObject b) =>
+            {
+
+                int layerA = PhotographDataManager.Instance.GetMinLayer(a);
+                int layerB = PhotographDataManager.Instance.GetMinLayer(b);
+                if (layerA < layerB)
+                {
+                    return -1;
+                }
+                else if (layerA > layerB)
+                {
+                    return 1;
+                }
+                return 0;
+            });
+
+        }
     }
 }

+ 60 - 0
GameClient/Assets/Game/HotUpdate/Data/PhotographSceneManager.cs

@@ -0,0 +1,60 @@
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class PhotographSceneManager : SingletonBase<PhotographSceneManager>
+    {
+        public GameObject sceneObject;
+
+        public void AddBgItem(ItemCfg itemCfg)
+        {
+            Transform tf = sceneObject.transform.Find("Bg/BgRes");
+            string resPath = ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
+            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            spr.sortingOrder = ItemTypeCfgArray.Instance.GetCfg(ConstDressUpItemType.BEI_JING).defaultLayer;
+            SceneController.SetBoxCollider2DToGameObject(tf.gameObject);
+
+        }
+        public void AddBorderItem(ItemCfg itemCfg)
+        {
+            Transform tf = sceneObject.transform.Find("Border/BorderRes");
+            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            if (spr != null)
+            {
+                GameObject.Destroy(spr);
+            }
+            string resPath = ResPathUtil.GetPhotographFPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
+            spr = tf.GetComponent<SpriteRenderer>();
+            spr.sortingOrder = 10000;//边框在所有道具的上边
+
+        }
+        public void AddSceneItem(ItemCfg itemCfg, int layer, bool setLayer)
+        {
+
+            GameObject parentGameObj = new GameObject(string.Format("{0}_{1}", itemCfg.id, 0));
+            SceneController.AddItemToScene(sceneObject, parentGameObj, itemCfg.id, 1, layer);
+            PhotographDataManager.Instance.AddItemGameObject(parentGameObj, setLayer);
+
+        }
+        public void AddNpcItem(ItemCfg itemCfg)
+        {
+            Transform tf = sceneObject.transform.Find("Scene/Npc/NpcRes");
+            string resPath = ResPathUtil.GetNpcPicFPath(itemCfg.res);
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
+            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+
+            tf.localPosition = new Vector2(-spr.bounds.center.x, -spr.bounds.center.y);
+            SceneController.SetBoxCollider2DToGameObject(tf.gameObject);
+            PhotographDataManager.Instance.AddItemGameObject(tf.parent.gameObject, true);
+
+        }
+        public void AddBodyItem()
+        {
+            GameObject bodyParent = sceneObject.transform.Find("Scene/Role").gameObject;
+            SceneController.UpdatePhotographBody(PhotographDataManager.Instance._equipRoleData.ToArray(), sceneObject, bodyParent);
+            PhotographDataManager.Instance.AddItemGameObject(bodyParent, false);
+        }
+    }
+}

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

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

+ 44 - 0
GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class SuitFosterDataManager : SingletonBase<SuitFosterDataManager>
+    {
+
+        private Dictionary<int, SuitInfoProto> _suitInfoBySuitIdDic = new Dictionary<int, SuitInfoProto>();
+
+        public void InitData()
+        {
+            _suitInfoBySuitIdDic.Clear();
+        }
+
+        public void InitServerData(List<SuitInfoProto> suitInfoList)
+        {
+            if (suitInfoList != null)
+            {
+                foreach (SuitInfoProto suitInfo in suitInfoList)
+                {
+                    _suitInfoBySuitIdDic.Add(suitInfo.SuitId, suitInfo);
+                }
+            }
+        }
+        public void SetMaintainSuit(int suitId, M2C_MaintainSuit maintainSuit)
+        {
+            _suitInfoBySuitIdDic[suitId].MaintainStep = maintainSuit.MaintainStep;
+            _suitInfoBySuitIdDic[suitId].MaintainBonusSteps = maintainSuit.MaintainBonusSteps;
+        }
+        public void SetMaintainBonusSteps(int suitId, M2C_GetMaintainSuitBonus getMaintainSuitBonus)
+        {
+            _suitInfoBySuitIdDic[suitId].MaintainBonusSteps = getMaintainSuitBonus.MaintainBonusSteps;
+        }
+
+        public void SetMakeNewSuit(int suitId, M2C_MakeNewSuit makeNewSuit)
+        {
+            _suitInfoBySuitIdDic[suitId].MakeNewState = makeNewSuit.MakeNewState;
+        }
+
+
+
+    }
+}

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

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

+ 12 - 1
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -91,7 +91,18 @@ namespace GFGGame
                 _targetTotalScore = value;
             }
         }
-
+        private bool _autoPlay = false;
+        public bool autoPlay
+        {
+            get
+            {
+                return _autoPlay;
+            }
+            set
+            {
+                _autoPlay = value;
+            }
+        }
         public void Dispose()
         {
             _sceneObj = null;

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0eb93856ab6578c4f80e8766748a81db
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_Button7.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_Button7
+    {
+        public GButton target;
+        public Controller m_get;
+        public const string URL = "ui://uicwtr5bpy5go";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "Button7";
+        private static UI_Button7 _proxy;
+
+        public static UI_Button7 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button7();
+            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_Button7 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button7();
+            }
+            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_get = comp.GetController("get");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_get = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_Button7.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_item.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ComboBox1_item
+    {
+        public GButton target;
+        public GImage m_imgLine;
+        public const string URL = "ui://uicwtr5bj5a511";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ComboBox1_item";
+        private static UI_ComboBox1_item _proxy;
+
+        public static UI_ComboBox1_item Create(GObject gObject = null)
+        {
+            var ui = new UI_ComboBox1_item();
+            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_ComboBox1_item Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComboBox1_item();
+            }
+            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_imgLine = (GImage)comp.GetChild("imgLine");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgLine = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_item.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_popup.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComboBox1_popup.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListFosterItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ListFosterItem
+    {
+        public GComponent target;
+        public Controller m_finish;
+        public const string URL = "ui://uicwtr5bj5a512";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ListFosterItem";
+        private static UI_ListFosterItem _proxy;
+
+        public static UI_ListFosterItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListFosterItem();
+            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_ListFosterItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListFosterItem();
+            }
+            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_finish = comp.GetController("finish");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_finish = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListFosterItem.cs.meta

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListMaterialsItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ListMaterialsItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtNeed;
+        public GTextField m_txtHas;
+        public const string URL = "ui://uicwtr5bpy5gu";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ListMaterialsItem";
+        private static UI_ListMaterialsItem _proxy;
+
+        public static UI_ListMaterialsItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListMaterialsItem();
+            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_ListMaterialsItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListMaterialsItem();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_txtHas = (GTextField)comp.GetChild("txtHas");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtNeed = null;
+            m_txtHas = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListMaterialsItem.cs.meta

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyAddItem.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ListPropertyAddItem
+    {
+        public GComponent target;
+        public GComponent m_comProperty;
+        public GTextField m_txtAdd;
+        public const string URL = "ui://uicwtr5bpy5gt";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ListPropertyAddItem";
+        private static UI_ListPropertyAddItem _proxy;
+
+        public static UI_ListPropertyAddItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListPropertyAddItem();
+            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_ListPropertyAddItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListPropertyAddItem();
+            }
+            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_comProperty = (GComponent)comp.GetChild("comProperty");
+            m_txtAdd = (GTextField)comp.GetChild("txtAdd");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comProperty = null;
+            m_txtAdd = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyAddItem.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyShowItem.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListPropertyShowItem.cs.meta

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ListRewardItem
+    {
+        public GComponent target;
+        public GTextField m_txtDiscribe;
+        public GComponent m_ComReward;
+        public const string URL = "ui://uicwtr5bpy5gw";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ListRewardItem";
+        private static UI_ListRewardItem _proxy;
+
+        public static UI_ListRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRewardItem();
+            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_ListRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRewardItem();
+            }
+            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_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
+            m_ComReward = (GComponent)comp.GetChild("ComReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtDiscribe = null;
+            m_ComReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs.meta

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

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListSuitItem.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_ListSuitItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_loaderPic;
+        public GTextField m_txtName;
+        public GProgressBar m_progBar;
+        public GLoader m_rarity;
+        public GImage m_imgLockBg;
+        public GImage m_imgLock;
+        public const string URL = "ui://uicwtr5bpy5g8";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "ListSuitItem";
+        private static UI_ListSuitItem _proxy;
+
+        public static UI_ListSuitItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSuitItem();
+            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_ListSuitItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSuitItem();
+            }
+            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_bg = (GLoader)comp.GetChild("bg");
+            m_loaderPic = (GLoader)comp.GetChild("loaderPic");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_progBar = (GProgressBar)comp.GetChild("progBar");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
+            m_imgLock = (GImage)comp.GetChild("imgLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_loaderPic = null;
+            m_txtName = null;
+            m_progBar = null;
+            m_rarity = null;
+            m_imgLockBg = null;
+            m_imgLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListSuitItem.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs.meta

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterUI.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ClothingFoster
+{
+    public partial class UI_SuitFosterUI
+    {
+        public GComponent target;
+        public GTextField m_txtTitle;
+        public GTextField m_txtDiscribe;
+        public GList m_listPropertyAdd;
+        public GList m_listMaterials;
+        public GButton m_btnFoster;
+        public GComponent m_ComConsume;
+        public const string URL = "ui://uicwtr5bpy5gp";
+        public const string PACKAGE_NAME = "ClothingFoster";
+        public const string RES_NAME = "SuitFosterUI";
+        private static UI_SuitFosterUI _proxy;
+
+        public static UI_SuitFosterUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SuitFosterUI();
+            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_SuitFosterUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SuitFosterUI();
+            }
+            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_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
+            m_listPropertyAdd = (GList)comp.GetChild("listPropertyAdd");
+            m_listMaterials = (GList)comp.GetChild("listMaterials");
+            m_btnFoster = (GButton)comp.GetChild("btnFoster");
+            m_ComConsume = (GComponent)comp.GetChild("ComConsume");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTitle = null;
+            m_txtDiscribe = null;
+            m_listPropertyAdd = null;
+            m_listMaterials = null;
+            m_btnFoster = null;
+            m_ComConsume = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

Some files were not shown because too many files changed in this diff