公用机提交

FGUIProject/assets/Main/componentsLevel/CompChapter2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1170,2600" scroll="both">
+<component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n36_rbmg" name="bg" src="slb41o" fileName="imagesStory/zhuxian_ditu.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
+    <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"/>

FGUIProject/assets/Main/package.xml

@@ -238,7 +238,6 @@
     <component id="r1a99d" name="StoryCardChooseUI.xml" path="/" exported="true"/>
     <component id="r1a99f" name="ListCardItem.xml" path="/components/"/>
     <image id="r1a99g" name="fzd_fzxzhong.png" path="/imagesStory/"/>
-    <image id="uo1t9j" name="815fdfad7130eb284ed17c13c7f81dd.png" path="/imagesStory/"/>
     <component id="cn279k" name="ComAllCircle.xml" path="/components/"/>
     <component id="py009l" name="StorySkillUI.xml" path="/" exported="true"/>
     <image id="py009m" name="zd_kpdi_2.png" path="/imagesStory/"/>
@@ -330,7 +329,6 @@
     <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
     <component id="v3k9c6" name="ProgressBarSingleScore.xml" path="/components/"/>
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
-    <image id="v3k9c8" name="f08dc01e397bcd8d2e04da1517d6cf7.png" path="/imagesStory/"/>
     <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
     <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
     <image id="v3k9cb" name="zd_jinengdi_1.png" path="/imagesStory/"/>
@@ -369,6 +367,7 @@
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
+    <image id="n1knde" name="beijing2_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_CompChapter2.cs

@@ -7,7 +7,6 @@ namespace UI.Main
     public partial class UI_CompChapter2
     {
         public GComponent target;
-        public GImage m_bg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -75,7 +74,6 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
             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"));
@@ -99,7 +97,6 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: bda3ea1766aa4ea469a3c07a4b20d1b5
+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: