diff --git a/Art_Bytes/ArtResourceConfig.bytes b/Art_Bytes/ArtResourceConfig.bytes index 267619e1..d886419a 100644 Binary files a/Art_Bytes/ArtResourceConfig.bytes and b/Art_Bytes/ArtResourceConfig.bytes differ diff --git a/Art_Json/Common/CommonIcon.json b/Art_Json/Common/CommonIcon.json index ed0a26aa..71a658c5 100644 --- a/Art_Json/Common/CommonIcon.json +++ b/Art_Json/Common/CommonIcon.json @@ -65,6 +65,54 @@ "SpritePath": "Assets/Art_SubModule/yyzl/01Mergeorder/image/Limitedtime_pic_kaiqifangshi_yuanbian.png", "SpineAssetPath": "", "SpineAnimName": "" + }, + { + "Id": 9, + "Name": "merge_icn_ads_liti", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/merge_icn_ads_liti.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 10, + "Name": "merge_icn_ads_liti_red", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti_red.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 12, + "Name": "merge_icn_ads_ping", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/merge_icn_ads_ping.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 13, + "Name": "merge_icon_small_annotation", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/merge_icon_small_annotation.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 14, + "Name": "merge_pic_off_red", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/merge_pic_off_red.png", + "SpineAssetPath": "", + "SpineAnimName": "" + }, + { + "Id": 15, + "Name": "merge_pic_tick", + "Desc": "", + "SpritePath": "Assets/Art_SubModule/yyzl/Common/Small/merge_pic_tick.png", + "SpineAssetPath": "", + "SpineAnimName": "" } ] } \ No newline at end of file diff --git a/Art_SO/Common/CommonIcon.asset b/Art_SO/Common/CommonIcon.asset index 964d2585..b0a42c44 100644 --- a/Art_SO/Common/CommonIcon.asset +++ b/Art_SO/Common/CommonIcon.asset @@ -79,3 +79,51 @@ MonoBehaviour: SpineAsset: {fileID: 0} SpineAssetPath: SpineAnimName: + - Id: 9 + Name: merge_icn_ads_liti + Desc: + Sprite: {fileID: 21300000, guid: 09056d38f723840458fdb4b6b5ed64bc, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/merge_icn_ads_liti.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 10 + Name: merge_icn_ads_liti_red + Desc: + Sprite: {fileID: 21300000, guid: 793d025412e790245af2a59592789180, type: 3} + SpritePath: Assets/Art_SubModule/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti_red.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 12 + Name: merge_icn_ads_ping + Desc: + Sprite: {fileID: 21300000, guid: 24dc61ae05a3f7d4b882c62ce0299bf6, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/merge_icn_ads_ping.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 13 + Name: merge_icon_small_annotation + Desc: + Sprite: {fileID: 21300000, guid: 645346e3d99b50d4980749e3108d9a42, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/merge_icon_small_annotation.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 14 + Name: merge_pic_off_red + Desc: + Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/merge_pic_off_red.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: + - Id: 15 + Name: merge_pic_tick + Desc: + Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} + SpritePath: Assets/Art_SubModule/yyzl/Common/Small/merge_pic_tick.png + SpineAsset: {fileID: 0} + SpineAssetPath: + SpineAnimName: diff --git a/GameMain/UI/UISprites/Card/Packed/Card1/merge_pic_tick box.png b/GameMain/UI/UISprites/Card/Packed/Card1/merge_pic_tick box.png deleted file mode 100644 index 184af3ac..00000000 Binary files a/GameMain/UI/UISprites/Card/Packed/Card1/merge_pic_tick box.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Card/Packed/Card1/merge_pic_tick box.png.meta b/GameMain/UI/UISprites/Card/Packed/Card1/merge_pic_tick box.png.meta deleted file mode 100644 index f1ea193c..00000000 --- a/GameMain/UI/UISprites/Card/Packed/Card1/merge_pic_tick box.png.meta +++ /dev/null @@ -1,179 +0,0 @@ -fileFormatVersion: 2 -guid: 168a4ba1037c525498b849e6ab7d3c7c -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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: 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: [] - 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/Merge/Packed/Other/merge_icon_small_green.png b/GameMain/UI/UISprites/Merge/Packed/Other/merge_icon_small_green.png deleted file mode 100644 index 0c421db9..00000000 Binary files a/GameMain/UI/UISprites/Merge/Packed/Other/merge_icon_small_green.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Merge/Packed/Other/merge_icon_small_green.png.meta b/GameMain/UI/UISprites/Merge/Packed/Other/merge_icon_small_green.png.meta deleted file mode 100644 index 6cf22359..00000000 --- a/GameMain/UI/UISprites/Merge/Packed/Other/merge_icon_small_green.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: a107b0d1641e61a4fb807ab4e2ef81b6 -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: 45, y: 0, z: 45, 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: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - 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: diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/Limitedtime_pic_xinfeng.png b/GameMain/UI/UISprites/Other/Packed/Sp1/Limitedtime_pic_xinfeng.png deleted file mode 100644 index ff08b26f..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/Limitedtime_pic_xinfeng.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/Limitedtime_pic_xinfeng.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/Limitedtime_pic_xinfeng.png.meta deleted file mode 100644 index deb6d44a..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/Limitedtime_pic_xinfeng.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: c56db2f4c4d4e2240bbbdc2c15d96a80 -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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: WindowsStoreApps - 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: iOS - 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: [] - 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/Sp1/merge_icn_ads_liti.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti.png deleted file mode 100644 index a7f6e011..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti.png.meta deleted file mode 100644 index 1acae8fb..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_liti.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: 898258efc3e474046b1deecc737993eb -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: 1 - 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: Server - 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: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iOS - 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: WebGL - 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: WindowsStoreApps - 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: [] - 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/Sp1/merge_icn_ads_ping.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping.png deleted file mode 100644 index edd4b307..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping.png.meta deleted file mode 100644 index 89c37320..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: 8188f0842a80dc8439f2d77f0c3e3ca3 -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: 1 - 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: Server - 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: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iOS - 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: WebGL - 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: WindowsStoreApps - 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: [] - 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/Sp1/merge_icn_ads_ping_red.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping_red.png deleted file mode 100644 index ba60b034..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping_red.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping_red.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping_red.png.meta deleted file mode 100644 index 4c1d7a3b..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icn_ads_ping_red.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: bfbf82d4aa7a5414d92dc383d446e055 -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: 1 - 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: Server - 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: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iOS - 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: WebGL - 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: WindowsStoreApps - 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: [] - 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/Sp1/merge_icon_small_annotation.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_annotation.png deleted file mode 100644 index 2f044e89..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_annotation.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_annotation.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_annotation.png.meta deleted file mode 100644 index 95152ca5..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_annotation.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: 60d4b45499852944db563ab16a44e6f2 -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iOS - 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: WindowsStoreApps - 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: [] - 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/Sp1/merge_icon_small_green.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_green.png deleted file mode 100644 index 1af8237a..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_green.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_green.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_green.png.meta deleted file mode 100644 index a06518ca..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_icon_small_green.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: 8be7b396a2b1d324f97956a0ad13a77c -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iOS - 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: WindowsStoreApps - 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: [] - 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/Sp1/merge_pic_kapaiqipao_bg.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_kapaiqipao_bg.png deleted file mode 100644 index 2c385bd8..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_kapaiqipao_bg.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_kapaiqipao_bg.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_kapaiqipao_bg.png.meta deleted file mode 100644 index c41ffaf8..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_kapaiqipao_bg.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: 1f53c5b9e74b23640b8305e570cda9d6 -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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: iOS - 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: WindowsStoreApps - 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: [] - 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/Sp1/merge_pic_off_red.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_off_red.png deleted file mode 100644 index 373550f6..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_off_red.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_off_red.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_off_red.png.meta deleted file mode 100644 index 434fc925..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_off_red.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: 940a37e642c542643aa93d0536e64e9c -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WindowsStoreApps - 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: iOS - 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: [] - 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/Sp1/merge_pic_tick.png b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_tick.png deleted file mode 100644 index aa50216c..00000000 Binary files a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_tick.png and /dev/null differ diff --git a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_tick.png.meta b/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_tick.png.meta deleted file mode 100644 index 832d04d8..00000000 --- a/GameMain/UI/UISprites/Other/Packed/Sp1/merge_pic_tick.png.meta +++ /dev/null @@ -1,192 +0,0 @@ -fileFormatVersion: 2 -guid: a96de8f49c9a32646827b3bcb4c2093d -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: 1 - 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: Server - 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: 1024 - resizeAlgorithm: 0 - textureFormat: 51 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iOS - 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: WindowsStoreApps - 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: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/yyzl/01Mergeorder/MainMergePanel.prefab b/yyzl/01Mergeorder/MainMergePanel.prefab index 3af27cd5..b76cf035 100644 --- a/yyzl/01Mergeorder/MainMergePanel.prefab +++ b/yyzl/01Mergeorder/MainMergePanel.prefab @@ -36110,7 +36110,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -92153,7 +92153,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60d4b45499852944db563ab16a44e6f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 645346e3d99b50d4980749e3108d9a42, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -101837,7 +101837,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -118607,7 +118607,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8188f0842a80dc8439f2d77f0c3e3ca3, type: 3} + m_Sprite: {fileID: 21300000, guid: 24dc61ae05a3f7d4b882c62ce0299bf6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -126841,7 +126841,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bfbf82d4aa7a5414d92dc383d446e055, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e540c4bc245eac459647cebe67e655f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -133806,7 +133806,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8be7b396a2b1d324f97956a0ad13a77c, type: 3} + m_Sprite: {fileID: 21300000, guid: 822b3d3eb00cdc443ac4b5bb66e2a451, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -148860,7 +148860,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/02MainHome/BubbleItem.prefab b/yyzl/02MainHome/BubbleItem.prefab index 8f07ee6e..ccfae96f 100644 --- a/yyzl/02MainHome/BubbleItem.prefab +++ b/yyzl/02MainHome/BubbleItem.prefab @@ -416,7 +416,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8be7b396a2b1d324f97956a0ad13a77c, type: 3} + m_Sprite: {fileID: 21300000, guid: 822b3d3eb00cdc443ac4b5bb66e2a451, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -940,7 +940,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bfbf82d4aa7a5414d92dc383d446e055, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e540c4bc245eac459647cebe67e655f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1845,7 +1845,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8188f0842a80dc8439f2d77f0c3e3ca3, type: 3} + m_Sprite: {fileID: 21300000, guid: 24dc61ae05a3f7d4b882c62ce0299bf6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/02MainHome/ShopEnergyItem.prefab b/yyzl/02MainHome/ShopEnergyItem.prefab index 18f2e93a..93e74557 100644 --- a/yyzl/02MainHome/ShopEnergyItem.prefab +++ b/yyzl/02MainHome/ShopEnergyItem.prefab @@ -1552,7 +1552,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8188f0842a80dc8439f2d77f0c3e3ca3, type: 3} + m_Sprite: {fileID: 21300000, guid: 24dc61ae05a3f7d4b882c62ce0299bf6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3652,7 +3652,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60d4b45499852944db563ab16a44e6f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 645346e3d99b50d4980749e3108d9a42, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4000,7 +4000,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bfbf82d4aa7a5414d92dc383d446e055, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e540c4bc245eac459647cebe67e655f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4468,7 +4468,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60d4b45499852944db563ab16a44e6f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 645346e3d99b50d4980749e3108d9a42, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/02MainHome/image/merge_icon_circlebg_blue.png b/yyzl/02MainHome/image/merge_icon_circlebg_blue.png deleted file mode 100644 index 9f238c71..00000000 Binary files a/yyzl/02MainHome/image/merge_icon_circlebg_blue.png and /dev/null differ diff --git a/yyzl/02MainHome/image/merge_icon_circlebg_blue.png.meta b/yyzl/02MainHome/image/merge_icon_circlebg_blue.png.meta deleted file mode 100644 index 98f9dfd4..00000000 --- a/yyzl/02MainHome/image/merge_icon_circlebg_blue.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: c5d5dd60d609ff34f80c3ade138619a5 -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: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - 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/yyzl/02MainHome/image/merge_icon_circlebg_green.png b/yyzl/02MainHome/image/merge_icon_circlebg_green.png deleted file mode 100644 index 2192ac27..00000000 Binary files a/yyzl/02MainHome/image/merge_icon_circlebg_green.png and /dev/null differ diff --git a/yyzl/02MainHome/image/merge_icon_circlebg_green.png.meta b/yyzl/02MainHome/image/merge_icon_circlebg_green.png.meta deleted file mode 100644 index 9280a6d0..00000000 --- a/yyzl/02MainHome/image/merge_icon_circlebg_green.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 14dbc50b28e649a4da4b2ac01513116b -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: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - 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/yyzl/04Illustratedbook/BookGroupItem.prefab b/yyzl/04Illustratedbook/BookGroupItem.prefab index 3c2c1b22..ae05fcb7 100644 --- a/yyzl/04Illustratedbook/BookGroupItem.prefab +++ b/yyzl/04Illustratedbook/BookGroupItem.prefab @@ -615,7 +615,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/04Illustratedbook/IllustratedBookPanel.prefab b/yyzl/04Illustratedbook/IllustratedBookPanel.prefab index 20f50bc8..a1f71515 100644 --- a/yyzl/04Illustratedbook/IllustratedBookPanel.prefab +++ b/yyzl/04Illustratedbook/IllustratedBookPanel.prefab @@ -7824,7 +7824,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -8485,7 +8485,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -9142,7 +9142,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -9729,7 +9729,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -10737,7 +10737,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -13461,7 +13461,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/05AvatarFrame/MainLvPanel.prefab b/yyzl/05AvatarFrame/MainLvPanel.prefab index 1b9c64eb..88a3823c 100644 --- a/yyzl/05AvatarFrame/MainLvPanel.prefab +++ b/yyzl/05AvatarFrame/MainLvPanel.prefab @@ -5282,7 +5282,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/06Task/DailyTaskPanel.prefab b/yyzl/06Task/DailyTaskPanel.prefab index 13d1117a..f0953d08 100644 --- a/yyzl/06Task/DailyTaskPanel.prefab +++ b/yyzl/06Task/DailyTaskPanel.prefab @@ -5973,7 +5973,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/06Task/NewBieDailyTaskPanel.prefab b/yyzl/06Task/NewBieDailyTaskPanel.prefab index 2c717012..259f5748 100644 --- a/yyzl/06Task/NewBieDailyTaskPanel.prefab +++ b/yyzl/06Task/NewBieDailyTaskPanel.prefab @@ -2380,7 +2380,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4742,7 +4742,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -7764,7 +7764,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -13274,7 +13274,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -13621,7 +13621,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/06Task/PetHomeDailyTaskPanel.prefab b/yyzl/06Task/PetHomeDailyTaskPanel.prefab index e7b20690..edc640db 100644 --- a/yyzl/06Task/PetHomeDailyTaskPanel.prefab +++ b/yyzl/06Task/PetHomeDailyTaskPanel.prefab @@ -1601,7 +1601,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -4434,7 +4434,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -7179,7 +7179,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -10567,7 +10567,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/07Friend/FriendPanel.prefab b/yyzl/07Friend/FriendPanel.prefab index 1b8036e8..3b03f181 100644 --- a/yyzl/07Friend/FriendPanel.prefab +++ b/yyzl/07Friend/FriendPanel.prefab @@ -3113,7 +3113,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3384,7 +3384,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10905,7 +10905,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13959,7 +13959,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60d4b45499852944db563ab16a44e6f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 645346e3d99b50d4980749e3108d9a42, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/07Friend/InvitePanel.prefab b/yyzl/07Friend/InvitePanel.prefab index b53aacfe..1af55ed0 100644 --- a/yyzl/07Friend/InvitePanel.prefab +++ b/yyzl/07Friend/InvitePanel.prefab @@ -6572,7 +6572,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8581,7 +8581,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/08Card/MasterCardPanel.prefab b/yyzl/08Card/MasterCardPanel.prefab index b7517e9e..7164fe87 100644 --- a/yyzl/08Card/MasterCardPanel.prefab +++ b/yyzl/08Card/MasterCardPanel.prefab @@ -229235,7 +229235,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b42624f9f09c3d34ca7e4dd2f195de6a, type: 3} + m_Sprite: {fileID: 21300000, guid: 1fbb157362f66b54a82bb8e1898efb8e, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/08Card/image/merge_pic_tick box.png b/yyzl/08Card/image/merge_pic_tick box.png deleted file mode 100644 index 184af3ac..00000000 Binary files a/yyzl/08Card/image/merge_pic_tick box.png and /dev/null differ diff --git a/yyzl/08Card/image/merge_pic_tick box.png.meta b/yyzl/08Card/image/merge_pic_tick box.png.meta deleted file mode 100644 index 6ed8010f..00000000 --- a/yyzl/08Card/image/merge_pic_tick box.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: b42624f9f09c3d34ca7e4dd2f195de6a -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: 16, y: 18, z: 17, w: 19} - 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: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - 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: diff --git a/yyzl/09PackPanel/MainPackPanel.prefab b/yyzl/09PackPanel/MainPackPanel.prefab index f755f336..142992c4 100644 --- a/yyzl/09PackPanel/MainPackPanel.prefab +++ b/yyzl/09PackPanel/MainPackPanel.prefab @@ -13845,7 +13845,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 60d4b45499852944db563ab16a44e6f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 645346e3d99b50d4980749e3108d9a42, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/yyzl/12PetHome/PetHomeRivalItem.prefab b/yyzl/12PetHome/PetHomeRivalItem.prefab index c6f96c3a..211ab653 100644 --- a/yyzl/12PetHome/PetHomeRivalItem.prefab +++ b/yyzl/12PetHome/PetHomeRivalItem.prefab @@ -284,7 +284,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c56db2f4c4d4e2240bbbdc2c15d96a80, type: 3} + m_Sprite: {fileID: 21300000, guid: 53ec1899ac872ea4f8823c547e514809, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/18LimitEvent/CatsGiftPanel.prefab b/yyzl/18LimitEvent/CatsGiftPanel.prefab index 33f8a8f1..78231ccd 100644 --- a/yyzl/18LimitEvent/CatsGiftPanel.prefab +++ b/yyzl/18LimitEvent/CatsGiftPanel.prefab @@ -7665,7 +7665,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14dbc50b28e649a4da4b2ac01513116b, type: 3} + m_Sprite: {fileID: 21300000, guid: 8d1f51b52cd3eeb438d0a392fb64d833, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8197,7 +8197,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14dbc50b28e649a4da4b2ac01513116b, type: 3} + m_Sprite: {fileID: 21300000, guid: 8d1f51b52cd3eeb438d0a392fb64d833, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8823,7 +8823,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14dbc50b28e649a4da4b2ac01513116b, type: 3} + m_Sprite: {fileID: 21300000, guid: 8d1f51b52cd3eeb438d0a392fb64d833, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/19Settings/MorePanel.prefab b/yyzl/19Settings/MorePanel.prefab index efacfcfa..ad28ac77 100644 --- a/yyzl/19Settings/MorePanel.prefab +++ b/yyzl/19Settings/MorePanel.prefab @@ -423,7 +423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -635,7 +635,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5742,7 +5742,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6994,7 +6994,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/19Settings/SettingPanel.prefab b/yyzl/19Settings/SettingPanel.prefab index dcfdefc9..51c4048c 100644 --- a/yyzl/19Settings/SettingPanel.prefab +++ b/yyzl/19Settings/SettingPanel.prefab @@ -3337,7 +3337,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4369,7 +4369,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6228,7 +6228,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13147,7 +13147,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16480,7 +16480,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19093,7 +19093,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19600,7 +19600,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19710,7 +19710,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21143,7 +21143,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/js/GetRewardPanel.prefab b/yyzl/js/GetRewardPanel.prefab index 8f39ec2a..c83ee53f 100644 --- a/yyzl/js/GetRewardPanel.prefab +++ b/yyzl/js/GetRewardPanel.prefab @@ -11670,7 +11670,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f53c5b9e74b23640b8305e570cda9d6, type: 3} + m_Sprite: {fileID: 21300000, guid: 799b7466e3ab4204884cb89273532325, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -99538,7 +99538,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -101878,7 +101878,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -130840,7 +130840,7 @@ PrefabInstance: - target: {fileID: 7289938137536926142, guid: 256e0e898048b0f4ab12ed8dc1a4beda, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + objectReference: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} - target: {fileID: 8555910419037059398, guid: 256e0e898048b0f4ab12ed8dc1a4beda, type: 3} propertyPath: m_FontData.m_BestFit value: 1 @@ -131832,7 +131832,7 @@ PrefabInstance: - target: {fileID: 7289938137536926142, guid: 256e0e898048b0f4ab12ed8dc1a4beda, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a96de8f49c9a32646827b3bcb4c2093d, type: 3} + objectReference: {fileID: 21300000, guid: 1da91eb4801b9c44da6c420ecbb56fcc, type: 3} - target: {fileID: 8555910419037059398, guid: 256e0e898048b0f4ab12ed8dc1a4beda, type: 3} propertyPath: m_FontData.m_BestFit value: 1 diff --git a/yyzl/tc/DeleteFriendImportantHintPanel.prefab b/yyzl/tc/DeleteFriendImportantHintPanel.prefab index 055bc586..064988c9 100644 --- a/yyzl/tc/DeleteFriendImportantHintPanel.prefab +++ b/yyzl/tc/DeleteFriendImportantHintPanel.prefab @@ -521,7 +521,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/tc/LoginPromptPanel.prefab b/yyzl/tc/LoginPromptPanel.prefab index f94106f6..fcd87ecf 100644 --- a/yyzl/tc/LoginPromptPanel.prefab +++ b/yyzl/tc/LoginPromptPanel.prefab @@ -831,7 +831,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5739,7 +5739,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/yyzl/tc/ModifyNicknamePanel.prefab b/yyzl/tc/ModifyNicknamePanel.prefab index f16f09d1..d67fa883 100644 --- a/yyzl/tc/ModifyNicknamePanel.prefab +++ b/yyzl/tc/ModifyNicknamePanel.prefab @@ -214,7 +214,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 940a37e642c542643aa93d0536e64e9c, type: 3} + m_Sprite: {fileID: 21300000, guid: bc72ebf190cdc1649bd30d212e875c90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1