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

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1200,2600" scroll="both">
+<component size="1200,2600" scroll="both" designImage="ui://mfvz4q8khky3fb" designImageLayer="1">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="hky3f9" fileName="imagesStory/beijing0_bg.jpg" xy="0,0" size="1197,2601"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"/>
+    <image id="n37_n1kn" name="n37" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="-4,-3" aspect="true"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="n1knde" fileName="imagesStory/beijing2_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="531,2108"/>
     <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="765,2058"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml

@@ -1,7 +1,7 @@
 <?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="-7,-24"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -1,7 +1,7 @@
 <?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"/>
+    <image id="n0_xuzk" name="bg" src="hky3f9" fileName="imagesStory/beijing0_bg.jpg" xy="0,0" size="1200,2600"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="n1knde" fileName="imagesStory/beijing2_bg.jpg" xy="0,0"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
     <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"/>

FGUIProject/assets/Main/componentsLevel/CompChapter20005.xml

@@ -1,7 +1,7 @@
 <?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"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_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"/>

FGUIProject/assets/Main/package.xml

@@ -384,6 +384,8 @@
     <image id="eq0bf6" name="beijing1_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <image id="eq0bf7" name="beijing3_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <image id="eq0bf8" name="beijing4_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
+    <image id="hky3f9" name="beijing0_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
+    <image id="hky3fb" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/ResIn/UI/Main/Main_atlas_slb41o.png.meta → GameClient/Assets/ResIn/UI/Main/Main_atlas_hky3f9.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 795f278df34e9184ba9c3a6b892befc6
+guid: 591800ec6384bd64f80b78506e7deef1
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}