diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png index ef9683e0..ad0c3cff 100644 Binary files a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png and b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png differ diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png.meta b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png.meta index 95e3f630..50bfad3d 100644 --- a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png.meta +++ b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep11_2.png.meta @@ -106,19 +106,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png index 7a864a34..dc501d58 100644 Binary files a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png and b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png differ diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png.meta b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png.meta index 075bf34d..53b87290 100644 --- a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png.meta +++ b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep12_1.png.meta @@ -106,19 +106,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png index 4cd6b73c..8454ad63 100644 Binary files a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png and b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png differ diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png.meta b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png.meta index 47e41944..ff8dcf81 100644 --- a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png.meta +++ b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep13_1.png.meta @@ -106,19 +106,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png index 56a940e4..db1a338d 100644 Binary files a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png and b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png differ diff --git a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png.meta b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png.meta index 5937d73e..2fde0979 100644 --- a/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png.meta +++ b/GameMain/UI/UISprites/Merge/Story_pic_sp2ep5_1.png.meta @@ -106,32 +106,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_xuxian.png b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_xuxian.png new file mode 100644 index 00000000..b4ee37ad Binary files /dev/null and b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_xuxian.png differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_xuxian.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_xuxian.png.meta new file mode 100644 index 00000000..46d2f557 --- /dev/null +++ b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_xuxian.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ae308d7f50e83f14a9d270fe2185ab10 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_zhedang.png b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_zhedang.png new file mode 100644 index 00000000..ca202fa5 Binary files /dev/null and b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_zhedang.png differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_zhedang.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_zhedang.png.meta new file mode 100644 index 00000000..1d9beffa --- /dev/null +++ b/GameMain/UI/UISprites/Other/Packed/Sp2/map_pic_xiangce_zhedang.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 31222b6c66eef2d47abf16e83424d1ef +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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: 2, y: 2, z: 2, w: 2} + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: