diff --git a/Assets/arts/atlas/icon/buff.asset b/Assets/arts/atlas/icon/buff.asset index 3da90ddd0..392ca470c 100644 --- a/Assets/arts/atlas/icon/buff.asset +++ b/Assets/arts/atlas/icon/buff.asset @@ -23,6 +23,11 @@ MonoBehaviour: - {fileID: 21300000, guid: 7e91bb376e02142c5ae9713cdf7060bb, type: 3} - {fileID: 21300000, guid: c70ea649b4ac6ba4cb17164f11d555a9, type: 3} - {fileID: 21300000, guid: 0e68ebc982e8cac4d92bc662d3ca5b2f, type: 3} + - {fileID: 21300000, guid: cbf7e18c2322044349133a347dd94ec0, type: 3} + - {fileID: 21300000, guid: 9fd3c5c27da57440189e23c5f080548d, type: 3} + - {fileID: 21300000, guid: cb55ab7ffa8c4495fa2610a352a53c16, type: 3} + - {fileID: 21300000, guid: b3f47bc2c10ea4f5cb8e51f51da33926, type: 3} + - {fileID: 21300000, guid: 420ade8b234c24e74b7c50686ae02ac8, type: 3} - {fileID: 21300000, guid: 4d5743e9d0a6ae447bad491b2a0c6cc6, type: 3} - {fileID: 21300000, guid: 487844becee23a94d97386cf66bf5252, type: 3} - {fileID: 21300000, guid: 42e30d11fda48bb498c8aea2b7221e08, type: 3} @@ -35,10 +40,11 @@ MonoBehaviour: - {fileID: 21300000, guid: 043179a56ef8e8d42ae09358dff341bf, type: 3} - {fileID: 21300000, guid: 61f59f5fd9224724b922e62aa6a44572, type: 3} - {fileID: 21300000, guid: 7f9dbdcfca34a634e8e98550f9f11dfa, type: 3} + - {fileID: 21300000, guid: 636a8f9a1c20c4df390429787d13cf5d, type: 3} - {fileID: 21300000, guid: 6160184d20e3f6345a3b01589e65fd3d, type: 3} - {fileID: 21300000, guid: e82b2ad42c23ffe4f99f87bee23939d2, type: 3} - {fileID: 21300000, guid: 6bd6b8f81811c3f49a743cb13b3d16cc, type: 3} - {fileID: 21300000, guid: 020a89104d6668248bc2518cce1fc6cc, type: 3} - {fileID: 21300000, guid: 6568b6c56e8900547b76bf3fc6307823, type: 3} - {fileID: 21300000, guid: 232ebdf92251f9446aa2ff109a3a189f, type: 3} - spriteNameList: 3bb554de3a9f9705cf512e00d7d7a3050de6ee3844d744fcbce45674f4b873f69200aa050cc1401e9ed464f6a01289b4832c60b9cfbbd3ea10d4ad7d2bc532008284f110e38ff110086f6cc56c4e7640fb662f9b691f28ca9f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0 + spriteNameList: 3bb554de3a9f9705cf512e00d7d7a3050de6ee3844d744fcbce45674f4b873f69200aa050cc1401e7a7e5d04e7415e8e5cfd091af5ec0eef143e942f9ed464f6a01289b4832c60b9cfbbd3ea10d4ad7d2bc532008284f110e38ff110086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0 diff --git a/Assets/arts/atlas/icon/buff.spriteatlas b/Assets/arts/atlas/icon/buff.spriteatlas index bb5270491..a0f2768fc 100644 --- a/Assets/arts/atlas/icon/buff.spriteatlas +++ b/Assets/arts/atlas/icon/buff.spriteatlas @@ -69,6 +69,8 @@ SpriteAtlas: - {fileID: 21300000, guid: 4fd484a10024b422f941737e3b4b9a6d, type: 3} - {fileID: 21300000, guid: 911e4ba1e8f5c594a9068ef0d20bbc25, type: 3} - {fileID: 21300000, guid: 06765e0298a373a468ed0efca3170681, type: 3} + - {fileID: 21300000, guid: 9fd3c5c27da57440189e23c5f080548d, type: 3} + - {fileID: 21300000, guid: b3f47bc2c10ea4f5cb8e51f51da33926, type: 3} - {fileID: 21300000, guid: ebec38e2bfdafd246a9ec89135a5714e, type: 3} - {fileID: 21300000, guid: fd824a83cca762246afe64ce585ccccf, type: 3} - {fileID: 21300000, guid: df597c1485f572f4faf4cdda764f1022, type: 3} @@ -85,10 +87,14 @@ SpriteAtlas: - {fileID: 21300000, guid: 0e68ebc982e8cac4d92bc662d3ca5b2f, type: 3} - {fileID: 21300000, guid: 4d5743e9d0a6ae447bad491b2a0c6cc6, type: 3} - {fileID: 21300000, guid: 232ebdf92251f9446aa2ff109a3a189f, type: 3} + - {fileID: 21300000, guid: 636a8f9a1c20c4df390429787d13cf5d, type: 3} - {fileID: 21300000, guid: 1b29673b2dd79e04abceec647b3c9fe6, type: 3} + - {fileID: 21300000, guid: 420ade8b234c24e74b7c50686ae02ac8, type: 3} + - {fileID: 21300000, guid: cbf7e18c2322044349133a347dd94ec0, type: 3} - {fileID: 21300000, guid: 6160184d20e3f6345a3b01589e65fd3d, type: 3} - {fileID: 21300000, guid: 487844becee23a94d97386cf66bf5252, type: 3} - {fileID: 21300000, guid: 61f59f5fd9224724b922e62aa6a44572, type: 3} + - {fileID: 21300000, guid: cb55ab7ffa8c4495fa2610a352a53c16, type: 3} - {fileID: 21300000, guid: 7f9dbdcfca34a634e8e98550f9f11dfa, type: 3} m_PackedSpriteNamesToIndex: - undead @@ -98,6 +104,8 @@ SpriteAtlas: - normal_attack_add - bleed - charm + - dec_dmg_green_add + - dec_dmg_red_add - Imprison - poison - counterattack @@ -114,10 +122,14 @@ SpriteAtlas: - death_summon - first_hand - weaken + - shield_ice - lethargy + - dec_dmg_yellow_add + - dec_dmg_blue_add - skill_hurt_add - frozen - self_heal + - dec_dmg_purple_add - shield m_RenderDataMap: {} m_Tag: buff diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 64254779d..9d1f0637d 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -48,6 +48,9 @@ MonoBehaviour: - {fileID: 21300000, guid: 744dbd3d5c288644c8a8b96958a0e89b, type: 3} - {fileID: 21300000, guid: 421fe68d394a55b45bb37d332f312805, type: 3} - {fileID: 21300000, guid: f37b1779751e6de42b14f4d4c8f52609, type: 3} + - {fileID: 21300000, guid: f5403077419a44a43862ba0f8caa294c, type: 3} + - {fileID: 21300000, guid: 630dea241c4944517bef3c769ac26dd1, type: 3} + - {fileID: 21300000, guid: 6f78a369627734acc81253c3e1c39596, type: 3} - {fileID: 21300000, guid: 4e3da980631dad04785f6ea58dc3447f, type: 3} - {fileID: 21300000, guid: 306205473d3cf1f4a9d821c3e2971092, type: 3} - {fileID: 21300000, guid: b87dcadba2e6bb442a2874411677d1ae, type: 3} @@ -211,4 +214,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 79049b3449a2b2e673ef759674ef7596be18769666b70a59de354ed31286789644556fda1386789605596fda1486789615867896168678961786789618867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed396589838e5354ed3575c9838e6354ed3186098387d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e6993388ac76fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf077547c25b523e1557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c97a0c7eae2a1c7eae28c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 + spriteNameList: 79049b3449a2b2e673ef759674ef7596be18769666b70a59de354ed31286789644556fda1386789605596fda1486789615867896168678961786789618867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed396589838e5354ed3575c9838e6354ed3186098387d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8c7ac7e96c8ac7e96c9ac7e96947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e6993388ac76fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf077547c25b523e1557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c97a0c7eae2a1c7eae28c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index b63078b5c..dc283e01b 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -114,6 +114,7 @@ SpriteAtlas: - {fileID: 21300000, guid: cf73870457f688f4ca0a68c8941d6ee3, type: 3} - {fileID: 21300000, guid: 2bd64d14416f47c4b8320532d03d7b90, type: 3} - {fileID: 21300000, guid: b1797d14a61badd4cbe95f19e3e5def1, type: 3} + - {fileID: 21300000, guid: 630dea241c4944517bef3c769ac26dd1, type: 3} - {fileID: 21300000, guid: af26c7443263f4d5182d6df5769e9bd8, type: 3} - {fileID: 21300000, guid: b2988864691ea9848b777a8d2fe5d32b, type: 3} - {fileID: 21300000, guid: d0dcbe94cbb9e427189b7a95ab335bd1, type: 3} @@ -150,6 +151,7 @@ SpriteAtlas: - {fileID: 21300000, guid: c7f11a478e4765040a4bc6fb66de18e2, type: 3} - {fileID: 21300000, guid: 9b35ea47339a8e94d9d4555e03956f35, type: 3} - {fileID: 21300000, guid: 5abeb357a5d3eeb4aa3ea9fc68efcf9a, type: 3} + - {fileID: 21300000, guid: f5403077419a44a43862ba0f8caa294c, type: 3} - {fileID: 21300000, guid: ad9edd77aac3648dab5eed7882235cb6, type: 3} - {fileID: 21300000, guid: dce59e87488903e4b8f377a7eeda2748, type: 3} - {fileID: 21300000, guid: 3420c1c78b5e240279b8ac4d097bccb5, type: 3} @@ -171,6 +173,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0c32ce29e270900449c45ff285f9849a, type: 3} - {fileID: 21300000, guid: 9e2f5539c62b8b94888536409894e82d, type: 3} - {fileID: 21300000, guid: 82b3e53961860f54a99b2d06e4d59e54, type: 3} + - {fileID: 21300000, guid: 6f78a369627734acc81253c3e1c39596, type: 3} - {fileID: 21300000, guid: f37b1779751e6de42b14f4d4c8f52609, type: 3} - {fileID: 21300000, guid: 3d4e7f797f9e52a428caf685cb9d945d, type: 3} - {fileID: 21300000, guid: a58c93b9583221947848dd5c55b42fd1, type: 3} @@ -313,6 +316,7 @@ SpriteAtlas: - battle_obstacle_leaf - battle_obstacle_chest_1 - battle_obstacle_waternake + - battle_btn_2 - battle_hinder_arena - battle_obstacle_stone_1 - battle_obstacle_chilun_1 @@ -349,6 +353,7 @@ SpriteAtlas: - battle_obstacle_altar_3 - battle_hinder_12 - battle_shadow_6_b + - battle_btn_1 - battle_bg_13 - battle_hinder_28 - battle_bg_11 @@ -370,6 +375,7 @@ SpriteAtlas: - battle_hinder_debris - battle_hinder_16 - battle_bg_3 + - battle_btn_3 - battle_board_7 - battle_hinder_5 - battle_hinder_32 diff --git a/Assets/arts/atlas/ui/setting.asset b/Assets/arts/atlas/ui/setting.asset index b0a15f4d7..977afe265 100644 --- a/Assets/arts/atlas/ui/setting.asset +++ b/Assets/arts/atlas/ui/setting.asset @@ -33,6 +33,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 1bf645aa17a1fa94194d989044eb9a6b, type: 3} - {fileID: 21300000, guid: cb6f3df0ba4bf6a43b496997afeef3c5, type: 3} - {fileID: 21300000, guid: 8f13ecccc6ac0924a95c9dfcaf551559, type: 3} + - {fileID: 21300000, guid: ea65e0362ec2a43cba10fd25ecf62799, type: 3} - {fileID: 21300000, guid: 7a35843cc154240459d64df8b972b216, type: 3} - {fileID: 21300000, guid: d703af51910191049ae5c12a82cf1753, type: 3} - {fileID: 21300000, guid: 7bc7042f99d324360986b382c254e84d, type: 3} @@ -49,4 +50,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 6f44bf59aae5dcd4483bbc4a281c37e8, type: 3} - {fileID: 21300000, guid: 482b520908f8e994a94b299a116793d2, type: 3} - {fileID: 21300000, guid: 2f0bac97a25a5df4a876b5b9054751cd, type: 3} - spriteNameList: 7d8d7896ede09396b2fee9b9c8fee9b9f0fee9b9f5fee9b913ffe9b962ffe9b994ba67e77effe9b9abffe9b94b00eab93d256be78a00eab9bb00eab9fa00eab97501eab9abf8f6b94637c61e4737c61e293e7c4a87c0ad221d32b353713bd486850c1cba860c1cba870c1cba880c1cba890c1cba8a0c1cba8b0c1cba65e6f5f63da202abd5d7aac2616ea7ba840fc510 + spriteNameList: 7d8d7896ede09396b2fee9b9c8fee9b9f0fee9b9f5fee9b913ffe9b962ffe9b994ba67e77effe9b9abffe9b94b00eab93d256be78a00eab9bb00eab9fa00eab97501eab9abf8f6b94637c61e4737c61e4837c61e293e7c4a87c0ad221d32b353713bd486850c1cba860c1cba870c1cba880c1cba890c1cba8a0c1cba8b0c1cba65e6f5f63da202abd5d7aac2616ea7ba840fc510 diff --git a/Assets/arts/textures/icon/buff/dec_dmg_blue_add.png b/Assets/arts/textures/icon/buff/dec_dmg_blue_add.png new file mode 100644 index 000000000..fbd55cb4a Binary files /dev/null and b/Assets/arts/textures/icon/buff/dec_dmg_blue_add.png differ diff --git a/Assets/arts/textures/icon/buff/dec_dmg_blue_add.png.meta b/Assets/arts/textures/icon/buff/dec_dmg_blue_add.png.meta new file mode 100644 index 000000000..1b6c3836a --- /dev/null +++ b/Assets/arts/textures/icon/buff/dec_dmg_blue_add.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: cbf7e18c2322044349133a347dd94ec0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/buff/dec_dmg_green_add.png b/Assets/arts/textures/icon/buff/dec_dmg_green_add.png new file mode 100644 index 000000000..b54aac634 Binary files /dev/null and b/Assets/arts/textures/icon/buff/dec_dmg_green_add.png differ diff --git a/Assets/arts/textures/icon/buff/dec_dmg_green_add.png.meta b/Assets/arts/textures/icon/buff/dec_dmg_green_add.png.meta new file mode 100644 index 000000000..44bf93b92 --- /dev/null +++ b/Assets/arts/textures/icon/buff/dec_dmg_green_add.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 9fd3c5c27da57440189e23c5f080548d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/buff/dec_dmg_purple_add.png b/Assets/arts/textures/icon/buff/dec_dmg_purple_add.png new file mode 100644 index 000000000..32699d610 Binary files /dev/null and b/Assets/arts/textures/icon/buff/dec_dmg_purple_add.png differ diff --git a/Assets/arts/textures/icon/buff/dec_dmg_purple_add.png.meta b/Assets/arts/textures/icon/buff/dec_dmg_purple_add.png.meta new file mode 100644 index 000000000..bf0c75616 --- /dev/null +++ b/Assets/arts/textures/icon/buff/dec_dmg_purple_add.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: cb55ab7ffa8c4495fa2610a352a53c16 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/buff/dec_dmg_red_add.png b/Assets/arts/textures/icon/buff/dec_dmg_red_add.png new file mode 100644 index 000000000..65c070615 Binary files /dev/null and b/Assets/arts/textures/icon/buff/dec_dmg_red_add.png differ diff --git a/Assets/arts/textures/icon/buff/dec_dmg_red_add.png.meta b/Assets/arts/textures/icon/buff/dec_dmg_red_add.png.meta new file mode 100644 index 000000000..dd6a89144 --- /dev/null +++ b/Assets/arts/textures/icon/buff/dec_dmg_red_add.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: b3f47bc2c10ea4f5cb8e51f51da33926 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/buff/dec_dmg_yellow_add.png b/Assets/arts/textures/icon/buff/dec_dmg_yellow_add.png new file mode 100644 index 000000000..38302a1a8 Binary files /dev/null and b/Assets/arts/textures/icon/buff/dec_dmg_yellow_add.png differ diff --git a/Assets/arts/textures/icon/buff/dec_dmg_yellow_add.png.meta b/Assets/arts/textures/icon/buff/dec_dmg_yellow_add.png.meta new file mode 100644 index 000000000..83c6e11c5 --- /dev/null +++ b/Assets/arts/textures/icon/buff/dec_dmg_yellow_add.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 420ade8b234c24e74b7c50686ae02ac8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/buff/shield_ice.png b/Assets/arts/textures/icon/buff/shield_ice.png new file mode 100644 index 000000000..e3a4cc0b0 Binary files /dev/null and b/Assets/arts/textures/icon/buff/shield_ice.png differ diff --git a/Assets/arts/textures/icon/buff/shield_ice.png.meta b/Assets/arts/textures/icon/buff/shield_ice.png.meta new file mode 100644 index 000000000..ecb1753f7 --- /dev/null +++ b/Assets/arts/textures/icon/buff/shield_ice.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 636a8f9a1c20c4df390429787d13cf5d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_btn_1.png b/Assets/arts/textures/ui/battle/battle_btn_1.png new file mode 100644 index 000000000..a35a24633 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_btn_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_btn_1.png.meta b/Assets/arts/textures/ui/battle/battle_btn_1.png.meta new file mode 100644 index 000000000..acfc23565 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_btn_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: f5403077419a44a43862ba0f8caa294c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_btn_2.png b/Assets/arts/textures/ui/battle/battle_btn_2.png new file mode 100644 index 000000000..b46883b74 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_btn_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_btn_2.png.meta b/Assets/arts/textures/ui/battle/battle_btn_2.png.meta new file mode 100644 index 000000000..6ed8c0a30 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_btn_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 630dea241c4944517bef3c769ac26dd1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_btn_3.png b/Assets/arts/textures/ui/battle/battle_btn_3.png new file mode 100644 index 000000000..e951a95d6 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_btn_3.png differ diff --git a/Assets/arts/textures/ui/battle/battle_btn_3.png.meta b/Assets/arts/textures/ui/battle/battle_btn_3.png.meta new file mode 100644 index 000000000..a798dc906 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_btn_3.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 6f78a369627734acc81253c3e1c39596 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/battle/battle_dec_1.png b/Assets/arts/textures/ui/battle/battle_dec_1.png index b74606516..aabe62d65 100644 Binary files a/Assets/arts/textures/ui/battle/battle_dec_1.png and b/Assets/arts/textures/ui/battle/battle_dec_1.png differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 5aab902b3..d14792a2e 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 294de7e71..a71da249b 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/module/task/task_manager.lua.bytes b/Assets/lua/app/module/task/task_manager.lua.bytes index b2e4cc9dc..f0988b71a 100644 Binary files a/Assets/lua/app/module/task/task_manager.lua.bytes and b/Assets/lua/app/module/task/task_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index 34aa4b120..90821cb10 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes b/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes index 86aab2dab..108660ed3 100644 Binary files a/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes and b/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes b/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes index 8ae8e11dd..9e39fac5d 100644 Binary files a/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes and b/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes index 360d5068a..fe265db40 100644 Binary files a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes and b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes index e2f1bf53c..394993840 100644 Binary files a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes and b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_entity.lua.bytes b/Assets/lua/app/userdata/bag/item_entity.lua.bytes index 53d8b98d1..00aec76cd 100644 Binary files a/Assets/lua/app/userdata/bag/item_entity.lua.bytes and b/Assets/lua/app/userdata/bag/item_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 0944325a8..0723f7482 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ