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/spines/characters/m30007.meta b/Assets/arts/spines/characters/m30007.meta new file mode 100644 index 000000000..a335a9fdd --- /dev/null +++ b/Assets/arts/spines/characters/m30007.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba51a4225641e4745bb75055182183f9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m30007/m30007.atlas.txt b/Assets/arts/spines/characters/m30007/m30007.atlas.txt new file mode 100644 index 000000000..6ccc9b0e6 --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007.atlas.txt @@ -0,0 +1,118 @@ +m30007.png +size:512,512 +filter:Linear,Linear +chi_l +bounds:2,337,154,173 +chi_r +bounds:2,162,154,173 +ear_l +bounds:450,423,57,32 +offsets:1,1,59,34 +ear_r +bounds:211,169,57,32 +offsets:1,1,59,34 +rotate:90 +eye_l +bounds:452,379,27,20 +offsets:1,1,29,22 +eye_r +bounds:481,377,25,19 +offsets:1,1,27,21 +hand_l_1 +bounds:205,13,30,42 +offsets:1,1,32,44 +hand_l_2 +bounds:2,2,77,78 +offsets:1,1,79,80 +hand_l_3 +bounds:450,457,53,55 +offsets:1,1,55,57 +rotate:90 +hand_l_4 +bounds:423,416,25,20 +offsets:1,1,27,22 +hand_r_1 +bounds:248,62,30,41 +offsets:1,1,32,43 +hand_r_2 +bounds:81,2,73,78 +offsets:1,1,75,80 +hand_r_3 +bounds:245,186,48,50 +offsets:1,1,50,52 +hand_r_4 +bounds:423,379,27,35 +offsets:1,1,29,37 +hand_r_5 +bounds:488,398,23,22 +offsets:1,1,25,24 +rotate:90 +head +bounds:158,309,91,75 +offsets:1,1,93,77 +huzi +bounds:2,82,150,78 +jian_l +bounds:368,457,80,53 +offsets:1,1,82,55 +jian_r +bounds:158,152,74,51 +offsets:1,1,76,53 +rotate:90 +jiao_l +bounds:158,228,61,79 +offsets:1,1,63,81 +jiao_r +bounds:277,389,58,79 +offsets:1,1,60,81 +rotate:90 +leg_l_1 +bounds:154,83,47,67 +leg_l_2 +bounds:245,148,46,36 +leg_l_3 +bounds:241,105,45,41 +leg_l_4 +bounds:211,154,26,13 +offsets:1,1,28,15 +leg_r_1 +bounds:156,14,47,67 +leg_r_2 +bounds:203,104,46,36 +rotate:90 +leg_r_3 +bounds:205,57,45,41 +rotate:90 +leg_r_4 +bounds:237,29,26,13 +offsets:1,1,28,15 +rotate:90 +spine +bounds:277,449,89,61 +wuqi1 +bounds:158,386,117,124 +offsets:1,1,119,126 +wuqi2 +bounds:368,438,80,17 +offsets:1,1,82,19 +xiabai +bounds:221,238,43,69 +ya_l +bounds:252,37,19,23 +offsets:1,1,21,25 +ya_r +bounds:280,80,19,23 +offsets:1,1,21,25 +yao_1 +bounds:156,2,22,9 +offsets:1,1,24,11 +yao_2 +bounds:452,401,34,20 +offsets:1,1,36,23 +yao_3 +bounds:358,391,63,45 +offsets:1,1,65,47 +yao_4 +bounds:251,310,74,21 +offsets:1,1,76,23 +rotate:90 diff --git a/Assets/arts/spines/characters/m30007/m30007.atlas.txt.meta b/Assets/arts/spines/characters/m30007/m30007.atlas.txt.meta new file mode 100644 index 000000000..c81529b60 --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 974f5ad99e485f54c9f6b23db4080d66 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m30007/m30007.png b/Assets/arts/spines/characters/m30007/m30007.png new file mode 100644 index 000000000..0a6a25836 Binary files /dev/null and b/Assets/arts/spines/characters/m30007/m30007.png differ diff --git a/Assets/arts/spines/characters/m30007/m30007.png.meta b/Assets/arts/spines/characters/m30007/m30007.png.meta new file mode 100644 index 000000000..c6277667e --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 4a059d69653c7bc4daabcfeb12b34e93 +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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m30007/m30007.skel.bytes b/Assets/arts/spines/characters/m30007/m30007.skel.bytes new file mode 100644 index 000000000..adeb33464 Binary files /dev/null and b/Assets/arts/spines/characters/m30007/m30007.skel.bytes differ diff --git a/Assets/arts/spines/characters/m30007/m30007.skel.bytes.meta b/Assets/arts/spines/characters/m30007/m30007.skel.bytes.meta new file mode 100644 index 000000000..80c1872fd --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9d7bb68a002ed7842942a637e9e08e67 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m30007/m30007_atlas.asset b/Assets/arts/spines/characters/m30007/m30007_atlas.asset new file mode 100644 index 000000000..ba8565558 --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007_atlas.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: m30007_atlas + m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} + atlasFile: {fileID: 4900000, guid: 974f5ad99e485f54c9f6b23db4080d66, type: 3} + materials: + - {fileID: 2100000, guid: 71144cb6d2ddd274c8460f760b27a653, type: 2} diff --git a/Assets/arts/spines/characters/m30007/m30007_atlas.asset.meta b/Assets/arts/spines/characters/m30007/m30007_atlas.asset.meta new file mode 100644 index 000000000..e50150007 --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f44511145f14a1745a1339de2f29b301 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m30007/m30007_material.mat b/Assets/arts/spines/characters/m30007/m30007_material.mat new file mode 100644 index 000000000..88f4f33e7 --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007_material.mat @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: m30007_material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4a059d69653c7bc4daabcfeb12b34e93, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/arts/spines/characters/m30007/m30007_material.mat.meta b/Assets/arts/spines/characters/m30007/m30007_material.mat.meta new file mode 100644 index 000000000..431e20254 --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71144cb6d2ddd274c8460f760b27a653 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/characters/m30007/m30007_skeletondata.asset b/Assets/arts/spines/characters/m30007/m30007_skeletondata.asset new file mode 100644 index 000000000..79f2e204c --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007_skeletondata.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: m30007_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: f44511145f14a1745a1339de2f29b301, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 9d7bb68a002ed7842942a637e9e08e67, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} diff --git a/Assets/arts/spines/characters/m30007/m30007_skeletondata.asset.meta b/Assets/arts/spines/characters/m30007/m30007_skeletondata.asset.meta new file mode 100644 index 000000000..a68f6de3a --- /dev/null +++ b/Assets/arts/spines/characters/m30007/m30007_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb4e92b4f5b244e4d85c5bca915a273b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: 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/spine/ui/characters/m30007.prefab b/Assets/prefabs/spine/ui/characters/m30007.prefab new file mode 100644 index 000000000..e749d8c95 --- /dev/null +++ b/Assets/prefabs/spine/ui/characters/m30007.prefab @@ -0,0 +1,204 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1991971382385470840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2951863086470196126} + - component: {fileID: 175887966974664630} + m_Layer: 5 + m_Name: m30007 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2951863086470196126 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991971382385470840} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2663275627370592771} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &175887966974664630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991971382385470840} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 490f47ff5874f0347bc783903bad2e72, type: 3} + m_Name: + m_EditorClassIdentifier: + SpineObject: {fileID: 8900387906475466617} + ObjectList: + - hashName: 3029410 + gameObject: {fileID: 4116628536935411962} + - hashName: 3506402 + gameObject: {fileID: 8900387906475466617} +--- !u!1 &4116628536935411962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2663275627370592771} + m_Layer: 5 + m_Name: body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2663275627370592771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4116628536935411962} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 110436067314948100} + m_Father: {fileID: 2951863086470196126} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8900387906475466617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 110436067314948100} + - component: {fileID: 9067112022599556684} + - component: {fileID: 1061563659970274733} + m_Layer: 5 + m_Name: root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &110436067314948100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8900387906475466617} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2663275627370592771} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9067112022599556684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8900387906475466617} + m_CullTransparentMesh: 1 +--- !u!114 &1061563659970274733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8900387906475466617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f74478ee343fcee41a91bc8e1dd67ff3, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + skeletonDataAsset: {fileID: 11400000, guid: fb4e92b4f5b244e4d85c5bca915a273b, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: + startingLoop: 0 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 0, y: 0} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 0, y: 0} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 diff --git a/Assets/prefabs/spine/ui/characters/m30007.prefab.meta b/Assets/prefabs/spine/ui/characters/m30007.prefab.meta new file mode 100644 index 000000000..6e0bc412e --- /dev/null +++ b/Assets/prefabs/spine/ui/characters/m30007.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 78e4fa33bb1711d4b82bf01da13e61c5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: prefabs/spine/ui/characters/m20001.prefab.ab + assetBundleVariant: diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 3002609ff..5ba26ae4c 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -3315,7 +3315,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -277, y: -190} + m_AnchoredPosition: {x: -277, y: -270} m_SizeDelta: {x: 165, y: 40} m_Pivot: {x: 0.5, y: 1} --- !u!225 &1311093511924940087 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 diff --git a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab index 439b509f5..6f7307227 100644 --- a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab @@ -5140,8 +5140,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7458981667612557451} - - {fileID: 3865392397974974736} + - {fileID: 1155135890432173738} + - {fileID: 4513643720513128263} m_Father: {fileID: 3037170935353435478} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9705,8 +9705,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6761212569308310449} - - {fileID: 4574809665930221330} + - {fileID: 7999363034845750897} + - {fileID: 5056924724370525227} m_Father: {fileID: 3037170935353435478} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10069,19 +10069,19 @@ MonoBehaviour: - name: fund_chapter_cell.rewards_free.reward_cell_1 hashName: 288943421 objectType: 1 - gameObject: {fileID: 2542375481157848687} + gameObject: {fileID: 1269874674952274863} - name: fund_chapter_cell.rewards_free.reward_cell_2 hashName: 288943422 objectType: 1 - gameObject: {fileID: 4746810649313538764} + gameObject: {fileID: 4085112564045474293} - name: fund_chapter_cell.rewards_pro.reward_cell_1 hashName: 1081700648 objectType: 1 - gameObject: {fileID: 1810256059326408021} + gameObject: {fileID: 7970016730109379444} - name: fund_chapter_cell.rewards_pro.reward_cell_2 hashName: 1081700649 objectType: 1 - gameObject: {fileID: 5420174382379013326} + gameObject: {fileID: 4629521237332140697} --- !u!114 &5332604933870136442 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10328,7 +10328,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 ---- !u!1001 &1585912524395069764 +--- !u!1001 &2091154441103865619 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -10365,23 +10365,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10401,15 +10401,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x @@ -10439,142 +10439,23 @@ PrefabInstance: propertyPath: m_Name value: reward_cell_2 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &3865392397974974736 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1585912524395069764} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5420174382379013326 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1585912524395069764} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2079000330970408774 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6945131483216796693} - m_Modifications: - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.x - value: 0.70000005 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.y - value: 0.70000005 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.z - value: 0.70000005 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Name - value: reward_cell_2 + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &4574809665930221330 stripped +--- !u!224 &4513643720513128263 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 2079000330970408774} + m_PrefabInstance: {fileID: 2091154441103865619} m_PrefabAsset: {fileID: 0} ---- !u!1 &4746810649313538764 stripped +--- !u!1 &4629521237332140697 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 2079000330970408774} + m_PrefabInstance: {fileID: 2091154441103865619} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4910413022047039711 +--- !u!1001 &3720315338221541118 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -10611,23 +10492,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10647,15 +10528,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x @@ -10687,17 +10568,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &1810256059326408021 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 4910413022047039711} - m_PrefabAsset: {fileID: 0} ---- !u!224 &7458981667612557451 stripped +--- !u!224 &1155135890432173738 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 4910413022047039711} + m_PrefabInstance: {fileID: 3720315338221541118} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9111430673459403749 +--- !u!1 &7970016730109379444 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 3720315338221541118} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5522988339910497829 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -10734,23 +10615,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.70000005 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10770,15 +10651,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x @@ -10810,13 +10691,140 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &2542375481157848687 stripped +--- !u!1 &1269874674952274863 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 9111430673459403749} + m_PrefabInstance: {fileID: 5522988339910497829} m_PrefabAsset: {fileID: 0} ---- !u!224 &6761212569308310449 stripped +--- !u!224 &7999363034845750897 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 9111430673459403749} + m_PrefabInstance: {fileID: 5522988339910497829} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7316982496713555071 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6945131483216796693} + m_Modifications: + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Name + value: reward_cell_2 + objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} +--- !u!1 &4085112564045474293 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7316982496713555071} + m_PrefabAsset: {fileID: 0} +--- !u!224 &5056924724370525227 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7316982496713555071} m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/fund/fund_level_comp.prefab b/Assets/prefabs/ui/fund/fund_level_comp.prefab index a81088019..36291c480 100644 --- a/Assets/prefabs/ui/fund/fund_level_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_level_comp.prefab @@ -707,9 +707,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 57} - m_SizeDelta: {x: 632, y: 114} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 632, y: 78} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &284067057054194576 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2120,19 +2120,19 @@ MonoBehaviour: - name: fund_level_cell.rewards_free.reward_cell_1 hashName: 3885292020 objectType: 1 - gameObject: {fileID: 6042283581198876072} + gameObject: {fileID: 4245221029211571490} - name: fund_level_cell.rewards_free.reward_cell_2 hashName: 3885292021 objectType: 1 - gameObject: {fileID: 7924319307089301883} + gameObject: {fileID: 3165872438596146650} - name: fund_level_cell.rewards_pro.reward_cell_1 hashName: 1059164561 objectType: 1 - gameObject: {fileID: 7058761513499332496} + gameObject: {fileID: 370443277924901615} - name: fund_level_cell.rewards_pro.reward_cell_2 hashName: 1059164562 objectType: 1 - gameObject: {fileID: 1319290448033846622} + gameObject: {fileID: 6232577758293530809} --- !u!114 &988961668831685128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4022,8 +4022,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3262421297432107126} - - {fileID: 1397281818273084581} + - {fileID: 4933407576671396092} + - {fileID: 6157408259527258116} m_Father: {fileID: 4011729442120982381} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4609,15 +4609,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2263393301632068174} - - {fileID: 7841890282668503168} + - {fileID: 8915128586322675505} + - {fileID: 2946025368462736743} m_Father: {fileID: 4011729442120982381} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 175, y: 0} - m_SizeDelta: {x: 250, y: 160} + m_SizeDelta: {x: 300, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2575149219081155591 CanvasRenderer: @@ -4645,7 +4645,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: -20 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -6100,7 +6100,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 640, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &3887666762688948920 MonoBehaviour: @@ -6135,7 +6135,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4104279771185553313} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: @@ -10502,419 +10502,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 ---- !u!1001 &1072023891418703906 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5130496216488263179} - m_Modifications: - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.x - value: 0.67 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.y - value: 0.67 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Name - value: reward_cell_1 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &3262421297432107126 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1072023891418703906} - m_PrefabAsset: {fileID: 0} ---- !u!1 &6042283581198876072 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1072023891418703906} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &3513597739439293681 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5130496216488263179} - m_Modifications: - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.x - value: 0.67 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalScale.y - value: 0.67 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Name - value: reward_cell_2 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &1397281818273084581 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 3513597739439293681} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7924319307089301883 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 3513597739439293681} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4381961589765790234 +--- !u!1001 &811924023161179443 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 6238568639698217690} m_Modifications: - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10925,7 +10519,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -10945,19 +10539,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.67 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.67 + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -10977,15 +10575,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x @@ -11007,109 +10605,37 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name - value: reward_cell_1 + value: reward_cell_2 objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &2263393301632068174 stripped +--- !u!224 &2946025368462736743 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 4381961589765790234} + m_PrefabInstance: {fileID: 811924023161179443} m_PrefabAsset: {fileID: 0} ---- !u!1 &7058761513499332496 stripped +--- !u!1 &6232577758293530809 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 4381961589765790234} + m_PrefabInstance: {fileID: 811924023161179443} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5725508098499100884 +--- !u!1001 &6349526651475588965 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 6238568639698217690} m_Modifications: - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 570046479878439712, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11120,7 +10646,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -11140,19 +10666,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.67 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.67 + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -11172,15 +10702,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x @@ -11202,83 +10732,273 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Name + value: reward_cell_1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} +--- !u!1 &370443277924901615 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6349526651475588965} + m_PrefabAsset: {fileID: 0} +--- !u!224 &8915128586322675505 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6349526651475588965} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7480504146619682984 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5130496216488263179} + m_Modifications: + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Name + value: reward_cell_1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} +--- !u!1 &4245221029211571490 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7480504146619682984} + m_PrefabAsset: {fileID: 0} +--- !u!224 &4933407576671396092 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 7480504146619682984} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8562865570910814288 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5130496216488263179} + m_Modifications: + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_SizeDelta.y + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.x + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.y + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.7 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x + value: 230 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_AnchoredPosition.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6632568566856853591, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name value: reward_cell_2 objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7862674963473649153, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_AnchoredPosition.y + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &1319290448033846622 stripped +--- !u!1 &3165872438596146650 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 5725508098499100884} + m_PrefabInstance: {fileID: 8562865570910814288} m_PrefabAsset: {fileID: 0} ---- !u!224 &7841890282668503168 stripped +--- !u!224 &6157408259527258116 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 5725508098499100884} + m_PrefabInstance: {fileID: 8562865570910814288} m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/fund/fund_main_ui.prefab b/Assets/prefabs/ui/fund/fund_main_ui.prefab index 589101564..e551e7941 100644 --- a/Assets/prefabs/ui/fund/fund_main_ui.prefab +++ b/Assets/prefabs/ui/fund/fund_main_ui.prefab @@ -2405,6 +2405,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2946025368462736743, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946025368462736743, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946025368462736743, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2946025368462736743, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2976238262423867070, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2505,6 +2521,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4933407576671396092, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4933407576671396092, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4933407576671396092, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4933407576671396092, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5879211834933436930, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2685,6 +2717,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8915128586322675505, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8915128586322675505, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8915128586322675505, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8915128586322675505, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8955260051436255108, guid: 74f19f05a30006e4a9b43744015f3ec6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3457,6 +3505,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1155135890432173738, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1155135890432173738, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1155135890432173738, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1155135890432173738, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1241567472151659549, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3605,6 +3669,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4513643720513128263, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4513643720513128263, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4513643720513128263, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4513643720513128263, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4574809665930221330, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3637,6 +3717,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5056924724370525227, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056924724370525227, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056924724370525227, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5056924724370525227, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5834061528663602357, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3777,6 +3873,22 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7999363034845750897, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7999363034845750897, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7999363034845750897, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7999363034845750897, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8293837076606017094, guid: b33de8a23fbacfb45b8a71d4dfaabf7b, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index 6068daf6b..4dd1a6bdb 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -2742,7 +2742,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 80, y: 15} - m_SizeDelta: {x: 36, y: 38} + m_SizeDelta: {x: 38, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2040083802234517251 CanvasRenderer: @@ -2772,7 +2772,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 19cb89eba1b174df4b091ee3984e7f9b, type: 3} + m_Sprite: {fileID: 21300000, guid: b7ef85b6c0ed64dc5b499de328e705ed, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab index f8d125fbf..05ee93b8c 100644 --- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab +++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab @@ -322,7 +322,7 @@ RectTransform: - {fileID: 7478773028872524474} - {fileID: 1451918511630981069} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -491,7 +491,7 @@ RectTransform: - {fileID: 6334354001788662849} - {fileID: 5392157314889844364} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -791,7 +791,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -871,7 +871,7 @@ RectTransform: - {fileID: 2552928582792349357} - {fileID: 153955675827897022} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -960,13 +960,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 668576161485588059} + - {fileID: 840259504270920964} + - {fileID: 5697118763878981349} - {fileID: 3251564394244787417} - {fileID: 2198481086097669730} - {fileID: 1987694164396694498} - {fileID: 2001377662689540356} - - {fileID: 668576161485588059} - - {fileID: 840259504270920964} - - {fileID: 5697118763878981349} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1344,7 +1344,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1630,7 +1630,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 5 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1862,7 +1862,7 @@ RectTransform: - {fileID: 3721673134913646307} - {fileID: 3453695780814355293} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1}