zhaoyang hace 2 años
padre
commit
96e319c4a4
Se han modificado 39 ficheros con 346 adiciones y 571 borrados
  1. 26 7
      FGUIProject/assets/Main/StoryChapterUI.xml
  2. 3 3
      FGUIProject/assets/Main/components/CompBonusBox.xml
  3. 1 1
      FGUIProject/assets/Main/components/CompChapter.xml
  4. 16 7
      FGUIProject/assets/Main/components/CompStoryLevelItem.xml
  5. 55 25
      FGUIProject/assets/Main/componentsLevel/CompChapter.xml
  6. BIN
      FGUIProject/assets/Main/imagesNew/zxgq_zddb.png
  7. BIN
      FGUIProject/assets/Main/imagesNew/zxgq_zdtb.png
  8. BIN
      FGUIProject/assets/Main/imagesNew/zxian_bg3_cover.png
  9. 6 3
      FGUIProject/assets/Main/package.xml
  10. 147 83
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter.cs
  11. 21 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryChapterUI.cs
  12. 71 55
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  13. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  14. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png
  18. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png
  20. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png
  22. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png
  24. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png.meta
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  31. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  32. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  33. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  34. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  35. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  36. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  37. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  38. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  39. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 26 - 7
FGUIProject/assets/Main/StoryChapterUI.xml

@@ -1,22 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="componentsLevel/CompChapter.xml" xy="0,0" size="1080,1920">
+    <loader id="n31_o4m7" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://mfvz4q8ko4m7fr9" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,center-center,middle-middle"/>
+    </loader>
+    <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="components/CompChapter.xml" xy="0,0" size="1080,1920">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <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="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">
+    <text id="n30_o4m7" name="txtChapter" xy="920,229" size="88,60" group="n19_o4m7" font="ui://mfvz4q8ko4m7fqo" fontSize="30" text="03"/>
+    <image id="n25_o4m7" name="n25" src="o4m7frf" fileName="imagesNew/zxian_bg3_cover.png" xy="923,253" group="n19_o4m7"/>
+    <image id="n15_ki96" name="n15" src="o4m7fq4" fileName="imagesNew/zxian_chapter_dec.png" xy="786,189" group="n19_o4m7">
       <relation target="" sidePair="center-center,top-top"/>
     </image>
-    <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="章节名字">
+    <text id="n16_ki96" name="txtChapterName0" xy="809,214" size="74,92" group="n19_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="70" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="草">
       <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
     </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"/>
+    <text id="n26_o4m7" name="txtChapterName1" xy="870,228" size="54,66" group="n19_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="50" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="书">
+      <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n27_o4m7" name="txtChapterName2" xy="894,280" size="54,66" group="n19_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="50" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="七">
+      <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n28_o4m7" name="txtChapterName3" xy="943,281" size="54,66" group="n19_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="50" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="绝">
+      <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n29_o4m7" name="txtChapterName4" xy="990,259" size="74,92" group="n19_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="70" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="册">
+      <relation target="n15_ki96" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n19_o4m7" name="n19" xy="786,189" size="278,162" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <component id="n7_v354" name="bonusBox3" src="v3542b" fileName="components/CompBonusBox.xml" xy="23,255" group="n20_o4m7" controller="c1,2"/>
+    <component id="n11_v354" name="bonusBox2" src="v3542b" fileName="components/CompBonusBox.xml" xy="23,386" group="n20_o4m7" controller="c1,1"/>
+    <component id="n12_v354" name="bonusBox1" src="v3542b" fileName="components/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"/>

+ 3 - 3
FGUIProject/assets/Main/components/CompBonusBox.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="122,136">
-  <controller name="c1" exported="true" pages="0,,1,,2," selected="2"/>
+<component size="122,136" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1,,2," selected="0"/>
   <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">
+    <loader id="n15_o4m7" name="n15" xy="65,-12" size="6,132" group="n16_o4m7" url="ui://mfvz4q8ko4m7fq7" 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>

+ 1 - 1
FGUIProject/assets/Main/components/CompChapter.xml

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

+ 16 - 7
FGUIProject/assets/Main/components/CompStoryLevelItem.xml

@@ -18,23 +18,32 @@
     <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">
+    <image id="n16_o4m7" name="n16" src="o4m7fqb" fileName="imagesNew/zxian_name_dec.png" xy="264,0" group="n17_o4m7"/>
+    <text id="n15_o4m7" name="txtName" xy="301,23" size="122,41" group="n17_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="30" color="#ffeabf" text="曲水流觞"/>
+    <group id="n17_o4m7" name="n17" xy="181,0" size="242,74" group="n19_o4m7" advanced="true" layout="hz" colGap="-15">
       <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">
+    <image id="n23_o4m7" name="n23" src="o4m7frd" fileName="imagesNew/zxgq_zddb.png" xy="89,48" pivot="0.5,0.5" size="360,120" 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"/>
+    <image id="n25_o4m7" name="n25" src="o4m7fre" fileName="imagesNew/zxgq_zdtb.png" xy="179,48" group="n26_o4m7">
+      <gearDisplay controller="c2" pages="0"/>
+    </image>
+    <text id="n20_o4m7" name="txtFightOrder" xy="255,59" pivot="0.5,0" size="106,50" group="n26_o4m7" font="ui://mfvz4q8ko4m7fr0" fontSize="30" color="#ffffff" align="center" text="1-1">
+      <gearXY controller="c2" pages="0,1" values="255,59|145,59"/>
     </text>
+    <image id="n27_o4m7" name="n27" src="o4m7fre" fileName="imagesNew/zxgq_zdtb.png" xy="353,48" group="n26_o4m7">
+      <gearDisplay controller="c2" pages="1"/>
+    </image>
+    <group id="n26_o4m7" name="n26" xy="179,48" size="182,70" group="n24_o4m7" advanced="true" layout="hz" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
     <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">
+    <group id="n24_o4m7" name="n24" xy="89,48" size="360,149" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
   </displayList>

+ 55 - 25
FGUIProject/assets/Main/componentsLevel/CompChapter.xml

@@ -1,29 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1753,3896" scroll="both" designImageLayer="1">
+<component size="1080,5500" 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"/>
+    <image id="n94_o4m7" name="n94" src="o4m7fqa" fileName="imagesNew/zxian_line.png" xy="72,3507" group="n117_o4m7" aspect="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </image>
+    <image id="n95_o4m7" name="imgBegin" src="o4m7fq1" fileName="imagesNew/zxian_sel.png" xy="540,5185" pivot="0.5,0" anchor="true" group="n117_o4m7" aspect="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+    <component id="n118_o4m7" name="g00" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="753,1081" group="n139_o4m7" controller="c2,1"/>
+    <component id="n119_o4m7" name="g01" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="434,1283" group="n139_o4m7" controller="c2,1"/>
+    <component id="n120_o4m7" name="g02" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="309,1485" group="n139_o4m7"/>
+    <component id="n121_o4m7" name="g03" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="408,1687" group="n139_o4m7"/>
+    <component id="n122_o4m7" name="g04" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="635,1889" group="n139_o4m7" controller="c2,1"/>
+    <component id="n123_o4m7" name="g05" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="734,2091" group="n139_o4m7" controller="c2,1"/>
+    <component id="n124_o4m7" name="g06" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="490,2293" group="n139_o4m7"/>
+    <component id="n125_o4m7" name="g07" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="328,2495" group="n139_o4m7"/>
+    <component id="n126_o4m7" name="g08" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="481,2697" group="n139_o4m7" controller="c2,1"/>
+    <component id="n127_o4m7" name="g09" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="691,2899" group="n139_o4m7" controller="c2,1"/>
+    <component id="n128_o4m7" name="g010" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="551,3101" group="n139_o4m7" controller="c2,0"/>
+    <component id="n129_o4m7" name="g011" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="787,3303" group="n139_o4m7" controller="c2,0"/>
+    <component id="n130_o4m7" name="g012" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="599,3505" group="n139_o4m7" controller="c2,0"/>
+    <component id="n131_o4m7" name="g013" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="403,3707" group="n139_o4m7"/>
+    <component id="n132_o4m7" name="g014" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="564,3909" group="n139_o4m7"/>
+    <component id="n133_o4m7" name="g015" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="664,4111" group="n139_o4m7" controller="c2,1"/>
+    <component id="n134_o4m7" name="g016" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="507,4313" group="n139_o4m7" controller="c2,1"/>
+    <component id="n135_o4m7" name="g017" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="853,4515" group="n139_o4m7"/>
+    <component id="n136_o4m7" name="g018" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="598,4717" group="n139_o4m7"/>
+    <component id="n137_o4m7" name="g019" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="436,4919" group="n139_o4m7"/>
+    <component id="n138_o4m7" name="g020" src="o4m7fqd" fileName="components/CompStoryLevelItem.xml" xy="589,5121" group="n139_o4m7"/>
+    <group id="n139_o4m7" name="n139" xy="39,955" size="1084,4292" group="n117_o4m7" visible="false" advanced="true" layout="vt" lineGap="-50" excludeInvisibles="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
+    <graph id="n115_o4m7" name="grh19_1" xy="767,1018" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n114_o4m7" name="grh18_0" xy="558,1234" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n113_o4m7" name="grh17_0" xy="311,1450" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n112_o4m7" name="grh16_1" xy="558,1666" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n111_o4m7" name="grh15_1" xy="790,1882" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n110_o4m7" name="grh14_0" xy="533,2098" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n109_o4m7" name="grh13_0" xy="297,2314" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n108_o4m7" name="grh12_1" xy="571,2530" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n107_o4m7" name="grh11_1" xy="822,2746" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n106_o4m7" name="grh10_0" xy="352,2962" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n105_o4m7" name="grh9_0" xy="821,3178" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n104_o4m7" name="grh8_0" xy="578,3394" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n103_o4m7" name="grh7_0" xy="246,3610" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n102_o4m7" name="grh6_0" xy="462,3826" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n101_o4m7" name="grh5_0" xy="802,4042" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n100_o4m7" name="grh4_1" xy="602,4258" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n99_o4m7" name="grh3_0" xy="436,4474" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n98_o4m7" name="grh2_0" xy="329,4690" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n97_o4m7" name="grh1_0" xy="354,4906" size="20,20" group="n116_o4m7" touchable="false"/>
+    <graph id="n96_o4m7" name="grh0_0" xy="567,5122" size="20,20" group="n116_o4m7" touchable="false"/>
+    <group id="n116_o4m7" name="n116" xy="246,1018" size="596,4124" group="n117_o4m7" advanced="true" layout="vt" lineGap="196" excludeInvisibles="true">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </group>
+    <group id="n117_o4m7" name="n117" xy="39,955" size="1084,4346"/>
   </displayList>
-  <relation target="n45_xv4o" sidePair="width-width,height-height"/>
 </component>

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


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


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


+ 6 - 3
FGUIProject/assets/Main/package.xml

@@ -663,11 +663,11 @@
     <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="o4m7fq8" name="zxian_gift_get.png" path="/imagesNew/" exported="true"/>
+    <image id="o4m7fq9" name="zxian_gift_unget.png" path="/imagesNew/" exported="true"/>
     <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/"/>
+    <component id="o4m7fqd" name="CompStoryLevelItem.xml" path="/components/" exported="true"/>
     <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/"/>
@@ -694,6 +694,9 @@
     <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"/>
+    <image id="o4m7frd" name="zxgq_zddb.png" path="/imagesNew/"/>
+    <image id="o4m7fre" name="zxgq_zdtb.png" path="/imagesNew/"/>
+    <image id="o4m7frf" name="zxian_bg3_cover.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 147 - 83
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter.cs

@@ -7,27 +7,48 @@ 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 GImage m_imgBegin;
+        public UI_CompStoryLevelItem m_g00;
+        public UI_CompStoryLevelItem m_g01;
+        public UI_CompStoryLevelItem m_g02;
+        public UI_CompStoryLevelItem m_g03;
+        public UI_CompStoryLevelItem m_g04;
+        public UI_CompStoryLevelItem m_g05;
+        public UI_CompStoryLevelItem m_g06;
+        public UI_CompStoryLevelItem m_g07;
+        public UI_CompStoryLevelItem m_g08;
+        public UI_CompStoryLevelItem m_g09;
+        public UI_CompStoryLevelItem m_g010;
+        public UI_CompStoryLevelItem m_g011;
+        public UI_CompStoryLevelItem m_g012;
+        public UI_CompStoryLevelItem m_g013;
+        public UI_CompStoryLevelItem m_g014;
+        public UI_CompStoryLevelItem m_g015;
+        public UI_CompStoryLevelItem m_g016;
+        public UI_CompStoryLevelItem m_g017;
+        public UI_CompStoryLevelItem m_g018;
+        public UI_CompStoryLevelItem m_g019;
+        public UI_CompStoryLevelItem m_g020;
+        public GGraph m_grh19_1;
+        public GGraph m_grh18_0;
+        public GGraph m_grh17_0;
+        public GGraph m_grh16_1;
+        public GGraph m_grh15_1;
+        public GGraph m_grh14_0;
+        public GGraph m_grh13_0;
+        public GGraph m_grh12_1;
+        public GGraph m_grh11_1;
+        public GGraph m_grh10_0;
+        public GGraph m_grh9_0;
+        public GGraph m_grh8_0;
+        public GGraph m_grh7_0;
+        public GGraph m_grh6_0;
+        public GGraph m_grh5_0;
+        public GGraph m_grh4_1;
+        public GGraph m_grh3_0;
+        public GGraph m_grh2_0;
+        public GGraph m_grh1_0;
+        public GGraph m_grh0_0;
         public const string URL = "ui://mfvz4q8ko4m7fr7";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter";
@@ -75,71 +96,114 @@ namespace UI.Main
 
         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"));
+            m_imgBegin = (GImage)comp.GetChild("imgBegin");
+            m_g00 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g00"));
+            m_g01 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g01"));
+            m_g02 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g02"));
+            m_g03 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g03"));
+            m_g04 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g04"));
+            m_g05 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g05"));
+            m_g06 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g06"));
+            m_g07 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g07"));
+            m_g08 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g08"));
+            m_g09 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g09"));
+            m_g010 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g010"));
+            m_g011 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g011"));
+            m_g012 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g012"));
+            m_g013 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g013"));
+            m_g014 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g014"));
+            m_g015 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g015"));
+            m_g016 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g016"));
+            m_g017 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g017"));
+            m_g018 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g018"));
+            m_g019 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g019"));
+            m_g020 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g020"));
+            m_grh19_1 = (GGraph)comp.GetChild("grh19_1");
+            m_grh18_0 = (GGraph)comp.GetChild("grh18_0");
+            m_grh17_0 = (GGraph)comp.GetChild("grh17_0");
+            m_grh16_1 = (GGraph)comp.GetChild("grh16_1");
+            m_grh15_1 = (GGraph)comp.GetChild("grh15_1");
+            m_grh14_0 = (GGraph)comp.GetChild("grh14_0");
+            m_grh13_0 = (GGraph)comp.GetChild("grh13_0");
+            m_grh12_1 = (GGraph)comp.GetChild("grh12_1");
+            m_grh11_1 = (GGraph)comp.GetChild("grh11_1");
+            m_grh10_0 = (GGraph)comp.GetChild("grh10_0");
+            m_grh9_0 = (GGraph)comp.GetChild("grh9_0");
+            m_grh8_0 = (GGraph)comp.GetChild("grh8_0");
+            m_grh7_0 = (GGraph)comp.GetChild("grh7_0");
+            m_grh6_0 = (GGraph)comp.GetChild("grh6_0");
+            m_grh5_0 = (GGraph)comp.GetChild("grh5_0");
+            m_grh4_1 = (GGraph)comp.GetChild("grh4_1");
+            m_grh3_0 = (GGraph)comp.GetChild("grh3_0");
+            m_grh2_0 = (GGraph)comp.GetChild("grh2_0");
+            m_grh1_0 = (GGraph)comp.GetChild("grh1_0");
+            m_grh0_0 = (GGraph)comp.GetChild("grh0_0");
         }
         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;
+            m_imgBegin = null;
+            m_g00.Dispose();
+            m_g00 = null;
+            m_g01.Dispose();
+            m_g01 = null;
+            m_g02.Dispose();
+            m_g02 = null;
+            m_g03.Dispose();
+            m_g03 = null;
+            m_g04.Dispose();
+            m_g04 = null;
+            m_g05.Dispose();
+            m_g05 = null;
+            m_g06.Dispose();
+            m_g06 = null;
+            m_g07.Dispose();
+            m_g07 = null;
+            m_g08.Dispose();
+            m_g08 = null;
+            m_g09.Dispose();
+            m_g09 = null;
+            m_g010.Dispose();
+            m_g010 = null;
+            m_g011.Dispose();
+            m_g011 = null;
+            m_g012.Dispose();
+            m_g012 = null;
+            m_g013.Dispose();
+            m_g013 = null;
+            m_g014.Dispose();
+            m_g014 = null;
+            m_g015.Dispose();
+            m_g015 = null;
+            m_g016.Dispose();
+            m_g016 = null;
+            m_g017.Dispose();
+            m_g017 = null;
+            m_g018.Dispose();
+            m_g018 = null;
+            m_g019.Dispose();
+            m_g019 = null;
+            m_g020.Dispose();
+            m_g020 = null;
+            m_grh19_1 = null;
+            m_grh18_0 = null;
+            m_grh17_0 = null;
+            m_grh16_1 = null;
+            m_grh15_1 = null;
+            m_grh14_0 = null;
+            m_grh13_0 = null;
+            m_grh12_1 = null;
+            m_grh11_1 = null;
+            m_grh10_0 = null;
+            m_grh9_0 = null;
+            m_grh8_0 = null;
+            m_grh7_0 = null;
+            m_grh6_0 = null;
+            m_grh5_0 = null;
+            m_grh4_1 = null;
+            m_grh3_0 = null;
+            m_grh2_0 = null;
+            m_grh1_0 = null;
+            m_grh0_0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,11 +7,17 @@ namespace UI.Main
     public partial class UI_StoryChapterUI
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GComponent m_chapter;
         public GComponent m_valueBar;
         public GButton m_btnBack;
         public GButton m_btnHome;
-        public GTextField m_txtChapterName;
+        public GTextField m_txtChapter;
+        public GTextField m_txtChapterName0;
+        public GTextField m_txtChapterName1;
+        public GTextField m_txtChapterName2;
+        public GTextField m_txtChapterName3;
+        public GTextField m_txtChapterName4;
         public UI_CompBonusBox m_bonusBox3;
         public UI_CompBonusBox m_bonusBox2;
         public UI_CompBonusBox m_bonusBox1;
@@ -63,11 +69,17 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_chapter = (GComponent)comp.GetChild("chapter");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
-            m_txtChapterName = (GTextField)comp.GetChild("txtChapterName");
+            m_txtChapter = (GTextField)comp.GetChild("txtChapter");
+            m_txtChapterName0 = (GTextField)comp.GetChild("txtChapterName0");
+            m_txtChapterName1 = (GTextField)comp.GetChild("txtChapterName1");
+            m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
+            m_txtChapterName3 = (GTextField)comp.GetChild("txtChapterName3");
+            m_txtChapterName4 = (GTextField)comp.GetChild("txtChapterName4");
             m_bonusBox3 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox3"));
             m_bonusBox2 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox2"));
             m_bonusBox1 = (UI_CompBonusBox)UI_CompBonusBox.Create(comp.GetChild("bonusBox1"));
@@ -75,11 +87,17 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_chapter = null;
             m_valueBar = null;
             m_btnBack = null;
             m_btnHome = null;
-            m_txtChapterName = null;
+            m_txtChapter = null;
+            m_txtChapterName0 = null;
+            m_txtChapterName1 = null;
+            m_txtChapterName2 = null;
+            m_txtChapterName3 = null;
+            m_txtChapterName4 = null;
             m_bonusBox3.Dispose();
             m_bonusBox3 = null;
             m_bonusBox2.Dispose();

+ 71 - 55
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -61,6 +61,7 @@ namespace GFGGame
             {
                 OnClickBonusBox(_ui.m_bonusBox3, 2);
             });
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
 
         }
         protected override void AddEventListener()
@@ -74,11 +75,8 @@ namespace GFGGame
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _chapterID = (int)viewData;
             MainStoryDataManager.currentChapterCfgId = _chapterID;
-            _compChapter = (GComponent)UIPackage.CreateObject("Main", "CompChapter" + _chapterID);
-            StoryChapterCfg cfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
-            _compChapter.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath(cfg.bgRes);
-            _ui.m_chapter.scrollPane.touchEffect = true;
-            _ui.m_chapter.AddChild(_compChapter);
+            // StoryChapterCfg cfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+
             InitChapter();
             _valueBarController.OnShown();
             // _valueBarController.Controller(1);
@@ -116,7 +114,13 @@ namespace GFGGame
         private void InitChapter()
         {
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
-            _ui.m_txtChapterName.text = StoryUtil.GetChapterOrderText(_chapterID) + "·" + chapterCfg.name;
+            _ui.m_txtChapterName0.text = chapterCfg.name.Length > 0 ? chapterCfg.name[0].ToString() : "";
+            _ui.m_txtChapterName1.text = chapterCfg.name.Length > 1 ? chapterCfg.name[1].ToString() : "";
+            _ui.m_txtChapterName2.text = chapterCfg.name.Length > 2 ? chapterCfg.name[2].ToString() : "";
+            _ui.m_txtChapterName3.text = chapterCfg.name.Length > 3 ? chapterCfg.name[3].ToString() : "";
+            _ui.m_txtChapterName4.text = chapterCfg.name.Length > 4 ? chapterCfg.name[4].ToString() : "";
+            int order = StoryUtil.GetChapterOrder(chapterCfg.id);
+            _ui.m_txtChapter.text = order < 10 ? "0" + order : order.ToString();
             int starCountChapter = InstanceZonesDataManager.GetChapterStarCount(_chapterID, chapterCfg.type, chapterCfg.subType);
             _ui.m_txtStarCount.text = "" + starCountChapter + "/" + chapterCfg.bonusStar3;
             UpdateBonusBoxName(_ui.m_bonusBox1, "" + chapterCfg.bonusStar1);
@@ -126,69 +130,81 @@ namespace GFGGame
 
             var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id);
             int endLevel = 0;
+
+            _compChapter = (GComponent)UIPackage.CreateObject("Main", "CompChapter");
+            float starPosY = _compChapter.GetChild("imgBegin").asImage.y;
+            _ui.m_chapter.scrollPane.touchEffect = true;
+            _ui.m_chapter.AddChild(_compChapter);
+
+            int lineGap = 4800 / list.Count;
             for (int i = 0; i < list.Count; i++)
             {
+                GObject obj = UIPackage.CreateObject("Main", "CompStoryLevelItem");
+                _compChapter.AddChild(obj);
+                GObject posGrh0 = _compChapter.GetChild(string.Format("grh{0}_0", i));
+                GObject posGrh1 = _compChapter.GetChild(string.Format("grh{0}_1", i));
+
+                obj.SetPosition(posGrh0 == null ? posGrh1.x : posGrh0.x, starPosY - lineGap * i - 100, 0); ;
+
                 StoryLevelCfg levelCfg = list[i];
-                GObject obj = _compChapter.GetChild("g" + levelCfg.order);
-                if (obj != null)
+                UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(obj);
+                levelItem.target.data = levelCfg.id;
+                if (MainStoryDataManager.CheckLevelUnlock(levelCfg.id))
                 {
-                    UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(obj);
-                    levelItem.target.data = levelCfg.id;
-                    if (MainStoryDataManager.CheckLevelUnlock(levelCfg.id))
+                    levelItem.m_c2.selectedIndex = posGrh0 == null ? 1 : 0;
+                    levelItem.target.visible = true;
+                    levelItem.target.onClick.Clear();
+                    levelItem.target.onClick.Add(OnClickLevelItem);
+                    string showId = StoryUtil.GetChapterOrder(_chapterID) + "-" + levelCfg.order;
+                    levelItem.m_txtDialogOrder.text = showId;
+                    levelItem.m_txtFightOrder.text = showId;
+                    if (levelCfg.fightID.Length > 0)
                     {
-                        levelItem.target.visible = true;
-                        levelItem.target.onClick.Clear();
-                        levelItem.target.onClick.Add(OnClickLevelItem);
-                        string showId = StoryUtil.GetChapterOrder(_chapterID) + "_" + levelCfg.order;
-                        levelItem.m_txtDialogOrder.text = showId;
-                        levelItem.m_txtFightOrder.text = showId;
-                        if (levelCfg.fightID.Length > 0)
-                        {
-                            levelItem.m_c1.selectedIndex = 1;
-                            int score = InstanceZonesDataManager.GetScoreHighest(levelCfg.id);
-                            if (score <= 0)
-                            {
-                                levelItem.m_flower.target.visible = false;
-                            }
-                            else
-                            {
-                                levelItem.m_flower.target.visible = true;
-                                int starCount = InstanceZonesDataManager.GetStarCountHistory(levelCfg.id);
-                                StoryUtil.UpdateStar(starCount, levelItem.m_flower.target);
-                            }
-                        }
-                        else
+                        levelItem.m_c1.selectedIndex = 1;
+                        int score = InstanceZonesDataManager.GetScoreHighest(levelCfg.id);
+                        if (score <= 0)
                         {
-                            levelItem.m_c1.selectedIndex = 0;
                             levelItem.m_flower.target.visible = false;
-
                         }
-                        levelItem.m_holder.visible = !InstanceZonesDataManager.CheckLevelPass(levelCfg.id);
-
-                        if (levelItem.m_holder.visible)
-                        {
-                            //设置为解锁关卡
-                            MainStoryDataManager.currentLevelCfgId = levelCfg.id;
-
-                            _unPasslevelItem = levelItem.target;
-                            _gameObject = null;
-                            _wrapper = null;
-                            string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
-                            SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
-                        }
-                        if (levelCfg.order > endLevel)
+                        else
                         {
-                            endLevel = levelCfg.order;
-                            _endLevelItem = levelItem.target;
+                            levelItem.m_flower.target.visible = true;
+                            int starCount = InstanceZonesDataManager.GetStarCountHistory(levelCfg.id);
+                            StoryUtil.UpdateStar(starCount, levelItem.m_flower.target);
                         }
                     }
                     else
                     {
-                        levelItem.target.visible = false;
+                        levelItem.m_c1.selectedIndex = 0;
+                        levelItem.m_flower.target.visible = false;
+
+                    }
+                    levelItem.m_holder.visible = !InstanceZonesDataManager.CheckLevelPass(levelCfg.id);
+
+                    if (levelItem.m_holder.visible)
+                    {
+                        //设置为解锁关卡
+                        MainStoryDataManager.currentLevelCfgId = levelCfg.id;
+
+                        _unPasslevelItem = levelItem.target;
+                        _gameObject = null;
+                        _wrapper = null;
+                        string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
+                        SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
+                    }
+                    if (levelCfg.order > endLevel)
+                    {
+                        endLevel = levelCfg.order;
+                        _endLevelItem = levelItem.target;
                     }
-                    UI_CompStoryLevelItem.ProxyEnd();
                 }
+                else
+                {
+                    levelItem.target.visible = false;
+                }
+                UI_CompStoryLevelItem.ProxyEnd();
             }
+
             if (_endLevelItem != null)
             {
                 float tx = _endLevelItem.x + _endLevelItem.width / 2;
@@ -227,11 +243,11 @@ namespace GFGGame
             // bonusBox.m_ComRewardEffect.visible = status == ConstBonusStatus.CAN_GET;
             if (status == ConstBonusStatus.GOT)
             {
-                bonusBox.m_icon.url = "ui://Main/zx_gka_baoxiang_2";
+                bonusBox.m_icon.url = "ui://Main/zxian_gift_get";
             }
             else
             {
-                bonusBox.m_icon.url = "ui://Main/zx_gka_baoxiang_1";
+                bonusBox.m_icon.url = "ui://Main/zxian_gift_unget";
             }
             bonusBox.target.data = status;
         }

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 0c6b39a369faabf459bcdcb7e97ece4f
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 3ff9732630a8747469c125e3c5abd51a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 08ed66531b04ba64b95b6be6a69ba2ee
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas0_11.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: b4730de58017b1949a43e1b8c601c304
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes