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

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -5,14 +5,14 @@
     <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="528,1675"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,1437"/>
+    <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="850,1153"/>
-    <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,960"/>
-    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,802"/>
-    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,670"/>
-    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="398,516"/>
-    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,209"/>
+    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="873,1205"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <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"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,1979"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="675,1887"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1695"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1687"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,1565"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,1407"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1293"/>
-    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1252"/>
-    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1043"/>
-    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,994"/>
-    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,909"/>
-    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,737"/>
-    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,767"/>
-    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,688"/>
-    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,577"/>
-    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,359"/>
-    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="495,193"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -2,18 +2,18 @@
 <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="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"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -2,17 +2,17 @@
 <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="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"/>
+    <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"/>
   </displayList>
 </component>