diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index 55f0878a7..cda17e9b9 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -64,6 +64,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 143a02006f322054e926abff54bc2953, type: 3} - {fileID: 21300000, guid: 63461d20be12601408351e3c6df6d799, type: 3} - {fileID: 21300000, guid: d135766030d953b4bbb3ca2404fe28da, type: 3} + - {fileID: 21300000, guid: 876ae66036b98b84a905c919cfba0682, type: 3} - {fileID: 21300000, guid: 4e3da980631dad04785f6ea58dc3447f, type: 3} - {fileID: 21300000, guid: 829c31a0f5439a94caee22785f2edfdc, type: 3} - {fileID: 21300000, guid: bb012b114a991f44c8583c6cc270981d, type: 3} @@ -72,12 +73,18 @@ SpriteAtlas: - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3} - {fileID: 21300000, guid: 35d30742d8a5d0641a6e7b0b18f323a1, type: 3} - {fileID: 21300000, guid: 8a3687a2ce1b5fd44baaea4d5688ae34, type: 3} + - {fileID: 21300000, guid: b11c2f63c86e22644bbe1d930815c6c8, type: 3} - {fileID: 21300000, guid: 57fe3e738dd3f60468018d5b59470fa0, type: 3} - {fileID: 21300000, guid: b78c059420cc8364daadb27686bc1242, type: 3} - {fileID: 21300000, guid: d03a08a450d45584cb6dfb67dd6df6ba, type: 3} + - {fileID: 21300000, guid: bfd65ee46b7a21c4fa376790ef09dc18, type: 3} + - {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} + - {fileID: 21300000, guid: cd87d9e54b03a8b47a1046bf67621096, type: 3} - {fileID: 21300000, guid: 6977af166b59e254a869ca5639e56bec, type: 3} - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3} - {fileID: 21300000, guid: 2ac6685652497304e92e5d80a0e2b523, type: 3} + - {fileID: 21300000, guid: 0e401707c603cbe438fef2cf3c4c3c15, type: 3} + - {fileID: 21300000, guid: 6174e317878cbdb4296a2eabdcc66af0, type: 3} - {fileID: 21300000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3} - {fileID: 21300000, guid: 0ebd413772dcdd44aacc3aa4882d9db9, type: 3} - {fileID: 21300000, guid: 306205473d3cf1f4a9d821c3e2971092, type: 3} @@ -107,6 +114,8 @@ SpriteAtlas: - {fileID: 21300000, guid: 421fe68d394a55b45bb37d332f312805, type: 3} - {fileID: 21300000, guid: 39cd734eccabde14fb2c3cffddc8d39a, type: 3} - {fileID: 21300000, guid: dfc7b64e38bed054fb7f4ae52e1586d6, type: 3} + - {fileID: 21300000, guid: b4eb3a5ebff984c49ab18ba4a98799a5, type: 3} + - {fileID: 21300000, guid: 839ce36e4d9db9644bf0ae3a048dbcac, type: 3} - {fileID: 21300000, guid: c38a84bed7b6ae443a92e10fd79b3e1e, type: 3} - {fileID: 21300000, guid: 39113fce63ffd9945a6dfe5e07e68860, type: 3} - {fileID: 21300000, guid: 3ad86f0f900c9f64ab2165d92f8d49e5, type: 3} @@ -117,6 +126,7 @@ SpriteAtlas: - battle_progress_3 - battle_skill_bg_yellow_2 - ice + - snow_2_1 - battle_btn_magnifier - battle_skill_bg_2 - battle_progress_2 @@ -125,12 +135,18 @@ SpriteAtlas: - battle_skill_line_8 - battle_skill_bg_blue_2 - battle_skill_colorful + - purple_1_1 - snow_1_1 - yellow_1_1 - snow_2 + - green_1_1 + - battle_bag_1 + - blue_1_1 - battle_progress_4 - battle_progress_1 - battle_skill_bg_purple_2 + - red_1_1 + - ice_1 - battle_board_1 - battle_progress_bg_2 - battle_btn_setting @@ -160,6 +176,8 @@ SpriteAtlas: - battle_board_6 - battle_board_3 - battle_dec_2 + - battle_bg_2 + - vine_1 - battle_board_2 - snow_1 - battle_skill_bg_yellow_1 diff --git a/Assets/arts/textures/background/battle/chessboard_1.png.meta b/Assets/arts/textures/background/battle/chessboard_1.png.meta index fb1661b39..d63b90f37 100644 --- a/Assets/arts/textures/background/battle/chessboard_1.png.meta +++ b/Assets/arts/textures/background/battle/chessboard_1.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/ui/battle/battle_bag_1.png b/Assets/arts/textures/ui/battle/battle_bag_1.png new file mode 100644 index 000000000..aa4c19c6c Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_bag_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_bag_1.png.meta b/Assets/arts/textures/ui/battle/battle_bag_1.png.meta new file mode 100644 index 000000000..0fdc47312 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_bag_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: b1230a75f4f278246854472f8e66182f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_bg_2.png b/Assets/arts/textures/ui/battle/battle_bg_2.png new file mode 100644 index 000000000..06e01d3f6 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_bg_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_bg_2.png.meta b/Assets/arts/textures/ui/battle/battle_bg_2.png.meta new file mode 100644 index 000000000..cde01f949 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_bg_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: b4eb3a5ebff984c49ab18ba4a98799a5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/blue_1.png b/Assets/arts/textures/ui/battle/blue_1.png index 356e4239c..cf845cafb 100644 Binary files a/Assets/arts/textures/ui/battle/blue_1.png and b/Assets/arts/textures/ui/battle/blue_1.png differ diff --git a/Assets/arts/textures/ui/battle/blue_1_1.png b/Assets/arts/textures/ui/battle/blue_1_1.png new file mode 100644 index 000000000..a11a73aa2 Binary files /dev/null and b/Assets/arts/textures/ui/battle/blue_1_1.png differ diff --git a/Assets/arts/textures/ui/battle/blue_1_1.png.meta b/Assets/arts/textures/ui/battle/blue_1_1.png.meta new file mode 100644 index 000000000..f4b40ea5f --- /dev/null +++ b/Assets/arts/textures/ui/battle/blue_1_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: cd87d9e54b03a8b47a1046bf67621096 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/green_1.png b/Assets/arts/textures/ui/battle/green_1.png index f2f67d22c..86c211610 100644 Binary files a/Assets/arts/textures/ui/battle/green_1.png and b/Assets/arts/textures/ui/battle/green_1.png differ diff --git a/Assets/arts/textures/ui/battle/green_1_1.png b/Assets/arts/textures/ui/battle/green_1_1.png new file mode 100644 index 000000000..72a5a6523 Binary files /dev/null and b/Assets/arts/textures/ui/battle/green_1_1.png differ diff --git a/Assets/arts/textures/ui/battle/green_1_1.png.meta b/Assets/arts/textures/ui/battle/green_1_1.png.meta new file mode 100644 index 000000000..292249aa7 --- /dev/null +++ b/Assets/arts/textures/ui/battle/green_1_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: bfd65ee46b7a21c4fa376790ef09dc18 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/ice.png b/Assets/arts/textures/ui/battle/ice.png index 1b6878afd..f6b6b3d73 100644 Binary files a/Assets/arts/textures/ui/battle/ice.png and b/Assets/arts/textures/ui/battle/ice.png differ diff --git a/Assets/arts/textures/ui/battle/ice_1.png b/Assets/arts/textures/ui/battle/ice_1.png new file mode 100644 index 000000000..deee90b93 Binary files /dev/null and b/Assets/arts/textures/ui/battle/ice_1.png differ diff --git a/Assets/arts/textures/ui/battle/ice_1.png.meta b/Assets/arts/textures/ui/battle/ice_1.png.meta new file mode 100644 index 000000000..9bc907bf8 --- /dev/null +++ b/Assets/arts/textures/ui/battle/ice_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 6174e317878cbdb4296a2eabdcc66af0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/purple_1.png b/Assets/arts/textures/ui/battle/purple_1.png index 818a179a0..46b9201cd 100644 Binary files a/Assets/arts/textures/ui/battle/purple_1.png and b/Assets/arts/textures/ui/battle/purple_1.png differ diff --git a/Assets/arts/textures/ui/battle/purple_1_1.png b/Assets/arts/textures/ui/battle/purple_1_1.png new file mode 100644 index 000000000..3142aece8 Binary files /dev/null and b/Assets/arts/textures/ui/battle/purple_1_1.png differ diff --git a/Assets/arts/textures/ui/battle/purple_1_1.png.meta b/Assets/arts/textures/ui/battle/purple_1_1.png.meta new file mode 100644 index 000000000..af1855719 --- /dev/null +++ b/Assets/arts/textures/ui/battle/purple_1_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: b11c2f63c86e22644bbe1d930815c6c8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/red_1.png b/Assets/arts/textures/ui/battle/red_1.png index c170d0f64..91e5d0978 100644 Binary files a/Assets/arts/textures/ui/battle/red_1.png and b/Assets/arts/textures/ui/battle/red_1.png differ diff --git a/Assets/arts/textures/ui/battle/red_1_1.png b/Assets/arts/textures/ui/battle/red_1_1.png new file mode 100644 index 000000000..a177e3d54 Binary files /dev/null and b/Assets/arts/textures/ui/battle/red_1_1.png differ diff --git a/Assets/arts/textures/ui/battle/red_1_1.png.meta b/Assets/arts/textures/ui/battle/red_1_1.png.meta new file mode 100644 index 000000000..bf23295d7 --- /dev/null +++ b/Assets/arts/textures/ui/battle/red_1_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 0e401707c603cbe438fef2cf3c4c3c15 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/snow_1.png b/Assets/arts/textures/ui/battle/snow_1.png index 52e9ddb1a..9632b8896 100644 Binary files a/Assets/arts/textures/ui/battle/snow_1.png and b/Assets/arts/textures/ui/battle/snow_1.png differ diff --git a/Assets/arts/textures/ui/battle/snow_2.png b/Assets/arts/textures/ui/battle/snow_2.png index 1b44a0e5a..e256cf0c8 100644 Binary files a/Assets/arts/textures/ui/battle/snow_2.png and b/Assets/arts/textures/ui/battle/snow_2.png differ diff --git a/Assets/arts/textures/ui/battle/snow_2_1.png b/Assets/arts/textures/ui/battle/snow_2_1.png new file mode 100644 index 000000000..7d469c174 Binary files /dev/null and b/Assets/arts/textures/ui/battle/snow_2_1.png differ diff --git a/Assets/arts/textures/ui/battle/snow_2_1.png.meta b/Assets/arts/textures/ui/battle/snow_2_1.png.meta new file mode 100644 index 000000000..e26dfd6d0 --- /dev/null +++ b/Assets/arts/textures/ui/battle/snow_2_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 876ae66036b98b84a905c919cfba0682 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/vine.png b/Assets/arts/textures/ui/battle/vine.png index d58340da4..eef507621 100644 Binary files a/Assets/arts/textures/ui/battle/vine.png and b/Assets/arts/textures/ui/battle/vine.png differ diff --git a/Assets/arts/textures/ui/battle/vine_1.png b/Assets/arts/textures/ui/battle/vine_1.png new file mode 100644 index 000000000..96841132b Binary files /dev/null and b/Assets/arts/textures/ui/battle/vine_1.png differ diff --git a/Assets/arts/textures/ui/battle/vine_1.png.meta b/Assets/arts/textures/ui/battle/vine_1.png.meta new file mode 100644 index 000000000..541d0253c --- /dev/null +++ b/Assets/arts/textures/ui/battle/vine_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 839ce36e4d9db9644bf0ae3a048dbcac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/yellow_1.png b/Assets/arts/textures/ui/battle/yellow_1.png index 2de86921d..8c7b8d7df 100644 Binary files a/Assets/arts/textures/ui/battle/yellow_1.png and b/Assets/arts/textures/ui/battle/yellow_1.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_1.png b/Assets/arts/textures/ui/common/common_bg_1.png index f5834d63e..2a45bac61 100644 Binary files a/Assets/arts/textures/ui/common/common_bg_1.png and b/Assets/arts/textures/ui/common/common_bg_1.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_2.png b/Assets/arts/textures/ui/common/common_bg_2.png index 029ebd0e1..bb5adbff0 100644 Binary files a/Assets/arts/textures/ui/common/common_bg_2.png and b/Assets/arts/textures/ui/common/common_bg_2.png differ diff --git a/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab b/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab index d4041c691..c87fb8362 100644 --- a/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab @@ -1422,6 +1422,10 @@ MonoBehaviour: hashName: 1890238940 objectType: 0 gameObject: {fileID: 8717811324299991778} + - name: battle_skill_select_ui.bg_1 + hashName: 2573133411 + objectType: 0 + gameObject: {fileID: 80214517956864511} --- !u!1 &8928582689438199514 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index cf9ff31a1..2eb17f317 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -268,6 +268,9 @@ GameObject: - component: {fileID: 9169016088919175857} - component: {fileID: 5571968080124832430} - component: {fileID: 2367446845432208974} + - component: {fileID: 8687072050442867506} + - component: {fileID: 7285475134766962647} + - component: {fileID: 1973265514322597013} m_Layer: 5 m_Name: board_node m_TagString: Untagged @@ -344,6 +347,57 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!223 &8687072050442867506 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606870700976508775} + 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_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &7285475134766962647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606870700976508775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 10 +--- !u!114 &1973265514322597013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606870700976508775} + 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 &634055907447216373 GameObject: m_ObjectHideFlags: 0 @@ -1219,6 +1273,117 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2705114348780108259 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8651853173775077516} + - component: {fileID: 5275487026623735067} + - component: {fileID: 794860114931072908} + - component: {fileID: 7912530609094128189} + - component: {fileID: 2127627616384160167} + m_Layer: 5 + m_Name: skill_box_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8651853173775077516 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2705114348780108259} + 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: 4292633816534545540} + 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: 380} + m_SizeDelta: {x: 185, y: 205} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5275487026623735067 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2705114348780108259} + m_CullTransparentMesh: 1 +--- !u!114 &794860114931072908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2705114348780108259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b4eb3a5ebff984c49ab18ba4a98799a5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!223 &7912530609094128189 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2705114348780108259} + 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_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &2127627616384160167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2705114348780108259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 20 --- !u!1 &2716961016822480841 GameObject: m_ObjectHideFlags: 0 @@ -1413,6 +1578,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4292633816534545540} + - component: {fileID: 6147286621111879589} + - component: {fileID: 3446100497241661549} m_Layer: 5 m_Name: board_cache_node m_TagString: Untagged @@ -1432,6 +1599,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8723116159258155002} + - {fileID: 8651853173775077516} m_Father: {fileID: 8367488913663849825} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1440,6 +1608,40 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 47} m_SizeDelta: {x: 702, y: 702} m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &6147286621111879589 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908987935824165984} + 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_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3446100497241661549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2908987935824165984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3} + m_Name: + m_EditorClassIdentifier: + GroupOrder: 11 --- !u!1 &3230621245398519833 GameObject: m_ObjectHideFlags: 0 @@ -2116,7 +2318,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -44} + m_AnchoredPosition: {x: 0, y: -40} m_SizeDelta: {x: 44, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5298323509264782958 @@ -3670,7 +3872,7 @@ GameObject: m_Component: - component: {fileID: 3537642348667792295} - component: {fileID: 9211055567761717053} - - component: {fileID: 8464060092286465546} + - component: {fileID: 2425427930888932034} m_Layer: 5 m_Name: board_mask m_TagString: Untagged @@ -3705,7 +3907,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7688802235252301942} m_CullTransparentMesh: 1 ---- !u!114 &8464060092286465546 +--- !u!114 &2425427930888932034 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3714,7 +3916,7 @@ MonoBehaviour: m_GameObject: {fileID: 7688802235252301942} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} @@ -3725,16 +3927,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_Texture: {fileID: 2800000, guid: 68bf3ccdb9f2b6549b1a3c1876228c76, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &7693652591837868564 GameObject: m_ObjectHideFlags: 0 @@ -4306,8 +4505,8 @@ RectTransform: 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: 656} - m_SizeDelta: {x: 84, y: 77} + m_AnchoredPosition: {x: 0, y: 380} + m_SizeDelta: {x: 185, y: 205} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8720282602456543341 CanvasRenderer: @@ -4337,7 +4536,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 13b1668a707250d4cac750f73ca8f3c3, type: 3} + m_Sprite: {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4434,6 +4633,7 @@ GameObject: - component: {fileID: 6295759409469260025} - component: {fileID: 8818842519807529348} - component: {fileID: 5914240286772839687} + - component: {fileID: 305814484176852896} m_Layer: 5 m_Name: battle_ui m_TagString: Untagged @@ -4641,6 +4841,23 @@ MonoBehaviour: hashName: 4261114232 objectType: 1 gameObject: {fileID: 6456457455187257617} +--- !u!114 &305814484176852896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8889665677046596496} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e78a175da984a448199e5b51a3a5f437, type: 3} + m_Name: + m_EditorClassIdentifier: + EffectList: + - {fileID: 7285475134766962647} + - {fileID: 3446100497241661549} + - {fileID: 2127627616384160167} + NotchScreenNodeList: [] --- !u!1 &8984854456205409131 GameObject: m_ObjectHideFlags: 0 @@ -4985,16 +5202,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!224 &4823950210164062713 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 164396171060211616} - m_PrefabAsset: {fileID: 0} --- !u!1 &4532191219610058284 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 164396171060211616} m_PrefabAsset: {fileID: 0} +--- !u!224 &4823950210164062713 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 164396171060211616} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5351464385034910283 PrefabInstance: m_ObjectHideFlags: 0 @@ -5136,16 +5353,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &8568562378450594759 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5351464385034910283} - m_PrefabAsset: {fileID: 0} --- !u!224 &792115507450702866 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5351464385034910283} m_PrefabAsset: {fileID: 0} +--- !u!1 &8568562378450594759 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5351464385034910283} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5688246229370211124 PrefabInstance: m_ObjectHideFlags: 0 @@ -5287,16 +5504,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &8240790560213506744 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 5688246229370211124} - m_PrefabAsset: {fileID: 0} --- !u!224 &1029817523774987629 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 5688246229370211124} m_PrefabAsset: {fileID: 0} +--- !u!1 &8240790560213506744 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 5688246229370211124} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6281625263577488710 PrefabInstance: m_ObjectHideFlags: 0 @@ -5438,16 +5655,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &7746559084762877130 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 6281625263577488710} - m_PrefabAsset: {fileID: 0} --- !u!224 &1699757838083181343 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 6281625263577488710} m_PrefabAsset: {fileID: 0} +--- !u!1 &7746559084762877130 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 6281625263577488710} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7292576075314493597 PrefabInstance: m_ObjectHideFlags: 0 @@ -5589,13 +5806,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3} ---- !u!1 &6456457455187257617 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} - m_PrefabInstance: {fileID: 7292576075314493597} - m_PrefabAsset: {fileID: 0} --- !u!224 &2706240165845954244 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3} m_PrefabInstance: {fileID: 7292576075314493597} m_PrefabAsset: {fileID: 0} +--- !u!1 &6456457455187257617 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3} + m_PrefabInstance: {fileID: 7292576075314493597} + m_PrefabAsset: {fileID: 0}