diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 5b9c8034c..8b4d12496 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -102,21 +102,28 @@ MonoBehaviour: - {fileID: 21300000, guid: 02e087bccc0cfff4a8e3c03bf0cf9e8b, type: 3} - {fileID: 21300000, guid: 284895d25c15c544b993df1b584ed401, type: 3} - {fileID: 21300000, guid: c7f11a478e4765040a4bc6fb66de18e2, type: 3} + - {fileID: 21300000, guid: d54116290d9ee4440b024cdd4c16250f, type: 3} - {fileID: 21300000, guid: e805e19a17e81f841b8aaa738fa4af7f, type: 3} - {fileID: 21300000, guid: 2bd64d14416f47c4b8320532d03d7b90, type: 3} - {fileID: 21300000, guid: 6220406f89e60aa4e9f08a64fc5db514, type: 3} - {fileID: 21300000, guid: 1e5d2e40c3af5f243b1f8938cb92aa94, type: 3} - {fileID: 21300000, guid: 15034d8ea90095b4bab593f8633691a7, type: 3} + - {fileID: 21300000, guid: d0dcbe94cbb9e427189b7a95ab335bd1, type: 3} + - {fileID: 21300000, guid: 895859d9c9ed84e929716375b974ad9c, type: 3} - {fileID: 21300000, guid: 1d49491301b6b1b4789297bf68c168a1, type: 3} - {fileID: 21300000, guid: 97c119ef1a85d724ca7484b84c09c361, type: 3} - {fileID: 21300000, guid: 1e7a91b5f6e7117449342d38697c7c51, type: 3} - {fileID: 21300000, guid: 38d794e09434def4283b00159a693c99, type: 3} - {fileID: 21300000, guid: d0aee8d1fbdc1c24ba90e2855e76d866, type: 3} + - {fileID: 21300000, guid: 1c12cc4f1bebf415dbb52ddb8da5cb72, type: 3} + - {fileID: 21300000, guid: 2cc299b1be3764cca97090072e743bb0, type: 3} - {fileID: 21300000, guid: 244d7eed152c55143a86488b35612615, type: 3} - {fileID: 21300000, guid: f265c9b9524202f48ba9f4f09d98f7d6, type: 3} - {fileID: 21300000, guid: 4d7aa7117473e5e43947026df437c4ab, type: 3} - {fileID: 21300000, guid: 6d1137255fa6fd3458f7b438cbeeb576, type: 3} - {fileID: 21300000, guid: d721a218fed03994f9f4fcb6047c1e38, type: 3} + - {fileID: 21300000, guid: e2a256d7c0cb9422e874f394ae6148de, type: 3} + - {fileID: 21300000, guid: 2c968bb68f2b04f90a99d41d392f9297, type: 3} - {fileID: 21300000, guid: adb1bb1275f590d458ba285b7d35c55c, type: 3} - {fileID: 21300000, guid: 9680984b8afcb9c4db63945b1b18d489, type: 3} - {fileID: 21300000, guid: cf73870457f688f4ca0a68c8941d6ee3, type: 3} @@ -126,6 +133,7 @@ MonoBehaviour: - {fileID: 21300000, guid: eb993031b1a39cf44aeff35169dcd3a1, type: 3} - {fileID: 21300000, guid: 0d77993f1d67edd4ab4209eb2ad595a8, type: 3} - {fileID: 21300000, guid: c5b2f243e6af18240b8f02297d60a98e, type: 3} + - {fileID: 21300000, guid: 58ed55e2265274458a11984028ac727e, type: 3} - {fileID: 21300000, guid: 8bc7b70c783d5f140b4ddcfbb35f365e, type: 3} - {fileID: 21300000, guid: e3b0a44647820e145a2a3d4bd235fed9, type: 3} - {fileID: 21300000, guid: 0c10d727a2c54294cb9083889f6ae5a7, type: 3} @@ -139,6 +147,9 @@ MonoBehaviour: - {fileID: 21300000, guid: 5f8fc78dee9091c49b9e25119348de4e, type: 3} - {fileID: 21300000, guid: 6dfca10eb924ea54683c3961dad94d26, type: 3} - {fileID: 21300000, guid: 02ebf2f9ddc012242b20491c8c0425b7, type: 3} + - {fileID: 21300000, guid: 324ff77b79928467c915d80aeb924eb3, type: 3} + - {fileID: 21300000, guid: 97dd2e2a9d42c490a92fecd0c2df41d8, type: 3} + - {fileID: 21300000, guid: 9486a572fd5ab46eab3c2943a7e58ad1, type: 3} - {fileID: 21300000, guid: fa8f5962b2032c84a9836b6c7af7e0ee, type: 3} - {fileID: 21300000, guid: 4ee394b230d6d9c449c2a528c8a57c62, type: 3} - {fileID: 21300000, guid: b1797d14a61badd4cbe95f19e3e5def1, type: 3} @@ -188,4 +199,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 49a2b2e673ef7596be18769666b70a59de354ed3128678961386789614867896158678961686789617867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed3e5354ed3e6354ed37d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e696fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab9afa36db9bfa36db9cfa36db0196263e029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f90c7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c978c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 + spriteNameList: 49a2b2e673ef7596be18769666b70a59de354ed3128678961386789614867896158678961686789617867896df354ed3e0354ed3e1354ed3e2354ed3e3354ed3e4354ed3e5354ed3e6354ed37d8d7896919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a667213652f396c3f22b5421523b5421537aa723a477b8a9601d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e6913dcc4b814dcc4b815dcc4b816dcc4b817dcc4b818dcc4b819dcc4b81adcc4b81bdcc4b81cdcc4b8be9b0e6932dcc4b833dcc4b834dcc4b835dcc4b836dcc4b837dcc4b838dcc4b839dcc4b83adcc4b83bdcc4b8bf9b0e6951dcc4b852dcc4b853dcc4b854dcc4b855dcc4b856dcc4b8c09b0e69c19b0e69c29b0e69c39b0e69c49b0e69c59b0e696fe5222e54a9179b0d7ccc490e7ccc490f7ccc49107ccc49132253d3c33f686cc43f686cc53f686c3bd7e2dfa4afbba06a2996ce6b2996ce6c2996ce6d2996ce3c74a00aa27677cff90ee7ab9afa36db9bfa36db9cfa36db0196263e0b488cc50c488cc5029d3752a3c0a1b6a4c0a1b6a5c0a1b6958cd3a2006bb0e7016bb0e7415abdf4495bbdf4c767bdf4948dbdf4e0b6b5f6a45a15e809d618e85a4c581b1ddd9f9082d7adbdc7a6c0f42f42c0b73042c0b73142c0b739fba4313afba4313bfba431ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b3523268edc03869edc03827d43a4dcd4fd4681304c2f41bed664187156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5dd48893cde48893c8b020eac8c020eac499b18984a9b18984b9b18984c9b18984d9b1898e1d0a115ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b85923ebb25356ecb2535683b74c9784b74c978c8d63ad4593dbad107222fd627da494f525e910605eed446e14a26803e475062623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index d6b97a935..636bbcacb 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -81,6 +81,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 240351618896ab24ab3bac798b03d638, type: 3} - {fileID: 21300000, guid: c7fe3771679f6c54b985272020d00348, type: 3} - {fileID: 21300000, guid: 838c1c8120a67b34ab27b4317842f255, type: 3} + - {fileID: 21300000, guid: 2cc299b1be3764cca97090072e743bb0, type: 3} - {fileID: 21300000, guid: d0aee8d1fbdc1c24ba90e2855e76d866, type: 3} - {fileID: 21300000, guid: 09dc5de1bb43f8e4fb620fdf5c1fdd9e, type: 3} - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3} @@ -88,6 +89,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 35d30742d8a5d0641a6e7b0b18f323a1, type: 3} - {fileID: 21300000, guid: fa8f5962b2032c84a9836b6c7af7e0ee, type: 3} - {fileID: 21300000, guid: ceaf3f622f799d149ba0165b47ea183a, type: 3} + - {fileID: 21300000, guid: 9486a572fd5ab46eab3c2943a7e58ad1, type: 3} - {fileID: 21300000, guid: 7f241a720e1b2ee49be4535872909743, type: 3} - {fileID: 21300000, guid: ff3920a27572b4e3d9b010273d99b859, type: 3} - {fileID: 21300000, guid: 8a3687a2ce1b5fd44baaea4d5688ae34, type: 3} @@ -95,6 +97,7 @@ SpriteAtlas: - {fileID: 21300000, guid: b73a73c24767841c095cdb8123772631, type: 3} - {fileID: 21300000, guid: d6bd24c2136f3b4449ffb18c334386f7, type: 3} - {fileID: 21300000, guid: 284895d25c15c544b993df1b584ed401, type: 3} + - {fileID: 21300000, guid: 58ed55e2265274458a11984028ac727e, type: 3} - {fileID: 21300000, guid: ce312be249c677b43baef5d81513702c, type: 3} - {fileID: 21300000, guid: 4b03650302be3fc4c9cf537918ce187e, type: 3} - {fileID: 21300000, guid: b92c2b030aa964949ae2b70123fe9fec, type: 3} @@ -109,6 +112,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 2bd64d14416f47c4b8320532d03d7b90, type: 3} - {fileID: 21300000, guid: b1797d14a61badd4cbe95f19e3e5def1, type: 3} - {fileID: 21300000, guid: b2988864691ea9848b777a8d2fe5d32b, type: 3} + - {fileID: 21300000, guid: d0dcbe94cbb9e427189b7a95ab335bd1, type: 3} - {fileID: 21300000, guid: ea9f61c48549694489d855a4a5f0bf77, type: 3} - {fileID: 21300000, guid: 93b00ed4f23e9bc4f8af52978ea09415, type: 3} - {fileID: 21300000, guid: 1fa9f5e45de18674f978e6b5faf85d3e, type: 3} @@ -129,6 +133,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0157b6564b880ad4c9ddcd8638e081bc, type: 3} - {fileID: 21300000, guid: 2ac6685652497304e92e5d80a0e2b523, type: 3} - {fileID: 21300000, guid: 5db2f476c5027f84b90b131c0ade5588, type: 3} + - {fileID: 21300000, guid: 2c968bb68f2b04f90a99d41d392f9297, type: 3} - {fileID: 21300000, guid: e78671f68c4b4d14290a6a01b66c6f3e, type: 3} - {fileID: 21300000, guid: d4ea9e079516d445b9625e95f785bc68, type: 3} - {fileID: 21300000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3} @@ -143,6 +148,7 @@ SpriteAtlas: - {fileID: 21300000, guid: dce59e87488903e4b8f377a7eeda2748, type: 3} - {fileID: 21300000, guid: 3420c1c78b5e240279b8ac4d097bccb5, type: 3} - {fileID: 21300000, guid: 9bc0dcc7b71c9c641ae3260d1192b2fd, type: 3} + - {fileID: 21300000, guid: e2a256d7c0cb9422e874f394ae6148de, type: 3} - {fileID: 21300000, guid: 171686d7ccc6d384a9d726efca39d78c, type: 3} - {fileID: 21300000, guid: 8dac4cd77ddbe4544b8a44602bb5c9be, type: 3} - {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3} @@ -155,6 +161,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 35091cc8f6c161543a1a0e29b05e2cf9, type: 3} - {fileID: 21300000, guid: 060ef8d8facbf4749a96f1caa7ef588f, type: 3} - {fileID: 21300000, guid: 331e6bd86c6815246bbdc3582757afde, type: 3} + - {fileID: 21300000, guid: d54116290d9ee4440b024cdd4c16250f, type: 3} - {fileID: 21300000, guid: 0c32ce29e270900449c45ff285f9849a, type: 3} - {fileID: 21300000, guid: 9e2f5539c62b8b94888536409894e82d, type: 3} - {fileID: 21300000, guid: f37b1779751e6de42b14f4d4c8f52609, type: 3} @@ -162,10 +169,12 @@ SpriteAtlas: - {fileID: 21300000, guid: a58c93b9583221947848dd5c55b42fd1, type: 3} - {fileID: 21300000, guid: f265c9b9524202f48ba9f4f09d98f7d6, type: 3} - {fileID: 21300000, guid: a4c621d9c5549134f9274c9f82ef2a01, type: 3} + - {fileID: 21300000, guid: 895859d9c9ed84e929716375b974ad9c, type: 3} - {fileID: 21300000, guid: 147399e99cac0ed4cb2188b7d635308f, type: 3} - {fileID: 21300000, guid: 6bdc2ee95e9dd65469015303a905880a, type: 3} - {fileID: 21300000, guid: 02ebf2f9ddc012242b20491c8c0425b7, type: 3} - {fileID: 21300000, guid: 2deaa61a5f1d4fd44b611e3d5819ce7a, type: 3} + - {fileID: 21300000, guid: 97dd2e2a9d42c490a92fecd0c2df41d8, type: 3} - {fileID: 21300000, guid: 7a76809ad26a15d499504521193c5f95, type: 3} - {fileID: 21300000, guid: e805e19a17e81f841b8aaa738fa4af7f, type: 3} - {fileID: 21300000, guid: a9fd7e9a8eb4d1c488fd097ca4956501, type: 3} @@ -180,6 +189,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 9680984b8afcb9c4db63945b1b18d489, type: 3} - {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3} - {fileID: 21300000, guid: ce74095b62dfe7d4dbeba9d77489a676, type: 3} + - {fileID: 21300000, guid: 324ff77b79928467c915d80aeb924eb3, type: 3} - {fileID: 21300000, guid: efb39dcb110bb304094dd6d1052d58eb, type: 3} - {fileID: 21300000, guid: b87dcadba2e6bb442a2874411677d1ae, type: 3} - {fileID: 21300000, guid: c69317eb5bc474947ac947e268c7d54d, type: 3} @@ -226,6 +236,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0d77993f1d67edd4ab4209eb2ad595a8, type: 3} - {fileID: 21300000, guid: 4ec6af3f661674ceab9968678a34c61c, type: 3} - {fileID: 21300000, guid: 608df94fc480746cd8504c97a9431730, type: 3} + - {fileID: 21300000, guid: 1c12cc4f1bebf415dbb52ddb8da5cb72, type: 3} - {fileID: 21300000, guid: 6220406f89e60aa4e9f08a64fc5db514, type: 3} - {fileID: 21300000, guid: a1c0506fd7243474bbb74aac6d127d35, type: 3} - {fileID: 21300000, guid: 0bec767f9e1c74ebb96272639b9262bf, type: 3} @@ -257,6 +268,7 @@ SpriteAtlas: - battle_line_3 - battle_hinder_21 - battle_hinder_24 + - battle_obstacle_huoshanshi_2 - battle_obstacle_firesnake - battle_hinder_2 - battle_skill_line_8 @@ -264,6 +276,7 @@ SpriteAtlas: - battle_skill_bg_blue_2 - battle_obstacle_tussock - battle_obstacle_stick_2 + - battle_obstacle_tengman - battle_hinder_10 - battle_bg_12 - battle_skill_colorful @@ -271,6 +284,7 @@ SpriteAtlas: - battle_bar_1_bg - battle_hinder_15 - battle_obstacle_altar_2 + - battle_obstacle_shenxiang - battle_daily_buff_1 - battle_obstacle_stone_2 - battle_hinder_20 @@ -285,6 +299,7 @@ SpriteAtlas: - battle_obstacle_chest_1 - battle_obstacle_waternake - battle_obstacle_stone_1 + - battle_obstacle_chilun_1 - battle_hinder_4 - battle_hinder_gold - battle_obstacle_stalactite_3 @@ -305,6 +320,7 @@ SpriteAtlas: - battle_hinder_23 - battle_skill_bg_purple_2 - battle_obstacle_stick_1 + - battle_obstacle_jizhuangxiang_2 - battle_obstacle_stone_3 - battie_skill_bg_1 - battle_board_1 @@ -319,6 +335,7 @@ SpriteAtlas: - battle_hinder_28 - battle_bg_11 - battle_hinder_25 + - battle_obstacle_jizhuangxiang_1 - battle_line_4 - battle_skill_bg_green_1 - battle_skill_bg_red_1 @@ -331,6 +348,7 @@ SpriteAtlas: - battle_bg_5 - battle_bg_8 - battle_progress_bg_1 + - battle_obstacle_bingkuai - battle_hinder_debris - battle_hinder_16 - battle_board_7 @@ -338,10 +356,12 @@ SpriteAtlas: - battle_hinder_32 - battle_obstacle_iron_1 - battle_btn_task_3 + - battle_obstacle_chushou - battle_hinder_22 - battle_hinder_9 - battle_obstacle_stump_3 - battle_line_1 + - battle_obstacle_suishi_2 - battle_obstacle_lock - battle_obstacle_blister - battle_mask @@ -356,6 +376,7 @@ SpriteAtlas: - battle_obstacle_lava - battle_title_2 - battle_obstacle_rocket_down + - battle_obstacle_suishi_1 - battle_hinder_17 - battle_btn_task - battle_hinder_34 @@ -402,6 +423,7 @@ SpriteAtlas: - battle_obstacle_rocket_right - battle_bg_1 - battle_bg_9 + - battle_obstacle_huoshanshi_1 - battle_obstacle_chest_2 - battle_bar_1 - battle_combo diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png b/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png new file mode 100644 index 000000000..e8fc0f2a8 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png.meta new file mode 100644 index 000000000..c29b1f42b --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_bingkuai.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: d54116290d9ee4440b024cdd4c16250f +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_chest_1.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png index 143217c08..1dccfb690 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png index a78b7ffb6..5ffe97640 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png index 62de75c54..8d86aaa2e 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png index faa8b9ad4..2f529ed6a 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chilun_1.png b/Assets/arts/textures/ui/battle/battle_obstacle_chilun_1.png new file mode 100644 index 000000000..949b7be8a Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_chilun_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chilun_1.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_chilun_1.png.meta new file mode 100644 index 000000000..bf9bb3ec2 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_chilun_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: d0dcbe94cbb9e427189b7a95ab335bd1 +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_chushou.png b/Assets/arts/textures/ui/battle/battle_obstacle_chushou.png new file mode 100644 index 000000000..e8d93e36c Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_chushou.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chushou.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_chushou.png.meta new file mode 100644 index 000000000..99174b672 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_chushou.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 895859d9c9ed84e929716375b974ad9c +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_huoshanshi_1.png b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_1.png new file mode 100644 index 000000000..b96d05146 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_1.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_1.png.meta new file mode 100644 index 000000000..248e4e5c5 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 1c12cc4f1bebf415dbb52ddb8da5cb72 +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_huoshanshi_2.png b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_2.png new file mode 100644 index 000000000..d6553f43f Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_2.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_2.png.meta new file mode 100644 index 000000000..d6c84c33a --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_huoshanshi_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 2cc299b1be3764cca97090072e743bb0 +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_jizhuangxiang_1.png b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_1.png new file mode 100644 index 000000000..fc621a088 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_1.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_1.png.meta new file mode 100644 index 000000000..e7f940323 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e2a256d7c0cb9422e874f394ae6148de +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_jizhuangxiang_2.png b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_2.png new file mode 100644 index 000000000..dd4a5f97b Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_2.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_2.png.meta new file mode 100644 index 000000000..6ff649560 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_jizhuangxiang_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 2c968bb68f2b04f90a99d41d392f9297 +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_lock.png b/Assets/arts/textures/ui/battle/battle_obstacle_lock.png index 4b038ad0b..0f960583b 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_lock.png and b/Assets/arts/textures/ui/battle/battle_obstacle_lock.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_shenxiang.png b/Assets/arts/textures/ui/battle/battle_obstacle_shenxiang.png new file mode 100644 index 000000000..e1826905d Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_shenxiang.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_shenxiang.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_shenxiang.png.meta new file mode 100644 index 000000000..e974ed21f --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_shenxiang.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 58ed55e2265274458a11984028ac727e +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_suishi_1.png b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_1.png new file mode 100644 index 000000000..6454d856c Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_suishi_1.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_1.png.meta new file mode 100644 index 000000000..782a2660a --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 324ff77b79928467c915d80aeb924eb3 +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_suishi_2.png b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_2.png new file mode 100644 index 000000000..9f80645bd Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_suishi_2.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_2.png.meta new file mode 100644 index 000000000..4f52c5c61 --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_suishi_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 97dd2e2a9d42c490a92fecd0c2df41d8 +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_tengman.png b/Assets/arts/textures/ui/battle/battle_obstacle_tengman.png new file mode 100644 index 000000000..d9da53596 Binary files /dev/null and b/Assets/arts/textures/ui/battle/battle_obstacle_tengman.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_tengman.png.meta b/Assets/arts/textures/ui/battle/battle_obstacle_tengman.png.meta new file mode 100644 index 000000000..53288241e --- /dev/null +++ b/Assets/arts/textures/ui/battle/battle_obstacle_tengman.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 9486a572fd5ab46eab3c2943a7e58ad1 +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/lua/app/bf/unity/uiprefab_object.lua.bytes b/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes index 17e3e0745..6818a8fc8 100644 Binary files a/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes and b/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes index 12eed0431..ee63abf90 100644 Binary files a/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_ui.lua.bytes index 0f8b2c521..cc8d20022 100644 Binary files a/Assets/lua/app/ui/arena/arena_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes b/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes index 3ef81faf3..4ffd73f3e 100644 Binary files a/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes b/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes index fd830836e..7a6ad2994 100644 Binary files a/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes b/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes index aef9d56e3..afce5a347 100644 Binary files a/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes and b/Assets/lua/app/ui/common/component/hero_formation_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes index 46480c0d9..963e46838 100644 Binary files a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes and b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index b1199db41..9db7f35ea 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes index 765b26333..52d0499f9 100644 Binary files a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes index 6412c8ae1..3dcd5a9f2 100644 Binary files a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes and b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes index 58512758e..760a99f1e 100644 Binary files a/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index 1e83915bc..1b709628d 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.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 7e2232ca8..1a63510fc 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/ui/player_info/avatar_cell.lua.bytes b/Assets/lua/app/ui/player_info/avatar_cell.lua.bytes index a40c362f1..97ef9971e 100644 Binary files a/Assets/lua/app/ui/player_info/avatar_cell.lua.bytes and b/Assets/lua/app/ui/player_info/avatar_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/player_info/frame_cell.lua.bytes b/Assets/lua/app/ui/player_info/frame_cell.lua.bytes index 239a0dec8..3b4ac8867 100644 Binary files a/Assets/lua/app/ui/player_info/frame_cell.lua.bytes and b/Assets/lua/app/ui/player_info/frame_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/player_info/player_info_ui.lua.bytes b/Assets/lua/app/ui/player_info/player_info_ui.lua.bytes index c33fe730a..b761f4cfd 100644 Binary files a/Assets/lua/app/ui/player_info/player_info_ui.lua.bytes and b/Assets/lua/app/ui/player_info/player_info_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index d2923e9ef..76db24be0 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes index fae8ccebe..e28544db8 100644 Binary files a/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_reward_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index 174514dcc..4f1fdf910 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab index 0abf9bde6..718643123 100644 --- a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab @@ -279,7 +279,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8923372071560847492 RectTransform: m_ObjectHideFlags: 0 @@ -751,7 +751,7 @@ GameObject: m_Component: - component: {fileID: 5926534531993263974} - component: {fileID: 6201661603163188761} - - component: {fileID: 1911239120828530496} + - component: {fileID: 7584527619705020204} m_Layer: 5 m_Name: rewards m_TagString: Untagged @@ -768,8 +768,8 @@ RectTransform: m_GameObject: {fileID: 3010928678893406636} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3164306698895583887} - {fileID: 7650127415693893845} @@ -781,7 +781,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 615.62, y: 144} + m_SizeDelta: {x: 400, y: 75} m_Pivot: {x: 1, y: 0.5} --- !u!222 &6201661603163188761 CanvasRenderer: @@ -791,7 +791,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3010928678893406636} m_CullTransparentMesh: 1 ---- !u!114 &1911239120828530496 +--- !u!114 &7584527619705020204 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -800,23 +800,16 @@ MonoBehaviour: m_GameObject: {fileID: 3010928678893406636} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: 61cd9c9c2795741588033c81cd008e7e, type: 3} m_Name: m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 15 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + left: 0 + right: 0 + top: 0 + bottom: 0 + childAlignment: 2 + spacing: 10 + verticalOrHorizontal: 0 --- !u!1 &3375555378304042737 GameObject: m_ObjectHideFlags: 0 @@ -2422,8 +2415,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2479,7 +2472,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7364845412254584281 RectTransform: m_ObjectHideFlags: 0 @@ -2532,7 +2525,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -2540,23 +2533,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -2588,11 +2585,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 150.62 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2606,6 +2603,10 @@ PrefabInstance: 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: 3119260218071452507, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Material value: @@ -2810,7 +2811,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -2818,23 +2819,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -2866,11 +2871,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 420.62 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2884,6 +2889,10 @@ PrefabInstance: 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: 3119260218071452507, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Material value: @@ -2949,7 +2958,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -2957,23 +2966,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -3005,11 +3018,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 285.62 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3023,6 +3036,10 @@ PrefabInstance: 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: 3119260218071452507, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Material value: @@ -3092,7 +3109,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -3100,23 +3117,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -3148,11 +3169,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 555.62 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3166,6 +3187,10 @@ PrefabInstance: 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: 3119260218071452507, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Material value: diff --git a/Assets/prefabs/ui/common/hero_formation_comp.prefab b/Assets/prefabs/ui/common/hero_formation_comp.prefab index 7daedf71a..8eac7583e 100644 --- a/Assets/prefabs/ui/common/hero_formation_comp.prefab +++ b/Assets/prefabs/ui/common/hero_formation_comp.prefab @@ -42,7 +42,7 @@ RectTransform: 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: 604, y: 194} + m_SizeDelta: {x: 566, y: 166} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3739646478636344155 CanvasRenderer: @@ -164,15 +164,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -204,7 +204,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -234 + value: -214 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -291,15 +291,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -331,7 +331,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -117 + value: -107 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -418,15 +418,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -545,15 +545,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -585,7 +585,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 117 + value: 107 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -672,15 +672,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalPosition.x @@ -712,7 +712,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 234 + value: 214 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/prefabs/ui/common/red_point_cell.prefab b/Assets/prefabs/ui/common/red_point_cell.prefab index 48fc6911f..ff6d50099 100644 --- a/Assets/prefabs/ui/common/red_point_cell.prefab +++ b/Assets/prefabs/ui/common/red_point_cell.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 2561740748560008671} m_RootOrder: 0 @@ -164,6 +165,7 @@ RectTransform: 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: 3031107651413496590} m_Father: {fileID: 0} @@ -172,7 +174,7 @@ RectTransform: 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: 46, y: 46} + m_SizeDelta: {x: 26, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1738945440303635954 CanvasRenderer: diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index f0fe6aab9..def10c57a 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -32,12 +32,12 @@ RectTransform: m_Children: - {fileID: 583921758773862003} - {fileID: 3335062103840720553} - - {fileID: 5164977974539208548} - {fileID: 7171483589642333812} - {fileID: 4089771124753005517} - {fileID: 2557292112129412969} - {fileID: 6425122533841886504} - {fileID: 4296149395571454274} + - {fileID: 5164977974539208548} m_Father: {fileID: 8717611866707408473} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -151,7 +151,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -227,7 +227,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -438,7 +438,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -666,7 +666,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 5 + 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} @@ -742,7 +742,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1559,7 +1559,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5993802040676866955} - m_RootOrder: 2 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index bef3c3dec..48af8f66f 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -30,7 +30,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1603035702617088389} - {fileID: 2154714173714463244} - {fileID: 5920618919447900822} - {fileID: 2542682175726021875} @@ -39,6 +38,7 @@ RectTransform: - {fileID: 6802774033257253966} - {fileID: 5976323603732557137} - {fileID: 5812866602325248981} + - {fileID: 1603035702617088389} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -959,7 +959,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5129409844343259102} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -3947,7 +3947,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5129409844343259102} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4140,6 +4140,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2348674475130942949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4509207081567672783} + - component: {fileID: 5380202317902581485} + - component: {fileID: 845731319647297214} + m_Layer: 5 + m_Name: red_img_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4509207081567672783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348674475130942949} + 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: 6287751932931666943} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 148, y: 0} + m_SizeDelta: {x: 26, y: 27} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5380202317902581485 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348674475130942949} + m_CullTransparentMesh: 1 +--- !u!114 &845731319647297214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2348674475130942949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2433248889916936903 GameObject: m_ObjectHideFlags: 0 @@ -6161,7 +6237,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5129409844343259102} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6800,6 +6876,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4156663065910893430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7014297166435613594} + - component: {fileID: 5258386844272863739} + - component: {fileID: 6278182544214692887} + m_Layer: 5 + m_Name: red_img_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7014297166435613594 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4156663065910893430} + 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: 6287751932931666943} + 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: -20, y: 0} + m_SizeDelta: {x: 26, y: 27} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5258386844272863739 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4156663065910893430} + m_CullTransparentMesh: 1 +--- !u!114 &6278182544214692887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4156663065910893430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4336206737176385080 GameObject: m_ObjectHideFlags: 0 @@ -6832,7 +6984,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5129409844343259102} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -8466,7 +8618,7 @@ RectTransform: m_Children: - {fileID: 1250432403099432212} m_Father: {fileID: 5129409844343259102} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9586,6 +9738,44 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5505528400008111988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6287751932931666943} + m_Layer: 5 + m_Name: red_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6287751932931666943 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5505528400008111988} + 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: 7014297166435613594} + - {fileID: 4509207081567672783} + m_Father: {fileID: 8461932745927490369} + 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: 0, y: -442} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5520592980630032104 GameObject: m_ObjectHideFlags: 0 @@ -9889,7 +10079,7 @@ RectTransform: - {fileID: 5192740225468937621} - {fileID: 8277223252311775671} m_Father: {fileID: 5129409844343259102} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -10312,6 +10502,7 @@ RectTransform: - {fileID: 3121552964615492639} - {fileID: 2584119948269024356} - {fileID: 5442453807868433622} + - {fileID: 6287751932931666943} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10513,6 +10704,14 @@ MonoBehaviour: hashName: 3526089206 objectType: 1 gameObject: {fileID: 7009585597240693844} + - name: hero_detail_ui.red_node.red_img_1 + hashName: 4110561370 + objectType: 0 + gameObject: {fileID: 4156663065910893430} + - name: hero_detail_ui.red_node.red_img_2 + hashName: 4110561371 + objectType: 0 + gameObject: {fileID: 2348674475130942949} --- !u!1 &6115343008586148951 GameObject: m_ObjectHideFlags: 0 @@ -12455,7 +12654,7 @@ RectTransform: m_Children: - {fileID: 5365376864369504516} m_Father: {fileID: 5129409844343259102} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14773,7 +14972,7 @@ RectTransform: - {fileID: 6706497757523550084} - {fileID: 4243587229810431492} m_Father: {fileID: 5129409844343259102} - m_RootOrder: 0 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -16288,7 +16487,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5129409844343259102} - m_RootOrder: 1 + 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} diff --git a/Assets/prefabs/ui/tips/formation_tips.prefab b/Assets/prefabs/ui/tips/formation_tips.prefab index d2fa4d04b..19a94bc40 100644 --- a/Assets/prefabs/ui/tips/formation_tips.prefab +++ b/Assets/prefabs/ui/tips/formation_tips.prefab @@ -32,6 +32,7 @@ RectTransform: 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: 5170824783243581902} m_Father: {fileID: 0} @@ -174,6 +175,7 @@ RectTransform: 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: 3189738921288518417} - {fileID: 1387321168749950259} @@ -183,7 +185,7 @@ RectTransform: 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: 648, y: 211} + m_SizeDelta: {x: 566, y: 166} m_Pivot: {x: 0.665, y: 1.05} --- !u!222 &1828475458880524690 CanvasRenderer: @@ -213,7 +215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -240,7 +242,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3189738921288518417 RectTransform: m_ObjectHideFlags: 0 @@ -251,6 +253,7 @@ RectTransform: 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: 4848567139397371415} m_RootOrder: 0 @@ -325,6 +328,7 @@ RectTransform: 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: 4848567139397371415} m_Father: {fileID: 3632126005436163848} @@ -448,13 +452,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} ---- !u!1 &5655213969515754852 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} - m_PrefabInstance: {fileID: 4623739948742686193} - m_PrefabAsset: {fileID: 0} --- !u!224 &1387321168749950259 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} m_PrefabInstance: {fileID: 4623739948742686193} m_PrefabAsset: {fileID: 0} +--- !u!1 &5655213969515754852 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1031757354196467861, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + m_PrefabInstance: {fileID: 4623739948742686193} + m_PrefabAsset: {fileID: 0}