Przeglądaj źródła

Merge remote-tracking branch 'remotes/origin/master' into xiaojie

何晓捷 2 lat temu
rodzic
commit
7be6816362
100 zmienionych plików z 904 dodań i 466 usunięć
  1. 3 3
      FGUIProject/assets/Arena/ArenaUI.xml
  2. 2 2
      FGUIProject/assets/CommonGame/components/ButtonHome.xml
  3. BIN
      FGUIProject/assets/CommonGame/imagesNew/home.png
  4. 0 0
      FGUIProject/assets/CommonGame/imagesNew/zx_jindu_bg.png
  5. 2 0
      FGUIProject/assets/CommonGame/package.xml
  6. 1 1
      FGUIProject/assets/LuckyBox/combox/ComBox1.xml
  7. 2 3
      FGUIProject/assets/LuckyBox/combox/ComModel.xml
  8. 9 0
      FGUIProject/assets/LuckyBox/combox/ComModelRes.xml
  9. 1 1
      FGUIProject/assets/LuckyBox/components/ComCost.xml
  10. 1 1
      FGUIProject/assets/LuckyBox/package.xml
  11. 10 0
      FGUIProject/assets/Main/FontNew/Font_Chapter_Big.fnt
  12. 11 0
      FGUIProject/assets/Main/FontNew/Font_Chapter_Small.fnt
  13. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_0.png
  14. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_1.png
  15. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_2.png
  16. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_3.png
  17. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_4.png
  18. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_5.png
  19. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_6.png
  20. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_7.png
  21. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_8.png
  22. BIN
      FGUIProject/assets/Main/FontNew/zxian_l_9.png
  23. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_-.png
  24. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_0.png
  25. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_1.png
  26. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_2.png
  27. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_3.png
  28. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_4.png
  29. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_5.png
  30. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_6.png
  31. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_7.png
  32. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_8.png
  33. BIN
      FGUIProject/assets/Main/FontNew/zxian_s_9.png
  34. 13 10
      FGUIProject/assets/Main/StoryChapterUI.xml
  35. 0 0
      FGUIProject/assets/Main/components/ButtonStart.xml
  36. 0 29
      FGUIProject/assets/Main/components/ComBtnSkill.xml
  37. 8 0
      FGUIProject/assets/Main/components/ComDialogBg.xml
  38. 18 0
      FGUIProject/assets/Main/components/CompBonusBox.xml
  39. 4 0
      FGUIProject/assets/Main/components/CompChapter.xml
  40. 7 4
      FGUIProject/assets/Main/components/CompFlower2.xml
  41. 41 0
      FGUIProject/assets/Main/components/CompStoryLevelItem.xml
  42. 0 0
      FGUIProject/assets/Main/components/CompStoryLevelItem1.xml
  43. 0 10
      FGUIProject/assets/Main/components/ProgressBarCD.xml
  44. 0 8
      FGUIProject/assets/Main/components/comClickCircle.xml
  45. 0 13
      FGUIProject/assets/Main/componentsLevel/CompBonusBox.xml
  46. 27 2
      FGUIProject/assets/Main/componentsLevel/CompChapter.xml
  47. BIN
      FGUIProject/assets/Main/imagesNew/zxian_btn_jq.png
  48. BIN
      FGUIProject/assets/Main/imagesNew/zxian_btn_zd.png
  49. BIN
      FGUIProject/assets/Main/imagesNew/zxian_chapter_dec.png
  50. BIN
      FGUIProject/assets/Main/imagesNew/zxian_chapter_switch.png
  51. BIN
      FGUIProject/assets/Main/imagesNew/zxian_gift_dec1.png
  52. BIN
      FGUIProject/assets/Main/imagesNew/zxian_gift_dec2.png
  53. BIN
      FGUIProject/assets/Main/imagesNew/zxian_gift_get.png
  54. BIN
      FGUIProject/assets/Main/imagesNew/zxian_gift_unget.png
  55. BIN
      FGUIProject/assets/Main/imagesNew/zxian_line.png
  56. BIN
      FGUIProject/assets/Main/imagesNew/zxian_mask.png
  57. BIN
      FGUIProject/assets/Main/imagesNew/zxian_name_dec.png
  58. BIN
      FGUIProject/assets/Main/imagesNew/zxian_sel.png
  59. BIN
      FGUIProject/assets/Main/imagesStory/fzd_fzxzhong.png
  60. BIN
      FGUIProject/assets/Main/imagesStory/zd_bl_0.png
  61. BIN
      FGUIProject/assets/Main/imagesStory/zd_bl_1.png
  62. BIN
      FGUIProject/assets/Main/imagesStory/zd_bl_2.png
  63. BIN
      FGUIProject/assets/Main/imagesStory/zd_cishukuang.png
  64. BIN
      FGUIProject/assets/Main/imagesStory/zd_daoshu_1.png
  65. BIN
      FGUIProject/assets/Main/imagesStory/zd_daoshu_2.png
  66. BIN
      FGUIProject/assets/Main/imagesStory/zd_gxi_1.png
  67. BIN
      FGUIProject/assets/Main/imagesStory/zd_jdbiao.png
  68. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_1.png
  69. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_2.png
  70. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_3.png
  71. BIN
      FGUIProject/assets/Main/imagesStory/zd_jineng_4.png
  72. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_1.png
  73. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_2.png
  74. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_3.png
  75. BIN
      FGUIProject/assets/Main/imagesStory/zd_jingzi_4.png
  76. 42 24
      FGUIProject/assets/Main/package.xml
  77. 1 1
      FGUIProject/assets/Studio/components/ListPorcelainItem.xml
  78. 21 2
      GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs
  79. 1 1
      GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs
  80. 1 1
      GameClient/Assets/Game/HotUpdate/Data/PhotographUtil.cs
  81. 1 0
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpPart.cs
  82. 2 2
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs
  83. 4 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModel.cs
  84. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModelRes.cs
  85. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModelRes.cs.meta
  86. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDialogBg.cs
  87. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDialogBg.cs.meta
  88. 6 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompBonusBox.cs
  89. 151 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter.cs
  90. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter.cs.meta
  91. 24 24
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10001.cs
  92. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10002.cs
  93. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10003.cs
  94. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10004.cs
  95. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10005.cs
  96. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10006.cs
  97. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10007.cs
  98. 40 40
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10008.cs
  99. 12 12
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs
  100. 20 20
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs

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

@@ -6,10 +6,10 @@
   </controller>
   </controller>
   <controller name="c2" pages="0,,1," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
   <displayList>
-    <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="746,1679" pivot="0.5,0.5" scale="-1,-1">
+    <image id="n48_jcej" name="n48" src="jcej39" fileName="images/jzsjzs_kddi.png" xy="755,1671" pivot="0.5,0.5" scale="-1,-1">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
     </image>
     </image>
-    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n28_psph"/>
+    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n28_psph" controller="c1,12"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n28_psph" controller="c1,12"/>
     <image id="n37_jcej" name="n37" src="jcej3d" fileName="images/jzsjzs_bzztzt.png" xy="358,154" group="n28_psph"/>
     <image id="n37_jcej" name="n37" src="jcej3d" fileName="images/jzsjzs_bzztzt.png" xy="358,154" group="n28_psph"/>
     <component id="n25_psph" name="comTheme" src="t6j15b" fileName="components/ComTheme.xml" xy="354,276" group="n28_psph"/>
     <component id="n25_psph" name="comTheme" src="t6j15b" fileName="components/ComTheme.xml" xy="354,276" group="n28_psph"/>
@@ -68,7 +68,7 @@
     <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1674" group="n49_jcej"/>
     <component id="n19_psph" name="btnRefresh" src="psph1j" fileName="components/BtnRefresh.xml" xy="753,1674" group="n49_jcej"/>
     <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1672" size="156,46" group="n49_jcej"/>
     <component id="n18_psph" name="comCostCurrent" src="jcej3y" fileName="components/ComCostCurrency.xml" xy="851,1672" size="156,46" group="n49_jcej"/>
     <group id="n49_jcej" name="n49" xy="753,1672" size="285,46" group="n20_psph"/>
     <group id="n49_jcej" name="n49" xy="753,1672" size="285,46" group="n20_psph"/>
-    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1537" group="n20_psph">
+    <component id="n13_psph" name="btnQuickFight" src="jcejtkk" fileName="components/Button17.xml" pkg="eg2y0ldp" xy="418,1565" group="n20_psph">
       <Button title="快速挑战"/>
       <Button title="快速挑战"/>
     </component>
     </component>
     <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,1659" size="209,61" group="n20_psph" aspect="true">
     <component id="n6_psph" name="btnShop" src="psph1g" fileName="components/BtnRecord.xml" xy="78,1659" size="209,61" group="n20_psph" aspect="true">

+ 2 - 2
FGUIProject/assets/CommonGame/components/ButtonHome.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="90,90" extention="Button">
+<component size="110,96" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
-    <image id="n0_qp4l" name="n0" src="slb41b" fileName="imagesExport/hz_fanhuizjm.png" xy="0,0">
+    <image id="n0_qp4l" name="n0" src="o4m7tog" fileName="imagesNew/home.png" xy="0,-3">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
   </displayList>
   </displayList>

BIN
FGUIProject/assets/CommonGame/imagesNew/home.png


+ 0 - 0
FGUIProject/assets/LuckyBox/imageNews/zx_jindu_bg.png → FGUIProject/assets/CommonGame/imagesNew/zx_jindu_bg.png


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

@@ -373,6 +373,8 @@
     <component id="jx6ztod" name="Button14.xml" path="/components/" exported="true"/>
     <component id="jx6ztod" name="Button14.xml" path="/components/" exported="true"/>
     <component id="jx6ztoe" name="BtnStyle007.xml" path="/components/" exported="true"/>
     <component id="jx6ztoe" name="BtnStyle007.xml" path="/components/" exported="true"/>
     <component id="jx6ztof" name="BtnStyle002.xml" path="/components/" exported="true"/>
     <component id="jx6ztof" name="BtnStyle002.xml" path="/components/" exported="true"/>
+    <image id="o4m7tog" name="home.png" path="/imagesNew/"/>
+    <image id="volstbs" name="zx_jindu_bg.png" path="/imagesNew/" exported="true"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -19,7 +19,7 @@
     <component id="n62_vols" name="btnPreview" src="duuftct" fileName="components/Button6.xml" xy="916,240" group="n66_vols">
     <component id="n62_vols" name="btnPreview" src="duuftct" fileName="components/Button6.xml" xy="916,240" group="n66_vols">
       <Button icon="ui://drx9d1usvek8v"/>
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
     </component>
-    <image id="n64_vols" name="n64" src="volstbs" fileName="imageNews/zx_jindu_bg.png" xy="903,341" group="n66_vols"/>
+    <image id="n64_vols" name="n64" src="volstbs" fileName="imageNews/zx_jindu_bg.png" xy="903,341" group="n66_vols" pkg="eg2y0ldp"/>
     <text id="n65_vols" name="txtOwned" xy="939,335" pivot="0.5,0" size="44,39" group="n66_vols" fontSize="28" color="#faf6e6" align="center" vars="true" text="{v1=0}/{v2=0}">
     <text id="n65_vols" name="txtOwned" xy="939,335" pivot="0.5,0" size="44,39" group="n66_vols" fontSize="28" color="#faf6e6" align="center" vars="true" text="{v1=0}/{v2=0}">
       <relation target="n64_vols" sidePair="center-center,middle-middle"/>
       <relation target="n64_vols" sidePair="center-center,middle-middle"/>
     </text>
     </text>

+ 2 - 3
FGUIProject/assets/LuckyBox/combox/ComModel.xml

@@ -4,10 +4,9 @@
     <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
     <loader id="n40_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
-    <loader id="n43_duuf" name="loaRes" xy="354,717" pivot="0.5,0.5" anchor="true" size="50,50" align="center" vAlign="middle"/>
-    <graph id="n39_dhoa" name="holder" xy="540,900" pivot="0.5,0.5" anchor="true" size="10,10">
+    <component id="n45_o4m7" name="comModelRes" src="o4m7tf6" fileName="combox/ComModelRes.xml" xy="0,0">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
-    </graph>
+    </component>
     <loader id="n44_ofwu" name="loaMask" xy="0,-240" size="1080,2400" alpha="0" url="ui://drx9d1usduuftf2" align="center" vAlign="middle" fill="scaleMatchWidth">
     <loader id="n44_ofwu" name="loaMask" xy="0,-240" size="1080,2400" alpha="0" url="ui://drx9d1usduuftf2" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     </loader>

+ 9 - 0
FGUIProject/assets/LuckyBox/combox/ComModelRes.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n46_o4m7" name="loaRes" xy="455,460" pivot="0.5,0.5" anchor="true" size="50,50" align="center" vAlign="middle"/>
+    <graph id="n47_o4m7" name="holder" xy="641,643" pivot="0.5,0.5" anchor="true" size="10,10">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+  </displayList>
+</component>

+ 1 - 1
FGUIProject/assets/LuckyBox/components/ComCost.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="180,43" pivot="0.5,0.5" anchor="true">
 <component size="180,43" pivot="0.5,0.5" anchor="true">
   <displayList>
   <displayList>
-    <image id="n28_vek8" name="n28" src="volstbs" fileName="imageNews/zx_jindu_bg.png" xy="-7,4" size="195,34"/>
+    <image id="n28_vek8" name="n28" src="volstbs" fileName="imageNews/zx_jindu_bg.png" xy="-7,4" size="195,34" pkg="eg2y0ldp"/>
     <loader id="n29_vek8" name="loaCost" xy="57,3" pivot="0.5,0.5" size="35,35" group="n30_duuf" aspect="true" url="ui://eg2y0ldpq08x6" fill="scale"/>
     <loader id="n29_vek8" name="loaCost" xy="57,3" pivot="0.5,0.5" size="35,35" group="n30_duuf" aspect="true" url="ui://eg2y0ldpq08x6" fill="scale"/>
     <text id="n14_ga16" name="txtCost" xy="112,19" pivot="0.5,0.5" anchor="true" size="20,44" group="n30_duuf" fontSize="32" color="#faf6e6" align="center" vAlign="middle" vars="true" text="1"/>
     <text id="n14_ga16" name="txtCost" xy="112,19" pivot="0.5,0.5" anchor="true" size="20,44" group="n30_duuf" fontSize="32" color="#faf6e6" align="center" vAlign="middle" vars="true" text="1"/>
     <group id="n30_duuf" name="n30" xy="57,-3" size="65,44" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
     <group id="n30_duuf" name="n30" xy="57,-3" size="65,44" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">

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

@@ -111,7 +111,6 @@
     <image id="volstbp" name="wp_bg_shuliang.png" path="/imageNews/" scale="9grid" scale9grid="24,9,48,18"/>
     <image id="volstbp" name="wp_bg_shuliang.png" path="/imageNews/" scale="9grid" scale9grid="24,9,48,18"/>
     <image id="volstbq" name="zx_bg_yueliang.png" path="/imageNews/"/>
     <image id="volstbq" name="zx_bg_yueliang.png" path="/imageNews/"/>
     <image id="volstbr" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
     <image id="volstbr" name="zx_bg_zhuangshi.png" path="/imageNews/"/>
-    <image id="volstbs" name="zx_jindu_bg.png" path="/imageNews/"/>
     <image id="volstbt" name="zx_lianxian_bg_zhuangshi.png" path="/imageNews/"/>
     <image id="volstbt" name="zx_lianxian_bg_zhuangshi.png" path="/imageNews/"/>
     <image id="volstbu" name="zx_lianxian_huang_guangquan.png" path="/imageNews/"/>
     <image id="volstbu" name="zx_lianxian_huang_guangquan.png" path="/imageNews/"/>
     <image id="volstbv" name="zx_lianxian_huang_shang.png" path="/imageNews/"/>
     <image id="volstbv" name="zx_lianxian_huang_shang.png" path="/imageNews/"/>
@@ -158,6 +157,7 @@
     <component id="e050tf3" name="LuckBoxBonusShowUI.xml" path="/" exported="true"/>
     <component id="e050tf3" name="LuckBoxBonusShowUI.xml" path="/" exported="true"/>
     <component id="e050tf4" name="LuckyBoxBonusShowItem.xml" path="/components/"/>
     <component id="e050tf4" name="LuckyBoxBonusShowItem.xml" path="/components/"/>
     <image id="e050tf5" name="zx_wp_lan_grey.png" path="/imageNews/"/>
     <image id="e050tf5" name="zx_wp_lan_grey.png" path="/imageNews/"/>
+    <component id="o4m7tf6" name="ComModelRes.xml" path="/combox/"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 10 - 0
FGUIProject/assets/Main/FontNew/Font_Chapter_Big.fnt

@@ -0,0 +1,10 @@
+char id=48 img=o4m7fqf xoffset=0 yoffset=0 xadvance=0
+char id=49 img=o4m7fqg xoffset=0 yoffset=0 xadvance=0
+char id=50 img=o4m7fqh xoffset=0 yoffset=0 xadvance=0
+char id=51 img=o4m7fqi xoffset=0 yoffset=0 xadvance=0
+char id=52 img=o4m7fqj xoffset=0 yoffset=0 xadvance=0
+char id=53 img=o4m7fqk xoffset=0 yoffset=0 xadvance=0
+char id=54 img=o4m7fql xoffset=0 yoffset=0 xadvance=0
+char id=55 img=o4m7fqm xoffset=0 yoffset=0 xadvance=0
+char id=56 img=o4m7fqn xoffset=0 yoffset=0 xadvance=0
+char id=57 img=o4m7fqe xoffset=0 yoffset=0 xadvance=0

+ 11 - 0
FGUIProject/assets/Main/FontNew/Font_Chapter_Small.fnt

@@ -0,0 +1,11 @@
+char id=45 img=o4m7fqq xoffset=0 yoffset=0 xadvance=0
+char id=48 img=o4m7fqr xoffset=0 yoffset=0 xadvance=0
+char id=49 img=o4m7fqs xoffset=0 yoffset=0 xadvance=0
+char id=50 img=o4m7fqt xoffset=0 yoffset=0 xadvance=0
+char id=51 img=o4m7fqu xoffset=0 yoffset=0 xadvance=0
+char id=52 img=o4m7fqv xoffset=0 yoffset=0 xadvance=0
+char id=53 img=o4m7fqw xoffset=0 yoffset=0 xadvance=0
+char id=54 img=o4m7fqx xoffset=0 yoffset=0 xadvance=0
+char id=55 img=o4m7fqy xoffset=0 yoffset=0 xadvance=0
+char id=56 img=o4m7fqz xoffset=0 yoffset=0 xadvance=0
+char id=57 img=o4m7fqp xoffset=0 yoffset=0 xadvance=0

BIN
FGUIProject/assets/Main/FontNew/zxian_l_0.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_1.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_2.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_3.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_4.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_5.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_6.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_7.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_8.png


BIN
FGUIProject/assets/Main/FontNew/zxian_l_9.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_-.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_0.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_1.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_2.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_3.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_4.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_5.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_6.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_7.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_8.png


BIN
FGUIProject/assets/Main/FontNew/zxian_s_9.png


+ 13 - 10
FGUIProject/assets/Main/StoryChapterUI.xml

@@ -6,19 +6,22 @@
     </component>
     </component>
     <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,1"/>
     <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,1"/>
     <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n4_v354" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
-    <image id="n5_v354" name="n5" src="v3541y" fileName="imagesStory/zx_gka_di_1.png" xy="34,375" aspect="true"/>
-    <text id="n6_v354" name="txtStarCount" xy="45,404" pivot="0.5,0" size="75,41" fontSize="30" color="#fff6e6" align="center" text="15/18">
-      <relation target="n5_v354" sidePair="center-center,middle-middle"/>
-    </text>
-    <component id="n7_v354" name="bonusBox3" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,493"/>
-    <component id="n11_v354" name="bonusBox2" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,653"/>
-    <component id="n12_v354" name="bonusBox1" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,809"/>
-    <image id="n15_ki96" name="n15" src="v35426" fileName="imagesStory/zx_gka_zshuk.png" xy="293,200">
+    <component id="n4_v354" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="159,80"/>
+    <image id="n15_ki96" name="n15" src="v35426" fileName="imagesStory/zx_gka_zshuk.png" xy="563,202" group="n19_o4m7">
       <relation target="" sidePair="center-center,top-top"/>
       <relation target="" sidePair="center-center,top-top"/>
     </image>
     </image>
-    <text id="n16_ki96" name="txtChapterName" xy="302,210" size="476,44" fontSize="32" color="#fff4e4" align="center" autoSize="none" autoClearText="true" text="章节名字">
+    <text id="n16_ki96" name="txtChapterName" xy="572,212" size="476,44" group="n19_o4m7" fontSize="32" color="#fff4e4" align="center" autoSize="none" autoClearText="true" text="章节名字">
       <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
       <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
     </text>
     </text>
+    <group id="n19_o4m7" name="n19" xy="563,202" size="494,68"/>
+    <component id="n7_v354" name="bonusBox3" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="23,255" group="n20_o4m7" controller="c1,2"/>
+    <component id="n11_v354" name="bonusBox2" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="23,386" group="n20_o4m7" controller="c1,1"/>
+    <component id="n12_v354" name="bonusBox1" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="23,516" group="n20_o4m7" controller="c1,1"/>
+    <image id="n5_v354" name="n5" src="volstbs" fileName="imagesNew/zx_jindu_bg.png" pkg="eg2y0ldp" xy="33,644" group="n18_o4m7" aspect="true"/>
+    <text id="n6_v354" name="txtStarCount" xy="54,638" pivot="0.5,0" size="71,39" group="n18_o4m7" fontSize="28" color="#faf6e6" align="center" text="15/18">
+      <relation target="n5_v354" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n18_o4m7" name="n18" xy="33,638" size="116,39" group="n20_o4m7"/>
+    <group id="n20_o4m7" name="n20" xy="23,255" size="126,422"/>
   </displayList>
   </displayList>
 </component>
 </component>

+ 0 - 0
FGUIProject/assets/Main/componentsLevel/ButtonStart.xml → FGUIProject/assets/Main/components/ButtonStart.xml


+ 0 - 29
FGUIProject/assets/Main/components/ComBtnSkill.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="212,212">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
-  <displayList>
-    <loader id="n22_uxaj" name="icon" xy="106,106" pivot="0.5,0.5" anchor="true" size="196,196" aspect="true" url="ui://mfvz4q8kv3k9cc" fill="scaleMatchHeight" autoSize="true"/>
-    <loader id="n32_k1kh" name="icon1" xy="105,187" pivot="0.5,0.5" anchor="true" size="105,50" aspect="true" url="ui://mfvz4q8kk1khe1" fill="scaleMatchHeight" autoSize="true"/>
-    <component id="n24_vbe8" name="proCD" src="v3k9c5" fileName="components/ProgressBarCD.xml" xy="-14,-14">
-      <gearDisplay controller="c1" pages="1"/>
-      <ProgressBar value="59" max="100"/>
-    </component>
-    <image id="n26_v3k9" name="n26" src="k1khe5" fileName="imagesStory/zd_txtxtx.png" xy="-22,-22" pivot="0.5,0.5" visible="false">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n29_k1kh" name="n29" src="k1khe0" fileName="imagesStory/zd_cishukuang.png" xy="155,8"/>
-    <text id="n30_k1kh" name="txtCount" xy="172,14" pivot="0.5,0" size="23,42" fontSize="30" color="#fbf4ed" align="center" bold="true" text="1"/>
-    <graph id="n31_k1kh" name="holder" xy="56,56" pivot="0.5,0.5" size="100,100" touchable="false">
-      <gearDisplay controller="c1" pages="0"/>
-    </graph>
-  </displayList>
-  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="Scale" target="n26_v3k9" tween="true" startValue="1,1" endValue="0.9,0.9" duration="18" ease="Linear"/>
-    <item time="4" type="Alpha" target="n26_v3k9" tween="true" startValue="1" endValue="0.5" duration="14" ease="Linear"/>
-    <item time="18" type="Alpha" target="n26_v3k9" tween="true" startValue="0.5" endValue="1" duration="14"/>
-    <item time="18" type="Scale" target="n26_v3k9" tween="true" startValue="0.9,0.9" endValue="1,1" duration="18" ease="Linear"/>
-    <item time="36" type="Alpha" target="n26_v3k9" value="1"/>
-  </transition>
-  <customProperty target="icon" propertyId="1"/>
-  <customProperty target="icon1" propertyId="1"/>
-</component>

+ 8 - 0
FGUIProject/assets/Main/components/ComDialogBg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="326,125" mask="n23_o4m7">
+  <displayList>
+    <image id="n20_o4m7" name="n20" src="o4m7fr6" fileName="imagesNew/zxian_mask.png" xy="3,7" size="315,110"/>
+    <loader id="n21_o4m7" name="loabg" xy="2,-117" size="321,1006" url="ui://mfvz4q8kwg7t8o" fill="scaleMatchWidth"/>
+    <graph id="n23_o4m7" name="n23" xy="92,7" size="227,111" type="polygon" lineSize="0" points="-42.61592,110.6692,-55.625,106.375,-60.67303,103.1932,-68.98875,98.29288,-76.88721,89.98563,-82.4944,81.69128,-87.72315,69.12647,-90,56,-87.95195,42.03042,-85.0848,33.56164,-78.89275,21.26243,-69.47199,12.66081,-58.00311,4.878404,-46.62715,0.1408386,180,0,189.4375,2.4375,205.5,11.375,216.375,22,225.375,38.375,227.4375,54.375,225.5,67.1875,221.4375,77.3125,216.5,86.4375,208.6094,95.48438,196.4375,104.4063,181.4063,110.3438,177,110,4,111"/>
+  </displayList>
+</component>

+ 18 - 0
FGUIProject/assets/Main/components/CompBonusBox.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="122,136">
+  <controller name="c1" exported="true" pages="0,,1,,2," selected="2"/>
+  <displayList>
+    <loader id="n8_v354" name="icon" xy="61,66" pivot="0.5,0.5" anchor="true" size="120,102" group="n16_o4m7" url="ui://mfvz4q8ko4m7fq8" autoSize="true"/>
+    <loader id="n15_o4m7" name="n15" xy="6,-80" size="110,200" group="n16_o4m7" url="ui://mfvz4q8ko4m7fq6" autoSize="true">
+      <gearXY controller="c1" pages="0,1,2" values="65,-12|58,-12|6,-80"/>
+      <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8ko4m7fq7|ui://mfvz4q8ko4m7fq7" default="ui://mfvz4q8ko4m7fq6"/>
+    </loader>
+    <image id="n11_oq7r" name="iconActive" src="oq7r9k" fileName="imagesExport/zx_hogndian.png" pkg="eg2y0ldp" xy="76,25" size="25,25" group="n16_o4m7" aspect="true"/>
+    <image id="n9_v354" name="n9" src="v35421" fileName="imagesStory/zx_gka_szkuang.png" xy="-3,89" size="128,38" group="n14_o4m7"/>
+    <text id="n10_v354" name="txtName" xy="41,90" size="33,41" group="n14_o4m7" fontSize="30" color="#fff6e6" align="center" text="00">
+      <relation target="n9_v354" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n14_o4m7" name="n14" xy="-3,89" size="128,42" group="n16_o4m7" visible="false" advanced="true"/>
+    <group id="n16_o4m7" name="n16" xy="-3,-80" size="128,211"/>
+  </displayList>
+</component>

+ 4 - 0
FGUIProject/assets/Main/components/CompChapter.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" overflow="scroll" scroll="both" scrollBarFlags="128" scrollBar="hidden">
+  <displayList/>
+</component>

+ 7 - 4
FGUIProject/assets/Main/components/CompFlower2.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="89,34">
+<component size="180,60">
   <displayList>
   <displayList>
-    <loader id="n6_s2cc" name="f1" xy="0,0" size="30,30" url="ui://mfvz4q8kv35422"/>
-    <loader id="n7_s2cc" name="f2" xy="29,4" size="30,30" url="ui://mfvz4q8kv35422"/>
-    <loader id="n8_s2cc" name="f3" xy="59,0" size="30,30" url="ui://mfvz4q8kv35422"/>
+    <loader id="n6_s2cc" name="f1" xy="0,0" size="60,60" group="n9_o4m7" url="ui://mfvz4q8kqkjsnz" autoSize="true"/>
+    <loader id="n7_s2cc" name="f2" xy="60,0" size="60,60" group="n9_o4m7" url="ui://mfvz4q8kqkjsnz" autoSize="true"/>
+    <loader id="n8_s2cc" name="f3" xy="120,0" size="60,60" group="n9_o4m7" url="ui://mfvz4q8kqkjsnz" autoSize="true"/>
+    <group id="n9_o4m7" name="n9" xy="0,0" size="180,60" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
   </displayList>
 </component>
 </component>

+ 41 - 0
FGUIProject/assets/Main/components/CompStoryLevelItem.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="540,252" pivot="0.5,0.5" anchor="true" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1," selected="1">
+    <remark page="0" value="剧情"/>
+    <remark page="1" value="对战"/>
+  </controller>
+  <controller name="c2" exported="true" pages="0,,1," selected="0">
+    <remark page="0" value="向左"/>
+    <remark page="1" value="向右"/>
+  </controller>
+  <displayList>
+    <component id="n12_o4m7" name="comDialogBg" src="o4m7fr5" fileName="components/ComDialogBg.xml" xy="118,67" size="326,125" group="n19_o4m7">
+      <gearXY controller="c2" pages="0" values="118,67" default="104,67"/>
+    </component>
+    <loader id="n13_o4m7" name="loaDialogBg" xy="0,0" pivot="0.5,0.5" size="540,216" group="n19_o4m7" scale="-1,1" url="ui://mfvz4q8ko4m7fq2" autoSize="true">
+      <gearSize controller="c2" pages="0" values="540,216,-1,1" default="540,216,1,1"/>
+    </loader>
+    <text id="n14_o4m7" name="txtDialogOrder" xy="181,16" pivot="0.5,0" size="98,50" group="n17_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="34" color="#ffffff" align="right" letterSpacing="-4" text="0-0">
+      <relation target="n13_o4m7" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n15_o4m7" name="txtName" xy="281,23" size="122,41" group="n17_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#ffeabf" text="曲水流觞"/>
+    <image id="n16_o4m7" name="n16" src="o4m7fqb" fileName="imagesNew/zxian_name_dec.png" xy="255,0" group="n17_o4m7"/>
+    <group id="n17_o4m7" name="n17" xy="181,0" size="222,74" group="n19_o4m7" advanced="true">
+      <gearXY controller="c2" pages="1" values="129,0" default="181,0"/>
+    </group>
+    <group id="n19_o4m7" name="n19" xy="0,0" size="540,216" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <image id="n23_o4m7" name="n23" src="o4m7fq3" fileName="imagesNew/zxian_btn_zd.png" xy="90,48" pivot="0.5,0.5" group="n24_o4m7">
+      <gearSize controller="c2" pages="1" values="360,120,-1,1" default="360,120,1,1"/>
+    </image>
+    <text id="n20_o4m7" name="txtFightOrder" xy="243,59" pivot="0.5,0" size="106,50" group="n24_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="30" color="#ffffff" align="right" text="0-0">
+      <gearXY controller="c2" pages="1" values="198,59" default="243,59"/>
+    </text>
+    <component id="n21_o4m7" name="flower" src="s2cc5l" fileName="components/CompFlower2.xml" xy="180,137" group="n24_o4m7"/>
+    <graph id="n22_o4m7" name="holder" xy="285,107" size="1,1" group="n24_o4m7"/>
+    <group id="n24_o4m7" name="n24" xy="90,48" size="360,149" advanced="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </group>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/Main/componentsLevel/CompStoryLevelItem.xml → FGUIProject/assets/Main/components/CompStoryLevelItem1.xml


+ 0 - 10
FGUIProject/assets/Main/components/ProgressBarCD.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="240,240" extention="ProgressBar">
-  <displayList>
-    <image id="n2_v3k9" name="n2" src="v3k9ca" fileName="imagesStory/zd_daoshu_2.png" xy="22,22"/>
-    <image id="n1_vbe8" name="bar" src="v3k9c9" fileName="imagesStory/zd_daoshu_1.png" xy="22,22" fillMethod="radial360" fillOrigin="1" fillClockwise="false">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-  </displayList>
-  <ProgressBar/>
-</component>

+ 0 - 8
FGUIProject/assets/Main/components/comClickCircle.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="274,274">
-  <displayList>
-    <image id="n28_wono" name="n28" src="wonogn" fileName="imagesStory/zd_gxi_1.png" xy="-6,5"/>
-    <text id="n29_wono" name="txtPart" xy="79,74" pivot="0.5,0" size="103,66" fontSize="50" color="#fcf3e2" strokeColor="#c49a49" strokeSize="2" text="上衣"/>
-    <text id="n30_wono" name="txtScore" xy="69,140" pivot="0.5,0" size="123,64" fontSize="48" color="#fcf3e2" strokeColor="#c49a49" strokeSize="2" text="1880"/>
-  </displayList>
-</component>

+ 0 - 13
FGUIProject/assets/Main/componentsLevel/CompBonusBox.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="136,136">
-  <displayList>
-    <image id="n7_v354" name="n7" src="v3541z" fileName="imagesStory/zx_gka_di_2.png" xy="0,0"/>
-    <loader id="n8_v354" name="icon" xy="68,66" pivot="0.5,0.5" anchor="true" size="97,98" url="ui://mfvz4q8kv3541x" autoSize="true"/>
-    <image id="n9_v354" name="n9" src="v35421" fileName="imagesStory/zx_gka_szkuang.png" xy="4,89"/>
-    <text id="n10_v354" name="txtName" xy="48,90" size="41,41" fontSize="30" color="#fff6e6" align="center" text="00">
-      <relation target="n9_v354" sidePair="center-center,middle-middle"/>
-    </text>
-    <component id="n13_wet2" name="ComRewardEffect" src="wet2ew" fileName="components/ComRewardEffect.xml" xy="0,0" visible="false" touchable="false"/>
-    <image id="n11_oq7r" name="iconActive" src="oq7r9k" fileName="imagesExport/zx_hogndian.png" pkg="eg2y0ldp" xy="90,16"/>
-  </displayList>
-</component>

+ 27 - 2
FGUIProject/assets/Main/componentsLevel/CompChapter.xml

@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" overflow="scroll" scroll="both" scrollBarFlags="128" scrollBar="hidden">
-  <displayList/>
+<component size="1753,3896" scroll="both" designImageLayer="1">
+  <displayList>
+    <loader id="n45_xv4o" name="loaBg" xy="876,1948" pivot="0.5,0.5" anchor="true" size="1753,3896" url="ui://mfvz4q8ko4m7fr9" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <image id="n94_o4m7" name="n94" src="o4m7fqa" fileName="imagesNew/zxian_line.png" xy="198,1252" size="1263,2339" aspect="true"/>
+    <component id="n70_o4m7" name="g20" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="884,409" group="n93_o4m7" controller="c2,1"/>
+    <component id="n71_o4m7" name="g19" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="1324,571" group="n93_o4m7" controller="c1,1"/>
+    <component id="n72_o4m7" name="g18" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="1066,733" group="n93_o4m7"/>
+    <component id="n73_o4m7" name="g17" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="762,895" group="n93_o4m7" controller="c1,1"/>
+    <component id="n74_o4m7" name="g16" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="434,1057" group="n93_o4m7" controller="c2,1"/>
+    <component id="n75_o4m7" name="g15" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="636,1219" group="n93_o4m7" controller="c2,1"/>
+    <component id="n76_o4m7" name="g14" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="995,1381" group="n93_o4m7" controller="c2,1"/>
+    <component id="n77_o4m7" name="g13" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="1504,1543" group="n93_o4m7" controller="c1,1"/>
+    <component id="n78_o4m7" name="g12" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="1311,1705" group="n93_o4m7"/>
+    <component id="n79_o4m7" name="g11" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="909,1867" group="n93_o4m7" controller="c1,1"/>
+    <component id="n80_o4m7" name="g10" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="622,2029" group="n93_o4m7"/>
+    <component id="n81_o4m7" name="g9" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="946,2191" group="n93_o4m7" controller="c1,1,c2,1"/>
+    <component id="n82_o4m7" name="g8" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="1397,2353" group="n93_o4m7" controller="c2,0"/>
+    <component id="n83_o4m7" name="g7" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="1095,2515" group="n93_o4m7" controller="c1,1"/>
+    <component id="n84_o4m7" name="g6" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="732,2677" group="n93_o4m7"/>
+    <component id="n85_o4m7" name="g5" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="257,2839" group="n93_o4m7" controller="c1,1,c2,1"/>
+    <component id="n86_o4m7" name="g4" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="588,3001" group="n93_o4m7"/>
+    <component id="n87_o4m7" name="g3" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="326,3163" group="n93_o4m7" controller="c1,1,c2,1"/>
+    <component id="n88_o4m7" name="g2" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="713,3325" group="n93_o4m7"/>
+    <component id="n89_o4m7" name="g1" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="883,3487" group="n93_o4m7" controller="c1,1"/>
+    <group id="n93_o4m7" name="n93" xy="-13,283" size="1787,3330" advanced="true" layout="vt" lineGap="-90" excludeInvisibles="true"/>
+  </displayList>
+  <relation target="n45_xv4o" sidePair="width-width,height-height"/>
 </component>
 </component>

BIN
FGUIProject/assets/Main/imagesNew/zxian_btn_jq.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_btn_zd.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_chapter_dec.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_chapter_switch.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_gift_dec1.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_gift_dec2.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_gift_get.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_gift_unget.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_line.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_mask.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_name_dec.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_sel.png


BIN
FGUIProject/assets/Main/imagesStory/fzd_fzxzhong.png


BIN
FGUIProject/assets/Main/imagesStory/zd_bl_0.png


BIN
FGUIProject/assets/Main/imagesStory/zd_bl_1.png


BIN
FGUIProject/assets/Main/imagesStory/zd_bl_2.png


BIN
FGUIProject/assets/Main/imagesStory/zd_cishukuang.png


BIN
FGUIProject/assets/Main/imagesStory/zd_daoshu_1.png


BIN
FGUIProject/assets/Main/imagesStory/zd_daoshu_2.png


BIN
FGUIProject/assets/Main/imagesStory/zd_gxi_1.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jdbiao.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jineng_1.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jineng_2.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jineng_3.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jineng_4.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jingzi_1.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jingzi_2.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jingzi_3.png


BIN
FGUIProject/assets/Main/imagesStory/zd_jingzi_4.png


+ 42 - 24
FGUIProject/assets/Main/package.xml

@@ -40,9 +40,9 @@
     <image id="v35427" name="zx_gka_zsp_1.png" path="/imagesStory/"/>
     <image id="v35427" name="zx_gka_zsp_1.png" path="/imagesStory/"/>
     <image id="v35428" name="zx_gka_zsp_2.png" path="/imagesStory/"/>
     <image id="v35428" name="zx_gka_zsp_2.png" path="/imagesStory/"/>
     <image id="v35429" name="zx_gka_zsp_3.png" path="/imagesStory/"/>
     <image id="v35429" name="zx_gka_zsp_3.png" path="/imagesStory/"/>
-    <component id="v3542b" name="CompBonusBox.xml" path="/componentsLevel/"/>
-    <component id="xuzk2d" name="CompStoryLevelItem.xml" path="/componentsLevel/"/>
-    <component id="xuzk2e" name="CompChapter.xml" path="/componentsLevel/"/>
+    <component id="v3542b" name="CompBonusBox.xml" path="/components/"/>
+    <component id="xuzk2d" name="CompStoryLevelItem1.xml" path="/components/"/>
+    <component id="xuzk2e" name="CompChapter.xml" path="/components/"/>
     <image id="xuzk2h" name="zx_gka_zsp_4.png" path="/imagesStory/"/>
     <image id="xuzk2h" name="zx_gka_zsp_4.png" path="/imagesStory/"/>
     <component id="xuzk2i" name="StoryDialogUI.xml" path="/" exported="true"/>
     <component id="xuzk2i" name="StoryDialogUI.xml" path="/" exported="true"/>
     <image id="nmnb2j" name="dhjm_bstx_1.png" path="/imagesDialog/"/>
     <image id="nmnb2j" name="dhjm_bstx_1.png" path="/imagesDialog/"/>
@@ -71,7 +71,7 @@
     <component id="vxw538" name="StoryLevelInfoUI.xml" path="/" exported="true"/>
     <component id="vxw538" name="StoryLevelInfoUI.xml" path="/" exported="true"/>
     <image id="t8o13c" name="zx_jqgka_anks_1.png" path="/imagesStory/"/>
     <image id="t8o13c" name="zx_jqgka_anks_1.png" path="/imagesStory/"/>
     <image id="t8o13g" name="zx_jq_djtubiao_1.png" path="/imagesStory/"/>
     <image id="t8o13g" name="zx_jq_djtubiao_1.png" path="/imagesStory/"/>
-    <component id="t8o13i" name="ButtonStart.xml" path="/componentsLevel/"/>
+    <component id="t8o13i" name="ButtonStart.xml" path="/components/"/>
     <component id="8xpg3o" name="StoryFightTargetUI.xml" path="/" exported="true"/>
     <component id="8xpg3o" name="StoryFightTargetUI.xml" path="/" exported="true"/>
     <image id="8xpg3p" name="zd_dz_jm_z.png" path="/imagesStory/"/>
     <image id="8xpg3p" name="zd_dz_jm_z.png" path="/imagesStory/"/>
     <image id="8xpg3q" name="zd_dz_mz_1.png" path="/imagesStory/"/>
     <image id="8xpg3q" name="zd_dz_mz_1.png" path="/imagesStory/"/>
@@ -196,11 +196,9 @@
     <image id="srnc98" name="zd_btzi_1.png" path="/images/"/>
     <image id="srnc98" name="zd_btzi_1.png" path="/images/"/>
     <image id="oq7r99" name="zx_gka_baoxiang_1.png" path="/imagesStory/"/>
     <image id="oq7r99" name="zx_gka_baoxiang_1.png" path="/imagesStory/"/>
     <image id="oq7r9a" name="zx_gka_baoxiang_2.png" path="/imagesStory/"/>
     <image id="oq7r9a" name="zx_gka_baoxiang_2.png" path="/imagesStory/"/>
-    <component id="n0js9b" name="comClickCircle.xml" path="/components/"/>
     <image id="r1a99c" name="kp_kpkuang_2.png" path="/images/"/>
     <image id="r1a99c" name="kp_kpkuang_2.png" path="/images/"/>
     <component id="r1a99d" name="StoryCardChooseUI.xml" path="/" exported="true"/>
     <component id="r1a99d" name="StoryCardChooseUI.xml" path="/" exported="true"/>
     <component id="r1a99f" name="ListCardItem.xml" path="/components/"/>
     <component id="r1a99f" name="ListCardItem.xml" path="/components/"/>
-    <image id="r1a99g" name="fzd_fzxzhong.png" path="/imagesStory/"/>
     <component id="py009l" name="StorySkillUI.xml" path="/" exported="true"/>
     <component id="py009l" name="StorySkillUI.xml" path="/" exported="true"/>
     <image id="py009m" name="zd_kpdi_2.png" path="/imagesStory/"/>
     <image id="py009m" name="zd_kpdi_2.png" path="/imagesStory/"/>
     <image id="py009n" name="zd_kpdi_1.png" path="/imagesStory/"/>
     <image id="py009n" name="zd_kpdi_1.png" path="/imagesStory/"/>
@@ -278,18 +276,10 @@
     <component id="vuz5bx" name="Slider1_grip.xml" path="/components/"/>
     <component id="vuz5bx" name="Slider1_grip.xml" path="/components/"/>
     <image id="oixcby" name="zd_pfjdt_4.png" path="/imagesStory/"/>
     <image id="oixcby" name="zd_pfjdt_4.png" path="/imagesStory/"/>
     <image id="oixcbz" name="zd_ztca.png" path="/imagesStory/"/>
     <image id="oixcbz" name="zd_ztca.png" path="/imagesStory/"/>
-    <component id="v3k9c0" name="ComBtnSkill.xml" path="/components/"/>
     <component id="v3k9c1" name="ComRoleSkillScore.xml" path="/components/"/>
     <component id="v3k9c1" name="ComRoleSkillScore.xml" path="/components/"/>
     <component id="v3k9c3" name="ComSkillShield.xml" path="/components/"/>
     <component id="v3k9c3" name="ComSkillShield.xml" path="/components/"/>
     <component id="v3k9c4" name="comTargetCircle.xml" path="/components/"/>
     <component id="v3k9c4" name="comTargetCircle.xml" path="/components/"/>
-    <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
-    <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
-    <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
-    <image id="v3k9cc" name="zd_jineng_1.png" path="/imagesStory/" exported="true"/>
-    <image id="v3k9cd" name="zd_jineng_2.png" path="/imagesStory/" exported="true"/>
-    <image id="v3k9ce" name="zd_jineng_3.png" path="/imagesStory/" exported="true"/>
-    <image id="v3k9cf" name="zd_jineng_4.png" path="/imagesStory/" exported="true"/>
     <image id="v3k9cq" name="zd_zdjdt_1.png" path="/imagesStory/"/>
     <image id="v3k9cq" name="zd_zdjdt_1.png" path="/imagesStory/"/>
     <image id="v3k9cr" name="zd_zdjdt_2.png" path="/imagesStory/"/>
     <image id="v3k9cr" name="zd_zdjdt_2.png" path="/imagesStory/"/>
     <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/" scale="9grid" scale9grid="229,9,458,18"/>
     <image id="v3k9cs" name="zd_zdjdt_3.png" path="/imagesStory/" scale="9grid" scale9grid="229,9,458,18"/>
@@ -319,11 +309,6 @@
     <image id="k1khdx" name="zdsz_7.png" path="/Font5/"/>
     <image id="k1khdx" name="zdsz_7.png" path="/Font5/"/>
     <image id="k1khdy" name="zdsz_8.png" path="/Font5/"/>
     <image id="k1khdy" name="zdsz_8.png" path="/Font5/"/>
     <image id="k1khdz" name="zdsz_9.png" path="/Font5/"/>
     <image id="k1khdz" name="zdsz_9.png" path="/Font5/"/>
-    <image id="k1khe0" name="zd_cishukuang.png" path="/imagesStory/"/>
-    <image id="k1khe1" name="zd_jingzi_1.png" path="/imagesStory/"/>
-    <image id="k1khe2" name="zd_jingzi_2.png" path="/imagesStory/"/>
-    <image id="k1khe3" name="zd_jingzi_3.png" path="/imagesStory/"/>
-    <image id="k1khe4" name="zd_jingzi_4.png" path="/imagesStory/"/>
     <image id="k1khe5" name="zd_txtxtx.png" path="/imagesStory/"/>
     <image id="k1khe5" name="zd_txtxtx.png" path="/imagesStory/"/>
     <font id="k1khe6" name="Font9.fnt" path="/Font5/" exported="true"/>
     <font id="k1khe6" name="Font9.fnt" path="/Font5/" exported="true"/>
     <component id="k1khe7" name="Component2.xml" path="/components/"/>
     <component id="k1khe7" name="Component2.xml" path="/components/"/>
@@ -377,18 +362,14 @@
     <image id="wonogj" name="zjm_txkuang_1.png" path="/imagesFight/"/>
     <image id="wonogj" name="zjm_txkuang_1.png" path="/imagesFight/"/>
     <component id="wonogk" name="ComRoleResult.xml" path="/components/"/>
     <component id="wonogk" name="ComRoleResult.xml" path="/components/"/>
     <component id="wonogm" name="ComRole.xml" path="/components/"/>
     <component id="wonogm" name="ComRole.xml" path="/components/"/>
-    <image id="wonogn" name="zd_gxi_1.png" path="/imagesStory/"/>
     <image id="wonogo" name="zd_jsjm_jdt_2.png" path="/imagesStory/"/>
     <image id="wonogo" name="zd_jsjm_jdt_2.png" path="/imagesStory/"/>
     <image id="wonogp" name="zd_jsjm_jdt_3 .png" path="/imagesStory/"/>
     <image id="wonogp" name="zd_jsjm_jdt_3 .png" path="/imagesStory/"/>
     <image id="wonogq" name="zd_jsjm_jdt_3.png" path="/imagesStory/"/>
     <image id="wonogq" name="zd_jsjm_jdt_3.png" path="/imagesStory/"/>
     <component id="wonogr" name="ComScoreStage.xml" path="/components/"/>
     <component id="wonogr" name="ComScoreStage.xml" path="/components/"/>
     <component id="wonogs" name="ComSingleScore.xml" path="/components/"/>
     <component id="wonogs" name="ComSingleScore.xml" path="/components/"/>
-    <image id="wonogt" name="zd_bl_2.png" path="/imagesStory/" exported="true"/>
-    <image id="wonogu" name="zd_bl_0.png" path="/imagesStory/" exported="true"/>
     <image id="wonogw" name="jz_yjd_dd.png" path="/imagesFight/"/>
     <image id="wonogw" name="jz_yjd_dd.png" path="/imagesFight/"/>
     <image id="wonogx" name="jz_yjd_f.png" path="/imagesFight/"/>
     <image id="wonogx" name="jz_yjd_f.png" path="/imagesFight/"/>
     <component id="wonoh2" name="ComSingleScoreStage.xml" path="/components/"/>
     <component id="wonoh2" name="ComSingleScoreStage.xml" path="/components/"/>
-    <image id="wonoh3" name="zd_bl_1.png" path="/imagesStory/" exported="true"/>
     <image id="wonoh5" name="jz_shan_1.png" path="/imagesFight/"/>
     <image id="wonoh5" name="jz_shan_1.png" path="/imagesFight/"/>
     <image id="wonoh6" name="jz_shan_2.png" path="/imagesFight/"/>
     <image id="wonoh6" name="jz_shan_2.png" path="/imagesFight/"/>
     <image id="wonoh7" name="jz_shan_3.png" path="/imagesFight/"/>
     <image id="wonoh7" name="jz_shan_3.png" path="/imagesFight/"/>
@@ -428,7 +409,6 @@
     <image id="v95qi8" name="zd_jz_3.png" path="/imagesStory/"/>
     <image id="v95qi8" name="zd_jz_3.png" path="/imagesStory/"/>
     <image id="v95qi9" name="zd_jz_1.png" path="/imagesStory/"/>
     <image id="v95qi9" name="zd_jz_1.png" path="/imagesStory/"/>
     <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
     <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
-    <image id="v95qib" name="zd_jdbiao.png" path="/imagesStory/"/>
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
     <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
     <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
@@ -676,6 +656,44 @@
     <component id="11ndfpy" name="CompChapter20006.xml" path="/componentsLevel/" exported="true"/>
     <component id="11ndfpy" name="CompChapter20006.xml" path="/componentsLevel/" exported="true"/>
     <component id="11ndfpz" name="CompChapter20007.xml" path="/componentsLevel/" exported="true"/>
     <component id="11ndfpz" name="CompChapter20007.xml" path="/componentsLevel/" exported="true"/>
     <component id="11ndfq0" name="CompChapter20008.xml" path="/componentsLevel/" exported="true"/>
     <component id="11ndfq0" name="CompChapter20008.xml" path="/componentsLevel/" exported="true"/>
+    <image id="o4m7fq1" name="zxian_sel.png" path="/imagesNew/"/>
+    <image id="o4m7fq2" name="zxian_btn_jq.png" path="/imagesNew/"/>
+    <image id="o4m7fq3" name="zxian_btn_zd.png" path="/imagesNew/"/>
+    <image id="o4m7fq4" name="zxian_chapter_dec.png" path="/imagesNew/"/>
+    <image id="o4m7fq5" name="zxian_chapter_switch.png" path="/imagesNew/"/>
+    <image id="o4m7fq6" name="zxian_gift_dec1.png" path="/imagesNew/"/>
+    <image id="o4m7fq7" name="zxian_gift_dec2.png" path="/imagesNew/"/>
+    <image id="o4m7fq8" name="zxian_gift_get.png" path="/imagesNew/"/>
+    <image id="o4m7fq9" name="zxian_gift_unget.png" path="/imagesNew/"/>
+    <image id="o4m7fqa" name="zxian_line.png" path="/imagesNew/"/>
+    <image id="o4m7fqb" name="zxian_name_dec.png" path="/imagesNew/"/>
+    <component id="o4m7fqd" name="CompStoryLevelItem.xml" path="/components/"/>
+    <image id="o4m7fqe" name="zxian_l_9.png" path="/FontNew/"/>
+    <image id="o4m7fqf" name="zxian_l_0.png" path="/FontNew/"/>
+    <image id="o4m7fqg" name="zxian_l_1.png" path="/FontNew/"/>
+    <image id="o4m7fqh" name="zxian_l_2.png" path="/FontNew/"/>
+    <image id="o4m7fqi" name="zxian_l_3.png" path="/FontNew/"/>
+    <image id="o4m7fqj" name="zxian_l_4.png" path="/FontNew/"/>
+    <image id="o4m7fqk" name="zxian_l_5.png" path="/FontNew/"/>
+    <image id="o4m7fql" name="zxian_l_6.png" path="/FontNew/"/>
+    <image id="o4m7fqm" name="zxian_l_7.png" path="/FontNew/"/>
+    <image id="o4m7fqn" name="zxian_l_8.png" path="/FontNew/"/>
+    <font id="o4m7fqo" name="Font_Chapter_Big.fnt" path="/FontNew/" exported="true"/>
+    <image id="o4m7fqp" name="zxian_s_9.png" path="/FontNew/"/>
+    <image id="o4m7fqq" name="zxian_s_-.png" path="/FontNew/"/>
+    <image id="o4m7fqr" name="zxian_s_0.png" path="/FontNew/"/>
+    <image id="o4m7fqs" name="zxian_s_1.png" path="/FontNew/"/>
+    <image id="o4m7fqt" name="zxian_s_2.png" path="/FontNew/"/>
+    <image id="o4m7fqu" name="zxian_s_3.png" path="/FontNew/"/>
+    <image id="o4m7fqv" name="zxian_s_4.png" path="/FontNew/"/>
+    <image id="o4m7fqw" name="zxian_s_5.png" path="/FontNew/"/>
+    <image id="o4m7fqx" name="zxian_s_6.png" path="/FontNew/"/>
+    <image id="o4m7fqy" name="zxian_s_7.png" path="/FontNew/"/>
+    <image id="o4m7fqz" name="zxian_s_8.png" path="/FontNew/"/>
+    <font id="o4m7fr0" name="Font_Chapter_Small.fnt" path="/FontNew/" exported="true"/>
+    <component id="o4m7fr5" name="ComDialogBg.xml" path="/components/"/>
+    <image id="o4m7fr6" name="zxian_mask.png" path="/imagesNew/"/>
+    <component id="o4m7fr7" name="CompChapter.xml" path="/componentsLevel/" exported="true"/>
   </resources>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Studio/components/ListPorcelainItem.xml

@@ -6,7 +6,7 @@
     <image id="n22_f2bf" name="n22" src="psph34" fileName="images/cqxf_di_2.png" xy="0,0" pivot="0.5,0.5"/>
     <image id="n22_f2bf" name="n22" src="psph34" fileName="images/cqxf_di_2.png" xy="0,0" pivot="0.5,0.5"/>
     <loader id="n19_wono" name="loaBg" xy="0,0" size="912,189" url="ui://xz8kxrecpsph34" align="right" vAlign="middle" autoSize="true" fillMethod="hz"/>
     <loader id="n19_wono" name="loaBg" xy="0,0" size="912,189" url="ui://xz8kxrecpsph34" align="right" vAlign="middle" autoSize="true" fillMethod="hz"/>
     <loader id="n27_psph" name="loaName" xy="411,63" size="197,62" visible="false" touchable="false" url="ui://xz8kxrecpsph3a" autoSize="true"/>
     <loader id="n27_psph" name="loaName" xy="411,63" size="197,62" visible="false" touchable="false" url="ui://xz8kxrecpsph3a" autoSize="true"/>
-    <text id="n30_o4m7" name="txtName" xy="490,73" pivot="0.5,0" size="40,42" fontSize="30" align="center" text=""/>
+    <text id="n30_o4m7" name="txtName" xy="410,60" pivot="0.5,0.5" size="201,54" font="ui://eg2y0ldpa0cftkz" fontSize="40" color="#bc775e" align="center" strokeColor="#ffe9bb" text="竹简修复-1"/>
     <image id="n23_f2bf" name="n23" src="j48o95" fileName="imagesExport/zx_jq_djtubiao_1.png" pkg="mfvz4q8k" xy="197,123" group="n26_f2bf">
     <image id="n23_f2bf" name="n23" src="j48o95" fileName="imagesExport/zx_jq_djtubiao_1.png" pkg="mfvz4q8k" xy="197,123" group="n26_f2bf">
       <gearDisplay controller="star" pages="1,2,3"/>
       <gearDisplay controller="star" pages="1,2,3"/>
     </image>
     </image>

+ 21 - 2
GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -200,12 +200,31 @@ namespace GFGGame
             {
             {
                 GameGlobal.isFirstEntry = true;
                 GameGlobal.isFirstEntry = true;
                 ViewManager.Hide<ModalStatusView>();
                 ViewManager.Hide<ModalStatusView>();
-                GameController.ShowCreateRole();
+                //GameController.ShowCreateRole();不显示创角界面,在剧情中改名
+                await ReqCreateRole();
             }
             }
         }
         }
 
 
-        public static async ETTask ReqCreateRole(string roleName)
+        public static async ETTask<string> ReqRandomRoleName()
         {
         {
+            (int result, string name) = await LoginHelper.ReqRandomRoleName();
+            if (result == ErrorCode.ERR_Success)
+            {
+                return name;
+            }
+            else
+            {
+                ErrorCodeController.Handler(result);
+                return "";
+            }
+        }
+
+        public static async ETTask ReqCreateRole(string roleName = null)
+        {
+            if(string.IsNullOrEmpty(roleName))
+            {
+                roleName = await ReqRandomRoleName();
+            }
             ViewManager.Show<ModalStatusView>("创建角色中...");
             ViewManager.Show<ModalStatusView>("创建角色中...");
             int errorCode = await ET.LoginHelper.CreateRole(GameGlobal.zoneScene, roleName);
             int errorCode = await ET.LoginHelper.CreateRole(GameGlobal.zoneScene, roleName);
             if (errorCode != ErrorCode.ERR_Success)
             if (errorCode != ErrorCode.ERR_Success)

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

@@ -29,7 +29,7 @@ namespace GFGGame
         public List<LeagueLogData> ListLogDatas = new List<LeagueLogData>();//日志数据
         public List<LeagueLogData> ListLogDatas = new List<LeagueLogData>();//日志数据
         public LeagueLastAnswerRoleData LastAnswerRoleData = new LeagueLastAnswerRoleData();//上题回答数据
         public LeagueLastAnswerRoleData LastAnswerRoleData = new LeagueLastAnswerRoleData();//上题回答数据
         public Dictionary<long, int> ListAnsweringDatas = new Dictionary<long, int>();//当前答题玩家数据,roleId,答题数量。
         public Dictionary<long, int> ListAnsweringDatas = new Dictionary<long, int>();//当前答题玩家数据,roleId,答题数量。
-        public Dictionary<int, List<LeagueAnswerData>> ListAnswerRankDatas = new Dictionary<int, List<LeagueAnswerData>>();//答题排行榜数据,int:type//1:周排行 2:上周排行
+        public Dictionary<int, List<LeagueAnswerData>> ListAnswerRankDatas = new Dictionary<int, List<LeagueAnswerData>>();//答题排行榜数据,int:type//0:周排行 1:上周排行
 
 
 
 
         public void Clear()
         public void Clear()

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

@@ -58,7 +58,7 @@ namespace GFGGame
                 if (render)
                 if (render)
                 {
                 {
                     index++;
                     index++;
-                    center += render.bounds.center;
+                    center += render.bounds.center + new Vector3(render.offset.x, render.offset.y, 0);
                 }
                 }
             }
             }
             if (index > 0) center /= index;
             if (index > 0) center /= index;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/DressUp/DressUpPart.cs

@@ -14,6 +14,7 @@ namespace GFGGame
             {
             {
                 Timers.inst.Remove(OnTimer);
                 Timers.inst.Remove(OnTimer);
             }
             }
+            OnTimer = null;
         }
         }
     }
     }
 }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -263,9 +263,9 @@ namespace GFGGame
             TryRemoveObj(parentObj, objName);
             TryRemoveObj(parentObj, objName);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
             GameObject spriteObj = null;
             GameObject spriteObj = null;
-            if (!DressUpMenuItemCfg1Array.Instance.CheckIsSceneTypeBySubType(itemCfg.subType))
+            if (DressUpMenuItemCfg1Array.Instance.CheckIsDefaultType(itemCfg.subType))
             {
             {
-                //这里需要先添加静态图,防止加载动画有延迟,出现光头
+                //默认类型的部件需要先添加静态图,防止加载动画有延迟,出现光头
                 spriteObj = AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
                 spriteObj = AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
             }
             }
 
 

+ 4 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModel.cs

@@ -8,8 +8,7 @@ namespace UI.LuckyBox
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public GLoader m_loaRes;
-        public GGraph m_holder;
+        public UI_ComModelRes m_comModelRes;
         public GLoader m_loaMask;
         public GLoader m_loaMask;
         public Transition m_t0;
         public Transition m_t0;
         public Transition m_t1;
         public Transition m_t1;
@@ -61,8 +60,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaRes = (GLoader)comp.GetChild("loaRes");
-            m_holder = (GGraph)comp.GetChild("holder");
+            m_comModelRes = (UI_ComModelRes)UI_ComModelRes.Create(comp.GetChild("comModelRes"));
             m_loaMask = (GLoader)comp.GetChild("loaMask");
             m_loaMask = (GLoader)comp.GetChild("loaMask");
             m_t0 = comp.GetTransition("t0");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
             m_t1 = comp.GetTransition("t1");
@@ -70,8 +68,8 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBg = null;
             m_loaBg = null;
-            m_loaRes = null;
-            m_holder = null;
+            m_comModelRes.Dispose();
+            m_comModelRes = null;
             m_loaMask = null;
             m_loaMask = null;
             m_t0 = null;
             m_t0 = null;
             m_t1 = null;
             m_t1 = null;

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModelRes.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComModelRes
+    {
+        public GComponent target;
+        public GLoader m_loaRes;
+        public GGraph m_holder;
+        public const string URL = "ui://drx9d1uso4m7tf6";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComModelRes";
+        private static UI_ComModelRes _proxy;
+
+        public static UI_ComModelRes Create(GObject gObject = null)
+        {
+            var ui = new UI_ComModelRes();
+            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_ComModelRes Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComModelRes();
+            }
+            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_loaRes = (GLoader)comp.GetChild("loaRes");
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaRes = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModelRes.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDialogBg.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComDialogBg
+    {
+        public GComponent target;
+        public GLoader m_loabg;
+        public const string URL = "ui://mfvz4q8ko4m7fr5";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComDialogBg";
+        private static UI_ComDialogBg _proxy;
+
+        public static UI_ComDialogBg Create(GObject gObject = null)
+        {
+            var ui = new UI_ComDialogBg();
+            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_ComDialogBg Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComDialogBg();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loabg = (GLoader)comp.GetChild("loabg");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loabg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 6 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompBonusBox.cs

@@ -7,10 +7,10 @@ namespace UI.Main
     public partial class UI_CompBonusBox
     public partial class UI_CompBonusBox
     {
     {
         public GComponent target;
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_icon;
         public GLoader m_icon;
-        public GTextField m_txtName;
-        public GComponent m_ComRewardEffect;
         public GImage m_iconActive;
         public GImage m_iconActive;
+        public GTextField m_txtName;
         public const string URL = "ui://mfvz4q8kv3542b";
         public const string URL = "ui://mfvz4q8kv3542b";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompBonusBox";
         public const string RES_NAME = "CompBonusBox";
@@ -58,17 +58,17 @@ namespace UI.Main
 
 
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
+            m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_ComRewardEffect = (GComponent)comp.GetChild("ComRewardEffect");
             m_iconActive = (GImage)comp.GetChild("iconActive");
             m_iconActive = (GImage)comp.GetChild("iconActive");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
+            m_c1 = null;
             m_icon = null;
             m_icon = null;
-            m_txtName = null;
-            m_ComRewardEffect = null;
             m_iconActive = null;
             m_iconActive = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 151 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter.cs

@@ -0,0 +1,151 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_CompChapter
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public UI_CompStoryLevelItem m_g1;
+        public UI_CompStoryLevelItem m_g2;
+        public UI_CompStoryLevelItem m_g3;
+        public UI_CompStoryLevelItem m_g4;
+        public UI_CompStoryLevelItem m_g5;
+        public UI_CompStoryLevelItem m_g6;
+        public UI_CompStoryLevelItem m_g7;
+        public UI_CompStoryLevelItem m_g8;
+        public UI_CompStoryLevelItem m_g9;
+        public UI_CompStoryLevelItem m_g10;
+        public UI_CompStoryLevelItem m_g11;
+        public UI_CompStoryLevelItem m_g12;
+        public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
+        public const string URL = "ui://mfvz4q8ko4m7fr7";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "CompChapter";
+        private static UI_CompChapter _proxy;
+
+        public static UI_CompChapter Create(GObject gObject = null)
+        {
+            var ui = new UI_CompChapter();
+            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_CompChapter Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompChapter();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_g1.Dispose();
+            m_g1 = null;
+            m_g2.Dispose();
+            m_g2 = null;
+            m_g3.Dispose();
+            m_g3 = null;
+            m_g4.Dispose();
+            m_g4 = null;
+            m_g5.Dispose();
+            m_g5 = null;
+            m_g6.Dispose();
+            m_g6 = null;
+            m_g7.Dispose();
+            m_g7 = null;
+            m_g8.Dispose();
+            m_g8 = null;
+            m_g9.Dispose();
+            m_g9 = null;
+            m_g10.Dispose();
+            m_g10 = null;
+            m_g11.Dispose();
+            m_g11 = null;
+            m_g12.Dispose();
+            m_g12 = null;
+            m_g13.Dispose();
+            m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 24 - 24
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10001.cs

@@ -8,18 +8,18 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
         public const string URL = "ui://mfvz4q8ktxgzdd";
         public const string URL = "ui://mfvz4q8ktxgzdd";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10001";
         public const string RES_NAME = "CompChapter10001";
@@ -68,18 +68,18 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10002.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8ktxgzdc";
         public const string URL = "ui://mfvz4q8ktxgzdc";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10002";
         public const string RES_NAME = "CompChapter10002";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10003.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8ks2cc5p";
         public const string URL = "ui://mfvz4q8ks2cc5p";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10003";
         public const string RES_NAME = "CompChapter10003";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10004.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8ks2cc5q";
         public const string URL = "ui://mfvz4q8ks2cc5q";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10004";
         public const string RES_NAME = "CompChapter10004";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10005.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8kga166s";
         public const string URL = "ui://mfvz4q8kga166s";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10005";
         public const string RES_NAME = "CompChapter10005";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10006.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8k11ndfpv";
         public const string URL = "ui://mfvz4q8k11ndfpv";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10006";
         public const string RES_NAME = "CompChapter10006";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10007.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8k11ndfpw";
         public const string URL = "ui://mfvz4q8k11ndfpw";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10007";
         public const string RES_NAME = "CompChapter10007";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 40 - 40
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10008.cs

@@ -8,26 +8,26 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
-        public UI_CompStoryLevelItem m_g11;
-        public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
+        public UI_CompStoryLevelItem1 m_g11;
+        public UI_CompStoryLevelItem1 m_g12;
+        public UI_CompStoryLevelItem1 m_g13;
+        public UI_CompStoryLevelItem1 m_g14;
+        public UI_CompStoryLevelItem1 m_g15;
+        public UI_CompStoryLevelItem1 m_g16;
+        public UI_CompStoryLevelItem1 m_g17;
+        public UI_CompStoryLevelItem1 m_g18;
+        public UI_CompStoryLevelItem1 m_g19;
+        public UI_CompStoryLevelItem1 m_g20;
         public const string URL = "ui://mfvz4q8k11ndfpx";
         public const string URL = "ui://mfvz4q8k11ndfpx";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10008";
         public const string RES_NAME = "CompChapter10008";
@@ -76,26 +76,26 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
-            m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
-            m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
+            m_g11 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g11"));
+            m_g12 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g20"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 12 - 12
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs

@@ -8,12 +8,12 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
         public const string URL = "ui://mfvz4q8kkpb08j";
         public const string URL = "ui://mfvz4q8kkpb08j";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter20001";
         public const string RES_NAME = "CompChapter20001";
@@ -62,12 +62,12 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

+ 20 - 20
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs

@@ -8,16 +8,16 @@ namespace UI.Main
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public UI_CompStoryLevelItem m_g1;
-        public UI_CompStoryLevelItem m_g2;
-        public UI_CompStoryLevelItem m_g3;
-        public UI_CompStoryLevelItem m_g4;
-        public UI_CompStoryLevelItem m_g5;
-        public UI_CompStoryLevelItem m_g6;
-        public UI_CompStoryLevelItem m_g7;
-        public UI_CompStoryLevelItem m_g8;
-        public UI_CompStoryLevelItem m_g9;
-        public UI_CompStoryLevelItem m_g10;
+        public UI_CompStoryLevelItem1 m_g1;
+        public UI_CompStoryLevelItem1 m_g2;
+        public UI_CompStoryLevelItem1 m_g3;
+        public UI_CompStoryLevelItem1 m_g4;
+        public UI_CompStoryLevelItem1 m_g5;
+        public UI_CompStoryLevelItem1 m_g6;
+        public UI_CompStoryLevelItem1 m_g7;
+        public UI_CompStoryLevelItem1 m_g8;
+        public UI_CompStoryLevelItem1 m_g9;
+        public UI_CompStoryLevelItem1 m_g10;
         public const string URL = "ui://mfvz4q8kkpb08i";
         public const string URL = "ui://mfvz4q8kkpb08i";
         public const string PACKAGE_NAME = "Main";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter20002";
         public const string RES_NAME = "CompChapter20002";
@@ -66,16 +66,16 @@ namespace UI.Main
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
-            m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
-            m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
-            m_g4 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g4"));
-            m_g5 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g5"));
-            m_g6 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g6"));
-            m_g7 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g7"));
-            m_g8 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g8"));
-            m_g9 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g9"));
-            m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
+            m_g1 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g1"));
+            m_g2 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g2"));
+            m_g3 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g3"));
+            m_g4 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g4"));
+            m_g5 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g5"));
+            m_g6 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g6"));
+            m_g7 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g7"));
+            m_g8 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g8"));
+            m_g9 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g9"));
+            m_g10 = (UI_CompStoryLevelItem1)UI_CompStoryLevelItem1.Create(comp.GetChild("g10"));
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików