diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_gb.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_gb.png.meta index e6c582653..698beecfc 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_gb.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_gb.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_can.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_can.png.meta index b1ca35de3..83c0f9078 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_can.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_can.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cc.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cc.png.meta index be1dcd454..c371ecfbf 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cc.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cc.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cg.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cg.png.meta index ecc3f8b80..0b5514ae0 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cg.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_cg.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_han.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_han.png.meta index 6ce104944..9e371a7b3 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_han.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_han.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lan.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lan.png.meta index 945eb194f..4d5e8440c 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lan.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lan.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lc.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lc.png.meta index c0d516327..e4141bee3 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lc.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lc.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lg.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lg.png.meta index 760cd1d36..d53511006 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lg.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_lg.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_st.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_st.png.meta index d2c363ec3..9400033d3 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_st.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_sd_st.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png index 5e2920baa..d2559d341 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png and b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png.meta index 30234e0d8..8bff5f442 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_tsbz.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_dd.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_dd.png.meta index ce5b88048..f6e746f76 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_dd.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_dd.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_jghdt.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_jghdt.png.meta index 48e2d542e..24c14fc16 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_jghdt.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_jghdt.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,17 +39,17 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 13, y: 0, z: 12, w: 0} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_yr.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_yr.png.meta index a6b670b29..49267d732 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_yr.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_yxbz_yr.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_zz.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_zz.png.meta index 4c4420586..5058e04be 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_zz.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/ejjm_zz.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,17 +39,17 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 109, y: 35, z: 91, w: 22} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/kf_js.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/kf_js.png.meta index 9a9dbdff1..cdcfe5003 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/kf_js.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/kf_js.png.meta @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dt.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dt.png.meta index cc4a1b9da..9e8f8aa6b 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dt.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dt.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,17 +39,17 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 2, y: 0, z: 3, w: 0} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dtc.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dtc.png.meta index 0e75856ce..4d3bff8b0 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dtc.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_dtc.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,17 +39,17 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 7, y: 0, z: 6, w: 0} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png index 9ed4392c7..17bfc70b4 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png and b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png.meta index dd3b4a7ed..fe3a092e3 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/mfcj_ej_mfy.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/sz_szd.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/sz_szd.png.meta index 41a5bd3b2..3ee214c4e 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/sz_szd.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/sz_szd.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_dq.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_dq.png.meta index 38b1f8050..d575f5c48 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_dq.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_dq.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png index 5281a3a2c..46e500779 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png and b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png.meta index 6931c3c0e..368dbe880 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_jb.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_qd.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_qd.png.meta index abd3f35cc..ac19d9e2f 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_qd.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_qd.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,17 +39,17 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 13, y: 0, z: 13, w: 0} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_xd.png.meta b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_xd.png.meta index 949c5a7d6..9bbe212be 100644 --- a/Assets/Art/XJMH/pw/pw_atals/commonui/xc_xd.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/commonui/xc_xd.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_dd.png b/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_dd.png index c9dc05f9e..8ce8e324b 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_dd.png and b/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_dd.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_jiantou.png b/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_jiantou.png index c4d6520e3..34a164906 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_jiantou.png and b/Assets/Art/XJMH/pw/pw_atals/freelotteryview/mfcj_jiantou.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd.png b/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd.png index 572f754c4..fe434f494 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd.png and b/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd_2.png b/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd_2.png index 41aac1dbf..917a3ae23 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd_2.png and b/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_dd_2.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_jnd.png b/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_jnd.png index 5845cbcee..b5c6854e6 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_jnd.png and b/Assets/Art/XJMH/pw/pw_atals/freemode/zd_mfzd_jnd.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/gainbox/tyhd_jld.png b/Assets/Art/XJMH/pw/pw_atals/gainbox/tyhd_jld.png index 08f490892..e7e98a826 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/gainbox/tyhd_jld.png and b/Assets/Art/XJMH/pw/pw_atals/gainbox/tyhd_jld.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/gainbox/xsc_jinbi_1.png b/Assets/Art/XJMH/pw/pw_atals/gainbox/xsc_jinbi_1.png index 625266164..a041164b7 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/gainbox/xsc_jinbi_1.png and b/Assets/Art/XJMH/pw/pw_atals/gainbox/xsc_jinbi_1.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1.png.meta index 3a7066acc..53623a587 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1l.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1l.png.meta index cd96e8080..3767b9a1f 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1l.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_1l.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2.png.meta index 0fdf8e9ee..16f8881a6 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2l.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2l.png.meta index fe9ecc74a..d46daf67a 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2l.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_2l.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3.png.meta index b1108653f..b397373f9 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3l.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3l.png.meta index a5bc5a025..ba86b3390 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3l.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_3l.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_bt.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_bt.png.meta index ab976f98b..3d9b460a7 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_bt.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_bt.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png index 9039dc188..9e2a87ee8 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png and b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png.meta index 0138844e6..9b89fabd6 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd1.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png index 35939fd9c..6990d600f 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png and b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png.meta index 5d7c08200..576dcd7b1 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_btd2.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_d.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_d.png.meta index fbd95015d..cd4b6ea59 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_d.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_d.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png index 7fbe53a42..7c6c8c096 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png and b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png.meta index ad62b05b8..079ec19b8 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_db.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png index 93a98a1bd..395a8cc2e 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png and b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png.meta b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png.meta index 722fe9781..934af843d 100644 --- a/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/help/ejjm_yxbz_smdb.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,17 +39,17 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 104, y: 0, z: 67, w: 0} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_gaoliang.png b/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_gaoliang.png index c3288c4ae..77c95c2e4 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_gaoliang.png and b/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_gaoliang.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_ht.png b/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_ht.png index 729e2f567..e6a9d6cff 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_ht.png and b/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_ht.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_hui.png b/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_hui.png index d1efff4da..b4e3f0059 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_hui.png and b/Assets/Art/XJMH/pw/pw_atals/phonesecurities/xjb_hui.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/planmatch/pok_bs_ph_3.png b/Assets/Art/XJMH/pw/pw_atals/planmatch/pok_bs_ph_3.png index c307e7403..dd0be2ed8 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/planmatch/pok_bs_ph_3.png and b/Assets/Art/XJMH/pw/pw_atals/planmatch/pok_bs_ph_3.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/scratchcardview/ggk_gz.png b/Assets/Art/XJMH/pw/pw_atals/scratchcardview/ggk_gz.png index fa746b530..935b24dbe 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/scratchcardview/ggk_gz.png and b/Assets/Art/XJMH/pw/pw_atals/scratchcardview/ggk_gz.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_bt.png.meta b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_bt.png.meta index 7b0ab2387..c98f9db49 100644 --- a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_bt.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_bt.png.meta @@ -7,8 +7,8 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 1 + sRGBTexture: 1 + linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png index 4d9fe72f5..b68b2115d 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png and b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png.meta b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png.meta index f16a1ccd7..d1c9bba15 100644 --- a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_db.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png index 14abcfb6c..75dc6490c 100644 Binary files a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png and b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png differ diff --git a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png.meta b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png.meta index beb666d07..1ca93a98a 100644 --- a/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png.meta +++ b/Assets/Art/XJMH/pw/pw_atals/setlock/ejjm_sd_xz.png.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -30,7 +30,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 4 + textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -39,14 +39,14 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} @@ -65,14 +65,14 @@ TextureImporter: ignorePngGamma: 0 applyGammaDecoding: 0 swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,7 +85,33 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + 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 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -98,7 +124,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -123,5 +149,5 @@ TextureImporter: mipmapLimitGroupName: pSDRemoveMatte: 0 userData: - assetBundleName: pw_atlas + assetBundleName: assetBundleVariant: diff --git a/Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_FreeFrame_R.prefab b/Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_FreeFrame_R.prefab index 425ddbb08..b4214689d 100644 --- a/Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_FreeFrame_R.prefab +++ b/Assets/Art/XJMH/pw/pw_prefab/game/battery/PW_Battery_FreeFrame_R.prefab @@ -1,31 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1614906730251133 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224610717509775035} - - component: {fileID: 222147185484291561} - - component: {fileID: 223525416096118206} - - component: {fileID: 114090304449408376} - m_Layer: 0 - m_Name: PW_Battery_FreeFrame_R - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1001504820255809 GameObject: - serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 224767921849820668} - component: {fileID: 222369659803278641} @@ -37,180 +18,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1827780608920913 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224790874485767270} - - component: {fileID: 222269410538421534} - - component: {fileID: 114146904061881664} - - component: {fileID: 114017394884163502} - m_Layer: 0 - m_Name: Num - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1035557567939554 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224930384221305009} - - component: {fileID: 222063754425170544} - - component: {fileID: 114318683649995962} - m_Layer: 0 - m_Name: Items - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1759732302383393 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224503720330728060} - m_Layer: 0 - m_Name: FreeImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1183592726094029 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224390856399041386} - m_Layer: 0 - m_Name: FreeTime - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1002570979705875 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224109324160054008} - - component: {fileID: 222362040536445958} - - component: {fileID: 114910869638817586} - m_Layer: 0 - m_Name: image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1627832129779596 -GameObject: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Component: - - component: {fileID: 224464953555354207} - - component: {fileID: 222786843756656306} - - component: {fileID: 114249271301320286} - - component: {fileID: 114691962005329859} - m_Layer: 0 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &224610717509775035 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614906730251133} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -568, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224767921849820668} - - {fileID: 224503720330728060} - - {fileID: 224390856399041386} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -568, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222147185484291561 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614906730251133} - m_CullTransparentMesh: 0 ---- !u!223 &223525416096118206 -Canvas: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614906730251133} - m_Enabled: 1 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 11 - m_TargetDisplay: 0 ---- !u!114 &114090304449408376 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614906730251133} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!224 &224767921849820668 RectTransform: m_ObjectHideFlags: 0 @@ -219,13 +26,13 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1001504820255809} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -60, y: 30, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 224790874485767270} - {fileID: 224930384221305009} m_Father: {fileID: 224610717509775035} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -250,11 +57,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -269,162 +77,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!224 &224790874485767270 -RectTransform: +--- !u!1 &1002570979705875 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827780608920913} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -45, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224767921849820668} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -45, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222269410538421534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827780608920913} - m_CullTransparentMesh: 0 ---- !u!114 &114146904061881664 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827780608920913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9803922, g: 0.7450981, b: 0.4117647, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 0d60340f50dc1de4b8a06a6e84304779, type: 3} - m_FontSize: 16 - m_FontStyle: 2 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 1 ---- !u!114 &114017394884163502 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1827780608920913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!224 &224930384221305009 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035557567939554} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224767921849820668} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 90, y: 70} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &222063754425170544 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035557567939554} - m_CullTransparentMesh: 0 ---- !u!114 &114318683649995962 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035557567939554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: {x: 0, y: 0, z: 0, w: 0} - m_Softness: {x: 0, y: 0} ---- !u!224 &224503720330728060 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1759732302383393} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 224610717509775035} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224390856399041386 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183592726094029} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 224109324160054008} - - {fileID: 224464953555354207} - m_Father: {fileID: 224610717509775035} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + serializedVersion: 6 + m_Component: + - component: {fileID: 224109324160054008} + - component: {fileID: 222362040536445958} + - component: {fileID: 114910869638817586} + m_Layer: 0 + m_Name: image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!224 &224109324160054008 RectTransform: m_ObjectHideFlags: 0 @@ -435,9 +105,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224390856399041386} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -462,11 +132,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -481,6 +152,210 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1035557567939554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224930384221305009} + - component: {fileID: 222063754425170544} + - component: {fileID: 114318683649995962} + m_Layer: 0 + m_Name: Items + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224930384221305009 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035557567939554} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224767921849820668} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 90, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222063754425170544 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035557567939554} + m_CullTransparentMesh: 0 +--- !u!114 &114318683649995962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035557567939554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!1 &1183592726094029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224390856399041386} + m_Layer: 0 + m_Name: FreeTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224390856399041386 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1183592726094029} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 224109324160054008} + - {fileID: 224464953555354207} + m_Father: {fileID: 224610717509775035} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1614906730251133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224610717509775035} + - component: {fileID: 222147185484291561} + - component: {fileID: 223525416096118206} + - component: {fileID: 114090304449408376} + m_Layer: 0 + m_Name: PW_Battery_FreeFrame_R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &224610717509775035 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614906730251133} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 224767921849820668} + - {fileID: 224503720330728060} + - {fileID: 224390856399041386} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -568, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222147185484291561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614906730251133} + m_CullTransparentMesh: 0 +--- !u!223 &223525416096118206 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614906730251133} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 11 + m_TargetDisplay: 0 +--- !u!114 &114090304449408376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614906730251133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &1627832129779596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224464953555354207} + - component: {fileID: 222786843756656306} + - component: {fileID: 114249271301320286} + - component: {fileID: 114691962005329859} + m_Layer: 0 + m_Name: Time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!224 &224464953555354207 RectTransform: m_ObjectHideFlags: 0 @@ -491,9 +366,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9999526, y: 0.9999526, z: 0.9999526} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224390856399041386} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -518,11 +393,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9803922, g: 0.7450981, b: 0.4117647, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -551,8 +427,138 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_EffectColor: {r: 0.2666667, g: 0.2431373, b: 0.2352941, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &1759732302383393 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224503720330728060} + m_Layer: 0 + m_Name: FreeImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224503720330728060 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759732302383393} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224610717509775035} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1827780608920913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224790874485767270} + - component: {fileID: 222269410538421534} + - component: {fileID: 114146904061881664} + - component: {fileID: 114017394884163502} + m_Layer: 0 + m_Name: Num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224790874485767270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827780608920913} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224767921849820668} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: -0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -45, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222269410538421534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827780608920913} + m_CullTransparentMesh: 0 +--- !u!114 &114146904061881664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827780608920913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9803922, g: 0.7450981, b: 0.4117647, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 0d60340f50dc1de4b8a06a6e84304779, type: 3} + m_FontSize: 16 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1 +--- !u!114 &114017394884163502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827780608920913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 diff --git a/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_DropProp0.png b/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_DropProp0.png index f6952674a..32ec8bbed 100644 Binary files a/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_DropProp0.png and b/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_DropProp0.png differ diff --git a/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_PhoneSecurities_10.png b/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_PhoneSecurities_10.png index f78fd146d..7c66ed051 100644 Binary files a/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_PhoneSecurities_10.png and b/Assets/Art/XJMH/pw/pw_sprite/freemodel/PW_FreeItem_PhoneSecurities_10.png differ diff --git a/Assets/Art/XJMH/pw/pw_sprite/handbook/tj_ts_jzx.png b/Assets/Art/XJMH/pw/pw_sprite/handbook/tj_ts_jzx.png index cd26c2ab7..37daac08c 100644 Binary files a/Assets/Art/XJMH/pw/pw_sprite/handbook/tj_ts_jzx.png and b/Assets/Art/XJMH/pw/pw_sprite/handbook/tj_ts_jzx.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_01.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_01.png index 294a0d959..c334ad2ec 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_01.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_01.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_02.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_02.png index 6e2dc936c..744eebaac 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_02.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_02.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_03.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_03.png index cf85308ed..7363752ea 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_03.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_03.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_04.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_04.png index 043a98d0e..94193eadb 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_04.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_04.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_05.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_05.png index 592d178e5..f89900b0c 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_05.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_05.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_06.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_06.png index e56dfe745..0ff0350d0 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_06.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_06.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_07.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_07.png index b56a59160..adad568b9 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_07.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_3_07.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_02.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_02.png index 4f73a3a55..927f6f5f7 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_02.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_02.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_03.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_03.png index 73c745b0e..2f30490e9 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_03.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_03.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_04.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_04.png index 525bb8b70..81bdd107e 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_04.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_04.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_05.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_05.png index 15db8045a..811580135 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_05.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_05.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_06.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_06.png index 6281193aa..11a5848f1 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_06.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_06.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_07.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_07.png index f2dfaab9f..3a6f18c00 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_07.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_07.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_08.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_08.png index 9bc6f1075..955797319 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_08.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_08.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_09.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_09.png index 7251eaf4d..6f87fbcba 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_09.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_09.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_10.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_10.png index 4e51971fa..2be42d2e4 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_10.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_10.png differ diff --git a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_11.png b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_11.png index ea3c7ef10..9623df275 100644 Binary files a/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_11.png and b/Assets/Art/XJMH/pw/pw_uieffect/xulie_jiangli/mfcj_jl_lipiao_11.png differ diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index f4df64f48..a0ba9c1ab 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -2400,6 +2400,7 @@ RectTransform: m_Children: - {fileID: 1819495571} - {fileID: 1806253262} + - {fileID: 8932118697924015192} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4333,6 +4334,135 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioMixer: {fileID: 24100000, guid: ca43f9a7549657a49a2978e97c7a621a, type: 2} +--- !u!1001 &3569938244496052059 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1096182889} + m_Modifications: + - target: {fileID: 838781140978391389, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_Name + value: 'Setting ' + objectReference: {fileID: 0} + - target: {fileID: 838781140978391389, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87a141ee6b07c324b91593c88bd1db9c, type: 3} +--- !u!224 &8932118697924015192 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, + type: 3} + m_PrefabInstance: {fileID: 3569938244496052059} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index 936d192e2..cf5773b8f 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -123,6 +123,10 @@ public class CreateFishManager : MonoSingleton /// 当前房间 fishNumber → RoomFishDetailConfig public Dictionary spawnDic; + /// 击杀广播:某条鱼被击杀时触发(monster=被击杀的鱼,sit=击杀者座位)。 + /// XJMH 免费模式等"按鱼配置"的特性用它,监听方自行过滤需要的鱼号,不改动既有击杀流程。 + public static event System.Action OnFishKilled; + public bool isCreateFish; //是否可以创建鱼 public bool isFrozen = false; //是否冰冻中(冻结出鱼+所有鱼定格) @@ -1962,6 +1966,9 @@ public class CreateFishManager : MonoSingleton // ⭐ 统一标记死亡:死亡后子弹不再命中、不再被锁定(含不调 base.DieFish 的 Boss 子类) monster.isDead = true; + // ⭐ 击杀广播:任何鱼被击杀(XJMH 免费模式等"按鱼配置"的特性用它,监听方自行过滤鱼号) + OnFishKilled?.Invoke(monster, sitData); + // 死亡粒子特效(池化,粒子播完自动回池) EffectPool.Instance.Get( monster.effect_Die != null ? monster.effect_Die : dieFXPrefab, diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index ccd17f19c..5e827b071 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -4154,6 +4154,8 @@ RectTransform: - {fileID: 5178367143983105583} - {fileID: 2786224979452906370} - {fileID: 5333548299015275724} + - {fileID: 2639485502620889346} + - {fileID: 2143777812051662526} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4299,6 +4301,14 @@ MonoBehaviour: exitViewTipText: "\u540C\u6B65\u670D\u52A1\u5668\u6570\u636E\u4E2D..." waitTipPanel: {fileID: 5268738107410595606} waitTipMessage: "\u6B63\u5728\u8FDE\u63A5\u670D\u52A1\u5668..." + freeFrameL: {fileID: 2222748392861420036} + freeFrameR: {fileID: 2862337636828716228} + freeFrameSlideDistance: 200 + freeFrameSlideInTime: 0.4 + freeFrameSlideOutTime: 0.3 + freeModeFishNumbers: + - 12025 + freeModeFallbackSeconds: 10 nukeItemStagger: 0.1 nukeItemPopTime: 0.1 popupOpenTime: 0.2 @@ -9326,15 +9336,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2312809170298891864} + - {fileID: 9179185251833639535} + - {fileID: 4980046371408964510} + - {fileID: 5781209983944085165} - {fileID: 7436692004955919657} - {fileID: 1389440235311396706} - {fileID: 6730420952657661727} - {fileID: 4120772903109577707} - {fileID: 80317843020233950} - - {fileID: 2312809170298891864} - - {fileID: 9179185251833639535} - - {fileID: 4980046371408964510} - - {fileID: 5781209983944085165} - {fileID: 791920537576704732} - {fileID: 1233422057346441001} - {fileID: 7085073037580773451} @@ -9407,10 +9417,10 @@ MonoBehaviour: currentTurretNumber: 0 currentTurret: {fileID: 3682759961943257957} xjmhTurretList: - - {fileID: 8301412203044014191} - - {fileID: 8125563889166561462} - - {fileID: 734938545944308975} - - {fileID: 6631460586028905330} + - {fileID: 4968694161106350648} + - {fileID: 5064756052779050165} + - {fileID: 8295326240447925651} + - {fileID: 3682759961943257957} tra_CurrTurret: {fileID: 0} currentAngle: 0 maxRotationAngle: 90 @@ -12118,7 +12128,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &80317843020233950 RectTransform: m_ObjectHideFlags: 0 @@ -14095,7 +14105,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &791920537576704732 RectTransform: m_ObjectHideFlags: 0 @@ -15696,7 +15706,7 @@ PrefabInstance: - target: {fileID: 838781140978391389, guid: 87a141ee6b07c324b91593c88bd1db9c, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8975416087219219768, guid: 87a141ee6b07c324b91593c88bd1db9c, type: 3} @@ -15926,7 +15936,7 @@ PrefabInstance: - target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -15936,7 +15946,7 @@ PrefabInstance: - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -16071,7 +16081,7 @@ PrefabInstance: - target: {fileID: 7125234996501131867, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7125234996501131867, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3} @@ -16679,6 +16689,139 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1212977298862533006} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2224305160241987432 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 245637205031072731} + m_Modifications: + - target: {fileID: 1856116721579372, guid: 95885a0c626c91f4baa6c26b33402794, type: 3} + propertyPath: m_Name + value: PW_Battery_FreeFrame_L + objectReference: {fileID: 0} + - target: {fileID: 1856116721579372, guid: 95885a0c626c91f4baa6c26b33402794, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -568 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 95885a0c626c91f4baa6c26b33402794, type: 3} +--- !u!224 &2143777812051662526 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224735013914978774, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + m_PrefabInstance: {fileID: 2224305160241987432} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2222748392861420036 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1856116721579372, guid: 95885a0c626c91f4baa6c26b33402794, + type: 3} + m_PrefabInstance: {fileID: 2224305160241987432} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2659585630406882586 PrefabInstance: m_ObjectHideFlags: 0 @@ -16935,6 +17078,139 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2717032965204163807} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2863352946595766201 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 245637205031072731} + m_Modifications: + - target: {fileID: 1614906730251133, guid: b66bae23f1d3ecb468253d155a596077, type: 3} + propertyPath: m_Name + value: PW_Battery_FreeFrame_R + objectReference: {fileID: 0} + - target: {fileID: 1614906730251133, guid: b66bae23f1d3ecb468253d155a596077, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -568 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b66bae23f1d3ecb468253d155a596077, type: 3} +--- !u!224 &2639485502620889346 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224610717509775035, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + m_PrefabInstance: {fileID: 2863352946595766201} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2862337636828716228 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1614906730251133, guid: b66bae23f1d3ecb468253d155a596077, + type: 3} + m_PrefabInstance: {fileID: 2863352946595766201} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3232876092691216913 PrefabInstance: m_ObjectHideFlags: 0 @@ -16956,7 +17232,7 @@ PrefabInstance: - target: {fileID: 2075051064728197762, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3174822985052505674, guid: e5efa9f179bbfdb4ba8e73fe85eb109a, type: 3} @@ -20153,6 +20429,10 @@ PrefabInstance: propertyPath: m_Name value: PW_GameView objectReference: {fileID: 0} + - target: {fileID: 1773599042758490, guid: 1341c23d0342bd14c9a039a59e5b9794, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1891802469323520, guid: 1341c23d0342bd14c9a039a59e5b9794, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs index e265a44e0..2168589d5 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanel_XJMH.cs @@ -80,7 +80,7 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase [Header("设置列表(按钮 + 缩放面板)")] [Tooltip("打开设置列表的按钮;留空则沿用父类 btn_SettingList(两个按钮都可用)")] public Button btn_SettingPopup; - [Tooltip("设置列表面板:点按钮后缩放弹出;留空则用父类的 SittingListParent")] + [Tooltip("设置列表备用面板(一般不用拖:默认用父类的 SittingListParent 通用设置列表;仅当 SittingListParent 没挂时才用这个)")] public GameObject settingListPanel; // ==================== 帮助面板(原版 PW_Help:图鉴 / 操作 / 玩法) ==================== @@ -144,6 +144,10 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase public float freeFrameSlideInTime = 0.4f; [Tooltip("滑出时长(秒,原版 0.3)")] public float freeFrameSlideOutTime = 0.3f; + [Tooltip("触发免费模式的鱼号列表(默认 12025 弹药箱):击杀后按配置里该鱼的 times 秒显示免费框;\n需要其它鱼(女龙王等)往这里加鱼号即可")] + public List freeModeFishNumbers = new List { "12025" }; + [Tooltip("配置里查不到 times 时的兜底时长(秒)")] + public float freeModeFallbackSeconds = 10f; [Header("核弹列表动画(照原版 Rocket 逐项弹出)")] [Tooltip("相邻条目的弹出/收缩间隔(秒),原版 0.1")] @@ -312,8 +316,12 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase // 重连等待提示:离场立即收起 if (waitTipPanel != null) waitTipPanel.SetActive(false); - // 免费模式框:离场立即收起并清动画 - _freeFrameActive = null; + // 免费模式框:离场立即停止倒计时、收起并清动画 + if (_freeFrameTicker != null) + { + StopCoroutine(_freeFrameTicker); + _freeFrameTicker = null; + } ResetFreeFrameView(_freeFrameL); ResetFreeFrameView(_freeFrameR); } @@ -803,8 +811,17 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase { if (btn_SettingPopup != null && btn_SettingPopup != btn_SettingList) { - btn_SettingPopup.onClick.RemoveAllListeners(); - btn_SettingPopup.onClick.AddListener(ToggleSettingPopup); + // ⭐ 与通用设置按钮(btn_Setting)是同一个时不绑:父类在该按钮上有"打开通用设置界面"的监听, + // 清掉监听会让通用设置界面被覆盖打不开——两者分离,互不影响 + if (btn_SettingPopup == btn_Setting) + { + Debug.LogWarning("[XJMH] btn_SettingPopup 配成了通用设置按钮,已跳过绑定(保留通用设置界面入口);请换一个独立按钮"); + } + else + { + btn_SettingPopup.onClick.RemoveAllListeners(); + btn_SettingPopup.onClick.AddListener(ToggleSettingPopup); + } } if (settingListPanel != null) settingListPanel.SetActive(false); // 弹窗初始收起 @@ -826,11 +843,19 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase else StartCoroutine(OpenSettingList()); } - /// 设置面板:优先用单独拖的 settingListPanel,没拖就用父类的 SittingListParent + /// 是否是"有既有职责"的设置类按钮(通用设置 / 设置列表 / 列表备用入口 / 帮助入口)——PW_Set 不能抢绑这些 + private bool IsSharedSettingButton(Button btn) + { + return btn == btn_Setting || btn == btn_SettingList || + btn == btn_SettingPopup || btn == btn_HelpPopup; + } + + /// 设置列表面板:优先用父类的 SittingListParent(通用设置列表,宽度 0↔319 那个); + /// 只有它没挂时才退到单独拖的 settingListPanel(备用) private GameObject GetSettingPanel() { - if (settingListPanel != null) return settingListPanel; if (SittingListParent != null) return SittingListParent.gameObject; + if (settingListPanel != null) return settingListPanel; return null; } @@ -1685,16 +1710,17 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase }; // ==================== 免费模式框(原版 PW_Battery_FreeFrame_L/R) ==================== - // 移植自原版 PW_Battery.txt(SetFreeMode / ShowFreeFrame / HideFreeFrame / FreeModeUpdate): - // - 免费模式开启 → 显示对应侧的框:FreeImage(免费图标)+ FreeTime(倒计时 Time,一位小数) + // 移植自原版 PW_Battery.txt(ShowFreeFrame / HideFreeFrame / FreeModeUpdate): + // - 组成:FreeImage(免费图标)+ FreeTime/Time(倒计时,一位小数)+ Frame(自己才有:buff 位 + Num) + // - 触发(口径已定):击杀 freeModeFishNumbers 里的鱼(默认 12025 弹药箱)→ 该座位显示免费框, + // 时长 = 配置里该鱼的 times(出鱼表的"持续事件/生命周期"秒数,直接从 spawnDic 读;查不到用兜底值) // - 自己(isSelf):先收起 FreeImage/FreeTime,框从屏外侧滑入(原版 0.4s),落位后才显示; - // 同时显示 Frame(buff 图标列表 + Num 数量);结束时滑出(原版 0.3s)后才隐藏 - // - 其它玩家:立即显示 FreeImage/FreeTime、不显示 Frame;结束直接隐藏 - // - 原版按座位侧加载 L/R(IsLeft = chairId==1),这里由调用方传 isLeft 选择;一次只显示一侧 - // - 原版其它玩家的 FreeImage/FreeTime 会吸附到该炮台 bottom/FreeImagePos、FreeTimePos 锚点; + // 倒计时走完滑出(原版 0.3s)后隐藏;其它玩家:立即显示/直接隐藏,不显示 Frame + // - 左右两侧各一份(两人场):左边座位用 L、右边用 R,可同时显示互不影响 + // - 倒计时每帧走表(原版 FreeModeUpdate 的 "%.1f"),走完自动收起 + // - 原版其它玩家的 FreeImage/FreeTime 会吸附到炮台 bottom/FreeImagePos、FreeTimePos 锚点; // 新炮台没有这两个锚点,这里直接用预制体摆放位置(拖框时摆到对应座位炮台下方即可) - // - ⚠️ 免费 buff 数据链(SetFreeMode/UseNextBuff/BuffFinish 的服务器同步)本项目还没接; - // 数据接上后调用以下公开 API 即可:ShowFreeFrame / UpdateFreeFrameTime / SetFreeFrameBuffCount / HideFreeFrame + // - 击杀广播来自 CreateFishManager.OnFishKilled(新增的静态事件,监听方自行过滤鱼号) /// 一侧免费模式框的节点与初始位置(左右各一份) private sealed class XjmhFreeFrameView @@ -1707,17 +1733,22 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase public Transform timeText; // FreeTime/Time(倒计时文本) public GameObject frame; // Frame(自己才有:buff 图标列表 + Num) public bool selfShown; // 本次显示是否走的"自己"(决定收起时是否滑出) + public bool counting; // 是否在倒计时 + public float remaining; // 剩余秒数 } private XjmhFreeFrameView _freeFrameL; private XjmhFreeFrameView _freeFrameR; - private XjmhFreeFrameView _freeFrameActive; // 当前在显示的框(一次只会有一侧) + private Coroutine _freeFrameTicker; // 倒计时协程(任一侧在计时时运行) - /// 免费模式框初始化:抓节点、记录原位、初始隐藏 + /// 免费模式框初始化:抓节点、记录原位、初始隐藏、订阅击杀广播 private void InitFreeFrame() { _freeFrameL = BuildFreeFrameView(freeFrameL); _freeFrameR = BuildFreeFrameView(freeFrameR); + + CreateFishManager.OnFishKilled -= OnFishKilledHandler; // 防重复订阅 + CreateFishManager.OnFishKilled += OnFishKilledHandler; } private XjmhFreeFrameView BuildFreeFrameView(GameObject root) @@ -1740,28 +1771,30 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase } /// - /// 显示免费模式框(原版 Battery:ShowFreeFrame): + /// 显示免费模式框(原版 Battery:ShowFreeFrame)并启动倒计时: /// 自己 → Frame 显示 + 从屏外滑入、落位后才显示 FreeImage/FreeTime;其它玩家 → 立即显示、不显示 Frame。 + /// seconds <= 0 时用 freeModeFallbackSeconds。 /// - public void ShowFreeFrame(bool isLeft, bool isSelf) + public void ShowFreeFrame(bool isLeft, bool isSelf, float seconds = 0f) { var v = isLeft ? _freeFrameL : _freeFrameR; - var other = isLeft ? _freeFrameR : _freeFrameL; if (v == null || v.root == null) return; - // 另一侧若在显示:立即收起(原版每台炮台各自一份,这里面板级一次只显示一侧) - if (other != null && other.root != null) - { - if (other.rootRt != null) other.rootRt.DOKill(); - other.root.SetActive(false); - } + if (seconds <= 0f) seconds = freeModeFallbackSeconds; - _freeFrameActive = v; + bool alreadyShowing = v.root.activeSelf; v.selfShown = isSelf; + v.counting = true; + v.remaining = seconds; + v.root.SetActive(true); if (v.frame != null) v.frame.SetActive(isSelf); // 原版:只有自己显示 Frame + if (isSelf && v.frame != null) + SetTextContent(FindChildByName(v.frame.transform, "Num"), "1"); // 原版=#buffList;新设计无 buff 组,占位 1 - if (isSelf && v.rootRt != null) + if (v.timeText != null) SetTextContent(v.timeText, seconds.ToString("F1")); // 初值(原版 %.1f) + + if (isSelf && v.rootRt != null && !alreadyShowing) { // 原版:先收起 FreeImage/FreeTime,从屏外滑入,onEnd 才 ActiveFreeTimeAndImagePos SetFreeFrameInfoActive(v, false); @@ -1775,15 +1808,24 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase { SetFreeFrameInfoActive(v, true); } + + // 启动倒计时(任一侧在计时时运行同一协程) + if (_freeFrameTicker == null) _freeFrameTicker = StartCoroutine(FreeFrameTickRoutine()); } - /// 隐藏免费模式框(原版 Battery:HideFreeFrame):自己先滑出再隐藏,其它玩家直接隐藏 + /// 隐藏免费模式框(两侧都收起;原版 Battery:HideFreeFrame:自己先滑出再隐藏,其它玩家直接隐藏) public void HideFreeFrame() { - var v = _freeFrameActive; - _freeFrameActive = null; - if (v == null || v.root == null) return; + HideFreeFrameSide(_freeFrameL); + HideFreeFrameSide(_freeFrameR); + } + /// 收起指定侧的框(自己滑出后隐藏、其它侧直接隐藏) + private void HideFreeFrameSide(XjmhFreeFrameView v) + { + if (v == null || v.root == null || !v.root.activeSelf) return; + + v.counting = false; SetFreeFrameInfoActive(v, false); if (v.frame != null) v.frame.SetActive(false); @@ -1803,20 +1845,84 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase v.selfShown = false; } - /// 免费倒计时(原版 FreeModeUpdate:freeTimeText = string.format("%.1f", remain)) - public void UpdateFreeFrameTime(float remainSeconds) + /// 击杀广播:命中 freeModeFishNumbers 的鱼 → 该座位按鱼的 times 秒显示免费框 + private void OnFishKilledHandler(MonsterContral monster, SitPosData sit) { - var v = _freeFrameActive; - if (v == null || v.timeText == null) return; - SetTextContent(v.timeText, remainSeconds.ToString("F1")); + if (monster == null || sit == null) return; + if (freeModeFishNumbers == null || freeModeFishNumbers.Count == 0) return; + + string fishNumber = monster.monsterData?.fishTypeConfig?.fishNumber; + if (string.IsNullOrEmpty(fishNumber) || !freeModeFishNumbers.Contains(fishNumber)) return; + + int times = FindFreeModeFishTimes(fishNumber); // 配置里该鱼的 times(持续事件/生命周期,秒) + float seconds = times > 0 ? times : freeModeFallbackSeconds; + + ShowFreeFrame(IsSeatLeft(sit), sit == currSitData, seconds); } - /// buff 图标数量(原版 Frame/Num = #freeBuffList) + /// 从当前出鱼配置里查该鱼的 times("持续事件"时长);查不到返回 0 + private static int FindFreeModeFishTimes(string fishNumber) + { + var mgr = CreateFishManager.Instance; + var dic = mgr != null ? mgr.spawnDic : null; + if (dic != null && dic.TryGetValue(fishNumber, out var cfg) && cfg != null && cfg.times > 0) + return cfg.times; + return 0; + } + + /// 判断座位在屏幕哪一侧(两人场:比较两个座位的 X,更靠左的算左;单人场按座号兜底) + private bool IsSeatLeft(SitPosData sit) + { + if (sit == null) return true; + + float x = sit.transform.position.x; + for (int i = 0; i < list_Sits.Count; i++) + { + var other = list_Sits[i]; + if (other == null || other == sit) continue; + if (other.user == null || !other.gameObject.activeSelf) continue; + return x <= other.transform.position.x; + } + return sit.posID <= 0; + } + + /// 倒计时:每帧走表,减完自动收起该侧(原版 FreeModeUpdate) + private IEnumerator FreeFrameTickRoutine() + { + while (true) + { + yield return null; + bool anyCounting = false; + if (TickFreeFrameSide(_freeFrameL, Time.deltaTime)) anyCounting = true; + if (TickFreeFrameSide(_freeFrameR, Time.deltaTime)) anyCounting = true; + if (!anyCounting) break; + } + _freeFrameTicker = null; + } + + private bool TickFreeFrameSide(XjmhFreeFrameView v, float dt) + { + if (v == null || !v.counting) return false; + + v.remaining -= dt; + if (v.remaining <= 0f) + { + v.remaining = 0f; + HideFreeFrameSide(v); // 倒计时结束 → 收起 + return false; + } + if (v.timeText != null) SetTextContent(v.timeText, v.remaining.ToString("F1")); + return true; + } + + /// buff 图标数量(原版 Frame/Num = #freeBuffList;两侧都写) public void SetFreeFrameBuffCount(int count) { - var v = _freeFrameActive; - if (v == null || v.frame == null) return; - SetTextContent(FindChildByName(v.frame.transform, "Num"), count.ToString()); + string str = count.ToString(); + if (_freeFrameL != null && _freeFrameL.frame != null) + SetTextContent(FindChildByName(_freeFrameL.frame.transform, "Num"), str); + if (_freeFrameR != null && _freeFrameR.frame != null) + SetTextContent(FindChildByName(_freeFrameR.frame.transform, "Num"), str); } /// FreeImage/FreeTime 显隐(原版 ActiveFreeTimeAndImagePos / Deactive) @@ -1838,6 +1944,8 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase SetFreeFrameInfoActive(v, false); if (v.frame != null) v.frame.SetActive(false); v.selfShown = false; + v.counting = false; + v.remaining = 0f; v.root.SetActive(false); } @@ -1877,10 +1985,11 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase waitTipPanel.SetActive(show); } - /// 注销重连事件(父类 OnDestroy 里有自己的清理,照常链式调用) + /// 注销事件(父类 OnDestroy 里有自己的清理,照常链式调用) public override void OnDestroy() { WebSocketManager.OnReconnectingChanged -= OnSocketReconnectingChanged; + CreateFishManager.OnFishKilled -= OnFishKilledHandler; base.OnDestroy(); } @@ -2009,10 +2118,20 @@ public class GameMainPanel_XJMH : GameMainPanel_FishBase /// private void InitSetPanel() { + // ⭐ 入口按钮:与既有设置类入口(通用设置/设置列表/帮助)是同一个按钮时不绑—— + // 这些按钮上有父类的监听(如 btn_Setting → 打开通用设置界面),清掉监听会互相覆盖; + // PW_Set 需要独立入口(建议用设置列表里的"设置"项按钮) if (btn_SetPopup != null) { - btn_SetPopup.onClick.RemoveAllListeners(); - btn_SetPopup.onClick.AddListener(ToggleSetPanel); + if (IsSharedSettingButton(btn_SetPopup)) + { + Debug.LogWarning("[XJMH] btn_SetPopup 配成了通用设置/设置列表等既有按钮,已跳过 PW_Set 绑定(两者互不影响);请拖一个独立按钮"); + } + else + { + btn_SetPopup.onClick.RemoveAllListeners(); + btn_SetPopup.onClick.AddListener(ToggleSetPanel); + } } if (setPanel == null) return;