Эх сурвалжийг харах

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

zhaoyang 3 жил өмнө
parent
commit
00c7f13caf

+ 7 - 7
FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -12,14 +12,14 @@
     <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="453,1539"/>
     <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="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="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="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="360,1205"/>
+    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="547,1106"/>
+    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="718,995"/>
     <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="845,840"/>
     <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="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="647,757"/>
+    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="435,653"/>
+    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="225,546"/>
+    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="111,392"/>
     <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="291,300"/>
     <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"/>
     <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="471,210"/>
   </displayList>
   </displayList>

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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