diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 3a2c1674f..3349bd152 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -78,6 +78,7 @@ SpriteAtlas: - {fileID: 21300000, guid: eb13070192e9d47a2ac961501207c01b, type: 3} - {fileID: 21300000, guid: c99386416aa7841f690ea6be0021047b, type: 3} - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} + - {fileID: 21300000, guid: 02f8ff41d79ab4d36ab6d85cf4db5e14, type: 3} - {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} - {fileID: 21300000, guid: 7f3712612494f4e0a9eeba12df7c0106, type: 3} - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3} @@ -177,6 +178,7 @@ SpriteAtlas: - {fileID: 21300000, guid: f777fe49e692d4008bf92f7a1ee40fd4, type: 3} - {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} - {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} + - {fileID: 21300000, guid: 823e90a9d698e4ff8994e70f4e684d7d, type: 3} - {fileID: 21300000, guid: e74dcab94de80bd4199e8ddd36ce28d4, type: 3} - {fileID: 21300000, guid: 51055eb9cf4f94f28b380c0a96047c79, type: 3} - {fileID: 21300000, guid: 4ab1c4c9276157d4e9a5c3b3c29ccfab, type: 3} @@ -256,6 +258,7 @@ SpriteAtlas: - common_ad_2 - common_bg_15 - common_menu_2 + - common_btn_wish - common_info_1 - common_dec_12 - common_bg_5 @@ -355,6 +358,7 @@ SpriteAtlas: - common_bg_31 - common_bottom_bg_1 - common_line_1 + - common_btn_refresh - common_progress_2_3 - common_bg_46 - common_plus_2 diff --git a/Assets/arts/spines/characters/m30006/m30006.atlas.txt b/Assets/arts/spines/characters/m30006/m30006.atlas.txt index 20ade9fa2..79f0d8c3a 100644 --- a/Assets/arts/spines/characters/m30006/m30006.atlas.txt +++ b/Assets/arts/spines/characters/m30006/m30006.atlas.txt @@ -1,63 +1,76 @@ m30006.png -size:512,512 +size:1024,1024 filter:Linear,Linear chu_1 -bounds:347,413,34,112 +bounds:801,986,34,112 rotate:90 chu_2 -bounds:347,449,61,107 +bounds:692,959,61,107 rotate:90 chu_3 -bounds:100,296,61,107 +bounds:2,182,61,107 chu_4 -bounds:226,338,60,77 +bounds:282,509,60,77 chu_5 -bounds:163,265,60,77 -rotate:90 +bounds:2,103,60,77 chu_6 -bounds:2,310,96,93 +bounds:594,927,96,93 chu_7 -bounds:148,417,96,93 +bounds:2,291,96,93 chu_8 -bounds:2,9,61,88 +bounds:526,728,61,88 chu_9 -bounds:163,327,61,88 +bounds:100,296,61,88 +eye_hit +bounds:665,895,22,30 +eye_yun +bounds:2,2,43,47 +rotate:90 head -bounds:246,434,99,76 +bounds:380,633,99,76 offsets:1,1,101,78 head2 -bounds:2,405,144,105 +bounds:380,711,144,105 offsets:1,1,146,107 +hei +bounds:2,386,200,200 spine -bounds:2,99,104,69 +bounds:594,821,104,69 offsets:1,1,106,71 rotate:90 tong_1 -bounds:374,395,16,31 +bounds:100,263,16,31 offsets:1,1,18,33 -rotate:90 tong_2 -bounds:288,386,55,46 +bounds:481,654,55,46 offsets:1,1,57,48 +rotate:90 +xuanwo1 +bounds:380,818,212,202 +offsets:12,16,232,232 +xuanwo2 +bounds:2,633,376,387 +offsets:12,12,400,411 ya_1 -bounds:242,265,71,29 +bounds:380,602,71,29 offsets:1,1,73,31 -rotate:90 yan_1 -bounds:146,290,4,15 +bounds:526,711,4,15 offsets:1,1,6,17 -rotate:90 yan_2 -bounds:345,384,27,27 +bounds:692,930,27,27 offsets:1,1,29,29 yan_3 -bounds:288,351,33,33 +bounds:65,256,33,33 offsets:1,1,35,35 yan_4 -bounds:456,456,54,54 +bounds:2,47,54,54 offsets:1,1,56,56 yan_4_1 -bounds:2,205,76,103 +bounds:204,483,76,103 offsets:0,23,102,126 yan_5 -bounds:80,220,64,74 +bounds:204,407,64,74 +yingzi +bounds:2,588,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/m30006/m30006.png b/Assets/arts/spines/characters/m30006/m30006.png index 6b92aae9c..fbd935f92 100644 Binary files a/Assets/arts/spines/characters/m30006/m30006.png and b/Assets/arts/spines/characters/m30006/m30006.png differ diff --git a/Assets/arts/spines/characters/m30006/m30006.skel.bytes b/Assets/arts/spines/characters/m30006/m30006.skel.bytes index 1a77e0813..a032a9182 100644 Binary files a/Assets/arts/spines/characters/m30006/m30006.skel.bytes and b/Assets/arts/spines/characters/m30006/m30006.skel.bytes differ diff --git a/Assets/arts/spines/characters/m30007/m30007.atlas.txt b/Assets/arts/spines/characters/m30007/m30007.atlas.txt index 6ccc9b0e6..5efaf69db 100644 --- a/Assets/arts/spines/characters/m30007/m30007.atlas.txt +++ b/Assets/arts/spines/characters/m30007/m30007.atlas.txt @@ -1,118 +1,136 @@ m30007.png -size:512,512 +size:1024,1024 filter:Linear,Linear +canying1 +bounds:2,741,382,275 +offsets:4,0,387,298 chi_l -bounds:2,337,154,173 +bounds:386,843,154,173 chi_r -bounds:2,162,154,173 +bounds:2,521,154,173 ear_l -bounds:450,423,57,32 +bounds:2,161,57,32 offsets:1,1,59,34 +rotate:90 ear_r -bounds:211,169,57,32 +bounds:2,102,57,32 offsets:1,1,59,34 rotate:90 eye_l -bounds:452,379,27,20 +bounds:962,996,27,20 offsets:1,1,29,22 eye_r -bounds:481,377,25,19 +bounds:991,997,25,19 offsets:1,1,27,21 +eye_yun +bounds:661,844,43,47 +gutou +bounds:2,220,39,60 hand_l_1 -bounds:205,13,30,42 +bounds:933,951,30,42 offsets:1,1,32,44 hand_l_2 -bounds:2,2,77,78 +bounds:661,938,77,78 offsets:1,1,79,80 hand_l_3 -bounds:450,457,53,55 +bounds:324,639,53,55 offsets:1,1,55,57 -rotate:90 hand_l_4 -bounds:423,416,25,20 +bounds:587,780,25,20 offsets:1,1,27,22 +rotate:90 hand_r_1 -bounds:248,62,30,41 +bounds:221,575,30,41 offsets:1,1,32,43 hand_r_2 -bounds:81,2,73,78 +bounds:2,364,73,78 offsets:1,1,75,80 hand_r_3 -bounds:245,186,48,50 +bounds:611,840,48,50 offsets:1,1,50,52 hand_r_4 -bounds:423,379,27,35 +bounds:221,538,27,35 offsets:1,1,29,37 hand_r_5 -bounds:488,398,23,22 +bounds:965,972,23,22 offsets:1,1,25,24 -rotate:90 head -bounds:158,309,91,75 +bounds:2,444,91,75 offsets:1,1,93,77 huzi -bounds:2,82,150,78 +bounds:386,763,150,78 jian_l -bounds:368,457,80,53 +bounds:2,282,80,53 offsets:1,1,82,55 +rotate:90 jian_r -bounds:158,152,74,51 +bounds:95,445,74,51 offsets:1,1,76,53 rotate:90 jiao_l -bounds:158,228,61,79 +bounds:243,633,61,79 offsets:1,1,63,81 +rotate:90 jiao_r -bounds:277,389,58,79 +bounds:740,958,58,79 offsets:1,1,60,81 rotate:90 +kulou +bounds:158,618,83,76 leg_l_1 -bounds:154,83,47,67 +bounds:542,843,47,67 +rotate:90 leg_l_2 -bounds:245,148,46,36 +bounds:2,54,46,36 +rotate:90 leg_l_3 -bounds:241,105,45,41 +bounds:706,846,45,41 +rotate:90 leg_l_4 -bounds:211,154,26,13 +bounds:243,618,26,13 offsets:1,1,28,15 leg_r_1 -bounds:156,14,47,67 +bounds:538,774,47,67 leg_r_2 -bounds:203,104,46,36 +bounds:2,6,46,36 rotate:90 leg_r_3 -bounds:205,57,45,41 -rotate:90 +bounds:886,952,45,41 leg_r_4 -bounds:237,29,26,13 +bounds:468,748,26,13 offsets:1,1,28,15 -rotate:90 spine -bounds:277,449,89,61 +bounds:158,527,89,61 +rotate:90 wuqi1 -bounds:158,386,117,124 +bounds:542,892,117,124 offsets:1,1,119,126 wuqi2 -bounds:368,438,80,17 +bounds:386,744,80,17 offsets:1,1,82,19 xiabai -bounds:221,238,43,69 +bounds:661,893,43,69 +rotate:90 ya_l -bounds:252,37,19,23 +bounds:965,951,19,23 offsets:1,1,21,25 +rotate:90 ya_r -bounds:280,80,19,23 +bounds:57,339,19,23 offsets:1,1,21,25 yao_1 -bounds:156,2,22,9 +bounds:538,763,22,9 offsets:1,1,24,11 yao_2 -bounds:452,401,34,20 +bounds:587,807,34,20 offsets:1,1,36,23 +rotate:90 yao_3 -bounds:358,391,63,45 +bounds:821,971,63,45 offsets:1,1,65,47 yao_4 -bounds:251,310,74,21 +bounds:886,995,74,21 offsets:1,1,76,23 -rotate:90 +yingzi +bounds:2,696,376,43 +offsets:1,1,378,45 diff --git a/Assets/arts/spines/characters/m30007/m30007.png b/Assets/arts/spines/characters/m30007/m30007.png index 0a6a25836..5ef03082f 100644 Binary files a/Assets/arts/spines/characters/m30007/m30007.png and b/Assets/arts/spines/characters/m30007/m30007.png differ diff --git a/Assets/arts/spines/characters/m30007/m30007.skel.bytes b/Assets/arts/spines/characters/m30007/m30007.skel.bytes index 1ba27a906..a977b5e01 100644 Binary files a/Assets/arts/spines/characters/m30007/m30007.skel.bytes and b/Assets/arts/spines/characters/m30007/m30007.skel.bytes differ diff --git a/Assets/arts/textures/icon/hero_summon/summon_card_mark_5.png b/Assets/arts/textures/icon/hero_summon/summon_card_mark_5.png index 5ba818bcf..781794ac3 100644 Binary files a/Assets/arts/textures/icon/hero_summon/summon_card_mark_5.png and b/Assets/arts/textures/icon/hero_summon/summon_card_mark_5.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png index 370a2aa3d..735907ce3 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_down.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png index 04054bac2..7942fd6cd 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_left.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png index 7d8d36b22..280909ce5 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_right.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png index 8a19ec8e7..cc5710c54 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png and b/Assets/arts/textures/ui/battle/battle_obstacle_rocket_up.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_odds.png b/Assets/arts/textures/ui/common/common_btn_odds.png index fec2dfeb4..85767b07c 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_odds.png and b/Assets/arts/textures/ui/common/common_btn_odds.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_refresh.png b/Assets/arts/textures/ui/common/common_btn_refresh.png new file mode 100644 index 000000000..88c6a1e81 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_refresh.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_refresh.png.meta b/Assets/arts/textures/ui/common/common_btn_refresh.png.meta new file mode 100644 index 000000000..94eefbebc --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_refresh.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 823e90a9d698e4ff8994e70f4e684d7d +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/common/common_btn_wish.png b/Assets/arts/textures/ui/common/common_btn_wish.png new file mode 100644 index 000000000..72de961ea Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_wish.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_wish.png.meta b/Assets/arts/textures/ui/common/common_btn_wish.png.meta new file mode 100644 index 000000000..8e6fd11f3 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_wish.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 02f8ff41d79ab4d36ab6d85cf4db5e14 +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/ui/summon/cell/summon_hero_cell.lua.bytes b/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes index 7d987341a..1124ca859 100644 Binary files a/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes and b/Assets/lua/app/ui/summon/cell/summon_hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes b/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes index 7126673ca..7e3045168 100644 Binary files a/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes and b/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/summon/cell/summon_hero_cell.prefab b/Assets/prefabs/ui/summon/cell/summon_hero_cell.prefab index ac765df05..0fa1c7527 100644 --- a/Assets/prefabs/ui/summon/cell/summon_hero_cell.prefab +++ b/Assets/prefabs/ui/summon/cell/summon_hero_cell.prefab @@ -93,7 +93,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2490809114076601512 RectTransform: m_ObjectHideFlags: 0 @@ -187,9 +187,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26, y: -22.5} + m_AnchoredPosition: {x: 4, y: -4} m_SizeDelta: {x: 52, y: 45} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!222 &3705780349050071448 CanvasRenderer: m_ObjectHideFlags: 0 @@ -218,7 +218,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 08068984387df4689bb28a3a21ed74bf, type: 3} + m_Sprite: {fileID: 21300000, guid: bd8b800261cea42d9917b3a3bb2c94b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -263,7 +263,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26, y: -22} + m_AnchoredPosition: {x: 30, y: -26} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1730507211995200354 diff --git a/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab b/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab index d4f4e198c..9d24f9d5a 100644 --- a/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab +++ b/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab @@ -112,6 +112,8 @@ RectTransform: - {fileID: 6528867066695955918} - {fileID: 4678786540824719809} - {fileID: 5932061840033988598} + - {fileID: 1574830756239521839} + - {fileID: 9027813110161903633} m_Father: {fileID: 3885734099466101579} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -148,7 +150,83 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 76dde00902af54bb583976396adfef18, type: 3} + m_Sprite: {fileID: 21300000, guid: 159ad5fe9adac43688ec8b8c09095cef, 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 &4884814405214865360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1574830756239521839} + - component: {fileID: 1016106892527455297} + - component: {fileID: 906721724365461095} + m_Layer: 5 + m_Name: dec + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1574830756239521839 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4884814405214865360} + 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: 9181314281491308573} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 4, y: -4} + m_SizeDelta: {x: 52, y: 45} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1016106892527455297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4884814405214865360} + m_CullTransparentMesh: 1 +--- !u!114 &906721724365461095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4884814405214865360} + 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: bd8b800261cea42d9917b3a3bb2c94b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -382,6 +460,14 @@ MonoBehaviour: hashName: 1835444658 objectType: 0 gameObject: {fileID: 3173659679749346995} + - name: summon_reward_cell.bg1.dec + hashName: 2714561990 + objectType: 0 + gameObject: {fileID: 4884814405214865360} + - name: summon_reward_cell.bg1.match_img + hashName: 4038868237 + objectType: 0 + gameObject: {fileID: 8343165323405341780} --- !u!114 &3513158575154620917 MonoBehaviour: m_ObjectHideFlags: 0 @@ -522,7 +608,83 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 76dde00902af54bb583976396adfef18, type: 3} + m_Sprite: {fileID: 21300000, guid: 159ad5fe9adac43688ec8b8c09095cef, 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 &8343165323405341780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9027813110161903633} + - component: {fileID: 984593024535999446} + - component: {fileID: 1718047574784143833} + m_Layer: 5 + m_Name: match_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9027813110161903633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8343165323405341780} + 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: 9181314281491308573} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -26} + m_SizeDelta: {x: 34, y: 34} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &984593024535999446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8343165323405341780} + m_CullTransparentMesh: 1 +--- !u!114 &1718047574784143833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8343165323405341780} + 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: 5cd566b6505c7f0439a8a4f414ac4a98, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1