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

FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -15,8 +15,8 @@
     <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="520,2028"/>
     <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="302,1912"/>
     <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="259,1639"/>
-    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="670,1307"/>
-    <component id="n32_j4p1" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="363,1386"/>
+    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="434,1405"/>
+    <component id="n32_j4p1" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="666,1281"/>
     <component id="n33_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="886,1112"/>
     <component id="n34_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1056,952"/>
     <component id="n35_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="778,760"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml

@@ -11,8 +11,8 @@
     <component id="n46_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="558,2316"/>
     <component id="n47_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="342,2129"/>
     <component id="n48_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="124,1908"/>
-    <component id="n49_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="642,1705"/>
-    <component id="n50_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="416,1864"/>
+    <component id="n49_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="407,1841"/>
+    <component id="n50_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="652,1739"/>
     <component id="n51_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="929,1690"/>
     <component id="n52_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1171,1574"/>
     <component id="n53_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="799,1419"/>