剧情优化

FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1170,2600" scroll="both">
+<component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="slb41o" fileName="imagesStory/zhuxian_ditu.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
+    <image id="n37_n1kn" name="n37" src="n1knde" fileName="componentsLevel/beijing2_bg.jpg" xy="-4,-3" aspect="true"/>
     <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,2400"/>
     <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,2273"/>
     <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,2091"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -2,18 +2,18 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,2203"/>
-    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1963"/>
-    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1963"/>
-    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,1723"/>
-    <component id="n12_ux8s" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1483"/>
-    <component id="n13_ux8s" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1483"/>
-    <component id="n14_ux8s" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,1243"/>
-    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1003"/>
-    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1003"/>
-    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,763"/>
-    <component id="n18_ux8s" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,523"/>
-    <component id="n19_ux8s" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,523"/>
-    <component id="n20_ux8s" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,283"/>
+    <component id="n21_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,2212"/>
+    <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1972"/>
+    <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1972"/>
+    <component id="n24_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,1732"/>
+    <component id="n25_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1492"/>
+    <component id="n26_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1492"/>
+    <component id="n27_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,1252"/>
+    <component id="n28_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1012"/>
+    <component id="n29_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1012"/>
+    <component id="n30_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,772"/>
+    <component id="n31_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,532"/>
+    <component id="n32_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,532"/>
+    <component id="n33_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,292"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter2.xml → FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1200,2600" scroll="both">
+<component size="1170,2600" scroll="both">
   <displayList>
-    <image id="n37_n1kn" name="n37" src="n1knde" fileName="componentsLevel/beijing2_bg.jpg" xy="-4,-3" aspect="true"/>
+    <image id="n0_xuzk" name="bg" src="slb41o" fileName="imagesStory/zhuxian_ditu.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
     <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,2400"/>
     <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,2273"/>
     <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,2091"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1200,2600" scroll="both">
+  <displayList>
+    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,2203"/>
+    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1963"/>
+    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1963"/>
+    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,1723"/>
+    <component id="n12_ux8s" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1483"/>
+    <component id="n13_ux8s" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1483"/>
+    <component id="n14_ux8s" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,1243"/>
+    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,1003"/>
+    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,1003"/>
+    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,763"/>
+    <component id="n18_ux8s" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="370,523"/>
+    <component id="n19_ux8s" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="844,523"/>
+    <component id="n20_ux8s" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,283"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1200,2600" scroll="both">
+  <displayList>
+    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,2190"/>
+    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,1940"/>
+    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,1940"/>
+    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1690"/>
+    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,1430"/>
+    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,1430"/>
+    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1180"/>
+    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,930"/>
+    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,930"/>
+    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,680"/>
+    <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="328,420"/>
+    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="802,420"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/componentsLevel/CompChapter20005.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1200,2600" scroll="both">
+  <displayList>
+    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,2167"/>
+    <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1917"/>
+    <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1917"/>
+    <component id="n45_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,1667"/>
+    <component id="n46_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1407"/>
+    <component id="n47_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1407"/>
+    <component id="n48_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,1157"/>
+    <component id="n49_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,907"/>
+    <component id="n50_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,907"/>
+    <component id="n51_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,657"/>
+    <component id="n52_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,397"/>
+    <component id="n53_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,397"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/componentsLevel/CompChapter3.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1200,2600" scroll="both">
-  <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n21_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,2212"/>
-    <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1972"/>
-    <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1972"/>
-    <component id="n24_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,1732"/>
-    <component id="n25_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1492"/>
-    <component id="n26_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1492"/>
-    <component id="n27_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,1252"/>
-    <component id="n28_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1012"/>
-    <component id="n29_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,1012"/>
-    <component id="n30_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,772"/>
-    <component id="n31_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,532"/>
-    <component id="n32_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="837,532"/>
-    <component id="n33_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="597,292"/>
-  </displayList>
-</component>

FGUIProject/assets/Main/componentsLevel/CompChapter4.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1200,2600" scroll="both">
-  <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n32_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="561,2198"/>
-    <component id="n33_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="327,1948"/>
-    <component id="n34_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="801,1948"/>
-    <component id="n35_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="561,1698"/>
-    <component id="n36_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="327,1438"/>
-    <component id="n37_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="801,1438"/>
-    <component id="n38_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="561,1188"/>
-    <component id="n39_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="327,938"/>
-    <component id="n40_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="801,938"/>
-    <component id="n41_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="561,688"/>
-    <component id="n42_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="327,428"/>
-    <component id="n43_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="801,428"/>
-  </displayList>
-</component>

FGUIProject/assets/Main/componentsLevel/CompChapter5.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1200,2600" scroll="both">
-  <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n32_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="577,2175"/>
-    <component id="n33_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="343,1925"/>
-    <component id="n34_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="817,1925"/>
-    <component id="n35_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="577,1675"/>
-    <component id="n36_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="343,1415"/>
-    <component id="n37_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="817,1415"/>
-    <component id="n38_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="577,1165"/>
-    <component id="n39_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="343,915"/>
-    <component id="n40_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="817,915"/>
-    <component id="n41_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="577,665"/>
-    <component id="n42_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="343,405"/>
-    <component id="n43_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="817,405"/>
-  </displayList>
-</component>

FGUIProject/assets/Main/package.xml

@@ -152,8 +152,8 @@
     <image id="s2cc5m" name="zd_js_xing_1.png" path="/imagesStory/"/>
     <image id="s2cc5n" name="zd_jsjm_jszi_0.png" path="/imagesExport/" exported="true"/>
     <component id="s2cc5o" name="CompFlower3.xml" path="/components/"/>
-    <component id="s2cc5p" name="CompChapter3.xml" path="/componentsLevel/" exported="true"/>
-    <component id="s2cc5q" name="CompChapter4.xml" path="/componentsLevel/" exported="true"/>
+    <component id="s2cc5p" name="CompChapter10003.xml" path="/componentsLevel/" exported="true"/>
+    <component id="s2cc5q" name="CompChapter10004.xml" path="/componentsLevel/" exported="true"/>
     <image id="d4iw5r" name="zx_jq_fskuang_2.png" path="/imagesStory/"/>
     <image id="d4iw5s" name="zx_jq_fskuang_1.png" path="/imagesStory/"/>
     <image id="d4iw6g" name="grxx_jyt_1.png" path="/images/" scale="9grid" scale9grid="19,0,410,26"/>
@@ -167,7 +167,7 @@
     <component id="d4iw6p" name="ButtonHelp.xml" path="/components/"/>
     <component id="d4iw6q" name="GMPanelUI.xml" path="/" exported="true"/>
     <image id="ga166r" name="zhangjie_bg2.jpg" path="/imagesStory/" atlas="alone_npot"/>
-    <component id="ga166s" name="CompChapter5.xml" path="/componentsLevel/" exported="true"/>
+    <component id="ga166s" name="CompChapter10005.xml" path="/componentsLevel/" exported="true"/>
     <image id="tu966t" name="zx_zhez.png" path="/images/" scale="9grid" scale9grid="17,19,4,2"/>
     <component id="tu966u" name="ComponentChapterPic.xml" path="/components/"/>
     <image id="tu967b" name="zhuxian_diban_1.png" path="/imagesStory/"/>
@@ -206,11 +206,11 @@
     <image id="jvi38f" name="zhuxian_zj_pic_3.png" path="/imagesExport/" exported="true"/>
     <image id="jvi38g" name="zhuxian_zj_pic_4.png" path="/imagesExport/" exported="true"/>
     <image id="jvi38h" name="zhuxian_zj_pic_5.png" path="/imagesExport/" exported="true"/>
-    <component id="kpb08i" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
-    <component id="kpb08j" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
-    <component id="kpb08k" name="CompChapter10003.xml" path="/componentsLevel/" exported="true"/>
-    <component id="kpb08l" name="CompChapter10004.xml" path="/componentsLevel/" exported="true"/>
-    <component id="kpb08m" name="CompChapter10005.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08i" name="CompChapter20002.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08j" name="CompChapter20001.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08k" name="CompChapter20003.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08l" name="CompChapter20004.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08m" name="CompChapter20005.xml" path="/componentsLevel/" exported="true"/>
     <component id="c5sc8h" name="ButtonGM.xml" path="/components/"/>
     <image id="wg7t8n" name="zhuxian_zj_pic_1.jpg" path="/imagesExport/"/>
     <image id="wg7t8o" name="zhuxian_zj_pic_2.jpg" path="/imagesExport/"/>
@@ -365,8 +365,8 @@
     <image id="mhyhd7" name="grxx_mzk_1.png" path="/images/"/>
     <image id="mhyhd8" name="grxx_mzk_2.png" path="/images/"/>
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
-    <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
-    <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
+    <component id="txgzdc" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
+    <component id="txgzdd" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
     <image id="n1knde" name="beijing2_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <image id="jj0mdf" name="zd_jsjs_2.png" path="/images/"/>
     <image id="jj0mdg" name="zd_jsjs_1.png" path="/images/"/>

GameClient/Assets/Editor/Excel/Scanner.meta

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

GameClient/Assets/Editor/Excel/Scanner/InstanceZonesScanner.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using GFGGame;
+
+namespace GFGEditor
+{
+    public class InstanceZonesScanner
+    {
+        //计算每个副本的关卡数
+        private static Dictionary<int, int> levelCountDIc = new Dictionary<int, int>();
+        public static void StartScan()
+        {
+            var dataArray = StoryLevelCfgArray.Instance.dataArray;
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                foreach (var cfg in dataArray)
+                {
+                    var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(cfg.type, cfg.subType, cfg.chapterId);
+                    levelCountDIc.TryGetValue(key, out var count);
+                    count++;
+                    levelCountDIc[key] = count;
+                    var names = new string[] { "_" + nameof(cfg.order) };
+                    var values = new string[] { "" + count };
+                    SQLiteHelper.Instance.UpdateValues(nameof(StoryLevelCfgArray), names, values, "_" + nameof(cfg.id), "=", cfg.id.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+            
+            //写入
+            WriteStoryChapter();
+            WriteStudioChapter();
+        }
+
+        public static void WriteStoryChapter()
+        {
+            //写入
+            var dataArray = StoryChapterCfgArray.Instance.dataArray;
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                foreach (var cfg in dataArray)
+                {
+                    var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(cfg.type,cfg.subType, cfg.id);
+                    levelCountDIc.TryGetValue(key, out var count);
+                    var names = new string[] { "_" + nameof(cfg.levelCount) };
+                    var values = new string[] { "" + count };
+                    SQLiteHelper.Instance.UpdateValues(nameof(StoryChapterCfgArray), names, values, "_" + nameof(cfg.id), "=", cfg.id.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+            
+        }
+
+        public static void WriteStudioChapter()
+        {
+            //写入
+            var dataArray = StudioCfgArray.Instance.dataArray;
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                foreach (var cfg in dataArray)
+                {
+                    var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(cfg.type, cfg.subType, cfg.id);
+                    levelCountDIc.TryGetValue(key, out var count);
+                    var names = new string[] { "_" + nameof(cfg.levelCount) };
+                    var values = new string[] { "" + count };
+                    SQLiteHelper.Instance.UpdateValues(nameof(StudioCfgArray), names, values, "_" + nameof(cfg.id), "=", cfg.id.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+            
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Constant/ConstStoryType.cs.meta → GameClient/Assets/Editor/Excel/Scanner/InstanceZonesScanner.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 07d10fc792993d1429d38db0ed4c1b4f
+guid: 958b342c1a9bccf42807b4771db3a319
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Editor/Excel/ItemApproachScanner.cs.meta → GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d0db98262621ea74ca50494de022e2fc
+guid: 7b7c4da772203de48acc7787947ff377
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Editor/Excel/Template/Config.txt

@@ -6,7 +6,7 @@ using Microsoft.Data.Sqlite;
 
 namespace GFGGame
 {
-	public class {CfgName}
+	public class {CfgName} : ICfg
 	{
 {variable declaration}
 

GameClient/Assets/Editor/Excel/Template/ConfigArray.txt

@@ -11,29 +11,7 @@ namespace GFGGame
 
         public {CfgName} GetCfg({keyType} {keyName})
         { 
-            if (!_cfgDic.TryGetValue({keyName}, out {CfgName} cfg))
-            {
-                SQLiteHelper.Instance.OpenConnection();
-                try
-                {
-                    var reader = SQLiteHelper.Instance.ReadTableByOneCol("{CfgArrayName}", "{keyName}", {keyName}.ToString());
-                    if (reader.Read())
-                    {
-                        cfg = new {CfgName}();
-                        cfg.setData(reader);
-                        _cfgDic.Add({keyName}, cfg);
-                    }
-                }
-                catch(System.Exception e)
-                {
-                    ET.Log.Error(e);
-                }
-                finally
-                {
-                    SQLiteHelper.Instance.CloseConnection();
-                }
-            }
-            return cfg;
+            return ConfigUtil.GetCfg<{keyType}, {CfgName}>("{CfgArrayName}", "{keyName}", {keyName}, _cfgDic);
         }
         
         public {CfgName}[] dataArray
@@ -42,28 +20,7 @@ namespace GFGGame
             {
                 if(_allDatas == null)
                 {
-                    List<{CfgName}> list = new List<{CfgName}>();
-                    SQLiteHelper.Instance.OpenConnection();
-                    try
-                    {
-                        var reader = SQLiteHelper.Instance.ReadFullTable("{CfgArrayName}");
-                        while (reader.Read())
-                        {
-                            var cfg = new {CfgName}();
-                            cfg.setData(reader);
-                            list.Add(cfg);
-                            _cfgDic[cfg.{keyName}] = cfg;
-                        }
-                    }
-                    catch(System.Exception e)
-                    {
-                        ET.Log.Error(e);
-                    }
-                    finally
-                    {
-                        SQLiteHelper.Instance.CloseConnection();
-                    }
-                    _allDatas = list.ToArray();
+                    _allDatas = ConfigUtil.GetAllCfgs<{CfgName}>("{CfgArrayName}");
                 }
                 return _allDatas;
             }

GameClient/Assets/Editor/Excel/Template/ConfigArray2.txt

@@ -8,33 +8,7 @@ namespace GFGGame
 
         public {CfgName}[] GetCfgs({keyType} {keyName})
         {
-            if (_cfgsDic.TryGetValue({keyName}, out {CfgName}[] cfgs))
-            {
-                return cfgs;
-            }
-            List<{CfgName}> list = new List<{CfgName}>();
-            SQLiteHelper.Instance.OpenConnection();
-            try
-            {
-                var reader = SQLiteHelper.Instance.ReadTableByOneCol("{CfgArrayName}", "{keyName}", {keyName}.ToString());
-                while (reader.Read())
-                {
-                    var cfg = new {CfgName}();
-                    cfg.setData(reader);
-                    list.Add(cfg);
-                }
-            }
-            catch(System.Exception e)
-            {
-                ET.Log.Error(e);
-            }
-            finally
-            {
-                SQLiteHelper.Instance.CloseConnection();
-            }
-            cfgs = list.ToArray();
-            _cfgsDic.Add({keyName}, cfgs);
-            return cfgs;
+            return ConfigUtil.GetCfgs<{keyType}, {CfgName}>("{CfgArrayName}", "{keyName}", {keyName}, _cfgsDic);
         }
 
 #if UNITY_EDITOR
@@ -45,27 +19,7 @@ namespace GFGGame
             {
                 if (_allDatas == null)
                 {
-                    List<{CfgName}> list = new List<{CfgName}>();
-                    SQLiteHelper.Instance.OpenConnection();
-                    try
-                    {
-                        var reader = SQLiteHelper.Instance.ReadFullTable("{CfgArrayName}");
-                        while (reader.Read())
-                        {
-                            var cfg = new {CfgName}();
-                            cfg.setData(reader);
-                            list.Add(cfg);
-                        }
-                    }
-                    catch(System.Exception e)
-                    {
-                        ET.Log.Error(e);
-                    }
-                    finally
-                    {
-                        SQLiteHelper.Instance.CloseConnection();
-                    }
-                    _allDatas = list.ToArray();
+                    _allDatas = ConfigUtil.GetAllCfgs<{CfgName}>("{CfgArrayName}");
                 }
                 return _allDatas;
             }

GameClient/Assets/Editor/ToolsMenu.cs

@@ -129,6 +129,8 @@ namespace GFGEditor
             }
             //扫描物品表获取途径并更新数据库
             ItemApproachScanner.startScan();
+            //扫描副本
+            InstanceZonesScanner.StartScan();
             AssetDatabase.Refresh();
             EditorUtility.ClearProgressBar();
         }

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit f5a091e069da3bb5b4dbce42e6da2396cb9f6b58
+Subproject commit b4be7aa5b435b77b6465e7fd98e4ae2896ea63c3

GameClient/Assets/Game/HotUpdate/Constant/ConstStoryType.cs

@@ -1,8 +0,0 @@
-namespace GFGGame
-{
-    public class ConstStoryType
-    {
-        public const int NORMAL_TYPE = 0;
-        public const int HARD_TYPE = 1;
-    }
-}

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -144,7 +144,7 @@ namespace GFGGame
             }
             else
             {
-                StoryDataManager.currentChapter = 1;
+                StoryDataManager.currentChapterCfgId = 10001;
                 if (GameGlobal.isFirstEntry == true)
                 {
                     // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, });
@@ -152,7 +152,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
                 }
             }
             Timers.inst.CallLater(AfterEnterGame);

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -37,7 +37,7 @@ namespace GFGGame
             && (cfg.priorId <= 0 || cfg.priorId > 0 && (GuideDataManager.GetGuideCountCopy(cfg.priorId) > 0))
             && (!checkIndex || checkIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true && GuideDataManager.IsGuideIndexFinish(cfg.id, index) == false)
             && (GuideDataManager.currentGuideId == 0 || GuideDataManager.currentGuideId == cfg.id && GuideDataManager.currentGuideIdIndex != index)
-            && (StoryDataManager.currentChapter == 0 || StoryDataManager.CheckCurrentLevelPass() == false)
+            && (StoryDataManager.CurrentChapterOrder == 0 || StoryDataManager.CheckCurrentLevelPass() == false)
             && StoryDataManager.CheckLevelPass(cfg.chapterId, cfg.level - 1)
             && !StoryDataManager.CheckLevelPass(cfg.chapterId, cfg.level))
             ||

GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs

@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class InstanceZonesDataManager
+    {
+        //关卡配置表的id
+        public static int currentLevelCfgId;
+
+
+        //副本通关状态,key为（副本类型+副本id*1000），值为通到第几关
+        private static Dictionary<int, int> _passLevel = new Dictionary<int, int>();
+
+        /// <summary>
+        /// 获取副本通关关卡
+        /// </summary>
+        /// <param name="type" value="副本类型"></param>
+        /// <param name="subType" value="章节id"></param>
+        /// <returns></returns>
+        public static int GetPassLevelCfgId(int type, int subType, int chapterId)
+        {
+            var key = CalculateHelper.GenerateInstanceZonesLevelStateKey(type, subType, chapterId);
+            if(_passLevel.TryGetValue(key, out var value))
+            {
+                return value;
+            }
+            return 0;
+        }
+
+        public static int GetPassLevelOrder(int type, int subType, int chapterId)
+        {
+            var levelCfgId = GetPassLevelCfgId(type, subType, chapterId);
+            var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+            if(levelCfg != null)
+            {
+                return levelCfg.order;
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// 检查某关卡是否通过，参数为关卡配置id
+        /// </summary>
+        /// <param name="levelCfgId"></param>
+        /// <returns></returns>
+        public static bool CheckLevelPass(int levelCfgId)
+        {
+            var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+            if(levelCfg != null)
+            {
+                var passLevelOrder = InstanceZonesDataManager.GetPassLevelOrder(levelCfg.type, levelCfg.subType, levelCfg.chapterId);
+                return levelCfg.order <= passLevelOrder;
+            }
+            return false;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/StoryCfgManager.cs.meta → GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 28584a2446031ea46925b2ec41364f8a
+guid: 6cea0156d49bc174f94bee340e801a66
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Data/StoryDataManager.cs

@@ -9,17 +9,31 @@ namespace GFGGame
     public class StoryDataManager
     {
         public static string priorId = "prior";//首次登录前置剧情id
-        public static int currentChapter = 0;
-        public static int currentLevel = 0;
-        //配置表的id
+
+        public static int currentChapterCfgId = 0;
+        public static int currentLevelOrder = 0;
+        //关卡配置表的id
         public static int currentLevelCfgId;
+
+        //当前关卡序号，从1开始
+        public static int CurrentChapterOrder
+        {
+            get
+            {
+                var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(currentChapterCfgId);
+                if(chapterCfg != null)
+                {
+                    return chapterCfg.order;
+                }
+                return 0;
+            }
+        }
+
         public static int currentScoreType;
         public static int currentCardId = 0;
         public static bool usedRecommend;
-        public static int _passChapter = 0;
-        public static int _passLevel = 0;
-        private static int _passChapterJY = 10000;
-        private static int _passLevelJY = 0;
+
+
 
         //关卡最高分数记录
         private static Dictionary<int, int> _highestScoreDic = new Dictionary<int, int>();
@@ -138,7 +152,7 @@ namespace GFGGame
         //检查指定章节对应的普通章节是否通关
         public static bool CheckNormalChapterPass(int chapterId)
         {
-            int normalChapterId = StoryUtil.GetNormalChapterId(chapterId);
+            int normalChapterId = StoryUtil.GetChapterOrder(chapterId);
             return normalChapterId <= GameGlobal.myNumericComponent.GetAsInt(NumericType.Chapter);
         }
 
@@ -172,11 +186,11 @@ namespace GFGGame
             return true;
         }
 
-        public static bool CheckLevelPass(int chapterId, int level)
+        public static bool CheckLevelPass(int chapterId, int levelOrder)
         {
-            int passChapter = GetPassChapter(chapterId);
-            int passLevel = GetPassLevel(chapterId);
-            return CalculateHelper.CheckLevelPass(chapterId, level, passChapter, passLevel);
+            int passChapterOrder = GetPassChapter(chapterId);
+            int passLevelOrder = GetPassLevel(chapterId);
+            return CalculateHelper.CheckLevelPass(chapterId, levelOrder, passChapterOrder, passLevelOrder);
         }
 
 
@@ -198,7 +212,7 @@ namespace GFGGame
 
         public static bool CheckCurrentLevelPass()
         {
-            return CheckLevelPass(currentChapter, currentLevel);
+            return InstanceZonesDataManager.CheckLevelPass(currentLevelCfgId);
         }
 
         public static int GetScoreHighest(int levelID)
@@ -341,7 +355,7 @@ namespace GFGGame
             var star = 0;
             foreach(var item in _starDic)
             {
-                var tempChapter = item.Key / GameConst.STORY_LEVEL_KEY_NUM;
+                CalculateHelper.GetStoryChapterLevel(item.Key, out var tempChapter, out var levelOrder);
                 if(tempChapter == chapterID)
                 {
                     star += item.Value;

GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/StoryCfgManager.cs

@@ -1,41 +0,0 @@
-using System.Collections.Generic;
-
-namespace GFGGame
-{
-    public class StoryCfgManager : SingletonBase<StoryCfgManager>
-    {
-        private List<StoryChapterCfg> _commonCfgs;
-        private List<StoryChapterCfg> _hardCfgs;
-
-        public StoryCfgManager()
-        {
-            _commonCfgs = new List<StoryChapterCfg>();
-            _hardCfgs = new List<StoryChapterCfg>();
-            StoryChapterCfg[] dataArray = StoryChapterCfgArray.Instance.dataArray;
-            foreach(StoryChapterCfg cfg in dataArray)
-            {
-                if(CalculateHelper.CheckChapterIsHard(cfg.id))
-                {
-                    _hardCfgs.Add(cfg);
-                }
-                else
-                {
-                    _commonCfgs.Add(cfg);
-                }
-            }
-        }
-
-        public List<StoryChapterCfg> GetDataArray(int storyType)
-        {
-            if(storyType == ConstStoryType.HARD_TYPE)
-            {
-                return _hardCfgs;
-            }
-            else
-            {
-                return _commonCfgs;
-            }
-        }
-
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10001.cs

@@ -20,7 +20,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public const string URL = "ui://mfvz4q8kkpb08j";
+        public const string URL = "ui://mfvz4q8ktxgzdd";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10001";
         private static UI_CompChapter10001 _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10002.cs

@@ -7,7 +7,6 @@ namespace UI.Main
     public partial class UI_CompChapter10002
     {
         public GComponent target;
-        public GImage m_bg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -28,7 +27,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g18;
         public UI_CompStoryLevelItem m_g19;
         public UI_CompStoryLevelItem m_g20;
-        public const string URL = "ui://mfvz4q8kkpb08i";
+        public const string URL = "ui://mfvz4q8ktxgzdc";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10002";
         private static UI_CompChapter10002 _proxy;
@@ -75,7 +74,6 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
             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"));
@@ -99,7 +97,6 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10003.cs

@@ -21,7 +21,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
         public UI_CompStoryLevelItem m_g13;
-        public const string URL = "ui://mfvz4q8kkpb08k";
+        public const string URL = "ui://mfvz4q8ks2cc5p";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10003";
         private static UI_CompChapter10003 _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10004.cs

@@ -20,7 +20,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public const string URL = "ui://mfvz4q8kkpb08l";
+        public const string URL = "ui://mfvz4q8ks2cc5q";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10004";
         private static UI_CompChapter10004 _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10005.cs

@@ -20,7 +20,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public const string URL = "ui://mfvz4q8kkpb08m";
+        public const string URL = "ui://mfvz4q8kga166s";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10005";
         private static UI_CompChapter10005 _proxy;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompChapter1
+    public partial class UI_CompChapter20001
     {
         public GComponent target;
         public GImage m_bg;
@@ -20,14 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public const string URL = "ui://mfvz4q8ktxgzdd";
+        public const string URL = "ui://mfvz4q8kkpb08j";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompChapter1";
-        private static UI_CompChapter1 _proxy;
+        public const string RES_NAME = "CompChapter20001";
+        private static UI_CompChapter20001 _proxy;
 
-        public static UI_CompChapter1 Create(GObject gObject = null)
+        public static UI_CompChapter20001 Create(GObject gObject = null)
         {
-            var ui = new UI_CompChapter1();
+            var ui = new UI_CompChapter20001();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -36,11 +36,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompChapter1 Proxy(GObject gObject = null)
+        public static UI_CompChapter20001 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompChapter1();
+                _proxy = new UI_CompChapter20001();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c95dee8d911555a4e8884fe21a81b2e3
+guid: 276852bc0e7a3044593296c95bf6d77a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs

@@ -4,9 +4,10 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompChapter2
+    public partial class UI_CompChapter20002
     {
         public GComponent target;
+        public GImage m_bg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -27,14 +28,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g18;
         public UI_CompStoryLevelItem m_g19;
         public UI_CompStoryLevelItem m_g20;
-        public const string URL = "ui://mfvz4q8ktxgzdc";
+        public const string URL = "ui://mfvz4q8kkpb08i";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompChapter2";
-        private static UI_CompChapter2 _proxy;
+        public const string RES_NAME = "CompChapter20002";
+        private static UI_CompChapter20002 _proxy;
 
-        public static UI_CompChapter2 Create(GObject gObject = null)
+        public static UI_CompChapter20002 Create(GObject gObject = null)
         {
-            var ui = new UI_CompChapter2();
+            var ui = new UI_CompChapter20002();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -43,11 +44,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompChapter2 Proxy(GObject gObject = null)
+        public static UI_CompChapter20002 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompChapter2();
+                _proxy = new UI_CompChapter20002();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -74,6 +75,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_bg = (GImage)comp.GetChild("bg");
             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"));
@@ -97,6 +99,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_bg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20003.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompChapter3
+    public partial class UI_CompChapter20003
     {
         public GComponent target;
         public GImage m_bg;
@@ -21,14 +21,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
         public UI_CompStoryLevelItem m_g13;
-        public const string URL = "ui://mfvz4q8ks2cc5p";
+        public const string URL = "ui://mfvz4q8kkpb08k";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompChapter3";
-        private static UI_CompChapter3 _proxy;
+        public const string RES_NAME = "CompChapter20003";
+        private static UI_CompChapter20003 _proxy;
 
-        public static UI_CompChapter3 Create(GObject gObject = null)
+        public static UI_CompChapter20003 Create(GObject gObject = null)
         {
-            var ui = new UI_CompChapter3();
+            var ui = new UI_CompChapter20003();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -37,11 +37,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompChapter3 Proxy(GObject gObject = null)
+        public static UI_CompChapter20003 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompChapter3();
+                _proxy = new UI_CompChapter20003();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20003.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter5.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20004.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompChapter5
+    public partial class UI_CompChapter20004
     {
         public GComponent target;
         public GImage m_bg;
@@ -20,14 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public const string URL = "ui://mfvz4q8kga166s";
+        public const string URL = "ui://mfvz4q8kkpb08l";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompChapter5";
-        private static UI_CompChapter5 _proxy;
+        public const string RES_NAME = "CompChapter20004";
+        private static UI_CompChapter20004 _proxy;
 
-        public static UI_CompChapter5 Create(GObject gObject = null)
+        public static UI_CompChapter20004 Create(GObject gObject = null)
         {
-            var ui = new UI_CompChapter5();
+            var ui = new UI_CompChapter20004();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -36,11 +36,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompChapter5 Proxy(GObject gObject = null)
+        public static UI_CompChapter20004 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompChapter5();
+                _proxy = new UI_CompChapter20004();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20004.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter4.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20005.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_CompChapter4
+    public partial class UI_CompChapter20005
     {
         public GComponent target;
         public GImage m_bg;
@@ -20,14 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public const string URL = "ui://mfvz4q8ks2cc5q";
+        public const string URL = "ui://mfvz4q8kkpb08m";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "CompChapter4";
-        private static UI_CompChapter4 _proxy;
+        public const string RES_NAME = "CompChapter20005";
+        private static UI_CompChapter20005 _proxy;
 
-        public static UI_CompChapter4 Create(GObject gObject = null)
+        public static UI_CompChapter20005 Create(GObject gObject = null)
         {
-            var ui = new UI_CompChapter4();
+            var ui = new UI_CompChapter20005();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -36,11 +36,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_CompChapter4 Proxy(GObject gObject = null)
+        public static UI_CompChapter20005 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_CompChapter4();
+                _proxy = new UI_CompChapter20005();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20005.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter3.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter4.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter5.cs.meta

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

GameClient/Assets/Game/HotUpdate/ServerProxy/StorySProxy.cs

@@ -44,7 +44,7 @@ namespace GFGGame
                 }
             }
             //异常返回到关卡列表界面
-            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
+            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
         }
 
         //完成剧情战斗关卡
@@ -95,7 +95,7 @@ namespace GFGGame
                 }
             }
             //异常返回到关卡列表界面
-            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
+            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
         }
 
         //剧情战斗关卡失败，更新最高分

GameClient/Assets/Game/HotUpdate/Utils/StoryUtil.cs

@@ -66,22 +66,19 @@ namespace GFGGame
 
         public static string GetChapterOrderText(int chapterID)
         {
-            int order = GetNormalChapterId(chapterID);
+            int order = GetChapterOrder(chapterID);
             return "第" + NumberUtil.GetChiniseNumberText(order) + "章";
         }
 
         /// <summary>
         /// 获得章节显示的序号
         /// </summary>
-        /// <param name="chapterId"></param>
+        /// <param name="chapterCfgId"></param>
         /// <returns></returns>
-        public static int GetNormalChapterId(int chapterId)
+        public static int GetChapterOrder(int chapterCfgId)
         {
-            if(CalculateHelper.CheckChapterIsHard(chapterId))
-            {
-                return chapterId - GameConst.START_ID_OF_HARD;
-            }
-            return chapterId;
+            StoryChapterCfg storyChapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterCfgId);
+            return storyChapterCfg.order;
         }
 
         public static void UpdateStar(int starCount, GComponent component)

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -9,8 +9,8 @@ namespace GFGGame
     {
         private UI_StoryChapterListUI _ui;
         private int curTab;
-        private int storyType = ConstStoryType.NORMAL_TYPE;
-        private List<StoryChapterCfg> _chapterCfgs;
+        private int subType = ConstInstanceZonesSubType.Normal;
+        private StoryChapterCfg[] _chapterCfgs;
 
         public override void Dispose()
         {
@@ -43,15 +43,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            if (CalculateHelper.CheckChapterIsHard(StoryDataManager.currentChapter))
-            {
-                storyType = ConstStoryType.HARD_TYPE;
-            }
-            else
-            {
-                storyType = ConstStoryType.NORMAL_TYPE;
-            }
-            _ui.m_listType.selectedIndex = storyType;
+            subType = CalculateHelper.GetChapterSubType(StoryDataManager.currentChapterCfgId);
+            _ui.m_listType.selectedIndex = subType;
             UpdateList();
         }
 
@@ -78,7 +71,7 @@ namespace GFGGame
         }
         private void OnClickListTypeItem()
         {
-            this.storyType = _ui.m_listType.selectedIndex;
+            this.subType = _ui.m_listType.selectedIndex;
             UpdateList();
         }
         private void OnClickListChapterItem(EventContext context)
@@ -110,7 +103,7 @@ namespace GFGGame
                 listItem.m_content.target.y = 0;
             }
             StoryChapterCfg chapterCfg = _chapterCfgs[index];
-            listItem.m_content.m_txtLv.text = StoryUtil.GetNormalChapterId(chapterCfg.id).ToString();
+            listItem.m_content.m_txtLv.text = StoryUtil.GetChapterOrder(chapterCfg.id).ToString();
             listItem.m_content.m_txtTitle.text = chapterCfg.name;
             listItem.m_content.m_compPic.m_pic.url = "ui://Main/" + chapterCfg.res;
             listItem.target.data = chapterCfg.id;
@@ -118,8 +111,8 @@ namespace GFGGame
 
         private void UpdateList()
         {
-            _chapterCfgs = StoryCfgManager.Instance.GetDataArray(storyType);
-            _ui.m_listChapter.numItems = _chapterCfgs.Count;
+            _chapterCfgs = StoryChapterCfgManager.Instance.GetCfgs(subType);
+            _ui.m_listChapter.numItems = _chapterCfgs.Length;
             for (int i = 0; i < _ui.m_listChapter.numChildren; i++)
             {
                 UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(_ui.m_listChapter.GetChildAt(i));

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             base.OnShown();
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _chapterID = (int)viewData;
-            StoryDataManager.currentChapter = _chapterID;
+            StoryDataManager.currentChapterCfgId = _chapterID;
             _compChapter = (GComponent)UIPackage.CreateObject("Main", "CompChapter" + _chapterID);
             _ui.m_chapter.AddChild(_compChapter);
             InitChapter();
@@ -103,72 +103,64 @@ namespace GFGGame
             UpdateBonusBoxStatus(_ui.m_bonusBox1, 0);
             UpdateBonusBoxStatus(_ui.m_bonusBox2, 1);
             UpdateBonusBoxStatus(_ui.m_bonusBox3, 2);
-
+            var list = StoryLevelCfgManager.Instance.GetCfgs(1, 1);
             int endLevel = 0;
-            for (int i = 0; i < _compChapter.numChildren; i++)
+            for (int i = 0; i < list.Length; i++)
             {
-                GObject obj = _compChapter.GetChildAt(i);
-                if (obj.name.IndexOf("g") == 0)
+                StoryLevelCfg levelCfg = list[i];
+                GObject obj = _compChapter.GetChild("g" + levelCfg.order);
+                if (obj != null)
                 {
                     UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(obj);
-                    int level = int.Parse(levelItem.target.name.Replace("g", ""));
-                    if (StoryDataManager.CheckLevelUnlock(_chapterID, level))
+                    levelItem.target.data = levelCfg.id;
+                    if (StoryDataManager.CheckLevelUnlock(_chapterID, levelCfg.order))
                     {
                         levelItem.target.visible = true;
                         levelItem.target.onClick.Clear();
                         levelItem.target.onClick.Add(OnClickLevelItem);
-                        int levelID = _chapterID*GameConst.STORY_LEVEL_KEY_NUM + level;
-                        string showId = StoryUtil.GetNormalChapterId(_chapterID) + "_" + level;
+                        string showId = StoryUtil.GetChapterOrder(_chapterID) + "_" + levelCfg.order;
                         levelItem.m_txtOrder.text = showId;
-                        StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
-                        if (levelCfg != null)
+                        if (levelCfg.fightID.Length > 0)
                         {
-                            if (levelCfg.fightID.Length > 0)
-                            {
-                                levelItem.m_bg.url = "ui://Main/zx_gka_zb_2";
-                                int score = StoryDataManager.GetScoreHighest(levelID);
-                                if (score <= 0)
-                                {
-                                    levelItem.m_flower.target.visible = false;
-                                }
-                                else
-                                {
-                                    levelItem.m_flower.target.visible = true;
-                                    int starCount = StoryDataManager.GetStarCountHistory(levelID);
-                                    StoryUtil.UpdateStar(starCount, levelItem.m_flower.target);
-                                }
-                            }
-                            else
+                            levelItem.m_bg.url = "ui://Main/zx_gka_zb_2";
+                            int score = StoryDataManager.GetScoreHighest(levelCfg.id);
+                            if (score <= 0)
                             {
-                                levelItem.m_bg.url = "ui://Main/zx_gka_zb_1";
                                 levelItem.m_flower.target.visible = false;
-
-                            }
-                            // levelItem.m_iconUnPass.visible = 
-                            levelItem.m_holder.visible = !StoryDataManager.CheckLevelPass(_chapterID, level);
-                            // if (levelItem.m_holder.visible)
-                            // {
-                            // }
-                            if (levelItem.m_holder.visible)
-                            {
-                                // StoryDataManager.currentChapter = _chapterID;
-                                StoryDataManager.currentLevel = int.Parse(levelItem.target.name.Replace("g", ""));
-
-                                _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 (level > endLevel)
+                            else
                             {
-                                endLevel = level;
-                                _endLevelItem = levelItem.target;
+                                levelItem.m_flower.target.visible = true;
+                                int starCount = StoryDataManager.GetStarCountHistory(levelCfg.id);
+                                StoryUtil.UpdateStar(starCount, levelItem.m_flower.target);
                             }
                         }
                         else
                         {
-                            levelItem.target.visible = false;
+                            levelItem.m_bg.url = "ui://Main/zx_gka_zb_1";
+                            levelItem.m_flower.target.visible = false;
+
+                        }
+                        // levelItem.m_iconUnPass.visible = 
+                        levelItem.m_holder.visible = !StoryDataManager.CheckLevelPass(_chapterID, levelCfg.order);
+                        // if (levelItem.m_holder.visible)
+                        // {
+                        // }
+                        if (levelItem.m_holder.visible)
+                        {
+                            // StoryDataManager.currentChapter = _chapterID;
+                            StoryDataManager.currentLevelOrder = int.Parse(levelItem.target.name.Replace("g", ""));
+
+                            _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;
                         }
                     }
                     else
@@ -192,8 +184,7 @@ namespace GFGGame
         {
 
             UI_CompStoryLevelItem levelItem = UI_CompStoryLevelItem.Proxy(context.sender as GObject);
-            int level = int.Parse(levelItem.target.name.Replace("g", ""));
-            var levelCfgId = CalculateHelper.GetStoryLevelId(_chapterID, level);
+            int levelCfgId = (int)levelItem.target.data;
             StoryController.ShowLevelView(levelCfgId);
         }
 
@@ -204,7 +195,7 @@ namespace GFGGame
 
         private void UpdateBonusBoxStatus(UI_CompBonusBox bonusBox, int index)
         {
-            int status = StoryDataManager.GetChapterBonusStatus(StoryDataManager.currentChapter, index);
+            int status = StoryDataManager.GetChapterBonusStatus(StoryDataManager.currentChapterCfgId, index);
             bonusBox.m_iconActive.visible = status == ConstBonusStatus.CAN_GET;
             if (status == ConstBonusStatus.GOT)
             {
@@ -222,7 +213,7 @@ namespace GFGGame
             int status = (int)bonusBox.target.data;
             if (status == ConstBonusStatus.CAN_GET)
             {
-                List<ItemData> bonusList = StoryDataManager.GetChapterBonus(StoryDataManager.currentChapter, index);
+                List<ItemData> bonusList = StoryDataManager.GetChapterBonus(StoryDataManager.currentChapterCfgId, index);
                 if (bonusList != null && bonusList.Count > 0)
                 {
                     // ViewManager.Show(ViewName.GET_BONUS_VIEW, bonusList);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs

@@ -8,11 +8,12 @@ namespace GFGGame
     {
         public static void ShowLevelView(int levelCfgId)
 {
-            CalculateHelper.GetStoryChapterLevel(levelCfgId, out int chapterID, out int level);
-            StoryDataManager.currentChapter = chapterID;
+            CalculateHelper.GetStoryChapterLevel(levelCfgId, out int chapterID, out int levelOrder);
+            StoryDataManager.currentChapterCfgId = chapterID;
             StoryDataManager.currentLevelCfgId = levelCfgId;
+            InstanceZonesDataManager.currentLevelCfgId = levelCfgId;
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
-            StoryDataManager.currentLevel = level;
+            StoryDataManager.currentLevelOrder = levelOrder;
             if (levelCfg.fightID.Length > 0)
             {
                 ViewManager.Show(ViewName.STORY_LEVEL_INFO_VIEW, levelCfgId);
@@ -30,8 +31,8 @@ namespace GFGGame
         }
         public static void ShowPriorStoryDialog()
         {
-            StoryDataManager.currentChapter = 1;
-            StoryDataManager.currentLevelCfgId = 1001;
+            StoryDataManager.currentChapterCfgId = 10001;
+            StoryDataManager.currentLevelCfgId = 100001001;
             ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { StoryDataManager.priorId, false, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, null, true);
         }
 
@@ -74,7 +75,7 @@ namespace GFGGame
             }
             else
             {
-                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
+                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -45,10 +45,10 @@ namespace GFGGame
             base.OnShown();
             int count = (int)viewData;
             _levelID = StoryDataManager.currentLevelCfgId;
-            _storyType = _levelID/GameConst.STORY_LEVEL_KEY_NUM / 10000;
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            _storyType = levelCfg.subType;
             _expAdd = fightCfg.exp;
             _power = levelCfg.power;
             StartFight(count);
@@ -68,7 +68,7 @@ namespace GFGGame
         {
             int time = StoryDataManager.GetCanFightTime(_levelID);
 
-            if (_storyType == ConstStoryType.NORMAL_TYPE && time < count)
+            if (_storyType == ConstInstanceZonesSubType.Normal && time < count)
             {
                 ItemUtil.AddPower("体力不足", () => { StartFight(count); });
                 return;
@@ -146,14 +146,14 @@ namespace GFGGame
                 _ui.m_btnFightTimes.visible = time > 0;
                 _ui.m_txtPowerDesc.visible = _ui.m_btnFightTimes.visible;
 
-                if (_storyType == ConstStoryType.NORMAL_TYPE)
+                if (_storyType == ConstInstanceZonesSubType.Normal)
                 {
                     _ui.m_btnFightTimes.visible = true;
 
                     _fightTimes = (int)viewData;
                     _ui.m_btnFightTimes.text = "挑战" + NumberUtil.GetChiniseNumberText((int)viewData) + "次";
                 }
-                else if (_storyType == ConstStoryType.HARD_TYPE)
+                else if (_storyType == ConstInstanceZonesSubType.Hard)
                 {
 
                     _ui.m_btnFightTimes.visible = time > 1;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -252,7 +252,7 @@ namespace GFGGame
         {
             Reset();
             this.Hide();
-            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
+            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
 
         }
         private void Reset()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -448,7 +448,7 @@ namespace GFGGame
         {
             Reset();
             this.Hide();
-            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
+            ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW));
 
         }
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -45,7 +45,8 @@ namespace GFGGame
         {
             base.OnShown();
             _levelID = (int)viewData;
-            _storyType = _levelID/GameConst.STORY_LEVEL_KEY_NUM / 10000;
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+            _storyType = levelCfg.subType;
             _ui.m_btnStart.touchable = true;
             UpdateView();
 
@@ -90,7 +91,7 @@ namespace GFGGame
         private void OnClickBtnFightTimes()
         {
 
-            if (_storyType == ConstStoryType.NORMAL_TYPE)
+            if (_storyType == ConstInstanceZonesSubType.Normal)
             {
                 if (_fightTimes < _timeCount)
                 {
@@ -101,7 +102,7 @@ namespace GFGGame
                     ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, _fightTimes);
                 }
             }
-            else if (_storyType == ConstStoryType.HARD_TYPE)
+            else if (_storyType == ConstInstanceZonesSubType.Hard)
             {
                 ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, _fightTimes);
             }
@@ -128,14 +129,14 @@ namespace GFGGame
             {
                 int time = StoryDataManager.GetCanFightTime(_levelID);
                 time = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, time);
-                if (_storyType == ConstStoryType.NORMAL_TYPE)
+                if (_storyType == ConstInstanceZonesSubType.Normal)
                 {
                     _ui.m_btnFightTimes.visible = true;
 
                     _fightTimes = time;
                     _ui.m_btnFightTimes.text = "挑战" + NumberUtil.GetChiniseNumberText(_timeCount) + "次";
                 }
-                else if (_storyType == ConstStoryType.HARD_TYPE)
+                else if (_storyType == ConstInstanceZonesSubType.Hard)
                 {
 
                     _ui.m_btnFightTimes.visible = time > 0;
@@ -152,7 +153,7 @@ namespace GFGGame
         {
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-            _ui.m_txtTitle.text = StoryDataManager.currentChapter + "-" + StoryDataManager.currentLevel + " " + levelCfg.name;
+            _ui.m_txtTitle.text = StoryDataManager.CurrentChapterOrder + "-" + StoryDataManager.currentLevelOrder + " " + levelCfg.name;
             _ui.m_txtLevelDesc.text = levelCfg.desc;
             _ui.m_txtPowerDesc.SetVar("power", "" + levelCfg.power).FlushVars();
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + fightCfg.scoreType;