Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -2,17 +2,17 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="520,1678"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="77,1431"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1292"/>
-    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="873,1205"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="378,2112"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="552,1948"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="672,1729"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="460,1594"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="243,1410"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="485,1235"/>
+    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,1124"/>
     <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="529,945"/>
-    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="134,786"/>
-    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="901,689"/>
-    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="413,515"/>
-    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="507,209"/>
+    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="302,847"/>
+    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="464,672"/>
+    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="706,550"/>
+    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="492,384"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -2,25 +2,25 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n37_n1kn" name="n37" src="n1knde" fileName="imagesStory/beijing2_bg.jpg" xy="-4,-3" aspect="true"/>
-    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="634,2422"/>
-    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="486,2250"/>
-    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="307,2142"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="144,2027"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="458,1909"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="726,1890"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="992,1779"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="720,1624"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="235,1485"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="13,1342"/>
-    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="177,1186"/>
-    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="509,1126"/>
-    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="756,1047"/>
-    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="627,881"/>
-    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="294,714"/>
-    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="549,574"/>
-    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="388,491"/>
-    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="123,401"/>
-    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="301,319"/>
-    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="512,259"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="731,2325"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="518,2250"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="338,2133"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="291,1975"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="514,1878"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="770,1810"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="621,1659"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="453,1539"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="271,1446"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="146,1292"/>
+    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="390,1193"/>
+    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="551,1097"/>
+    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="710,986"/>
+    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="845,840"/>
+    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="649,766"/>
+    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="353,606"/>
+    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="206,522"/>
+    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="120,367"/>
+    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="291,300"/>
+    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="471,210"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -3,17 +3,24 @@
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
     <component id="n21_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="318,2231"/>
-    <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="550,2110"/>
-    <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="928,1988"/>
-    <component id="n24_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="763,1841"/>
-    <component id="n25_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="556,1716"/>
-    <component id="n26_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="194,1563"/>
-    <component id="n27_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="258,1285"/>
-    <component id="n28_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="100,973"/>
-    <component id="n29_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="662,1159"/>
-    <component id="n30_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="991,901"/>
-    <component id="n31_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="669,728"/>
-    <component id="n32_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="218,557"/>
-    <component id="n33_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="549,361"/>
+    <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="531,2108"/>
+    <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="765,2058"/>
+    <component id="n24_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="945,1948"/>
+    <component id="n25_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="796,1804"/>
+    <component id="n26_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="589,1704"/>
+    <component id="n27_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="384,1606"/>
+    <component id="n28_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="184,1458"/>
+    <component id="n29_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="325,1339"/>
+    <component id="n30_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="506,1234"/>
+    <component id="n31_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="707,1168"/>
+    <component id="n32_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="929,1131"/>
+    <component id="n33_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,949"/>
+    <component id="n34_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="642,833"/>
+    <component id="n35_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="411,771"/>
+    <component id="n36_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="182,684"/>
+    <component id="n37_j4p1" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="282,511"/>
+    <component id="n38_j4p1" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="448,416"/>
+    <component id="n39_j4p1" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="610,314"/>
+    <component id="n40_j4p1" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="446,187"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -2,17 +2,25 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
-    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="592,2450"/>
-    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="340,2308"/>
-    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="630,2221"/>
-    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="145,2012"/>
-    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="728,1577"/>
-    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="51,1384"/>
-    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="465,1111"/>
-    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1009,1166"/>
-    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="493,913"/>
-    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="481,432"/>
-    <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="745,302"/>
-    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="493,168"/>
+    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="578,2386"/>
+    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="237,2111"/>
+    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="428,2224"/>
+    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="408,1985"/>
+    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="637,1930"/>
+    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="862,1873"/>
+    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="736,1689"/>
+    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="568,1563"/>
+    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="367,1472"/>
+    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="175,1384"/>
+    <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="242,1176"/>
+    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="486,1095"/>
+    <component id="n32_j4p1" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="720,1086"/>
+    <component id="n33_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="927,1004"/>
+    <component id="n34_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="728,872"/>
+    <component id="n35_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="515,784"/>
+    <component id="n36_j4p1" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="316,682"/>
+    <component id="n37_j4p1" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="402,478"/>
+    <component id="n38_j4p1" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="607,377"/>
+    <component id="n39_j4p1" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="507,156"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml

@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.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"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="-7,-24"/>
+    <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="466,2331"/>
+    <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="657,2218"/>
+    <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="805,2095"/>
+    <component id="n45_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="606,2000"/>
+    <component id="n46_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="410,1920"/>
+    <component id="n47_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="218,1797"/>
+    <component id="n48_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="375,1643"/>
+    <component id="n49_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="798,1482"/>
+    <component id="n50_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="600,1584"/>
+    <component id="n51_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="834,1302"/>
+    <component id="n52_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="636,1214"/>
+    <component id="n53_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="419,1119"/>
+    <component id="n54_j4p1" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="242,1008"/>
+    <component id="n55_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="188,810"/>
+    <component id="n56_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="400,741"/>
+    <component id="n57_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="635,750"/>
+    <component id="n58_j4p1" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="877,691"/>
+    <component id="n59_j4p1" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="656,554"/>
+    <component id="n60_j4p1" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="416,495"/>
+    <component id="n61_j4p1" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="480,296"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -2,11 +2,11 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="483,2066"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="472,1673"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="84,1410"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="849,1206"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="154,785"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="408,365"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="509,1972"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="639,1655"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="411,1425"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="553,1172"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="343,909"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="586,712"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml

@@ -2,15 +2,15 @@
 <component size="1170,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"/>
-    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="476,2298"/>
-    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="282,2133"/>
-    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="286,1782"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="667,1706"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="469,1443"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,1277"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="364,1073"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="740,967"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="364,754"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="523,529"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="585,2184"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="603,1951"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="375,1784"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="202,1583"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="547,1474"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="752,1288"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="441,1141"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="642,955"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="345,812"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="599,656"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -2,15 +2,15 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
-    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="317,2227"/>
-    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,2072"/>
-    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="925,1806"/>
-    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1712"/>
+    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="346,2224"/>
+    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="707,2082"/>
+    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="927,1803"/>
+    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="537,1704"/>
     <component id="n12_ux8s" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="187,1562"/>
     <component id="n13_ux8s" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="407,1327"/>
     <component id="n14_ux8s" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,1161"/>
-    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="924,922"/>
-    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="177,825"/>
-    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="437,431"/>
+    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="856,956"/>
+    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="556,783"/>
+    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="286,470"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -2,15 +2,15 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
-    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="607,2225"/>
-    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="150,2007"/>
-    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="513,1734"/>
-    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="746,1542"/>
-    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="41,1365"/>
-    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1000,1157"/>
-    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="492,916"/>
-    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="470,438"/>
-    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,301"/>
-    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="496,141"/>
+    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="484,2255"/>
+    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="688,2077"/>
+    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="511,1804"/>
+    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="680,1591"/>
+    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="306,1409"/>
+    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="609,1167"/>
+    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="780,974"/>
+    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,755"/>
+    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="422,570"/>
+    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="663,292"/>
   </displayList>
 </component>

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

@@ -21,6 +21,13 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
         public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8ks2cc5p";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10003";
@@ -82,6 +89,13 @@ namespace UI.Main
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
             m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -112,6 +126,20 @@ namespace UI.Main
             m_g12 = null;
             m_g13.Dispose();
             m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,6 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
+        public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8ks2cc5q";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10004";
@@ -80,6 +88,14 @@ namespace UI.Main
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +124,22 @@ namespace UI.Main
             m_g11 = null;
             m_g12.Dispose();
             m_g12 = null;
+            m_g13.Dispose();
+            m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,6 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
+        public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8kga166s";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10005";
@@ -80,6 +88,14 @@ namespace UI.Main
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +124,22 @@ namespace UI.Main
             m_g11 = null;
             m_g12.Dispose();
             m_g12 = null;
+            m_g13.Dispose();
+            m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();