diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 9d1f0637d..7e8e31a72 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -126,6 +126,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 97c119ef1a85d724ca7484b84c09c361, type: 3} - {fileID: 21300000, guid: 1e7a91b5f6e7117449342d38697c7c51, type: 3} - {fileID: 21300000, guid: 38d794e09434def4283b00159a693c99, type: 3} + - {fileID: 21300000, guid: f608774512f6f4f6eab5a045009a49d5, type: 3} + - {fileID: 21300000, guid: 0897a70bf85fe441a9672deb0bc1d497, type: 3} - {fileID: 21300000, guid: d0aee8d1fbdc1c24ba90e2855e76d866, type: 3} - {fileID: 21300000, guid: 1c12cc4f1bebf415dbb52ddb8da5cb72, type: 3} - {fileID: 21300000, guid: 2cc299b1be3764cca97090072e743bb0, type: 3} @@ -139,6 +141,7 @@ MonoBehaviour: - {fileID: 21300000, guid: adb1bb1275f590d458ba285b7d35c55c, type: 3} - {fileID: 21300000, guid: 9680984b8afcb9c4db63945b1b18d489, type: 3} - {fileID: 21300000, guid: cf73870457f688f4ca0a68c8941d6ee3, type: 3} + - {fileID: 21300000, guid: 28a1f83434f1d4b9b8c4a61115da3253, type: 3} - {fileID: 21300000, guid: 7a76809ad26a15d499504521193c5f95, type: 3} - {fileID: 21300000, guid: 8d14e6ce5e19eca47a6d2061cabbab40, type: 3} - {fileID: 21300000, guid: ce74095b62dfe7d4dbeba9d77489a676, type: 3} @@ -161,6 +164,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 02ebf2f9ddc012242b20491c8c0425b7, type: 3} - {fileID: 21300000, guid: 324ff77b79928467c915d80aeb924eb3, type: 3} - {fileID: 21300000, guid: 97dd2e2a9d42c490a92fecd0c2df41d8, type: 3} + - {fileID: 21300000, guid: 55f9e9834903f4969a04f433207589b9, type: 3} - {fileID: 21300000, guid: 9486a572fd5ab46eab3c2943a7e58ad1, type: 3} - {fileID: 21300000, guid: fa8f5962b2032c84a9836b6c7af7e0ee, type: 3} - {fileID: 21300000, guid: 4ee394b230d6d9c449c2a528c8a57c62, type: 3} @@ -214,4 +218,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 79049b3449a2b2e673ef759674ef7596be18769666b70a59de354ed31286789644556fda1386789605596fda1486789615867896168678961786789618867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed396589838e5354ed3575c9838e6354ed3186098387d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8c7ac7e96c8ac7e96c9ac7e96947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e6993388ac76fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf077547c25b523e1557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c97a0c7eae2a1c7eae28c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 + spriteNameList: 79049b3449a2b2e673ef759674ef7596be18769666b70a59de354ed31286789644556fda1386789605596fda1486789615867896168678961786789618867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed396589838e5354ed3575c9838e6354ed3186098387d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8c7ac7e96c8ac7e96c9ac7e96947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e6993388ac76fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db5a79c7e7211b5ece0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4c5da02bb948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc0386aedc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf077547c25b523e1557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c97a0c7eae2a1c7eae28c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index dc283e01b..63f3a564e 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -109,12 +109,14 @@ SpriteAtlas: - {fileID: 21300000, guid: de67ff43cf9c86c46be7127c2fb7cc84, type: 3} - {fileID: 21300000, guid: f84ffb5354dfd484aa016bd3077eabe1, type: 3} - {fileID: 21300000, guid: afcf9e53b76eef44dba33da9caa87fc3, type: 3} + - {fileID: 21300000, guid: 55f9e9834903f4969a04f433207589b9, type: 3} - {fileID: 21300000, guid: 3c7fd9d3a2e014cefa51306759175e35, type: 3} - {fileID: 21300000, guid: beaaa8e349966d64292667db5f7b8c3a, type: 3} - {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: 28a1f83434f1d4b9b8c4a61115da3253, type: 3} - {fileID: 21300000, guid: af26c7443263f4d5182d6df5769e9bd8, type: 3} - {fileID: 21300000, guid: b2988864691ea9848b777a8d2fe5d32b, type: 3} - {fileID: 21300000, guid: d0dcbe94cbb9e427189b7a95ab335bd1, type: 3} @@ -122,6 +124,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 93b00ed4f23e9bc4f8af52978ea09415, type: 3} - {fileID: 21300000, guid: 1fa9f5e45de18674f978e6b5faf85d3e, type: 3} - {fileID: 21300000, guid: 6d1137255fa6fd3458f7b438cbeeb576, type: 3} + - {fileID: 21300000, guid: f608774512f6f4f6eab5a045009a49d5, type: 3} - {fileID: 21300000, guid: bd89ab45a7458774fa0c1acc5a4c2ba1, type: 3} - {fileID: 21300000, guid: 4b32b1658c8304c20802eb4109c2035b, type: 3} - {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} @@ -193,6 +196,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 7b1941eab1a2f1e4d898491b572be0d8, type: 3} - {fileID: 21300000, guid: d860c7ea2dcad1c4a804fe48f07fcdf3, type: 3} - {fileID: 21300000, guid: 9bb2f10b15aa44a4fa22ec0655146511, type: 3} + - {fileID: 21300000, guid: 0897a70bf85fe441a9672deb0bc1d497, type: 3} - {fileID: 21300000, guid: c599ca3bea4c4014c9aa3eb3783c5a9e, type: 3} - {fileID: 21300000, guid: efac3e3ba021f44d192c94b1eea504e7, type: 3} - {fileID: 21300000, guid: 9680984b8afcb9c4db63945b1b18d489, type: 3} @@ -311,12 +315,14 @@ SpriteAtlas: - battle_star_2 - battle_bg_15 - battle_pig + - battle_obstacle_suishi_3 - battle_bg_7_1 - battle_hinder_33 - battle_obstacle_leaf - battle_obstacle_chest_1 - battle_obstacle_waternake - battle_btn_2 + - battle_obstacle_leaves - battle_hinder_arena - battle_obstacle_stone_1 - battle_obstacle_chilun_1 @@ -324,6 +330,7 @@ SpriteAtlas: - battle_hinder_gold - battle_obstacle_stalactite_3 - battle_obstacle_iron_3 + - battle_obstacle_cotton_candy - battle_bg_6 - battle_bg_10_1 - battle_bag_1 @@ -395,6 +402,7 @@ SpriteAtlas: - battle_dec_5 - battle_dec_1 - blue_1 + - battle_obstacle_dark_matter - battle_hinder_35 - battle_rouge_board_6 - battle_obstacle_lava diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index da8848ecb..91c660af3 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -17,6 +17,7 @@ MonoBehaviour: - {fileID: 21300000, guid: eb13070192e9d47a2ac961501207c01b, type: 3} - {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} - {fileID: 21300000, guid: af2468e67b69b3647afb863604c01d03, type: 3} + - {fileID: 21300000, guid: 0e9b0f533f4a24a2ebdbc79d49003ce6, type: 3} - {fileID: 21300000, guid: 66c4ae88b2f669a48880595563b8e5f5, type: 3} - {fileID: 21300000, guid: d8d7450c5023f744a93f70f8a2ac59f9, type: 3} - {fileID: 21300000, guid: dfd622b8474c03e42bba1e48879cb1a1, type: 3} @@ -77,6 +78,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 3cf1784287669db4f91e9b56d1ebc7e1, type: 3} - {fileID: 21300000, guid: 4b4d73ac48dffca4fa760e7a48e51ad2, type: 3} - {fileID: 21300000, guid: 438379085b5f94865aa21e11bb5fa6c1, type: 3} + - {fileID: 21300000, guid: 40ecebbbd24b643d7881d0bde6b08d9b, type: 3} + - {fileID: 21300000, guid: 878338804acdb449ea7a94ae5677bd9c, type: 3} - {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} - {fileID: 21300000, guid: e6ec7dd0257a3435ca158889047e65c1, type: 3} - {fileID: 21300000, guid: 0878152c45dfc4c7fa2ddfe21a5a6d1b, type: 3} @@ -120,6 +123,7 @@ MonoBehaviour: - {fileID: 21300000, guid: ce3ecf0e5cac5d4489328b0b8e3b5123, type: 3} - {fileID: 21300000, guid: ef885e1efc66548f9955be4765ea37ab, type: 3} - {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} + - {fileID: 21300000, guid: 1cb5c89eb74a8461f85bbdf88ea37c4e, type: 3} - {fileID: 21300000, guid: 80a4cdd0f592b40359159f8ee3c49d0a, type: 3} - {fileID: 21300000, guid: 92f0559c7dc7a4f748e4f471741dc664, type: 3} - {fileID: 21300000, guid: 792ef1532be4a470aaf22dff9cde4e68, type: 3} @@ -134,6 +138,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 070fd6553e0b5bf4a816757085221bda, type: 3} - {fileID: 21300000, guid: 324d3fc5bf7f47241865971067a87b80, type: 3} - {fileID: 21300000, guid: 67a031dfa138a409f8109c1235244d25, type: 3} + - {fileID: 21300000, guid: 6e137e52f578c4b72bebb4002d0ef804, type: 3} - {fileID: 21300000, guid: 96fd70b1d51e00641ab3107096c4994b, type: 3} - {fileID: 21300000, guid: cc36a2865259e6a449af8d0bfe2b7165, type: 3} - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} @@ -185,4 +190,4 @@ MonoBehaviour: - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a7712f57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a826d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a12138503497395134973952349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 + spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a771e98d43c32857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a7712f57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a826d861a91243e8d92243e8d93243e8d5ff0dec4c48e80a0c58e80a0f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a12138503497395134973952349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30c017ebec160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 diff --git a/Assets/arts/textures/icon/hero/match_1.png b/Assets/arts/textures/icon/hero/match_1.png index 528bd769b..c953e3cd3 100644 Binary files a/Assets/arts/textures/icon/hero/match_1.png and b/Assets/arts/textures/icon/hero/match_1.png differ diff --git a/Assets/arts/textures/icon/hero/match_2.png b/Assets/arts/textures/icon/hero/match_2.png index 227a8c4c4..b9421d448 100644 Binary files a/Assets/arts/textures/icon/hero/match_2.png and b/Assets/arts/textures/icon/hero/match_2.png differ diff --git a/Assets/arts/textures/icon/hero/match_3.png b/Assets/arts/textures/icon/hero/match_3.png index 1c6335ab7..f1e33ed5b 100644 Binary files a/Assets/arts/textures/icon/hero/match_3.png and b/Assets/arts/textures/icon/hero/match_3.png differ diff --git a/Assets/arts/textures/icon/hero/match_4.png b/Assets/arts/textures/icon/hero/match_4.png index 2bd74243e..9771498b2 100644 Binary files a/Assets/arts/textures/icon/hero/match_4.png and b/Assets/arts/textures/icon/hero/match_4.png differ diff --git a/Assets/arts/textures/icon/hero/match_5.png b/Assets/arts/textures/icon/hero/match_5.png index 33456f944..f542e90d0 100644 Binary files a/Assets/arts/textures/icon/hero/match_5.png and b/Assets/arts/textures/icon/hero/match_5.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_cotton_candy.png b/Assets/arts/textures/ui/battle/battle_obstacle_cotton_candy.png new file mode 100644 index 000000000..c45fc3f87 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_cotton_candy.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_cotton_candy.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_cotton_candy.png.meta new file mode 100644 index 000000000..704feef63 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_cotton_candy.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: f608774512f6f4f6eab5a045009a49d5 +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_obstacle_dark_matter.png b/Assets/arts/textures/ui/battle/battle_obstacle_dark_matter.png new file mode 100644 index 000000000..e4645d651 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_dark_matter.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_dark_matter.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_dark_matter.png.meta new file mode 100644 index 000000000..724511aec --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_dark_matter.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 0897a70bf85fe441a9672deb0bc1d497 +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_obstacle_leaves.png b/Assets/arts/textures/ui/battle/battle_obstacle_leaves.png new file mode 100644 index 000000000..44bf421d4 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_leaves.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_leaves.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_leaves.png.meta new file mode 100644 index 000000000..68cc54c2b --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_leaves.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 28a1f83434f1d4b9b8c4a61115da3253 +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_obstacle_rocket_down.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png index 6b81d308f..370a2aa3d 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png index 3a43fa438..04054bac2 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png index a8e13e611..7d8d36b22 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png index 9c9f31407..8a19ec8e7 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_suishi_3.png b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_3.png new file mode 100644 index 000000000..592db9dcb Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_3.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_suishi_3.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_3.png.meta new file mode 100644 index 000000000..b323bb4a2 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_3.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 55f9e9834903f4969a04f433207589b9 +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/blue_1.png b/Assets/arts/textures/ui/battle/blue_1.png index 58a627efe..a15ddc82c 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/green_1.png b/Assets/arts/textures/ui/battle/green_1.png index d491284cd..b0aefe10b 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/purple_1.png b/Assets/arts/textures/ui/battle/purple_1.png index 2578581f0..191dc9a9d 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/red_1.png b/Assets/arts/textures/ui/battle/red_1.png index 84f7c68f6..99c392d49 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/yellow_1.png b/Assets/arts/textures/ui/battle/yellow_1.png index 38f75c856..08010b6ac 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/lua/app/ui/equip/equip_growth_ui.lua.bytes b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes index 5b654c63a..0c4097102 100644 Binary files a/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes and b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 4125affd4..6cfd7a75e 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/dungeon/dungeon_daily_data.lua.bytes b/Assets/lua/app/userdata/dungeon/dungeon_daily_data.lua.bytes index ffada86c7..a71b43096 100644 Binary files a/Assets/lua/app/userdata/dungeon/dungeon_daily_data.lua.bytes and b/Assets/lua/app/userdata/dungeon/dungeon_daily_data.lua.bytes differ diff --git a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab index 402d808de..1aa28ae97 100644 --- a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab +++ b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 2192716847465719605} - component: {fileID: 6944435152131527379} - component: {fileID: 2795467979576223859} + - component: {fileID: 7087361731608017253} m_Layer: 5 m_Name: scrollrect m_TagString: Untagged @@ -121,6 +122,19 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] +--- !u!114 &7087361731608017253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312913116940887206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1662dc6b7956ec4895a2a65df4ab7d6, type: 3} + m_Name: + m_EditorClassIdentifier: + parentScrollRect: {fileID: 2945963514477939877} --- !u!1 &331534103305965961 GameObject: m_ObjectHideFlags: 0 @@ -3211,6 +3225,7 @@ GameObject: - component: {fileID: 7553100021039602623} - component: {fileID: 4348031007740495042} - component: {fileID: 5830129834021184496} + - component: {fileID: 860323091502750596} m_Layer: 5 m_Name: scrollrect m_TagString: Untagged @@ -3319,6 +3334,19 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] +--- !u!114 &860323091502750596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3845167984817215922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1662dc6b7956ec4895a2a65df4ab7d6, type: 3} + m_Name: + m_EditorClassIdentifier: + parentScrollRect: {fileID: 60797955284639076} --- !u!1 &3867684951241395836 GameObject: m_ObjectHideFlags: 0