Revert "序章背景替换"

This reverts commit d6270eea8d24af3e3fe06916c4caf6e3c0bfc084.

FGUIProject/assets/CommonGame/package.xml

@@ -189,6 +189,7 @@
     <image id="slyzthy" name="yx_yihd.png" path="/images/"/>
     <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
+    <image id="gd29ti0" name="jingzhongh_bg.jpg" path="/bgimg/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both" designImageLayer="1">
   <displayList>
-    <image id="n43_fz8v" name="loaBg" src="hky3fc" fileName="imagesStory/beijing0_bg.jpg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600">
+    <loader id="n43_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </image>
+    </loader>
     <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/CompChapter20001.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n37_fz8v" name="loaBg" src="hky3fc" fileName="imagesStory/beijing0_bg.jpg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600">
+    <loader id="n37_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
-    </image>
+    </loader>
     <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/package.xml

@@ -341,7 +341,6 @@
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="txgzdc" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
-    <image id="n1knde" name="beijing2_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <image id="jj0mdf" name="zd_jsjs_2.png" path="/images/"/>
     <image id="jj0mdg" name="zd_jsjs_1.png" path="/images/"/>
     <component id="jj0mdl" name="ButtonSpeedUp1.xml" path="/componentsDialog/"/>
@@ -381,11 +380,7 @@
     <movieclip id="wet2f3" name="MovieClip4.jta" path="/Movie/"/>
     <image id="ox5bf4" name="zjm_hdhd_3.png" path="/images/"/>
     <component id="ox5bf5" name="Button2.xml" path="/components/"/>
-    <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="hky3fb" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/images/"/>
-    <image id="hky3fc" name="beijing0_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter10001
     {
         public GComponent target;
-        public GImage m_loaBg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -67,7 +67,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GImage)comp.GetChild("loaBg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));

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

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter20001
     {
         public GComponent target;
-        public GImage m_loaBg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -61,7 +61,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_loaBg = (GImage)comp.GetChild("loaBg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));

GameClient/Assets/ResIn/UI/Main/Main_atlas_hky3fc.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 3222c931c0099554ea2225414db2a187
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: