diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index b3af3c211..1d14ef8b1 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -17,10 +17,10 @@ MonoBehaviour: - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} - {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3} - - {fileID: 21300000, guid: 2b6d8940c0d20d14ab03aced34e9ceb2, type: 3} - {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3} - {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3} - {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3} + - {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3} - {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3} - {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3} - {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3} diff --git a/Assets/arts/atlas/icon/item.spriteatlas b/Assets/arts/atlas/icon/item.spriteatlas index 5d7faace3..e9a47ae2f 100644 --- a/Assets/arts/atlas/icon/item.spriteatlas +++ b/Assets/arts/atlas/icon/item.spriteatlas @@ -61,11 +61,11 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: - - {fileID: 21300000, guid: 2b6d8940c0d20d14ab03aced34e9ceb2, type: 3} - {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3} - {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3} - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} - {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3} + - {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3} - {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3} - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} - {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3} @@ -73,17 +73,17 @@ SpriteAtlas: - {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3} - {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3} m_PackedSpriteNamesToIndex: - - frame_1 - 5 - - frame_3 + - frame_2 - 4 - frame_mask - - frame_2 + - frame_4 + - frame_1 - 3 - frame_select - 1 - frame_5 - - frame_4 + - frame_3 m_RenderDataMap: {} m_Tag: item m_IsVariant: 0 diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 0f300eeb3..29f9592d6 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -31,6 +31,12 @@ MonoBehaviour: - {fileID: 21300000, guid: 0928e747552d400468dcd7ba0a5cf10a, type: 3} - {fileID: 21300000, guid: cd8cf65d131e4bf44a2d7c37bfe60080, type: 3} - {fileID: 21300000, guid: 10dac87d52e3e6647ad3d1644b607922, type: 3} + - {fileID: 21300000, guid: 09dc5de1bb43f8e4fb620fdf5c1fdd9e, type: 3} + - {fileID: 21300000, guid: 6bbb916e771550640b39c658dbe4508f, type: 3} + - {fileID: 21300000, guid: ea9f61c48549694489d855a4a5f0bf77, type: 3} + - {fileID: 21300000, guid: 3d4e7f797f9e52a428caf685cb9d945d, type: 3} + - {fileID: 21300000, guid: 84a8e79f7596403459578a2297a00864, type: 3} + - {fileID: 21300000, guid: fb43ca103930b98418608ba14f871c21, type: 3} - {fileID: 21300000, guid: 2deaa61a5f1d4fd44b611e3d5819ce7a, type: 3} - {fileID: 21300000, guid: a9fd7e9a8eb4d1c488fd097ca4956501, type: 3} - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3} @@ -67,4 +73,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 79656e8810168454eabe93c524a9878a, type: 3} - {fileID: 21300000, guid: 52ac764cef5804147aa8efe734be0a01, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 73ef7596df354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3ede09396eee09396efe09396f0e09396bd9b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63adf525e9108b9601006e14a268a0bc6ec803e47506d77eae8fd87eae8faa3b37002623b5b6 + spriteNameList: 73ef7596df354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3ede09396eee09396efe09396f0e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63adf525e9108b9601006e14a268a0bc6ec803e47506d77eae8fd87eae8faa3b37002623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index 28c2912af..0df50fd32 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -62,6 +62,7 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 143a02006f322054e926abff54bc2953, type: 3} + - {fileID: 21300000, guid: fb43ca103930b98418608ba14f871c21, type: 3} - {fileID: 21300000, guid: 63461d20be12601408351e3c6df6d799, type: 3} - {fileID: 21300000, guid: d135766030d953b4bbb3ca2404fe28da, type: 3} - {fileID: 21300000, guid: 4e3da980631dad04785f6ea58dc3447f, type: 3} @@ -69,11 +70,13 @@ SpriteAtlas: - {fileID: 21300000, guid: bb012b114a991f44c8583c6cc270981d, type: 3} - {fileID: 21300000, guid: fe271741bc843c8438da54d6990e17c0, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} + - {fileID: 21300000, guid: 09dc5de1bb43f8e4fb620fdf5c1fdd9e, type: 3} - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3} - {fileID: 21300000, guid: 423cf212d1afa6a4aa5874da25e9b30e, type: 3} - {fileID: 21300000, guid: 35d30742d8a5d0641a6e7b0b18f323a1, type: 3} - {fileID: 21300000, guid: 8a3687a2ce1b5fd44baaea4d5688ae34, type: 3} - {fileID: 21300000, guid: b11c2f63c86e22644bbe1d930815c6c8, type: 3} + - {fileID: 21300000, guid: ea9f61c48549694489d855a4a5f0bf77, type: 3} - {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} - {fileID: 21300000, guid: 6977af166b59e254a869ca5639e56bec, type: 3} - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3} @@ -89,6 +92,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 331e6bd86c6815246bbdc3582757afde, type: 3} - {fileID: 21300000, guid: f37b1779751e6de42b14f4d4c8f52609, type: 3} + - {fileID: 21300000, guid: 3d4e7f797f9e52a428caf685cb9d945d, type: 3} - {fileID: 21300000, guid: 2deaa61a5f1d4fd44b611e3d5819ce7a, type: 3} - {fileID: 21300000, guid: a9fd7e9a8eb4d1c488fd097ca4956501, type: 3} - {fileID: 21300000, guid: 816486ca69b027b4bb3438882fd42f2b, type: 3} @@ -110,13 +114,16 @@ SpriteAtlas: - {fileID: 21300000, guid: 39cd734eccabde14fb2c3cffddc8d39a, type: 3} - {fileID: 21300000, guid: dfc7b64e38bed054fb7f4ae52e1586d6, type: 3} - {fileID: 21300000, guid: b4eb3a5ebff984c49ab18ba4a98799a5, type: 3} + - {fileID: 21300000, guid: 6bbb916e771550640b39c658dbe4508f, type: 3} - {fileID: 21300000, guid: c38a84bed7b6ae443a92e10fd79b3e1e, type: 3} - {fileID: 21300000, guid: 3ad86f0f900c9f64ab2165d92f8d49e5, type: 3} + - {fileID: 21300000, guid: 84a8e79f7596403459578a2297a00864, type: 3} - {fileID: 21300000, guid: e8a869bf5b5b1a2469b54cc718b6642e, type: 3} - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: 634f8eff83cb4cd4780e6afae3bc6c65, type: 3} m_PackedSpriteNamesToIndex: - battle_progress_3 + - battle_hinder_7 - battle_skill_bg_yellow_2 - ice - battle_btn_magnifier @@ -124,11 +131,13 @@ SpriteAtlas: - battle_progress_2 - battle_board_4 - yellow_1 + - battle_hinder_2 - battle_skill_line_8 - stone_1 - battle_skill_bg_blue_2 - battle_skill_colorful - purple_1_1 + - battle_hinder_4 - battle_bag_1 - battle_progress_4 - battle_progress_1 @@ -144,6 +153,7 @@ SpriteAtlas: - red_1 - battle_progress_bg_1 - battle_board_7 + - battle_hinder_5 - battle_line_1 - battle_mask - battle_skill_line_9 @@ -165,8 +175,10 @@ SpriteAtlas: - battle_board_3 - battle_dec_2 - battle_bg_2 + - battle_hinder_3 - battle_board_2 - battle_skill_bg_yellow_1 + - battle_hinder_6 - battle_skill_bg_1 - purple_1 - green_1 diff --git a/Assets/arts/textures/ui/battle/battle_hinder_2.png b/Assets/arts/textures/ui/battle/battle_hinder_2.png new file mode 100644 index 000000000..b418e6a64 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_hinder_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_hinder_2.png.meta b/Assets/arts/textures/ui/battle/battle_hinder_2.png.meta new file mode 100644 index 000000000..5265d12d3 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_hinder_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 09dc5de1bb43f8e4fb620fdf5c1fdd9e +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_hinder_3.png b/Assets/arts/textures/ui/battle/battle_hinder_3.png new file mode 100644 index 000000000..634f2e9a2 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_hinder_3.png differ diff --git a/Assets/arts/textures/ui/battle/battle_hinder_3.png.meta b/Assets/arts/textures/ui/battle/battle_hinder_3.png.meta new file mode 100644 index 000000000..a374b7222 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_hinder_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 6bbb916e771550640b39c658dbe4508f +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_hinder_4.png b/Assets/arts/textures/ui/battle/battle_hinder_4.png new file mode 100644 index 000000000..2913ddb0b Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_hinder_4.png differ diff --git a/Assets/arts/textures/ui/battle/battle_hinder_4.png.meta b/Assets/arts/textures/ui/battle/battle_hinder_4.png.meta new file mode 100644 index 000000000..2ff326572 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_hinder_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: ea9f61c48549694489d855a4a5f0bf77 +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_hinder_5.png b/Assets/arts/textures/ui/battle/battle_hinder_5.png new file mode 100644 index 000000000..a54588b8d Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_hinder_5.png differ diff --git a/Assets/arts/textures/ui/battle/battle_hinder_5.png.meta b/Assets/arts/textures/ui/battle/battle_hinder_5.png.meta new file mode 100644 index 000000000..eec808604 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_hinder_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3d4e7f797f9e52a428caf685cb9d945d +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_hinder_6.png b/Assets/arts/textures/ui/battle/battle_hinder_6.png new file mode 100644 index 000000000..6b28a92d6 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_hinder_6.png differ diff --git a/Assets/arts/textures/ui/battle/battle_hinder_6.png.meta b/Assets/arts/textures/ui/battle/battle_hinder_6.png.meta new file mode 100644 index 000000000..163f5830e --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_hinder_6.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 84a8e79f7596403459578a2297a00864 +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_hinder_7.png b/Assets/arts/textures/ui/battle/battle_hinder_7.png new file mode 100644 index 000000000..079015553 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_hinder_7.png differ diff --git a/Assets/arts/textures/ui/battle/battle_hinder_7.png.meta b/Assets/arts/textures/ui/battle/battle_hinder_7.png.meta new file mode 100644 index 000000000..f18a5c24c --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_hinder_7.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: fb43ca103930b98418608ba14f871c21 +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/lua/app/module/battle/controller/battle_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes index fbf6b8a0f..916c342e5 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes index 81ededb66..bf3c682b5 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_stage.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes index 07fbf9e11..c5c769cd9 100644 Binary files a/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_skill_select_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 62c3ef37d..01df4fbc1 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes index d45e45ece..c785b13d9 100644 Binary files a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes and b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_data.lua.bytes index 0e0a23f7b..e63501602 100644 Binary files a/Assets/lua/app/userdata/battle/battle_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes b/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes index ca2a07566..da7453081 100644 Binary files a/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes and b/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes differ