diff --git a/Assets/arts/atlas/icon/avatar.asset b/Assets/arts/atlas/icon/avatar.asset index c76225f42..2c37f633d 100644 --- a/Assets/arts/atlas/icon/avatar.asset +++ b/Assets/arts/atlas/icon/avatar.asset @@ -14,5 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} + - {fileID: 21300000, guid: 3297fc665edcde34cb54957166a8e63c, type: 3} + - {fileID: 21300000, guid: e1559cf5b8a501f4fbf7fe9081997063, type: 3} - {fileID: 21300000, guid: 107429cda8f26954b9c221c6d79134b7, type: 3} - spriteNameList: f90c0ae6445b58ce + spriteNameList: f90c0ae6fa0c0ae6fb0c0ae6445b58ce diff --git a/Assets/arts/atlas/icon/avatar.spriteatlas b/Assets/arts/atlas/icon/avatar.spriteatlas index 148670f38..39188b669 100644 --- a/Assets/arts/atlas/icon/avatar.spriteatlas +++ b/Assets/arts/atlas/icon/avatar.spriteatlas @@ -61,9 +61,13 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: e1559cf5b8a501f4fbf7fe9081997063, type: 3} + - {fileID: 21300000, guid: 3297fc665edcde34cb54957166a8e63c, type: 3} - {fileID: 21300000, guid: 107429cda8f26954b9c221c6d79134b7, type: 3} - {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_PackedSpriteNamesToIndex: + - avatar_frame_3 + - avatar_frame_2 - avatar_frame_celect - avatar_frame_1 m_RenderDataMap: {} diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index 8c18c66e3..ed627e517 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -39,6 +39,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 25dfe02b2474b6b429a9405bfe8a4cbe, type: 3} - {fileID: 21300000, guid: 056b0c62d8026c546bd043ae92411b15, type: 3} - {fileID: 21300000, guid: 5d9ffdfc3fbf76d4c831f69d2afe48e3, type: 3} + - {fileID: 21300000, guid: 3b1274a6d891cb545864f2d9c72f8dc1, type: 3} - {fileID: 21300000, guid: 72b9b64de3f480041b53bc58450bcc29, type: 3} - {fileID: 21300000, guid: 5f59eb2671e1f8047bb5c912ab31a4e9, type: 3} - {fileID: 21300000, guid: b07e73b9fc9a6a24dab9f8d9d3a46cba, type: 3} @@ -63,4 +64,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f06000040060000410600004206000043060000440600003300000034000000350000003600000037000000380000003900000008e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 + spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f060000400600004106000042060000430600004406000033000000340000003500000036000000370000003800000039000000cbda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index 7b0f2fcf1..0416ad276 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -78,6 +78,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 1fac7f85b1398064bb2fe6291b431566, type: 3} - {fileID: 21300000, guid: 8f0d52f5b73b61f4da2d353433c9a3eb, type: 3} - {fileID: 21300000, guid: 5f59eb2671e1f8047bb5c912ab31a4e9, type: 3} + - {fileID: 21300000, guid: 3b1274a6d891cb545864f2d9c72f8dc1, type: 3} - {fileID: 21300000, guid: 292c42b6b51485944a13a0d9e1a19a4e, type: 3} - {fileID: 21300000, guid: ea4d65d6d3df27d46b554d322c49fd49, type: 3} - {fileID: 21300000, guid: f67782678a259484f9bbcc1fd47de7cb, type: 3} @@ -129,6 +130,7 @@ SpriteAtlas: - match_1 - frame_gray_4 - frame_2 + - avatar_1 - 17 - hero_arrow - 6 diff --git a/Assets/arts/atlas/ui/arena.asset b/Assets/arts/atlas/ui/arena.asset index 4655e1524..74ce18ce0 100644 --- a/Assets/arts/atlas/ui/arena.asset +++ b/Assets/arts/atlas/ui/arena.asset @@ -25,8 +25,6 @@ MonoBehaviour: - {fileID: 21300000, guid: 6d0d627d9bdff844cbe27be737d9dc5b, type: 3} - {fileID: 21300000, guid: 3b005179ddd3f794bbfd359c50d9cd07, type: 3} - {fileID: 21300000, guid: 00fd0ae4c09175f46b80c9f75ad9acec, type: 3} - - {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} - - {fileID: 21300000, guid: a31c8ba23e9c1024596fee83894b66e4, type: 3} - {fileID: 21300000, guid: 7285006cf10d19f49aa80a8478d10ba8, type: 3} - {fileID: 21300000, guid: cacd951ff412e684e8863cee652eccbd, type: 3} - {fileID: 21300000, guid: 13f9a094640ed874cbb2cb62333523d0, type: 3} @@ -56,4 +54,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 7c3a18c26f0ec664cb74cc6ff5b87f9c, type: 3} - {fileID: 21300000, guid: 0bec9bab93c4b664ebd7b55669932d0b, type: 3} - {fileID: 21300000, guid: bb4a664a5db1bf548ac578c400e3c20b, type: 3} - spriteNameList: ef5c00f8f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8c38565e33162aae71b24d9ebc0ea3ef2afec92ffaae695ff3b294e693c294e69cbf32408ccf32408cdf32408fc9b2608fd9b2608fe9b2608ff9b2608009c2608019c2608029c26089d3958939e3958939f395893231b2d8d241b2d8d251b2d8d261b2d8d271b2d8d50f67c9851f67c9852f67c9853f67c98300321f5310321f5320321f558c3c9ec59c3c9ec5ac3c9ec5bc3c9ec + spriteNameList: ef5c00f8f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8c38565e33162aae71b24d9ebc0ea3ef2afec92ffaae695ffcbf32408ccf32408cdf32408fc9b2608fd9b2608fe9b2608ff9b2608009c2608019c2608029c26089d3958939e3958939f395893231b2d8d241b2d8d251b2d8d261b2d8d271b2d8d50f67c9851f67c9852f67c9853f67c98300321f5310321f5320321f558c3c9ec59c3c9ec5ac3c9ec5bc3c9ec diff --git a/Assets/arts/atlas/ui/arena.spriteatlas b/Assets/arts/atlas/ui/arena.spriteatlas index 6f1cd76b1..1713d8b96 100644 --- a/Assets/arts/atlas/ui/arena.spriteatlas +++ b/Assets/arts/atlas/ui/arena.spriteatlas @@ -64,7 +64,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 8a50e1a0c6f7c81458874e21047c6977, type: 3} - {fileID: 21300000, guid: 369ef0e04cb680441baa4814f5e7ec28, type: 3} - {fileID: 21300000, guid: 0cf3e3816c4e89140a614c998518d618, type: 3} - - {fileID: 21300000, guid: a31c8ba23e9c1024596fee83894b66e4, type: 3} - {fileID: 21300000, guid: 7c3a18c26f0ec664cb74cc6ff5b87f9c, type: 3} - {fileID: 21300000, guid: 164807247edc9a84a87ac6c4336c9761, type: 3} - {fileID: 21300000, guid: 2bd9e554e73874d43931caf82a6da52d, type: 3} @@ -75,7 +74,6 @@ SpriteAtlas: - {fileID: 21300000, guid: dae049b6a2628eb4db9abda297ab6a3b, type: 3} - {fileID: 21300000, guid: 02a079d6dd048e349a54f81f4d089eef, type: 3} - {fileID: 21300000, guid: 45ae36870a658a743a0dab135d4701e0, type: 3} - - {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} - {fileID: 21300000, guid: 69df5408fe81cbc44a6c5d8e31abbe27, type: 3} - {fileID: 21300000, guid: 3a470558d6b0c8549b39a9169b15733d, type: 3} - {fileID: 21300000, guid: 8a5cf2a87c15a454b8cdc5ce2af7291f, type: 3} @@ -108,7 +106,6 @@ SpriteAtlas: - arena_btn_ranking - arena_dec_7 - arena_num_silver_4 - - arena_chest_2 - arena_ranking_bg_2 - arena_num_gold_2 - arena_num_bronze_3 @@ -119,7 +116,6 @@ SpriteAtlas: - arena_btn_defend - arena_bg_5 - arena_num_silver_2 - - arena_chest_1 - arena_bg_1 - arena_dec_1 - arena_ranking_1 diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 0a9b57c03..765200056 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -139,6 +139,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 4ba59bd3fda322748836bed4cfab73c5, type: 3} - {fileID: 21300000, guid: c4514947f60678c4e90c498ef095db61, type: 3} - {fileID: 21300000, guid: 75eeb868e0670844e959094562d14ec7, type: 3} + - {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} + - {fileID: 21300000, guid: 5263b9a86b77b2148823254343718685, type: 3} - {fileID: 21300000, guid: f68fde5de9bc3bb4bb20c8c2e8de00e1, type: 3} - {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} - {fileID: 21300000, guid: 841a1467a1c47414c91ac18891f9c65d, type: 3} @@ -158,4 +160,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8d8e243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8d8e243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f49782ef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e3558aa025459aa0254a15c468db6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/shop.asset b/Assets/arts/atlas/ui/shop.asset index 53de96be1..6d7dbc86b 100644 --- a/Assets/arts/atlas/ui/shop.asset +++ b/Assets/arts/atlas/ui/shop.asset @@ -36,6 +36,8 @@ MonoBehaviour: - {fileID: 21300000, guid: c45573f553201204a84ee42b05c34fb8, type: 3} - {fileID: 21300000, guid: afeea2759c1951d489c4ee3fc499c5c4, type: 3} - {fileID: 21300000, guid: 62e57e6ef6f56c147b2a1a6e64af3b7c, type: 3} + - {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} + - {fileID: 21300000, guid: a31c8ba23e9c1024596fee83894b66e4, type: 3} - {fileID: 21300000, guid: cdc12648211453c419d84b2cd3bc7bbf, type: 3} - {fileID: 21300000, guid: 733aebc4de524db438a1538e1ef9e575, type: 3} - {fileID: 21300000, guid: 8f9d32b0ba738ae43989a97305718382, type: 3} @@ -57,4 +59,4 @@ MonoBehaviour: - {fileID: 21300000, guid: a74d7671e7b3c6e4ab6ac559230d32cc, type: 3} - {fileID: 21300000, guid: d72627ddfda8c0a4cadb06cf4cebf0db, type: 3} - {fileID: 21300000, guid: 2788225d01b5040488c063e7440fbefc, type: 3} - spriteNameList: 60629382d0e9d8cfd1e9d8cfd2e9d8cfd3e9d8cfd4e9d8cfd5e9d8cfd6e9d8cfd7e9d8cf6162938262629382636293826462938265629382666293826762938268629382cf04274bd004274bd104274b2a6254742b6254742c625474ab44f4cfac44f4cffd41d5cefe41d5ceff41d5ce0042d5ce0142d5ce0242d5ce0342d5ce0442d5ce0542d5ce6b65b0495ec22c9f5fc22c9f60c22c9f521b30910c012e640d012e64e5073018e6073018e7073018 + spriteNameList: 60629382d0e9d8cfd1e9d8cfd2e9d8cfd3e9d8cfd4e9d8cfd5e9d8cfd6e9d8cfd7e9d8cf6162938262629382636293826462938265629382666293826762938268629382cf04274bd004274bd104274b2a6254742b6254742c6254742d6254742e625474ab44f4cfac44f4cffd41d5cefe41d5ceff41d5ce0042d5ce0142d5ce0242d5ce0342d5ce0442d5ce0542d5ce6b65b0495ec22c9f5fc22c9f60c22c9f521b30910c012e640d012e64e5073018e6073018e7073018 diff --git a/Assets/arts/atlas/ui/shop.spriteatlas b/Assets/arts/atlas/ui/shop.spriteatlas index b6d44bccc..1dd79b4d3 100644 --- a/Assets/arts/atlas/ui/shop.spriteatlas +++ b/Assets/arts/atlas/ui/shop.spriteatlas @@ -69,6 +69,7 @@ SpriteAtlas: - {fileID: 21300000, guid: a74d7671e7b3c6e4ab6ac559230d32cc, type: 3} - {fileID: 21300000, guid: 342c82a1a2a12e041a333a5e95ce7322, type: 3} - {fileID: 21300000, guid: 6adf7c42a711b1c4b8b7eb3ca3a5edd1, type: 3} + - {fileID: 21300000, guid: a31c8ba23e9c1024596fee83894b66e4, type: 3} - {fileID: 21300000, guid: 62b672037ea54c0458abffa1a35365b5, type: 3} - {fileID: 21300000, guid: 24ad6dc3ad1f6af4abbbbc2fc3c2df56, type: 3} - {fileID: 21300000, guid: ce3ca0348098d8a438bd03f9972f30f5, type: 3} @@ -85,6 +86,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 2dc48786355f55b4db3cc506b29e6762, type: 3} - {fileID: 21300000, guid: 1c28b7073a062534fb2f0bf92c63d6ca, type: 3} - {fileID: 21300000, guid: 7fe65a877ceb7b9438fe3cb364320aa2, type: 3} + - {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} - {fileID: 21300000, guid: 7b2ea538a8833144283d743465b51524, type: 3} - {fileID: 21300000, guid: 6e597148ed6e1b144beef186a1d92d25, type: 3} - {fileID: 21300000, guid: cdc12648211453c419d84b2cd3bc7bbf, type: 3} @@ -114,6 +116,7 @@ SpriteAtlas: - shop_species_1 - shop_diamond_7 - shop_bg_3 + - shop_chest_5 - shop_bg_8 - shop_diamond_4 - shop_bg_10 @@ -130,6 +133,7 @@ SpriteAtlas: - shop_diamond_5 - shop_gift_bg_3 - shop_board_3 + - shop_chest_4 - shop_bg_16 - shop_diamond_8 - shop_dec_1 diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_1.png b/Assets/arts/textures/icon/avatar/avatar_frame_1.png index ea4f824f7..dbe97bb93 100644 Binary files a/Assets/arts/textures/icon/avatar/avatar_frame_1.png and b/Assets/arts/textures/icon/avatar/avatar_frame_1.png differ diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_1.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_1.png.meta index 8bb95d576..c9462c875 100644 --- a/Assets/arts/textures/icon/avatar/avatar_frame_1.png.meta +++ b/Assets/arts/textures/icon/avatar/avatar_frame_1.png.meta @@ -128,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/icon/avatar.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_2.png b/Assets/arts/textures/icon/avatar/avatar_frame_2.png new file mode 100644 index 000000000..2e2eed1b4 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avatar_frame_2.png differ diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_2.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_2.png.meta new file mode 100644 index 000000000..536d865ba --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avatar_frame_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3297fc665edcde34cb54957166a8e63c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_3.png b/Assets/arts/textures/icon/avatar/avatar_frame_3.png new file mode 100644 index 000000000..85ff25cca Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avatar_frame_3.png differ diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_3.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_3.png.meta new file mode 100644 index 000000000..4cf774d42 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avatar_frame_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: e1559cf5b8a501f4fbf7fe9081997063 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta index 2af455a70..8e848e5b5 100644 --- a/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta +++ b/Assets/arts/textures/icon/avatar/avatar_frame_celect.png.meta @@ -128,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/icon/avatar.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/icon/hero/avatar_1.png b/Assets/arts/textures/icon/hero/avatar_1.png new file mode 100644 index 000000000..647548b44 Binary files /dev/null and b/Assets/arts/textures/icon/hero/avatar_1.png differ diff --git a/Assets/arts/textures/icon/hero/avatar_1.png.meta b/Assets/arts/textures/icon/hero/avatar_1.png.meta new file mode 100644 index 000000000..e3c4f2188 --- /dev/null +++ b/Assets/arts/textures/icon/hero/avatar_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 3b1274a6d891cb545864f2d9c72f8dc1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/arena/arena_chest_1.png b/Assets/arts/textures/ui/shop/shop_chest_4.png similarity index 100% rename from Assets/arts/textures/ui/arena/arena_chest_1.png rename to Assets/arts/textures/ui/shop/shop_chest_4.png diff --git a/Assets/arts/textures/ui/arena/arena_chest_1.png.meta b/Assets/arts/textures/ui/shop/shop_chest_4.png.meta similarity index 100% rename from Assets/arts/textures/ui/arena/arena_chest_1.png.meta rename to Assets/arts/textures/ui/shop/shop_chest_4.png.meta diff --git a/Assets/arts/textures/ui/arena/arena_chest_2.png b/Assets/arts/textures/ui/shop/shop_chest_5.png similarity index 100% rename from Assets/arts/textures/ui/arena/arena_chest_2.png rename to Assets/arts/textures/ui/shop/shop_chest_5.png diff --git a/Assets/arts/textures/ui/arena/arena_chest_2.png.meta b/Assets/arts/textures/ui/shop/shop_chest_5.png.meta similarity index 100% rename from Assets/arts/textures/ui/arena/arena_chest_2.png.meta rename to Assets/arts/textures/ui/shop/shop_chest_5.png.meta diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index a4478798b..390686939 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/module/arena/arena_manager.lua.bytes b/Assets/lua/app/module/arena/arena_manager.lua.bytes index c6d469bfb..c6349d2a9 100644 Binary files a/Assets/lua/app/module/arena/arena_manager.lua.bytes and b/Assets/lua/app/module/arena/arena_manager.lua.bytes differ diff --git a/Assets/lua/app/module/shop/shop_manager.lua.bytes b/Assets/lua/app/module/shop/shop_manager.lua.bytes index 14758576c..149ccc519 100644 Binary files a/Assets/lua/app/module/shop/shop_manager.lua.bytes and b/Assets/lua/app/module/shop/shop_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index 35a08e204..82bb23de8 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes b/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes index 51b134ad1..aa773e5e0 100644 Binary files a/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes and b/Assets/lua/app/ui/shop/box_hero_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/arena/arena_data.lua.bytes b/Assets/lua/app/userdata/arena/arena_data.lua.bytes index e1ea6434b..375c55eb4 100644 Binary files a/Assets/lua/app/userdata/arena/arena_data.lua.bytes and b/Assets/lua/app/userdata/arena/arena_data.lua.bytes differ diff --git a/Assets/prefabs/ui/player_info/player_info_ui.prefab b/Assets/prefabs/ui/player_info/player_info_ui.prefab index 8dd48e0ba..12c3dc0a1 100644 --- a/Assets/prefabs/ui/player_info/player_info_ui.prefab +++ b/Assets/prefabs/ui/player_info/player_info_ui.prefab @@ -760,7 +760,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: 160, y: 160} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3005935637891243511 CanvasRenderer: diff --git a/Assets/prefabs/ui/shop/box_hero_ui.prefab b/Assets/prefabs/ui/shop/box_hero_ui.prefab index 26cde4489..d9a22da5c 100644 --- a/Assets/prefabs/ui/shop/box_hero_ui.prefab +++ b/Assets/prefabs/ui/shop/box_hero_ui.prefab @@ -1,5 +1,96 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3053582331350787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4813047595954194170} + - component: {fileID: 7309468434370995818} + - component: {fileID: 5676159480497838541} + - component: {fileID: 3821875611297306915} + m_Layer: 5 + m_Name: ad_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4813047595954194170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3053582331350787} + 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_Children: + - {fileID: 940357355365908811} + - {fileID: 5020870550719271354} + m_Father: {fileID: 6532261956592226185} + 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: -294} + m_SizeDelta: {x: 246, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7309468434370995818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3053582331350787} + m_CullTransparentMesh: 1 +--- !u!114 &5676159480497838541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3053582331350787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} + m_Type: 1 + 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!114 &3821875611297306915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3053582331350787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &499759732370942480 GameObject: m_ObjectHideFlags: 0 @@ -268,6 +359,140 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1627947748808497081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5020870550719271354} + - component: {fileID: 3271154617564282497} + - component: {fileID: 3562574240778605488} + m_Layer: 5 + m_Name: tx_ad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5020870550719271354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627947748808497081} + 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_Children: [] + m_Father: {fileID: 4813047595954194170} + 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: 0, y: 6} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3271154617564282497 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627947748808497081} + m_CullTransparentMesh: 1 +--- !u!114 &3562574240778605488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627947748808497081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1691702521576416483 GameObject: m_ObjectHideFlags: 0 @@ -463,7 +688,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -885,6 +1110,7 @@ RectTransform: - {fileID: 6367979773758997921} - {fileID: 5194395687368136688} - {fileID: 3618769078468116502} + - {fileID: 4813047595954194170} - {fileID: 1226788473560635264} m_Father: {fileID: 8461932745927490369} m_RootOrder: 1 @@ -1048,8 +1274,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3876298356550912567} - {fileID: 5474555283759120578} + - {fileID: 3876298356550912567} m_Father: {fileID: 6532261956592226185} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1139,7 +1365,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3618769078468116502} - m_RootOrder: 0 + 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} @@ -1273,7 +1499,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3618769078468116502} - m_RootOrder: 1 + 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} @@ -1714,6 +1940,18 @@ MonoBehaviour: hashName: 2778957326 objectType: 0 gameObject: {fileID: 8681755587716151590} + - name: box_hero_ui.bg.ad_btn + hashName: 173467104 + objectType: 0 + gameObject: {fileID: 3053582331350787} + - name: box_hero_ui.bg.ad_btn.img_ad + hashName: 1439728109 + objectType: 0 + gameObject: {fileID: 7716960522081345130} + - name: box_hero_ui.bg.ad_btn.tx_ad + hashName: 56921648 + objectType: 0 + gameObject: {fileID: 1627947748808497081} --- !u!114 &960821287463814128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2152,6 +2390,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7716960522081345130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 940357355365908811} + - component: {fileID: 8792548610819069188} + - component: {fileID: 130207299183609650} + m_Layer: 5 + m_Name: img_ad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &940357355365908811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716960522081345130} + 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_Children: [] + m_Father: {fileID: 4813047595954194170} + 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: -68.4, y: 6} + m_SizeDelta: {x: 70, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8792548610819069188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716960522081345130} + m_CullTransparentMesh: 1 +--- !u!114 &130207299183609650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716960522081345130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, 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 &8681755587716151590 GameObject: m_ObjectHideFlags: 0