diff --git a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png b/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png index b6607318ab..c8662c994c 100644 Binary files a/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png and b/Assets/ManagedResources/Atlas/CommonAtlas/jiantou.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/r_zjm_huodongicon-chichafenyun_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/r_zjm_huodongicon-chichafenyun_zh.png index 371da5f619..d05b2fc7da 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/r_zjm_huodongicon-chichafenyun_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/r_zjm_huodongicon-chichafenyun_zh.png differ diff --git a/Assets/ManagedResources/Atlas/HotRankAtlas/ArtFont/hotRank_btn_zh.png b/Assets/ManagedResources/Atlas/HotRankAtlas/ArtFont/hotRank_btn_zh.png index 24e62042dc..9269b18b44 100644 Binary files a/Assets/ManagedResources/Atlas/HotRankAtlas/ArtFont/hotRank_btn_zh.png and b/Assets/ManagedResources/Atlas/HotRankAtlas/ArtFont/hotRank_btn_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui_zh.png index 74022e5f9a..946f789cbd 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce_zh.png index 275dad02e7..84e82c2605 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi_zh.png index aa17f2f2d4..3fed2023ca 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-chengujiu_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-chengujiu_zh.png index 6455746abc..6bef81101b 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-chengujiu_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-chengujiu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue_zh.png index f645319dea..b644c823d0 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-fuli_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-fuli_zh.png index d4240ccd69..fa15b74876 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-fuli_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-fuli_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong_zh.png index 24d9b222e1..463a26bc34 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuzhuanqiankun_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuzhuanqiankun_zh.png index 9ed5af5968..4d334bd4d1 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuzhuanqiankun_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuzhuanqiankun_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng_zh.png index 5dbce176fe..b59a11acf6 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png index b642b25ad6..e16aa1b9a5 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-sanjiexiangmo_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-sanjiexiangmo_zh.png index 057349731c..3d60da7c5a 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-sanjiexiangmo_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-sanjiexiangmo_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang2_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang2_zh.png index 31b5816865..a5d02687ac 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang2_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang_zh.png index 7dcaaef15c..a5d02687ac 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shibukedang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png index 05edb092c6..fa4ac1bec4 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-shunwukongshouchong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi_zh.png index 19588db09a..640fa05e1b 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren_zh.png index da82dcd19f..48d664c505 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi_zh.png index f4d9e1e78c..27a2e017f1 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xialuxiangfeng_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xialuxiangfeng_zh.png index 44bb650a26..8a3566d234 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xialuxiangfeng_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xialuxiangfeng_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianglongfuhu_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianglongfuhu_zh.png index a46ff92561..21e18c72bb 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianglongfuhu_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianglongfuhu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshihuodong_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshihuodong_zh.png index be40221b92..9acfe84921 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshihuodong_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshihuodong_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png index e272c57d22..ca1374238f 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xianshishenzhuang_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan_zh.png index 68aab3b07b..a10df27dcc 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yishandaohai_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yishandaohai_zh.png index f3f2b9fb4a..8d170abf3b 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yishandaohai_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yishandaohai_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yongwangzhiqian_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yongwangzhiqian_zh.png index 8ab966265a..5fec215150 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yongwangzhiqian_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yongwangzhiqian_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yunchouweiwo_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yunchouweiwo_zh.png index f8eee51968..761c953718 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yunchouweiwo_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-yunchouweiwo_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png index a016dc487a..dfc69ba674 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-zhizunhaoli_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png index 59bef569a4..0e37c6e59b 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_xingyuntanbao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/BG_zhujiemian_01.png b/Assets/ManagedResources/Atlas/PublicAtlas/BG_zhujiemian_01.png new file mode 100644 index 0000000000..a2dfb5c6c1 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/BG_zhujiemian_01.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/BG_zhujiemian_01.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/BG_zhujiemian_01.png.meta new file mode 100644 index 0000000000..5f93d53275 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/BG_zhujiemian_01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f4927a7e4251ed1458a2836b2c89d1e1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bbec36819a9c2e644a26572c4df25b55 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_def.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_def.png new file mode 100644 index 0000000000..1f2482eab8 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_def.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_def.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_def.png.meta new file mode 100644 index 0000000000..258cfb45e6 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_def.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d5bec3c931a1c17419b58e190ca1b170 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 545b0b36e78b3bc42839a0c9c39512d8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_select.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_select.png new file mode 100644 index 0000000000..982d87e123 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_select.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_select.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_select.png.meta new file mode 100644 index 0000000000..40b8750df5 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_maincity_icon_select.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 46a75f654268c7b4a90b3c313cd7a2cc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 04147e7d297dcb44e9be51082042a0d9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_map_hongdian.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_map_hongdian.png index 3811f4bc8a..31bdf9808b 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_map_hongdian.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_map_hongdian.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhijiahao.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhijiahao.png index 0b77608304..18ecb4d3ff 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhijiahao.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhijiahao.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png index bc20903a65..61dd0cd8a7 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao1.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao1.png new file mode 100644 index 0000000000..482870cae0 Binary files /dev/null and b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao1.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao1.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao1.png.meta new file mode 100644 index 0000000000..f7fbb31146 --- /dev/null +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 37af0a2fa010b09459c0871325ad81cc +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c83d97eb2fd26c54aa05aafb63eb1070 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: PublicAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_jinengtuo.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_jinengtuo.png index 426a665875..8244a3d859 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_jinengtuo.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_jinengtuo.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_renwu.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_renwu.png index e01f0d2131..89988e4019 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_renwu.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_renwu.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_touxiangtuo.png b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_touxiangtuo.png index 67f2e9e70a..c7a0013d10 100644 Binary files a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_touxiangtuo.png and b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_touxiangtuo.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku001_zh.png index c116e35b7a..699d6bd8b4 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku002_zh.png index 6e48c09b4b..699d6bd8b4 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-cangku002_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben001_zh.png index a0b69c3f4f..07e07cc4af 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben002_zh.png index b6c0d89469..07e07cc4af 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-fuben002_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui001_zh.png index 97959b1254..55f3e87901 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui002_zh.png index 3bdf6463d9..55f3e87901 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghui002_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png index d324713c4a..67530e6681 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing02.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing02.png index 7ea7eab86d..67530e6681 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing02.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing02.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka001_zh.png index cbca4c5b6b..5fd6705ae9 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka002_zh.png index dc64c220ef..5fd6705ae9 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-guanka002_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang001_zh.png index 7217ce6ceb..205f49c74a 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang002_zh.png index fbc35614a9..205f49c74a 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-shenjiang002_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan001_zh.png index f3977d70e7..67530e6681 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan002_zh.png index b8eade5ffb..67530e6681 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-tequan002_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng001_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng001_zh.png index 4e1ff7a82d..eade89b916 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng001_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng001_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng002_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng002_zh.png index 1b3ae77e2f..eade89b916 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng002_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-zhucheng002_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_xin_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_xin_zh.png index 5e0348856b..99b06f8103 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_xin_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_xin_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/friend.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/friend.png index 84b5ca245c..b4fe4b8d75 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/friend.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/friend.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_duihuaicon.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_duihuaicon.png index 8d3d09824f..27baa9d4c4 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_duihuaicon.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_duihuaicon.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png index 5f8f18695d..3afbc74ed7 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_huodongicon-di2.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_icon-paihan.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_icon-paihan.png index 5eb58eecc2..ab7e4aed2b 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_icon-paihan.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_icon-paihan.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tequanpaizi.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tequanpaizi.png index 341b743395..974d377d9e 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tequanpaizi.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tequanpaizi.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tuo.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tuo.png index 63897869a1..3852b15cb9 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tuo.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_tuo.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_youjian.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_youjian.png index 7f6301a9f5..906515d585 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_youjian.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/r_zjm_youjian.png differ diff --git a/Assets/ManagedResources/Icons/y_moren.png b/Assets/ManagedResources/Icons/y_moren.png index 98bb82dad7..c7a0013d10 100644 Binary files a/Assets/ManagedResources/Icons/y_moren.png and b/Assets/ManagedResources/Icons/y_moren.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab b/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab index bb061ebd19..2602a17b8d 100644 --- a/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/BtView/BtView.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7568271902983058820 CanvasRenderer: @@ -255,19 +255,19 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8459229031355081979} - - {fileID: 1279565468545304449} - {fileID: 7460220109211596834} + - {fileID: 5994939138272632008} - {fileID: 8075319357219433647} - {fileID: 6730709935535294727} - - {fileID: 9222520336153166412} - - {fileID: 5994939138272632008} - {fileID: 6389495984028840659} + - {fileID: 1279565468545304449} + - {fileID: 9222520336153166412} m_Father: {fileID: 224179834280654824} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 60} + m_AnchoredPosition: {x: 0, y: 97} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114938644010415092 @@ -288,7 +288,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: 16.16 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 @@ -352,7 +352,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &65352753708653099 RectTransform: m_ObjectHideFlags: 0 @@ -369,10 +369,10 @@ RectTransform: m_Father: {fileID: 8459229031355081979} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8459903935629436536 CanvasRenderer: @@ -402,7 +402,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -445,8 +445,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 13.800026} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8843023349748678163 CanvasRenderer: @@ -485,6 +485,196 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &240195409520255308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 253403587075673869} + - component: {fileID: 7046955499492603332} + - component: {fileID: 2211771673887191714} + - component: {fileID: 5557479358431718845} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &253403587075673869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240195409520255308} + 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: 9222520336153166412} + 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} + m_AnchoredPosition: {x: 0, y: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7046955499492603332 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240195409520255308} + m_CullTransparentMesh: 0 +--- !u!114 &2211771673887191714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240195409520255308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7279\u6743" +--- !u!114 &5557479358431718845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 240195409520255308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!1 &337708388696138029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7534398220406282275} + - component: {fileID: 5281703690902360008} + - component: {fileID: 7312635504742701171} + - component: {fileID: 5364664276251377589} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7534398220406282275 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337708388696138029} + 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: 5994939138272632008} + 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: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5281703690902360008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337708388696138029} + m_CullTransparentMesh: 0 +--- !u!114 &7312635504742701171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337708388696138029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u80CC\u5305" +--- !u!114 &5364664276251377589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 337708388696138029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &467027224480119402 GameObject: m_ObjectHideFlags: 0 @@ -520,13 +710,14 @@ RectTransform: - {fileID: 1086230880525906059} - {fileID: 4986024531908550943} - {fileID: 289490478397081149} + - {fileID: 4439284177717458321} m_Father: {fileID: 224675373245290278} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5350368570713940310 CanvasRenderer: @@ -549,14 +740,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a637bad0c9e3d8647ada652264bc4487, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -641,10 +832,10 @@ RectTransform: m_Father: {fileID: 9222520336153166412} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1863966578871887008 CanvasRenderer: @@ -674,7 +865,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -865,10 +1056,10 @@ RectTransform: m_Father: {fileID: 5994939138272632008} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9196802060887558678 CanvasRenderer: @@ -898,7 +1089,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -941,8 +1132,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4431000231853641492 CanvasRenderer: @@ -1016,13 +1207,14 @@ RectTransform: - {fileID: 390453693934899213} - {fileID: 4072676580646254714} - {fileID: 8762605169308932545} + - {fileID: 1707792658558596406} m_Father: {fileID: 224675373245290278} - m_RootOrder: 1 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1845886911478177509 CanvasRenderer: @@ -1045,14 +1237,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ec8c3424ba266bc43881c23e3f837d4e, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1120,7 +1312,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &315336464691071886 RectTransform: m_ObjectHideFlags: 0 @@ -1195,7 +1387,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8492052828496379418 RectTransform: m_ObjectHideFlags: 0 @@ -1212,7 +1404,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4252760464264421867 @@ -1286,7 +1478,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3479297131436798597 @@ -1343,7 +1535,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &9067973513794533985 RectTransform: m_ObjectHideFlags: 0 @@ -1360,7 +1552,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 40} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4092507225840436992 @@ -1434,8 +1626,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 11.1} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5018082232589499796 CanvasRenderer: @@ -1499,7 +1691,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2546636177625817102} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: [] @@ -1508,8 +1700,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 40, y: 63.999973} - m_SizeDelta: {x: 58, y: 58} + m_AnchoredPosition: {x: -30.9, y: 41.3} + m_SizeDelta: {x: 58, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2192547761309845224 CanvasRenderer: @@ -1656,10 +1848,10 @@ RectTransform: m_Father: {fileID: 8075319357219433647} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 10.089974} - m_SizeDelta: {x: 20, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3392719723679508752 CanvasRenderer: @@ -1689,7 +1881,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1732,13 +1924,14 @@ RectTransform: - {fileID: 7819138320611175682} - {fileID: 9067973513794533985} - {fileID: 4196172395814280517} + - {fileID: 4155050092851788450} m_Father: {fileID: 224675373245290278} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8738210985427038121 CanvasRenderer: @@ -1761,14 +1954,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 17827f47464343047a0b808d82fd1d27, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1928,13 +2121,14 @@ RectTransform: - {fileID: 5206401946484039485} - {fileID: 2587367169049231317} - {fileID: 399798514439597585} + - {fileID: 8824541870535838973} m_Father: {fileID: 224675373245290278} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &278730815618771922 CanvasRenderer: @@ -1957,14 +2151,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 415cbd51b1bee494fbafbf8c55c288c2, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2272,13 +2466,14 @@ RectTransform: - {fileID: 1278156731260996936} - {fileID: 2825818291843535240} - {fileID: 1580767738738028264} + - {fileID: 8511355442237899803} m_Father: {fileID: 224675373245290278} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5163823925775907519 CanvasRenderer: @@ -2301,14 +2496,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 12870f132671d6548ba8818b4b947f71, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2393,7 +2588,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8743838583992225724 @@ -2467,10 +2662,10 @@ RectTransform: m_Father: {fileID: 6389495984028840659} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &839487327968639538 CanvasRenderer: @@ -2500,7 +2695,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2509,6 +2704,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4163876113518198385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8511355442237899803} + - component: {fileID: 787917980093237216} + - component: {fileID: 8522941616441089457} + - component: {fileID: 1312984351572740911} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8511355442237899803 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163876113518198385} + 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: 8459229031355081979} + 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} + m_AnchoredPosition: {x: 0, y: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &787917980093237216 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163876113518198385} + m_CullTransparentMesh: 0 +--- !u!114 &8522941616441089457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163876113518198385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E3B\u57CE" +--- !u!114 &1312984351572740911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4163876113518198385} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4454689837864949894 GameObject: m_ObjectHideFlags: 0 @@ -2543,7 +2833,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2375594881860337068 @@ -2617,8 +2907,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 13.800026} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &518907687088281388 CanvasRenderer: @@ -2684,15 +2974,15 @@ RectTransform: m_GameObject: {fileID: 4506630964160377405} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5715261237029566118} 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: 2.9, y: 25.7} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8333508986552445375 CanvasRenderer: @@ -2805,6 +3095,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4982451487180591886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4439284177717458321} + - component: {fileID: 1827475158954967743} + - component: {fileID: 7218429514144776844} + - component: {fileID: 619950398915130188} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4439284177717458321 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982451487180591886} + 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: 6389495984028840659} + 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} + m_AnchoredPosition: {x: 0, y: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1827475158954967743 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982451487180591886} + m_CullTransparentMesh: 0 +--- !u!114 &7218429514144776844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982451487180591886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u516C\u4F1A" +--- !u!114 &619950398915130188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982451487180591886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5346504635055483592 GameObject: m_ObjectHideFlags: 0 @@ -2839,8 +3224,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 13.800026} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8811574835546813730 CanvasRenderer: @@ -2904,7 +3289,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5378712975184579418} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: [] @@ -2913,8 +3298,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 40, y: 63.999973} - m_SizeDelta: {x: 58, y: 58} + m_AnchoredPosition: {x: -30.9, y: 41.3} + m_SizeDelta: {x: 58, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8990221017584204114 CanvasRenderer: @@ -2988,13 +3373,14 @@ RectTransform: - {fileID: 8107933363025291534} - {fileID: 5430311836084545185} - {fileID: 3238442809343666094} + - {fileID: 253403587075673869} m_Father: {fileID: 224675373245290278} - m_RootOrder: 5 + 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: 877.5, y: 5.4} - m_SizeDelta: {x: 135, y: 118} + m_AnchoredPosition: {x: 1019.57007, y: 0} + m_SizeDelta: {x: 120.86, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7042496047279250599 CanvasRenderer: @@ -3017,14 +3403,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ec8c3424ba266bc43881c23e3f837d4e, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3109,8 +3495,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1075573274668490613 CanvasRenderer: @@ -3183,8 +3569,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 40, y: 63.999973} - m_SizeDelta: {x: 58, y: 58} + m_AnchoredPosition: {x: -30.9, y: 41.3} + m_SizeDelta: {x: 58, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2003155531966881138 CanvasRenderer: @@ -3223,6 +3609,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6154832340793695033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3410482601473079507} + - component: {fileID: 4775260885117118683} + - component: {fileID: 8349500298392287616} + - component: {fileID: 4759478136406841167} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3410482601473079507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6154832340793695033} + 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: 8075319357219433647} + 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: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4775260885117118683 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6154832340793695033} + m_CullTransparentMesh: 0 +--- !u!114 &8349500298392287616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6154832340793695033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5173\u5361" +--- !u!114 &4759478136406841167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6154832340793695033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6213091118426898648 GameObject: m_ObjectHideFlags: 0 @@ -3331,8 +3812,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 13.800026} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1327014166395800576 CanvasRenderer: @@ -3405,13 +3886,14 @@ RectTransform: - {fileID: 8611135082760516920} - {fileID: 8492052828496379418} - {fileID: 6095408888297027181} + - {fileID: 7534398220406282275} m_Father: {fileID: 224675373245290278} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6060723747781559980 CanvasRenderer: @@ -3434,14 +3916,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 95e0a0cdca9997f4bba1861a45b5c48c, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3526,8 +4008,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 28} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7099852842134202332 CanvasRenderer: @@ -3600,13 +4082,14 @@ RectTransform: - {fileID: 5715261237029566118} - {fileID: 5024828208432686861} - {fileID: 3476487814040812693} + - {fileID: 3410482601473079507} m_Father: {fileID: 224675373245290278} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 118} + m_SizeDelta: {x: 0, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3937947005754332091 CanvasRenderer: @@ -3629,14 +4112,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 718482cb9c5ead4479e7a3fac25f27a0, type: 3} + m_Sprite: {fileID: 21300000, guid: d5bec3c931a1c17419b58e190ca1b170, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3687,6 +4170,196 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7295667122129339220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4155050092851788450} + - component: {fileID: 1628001700705430990} + - component: {fileID: 3187021457185463150} + - component: {fileID: 2287503075746050249} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4155050092851788450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295667122129339220} + 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: 7460220109211596834} + 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: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1628001700705430990 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295667122129339220} + m_CullTransparentMesh: 0 +--- !u!114 &3187021457185463150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295667122129339220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u795E\u5C06" +--- !u!114 &2287503075746050249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295667122129339220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!1 &7316277041819128555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1707792658558596406} + - component: {fileID: 5464619441121625910} + - component: {fileID: 4747914729974609989} + - component: {fileID: 7891570460955169076} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1707792658558596406 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316277041819128555} + 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: 1279565468545304449} + 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} + m_AnchoredPosition: {x: 0, y: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5464619441121625910 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316277041819128555} + m_CullTransparentMesh: 0 +--- !u!114 &4747914729974609989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316277041819128555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4E3B\u89D2" +--- !u!114 &7891570460955169076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7316277041819128555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7378941151362412018 GameObject: m_ObjectHideFlags: 0 @@ -3795,10 +4468,10 @@ RectTransform: m_Father: {fileID: 1279565468545304449} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1826323911347262235 CanvasRenderer: @@ -3828,7 +4501,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3871,10 +4544,10 @@ RectTransform: m_Father: {fileID: 6730709935535294727} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1990074696154720655 CanvasRenderer: @@ -3904,7 +4577,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3947,8 +4620,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 11.10001} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5947126864797472014 CanvasRenderer: @@ -3978,7 +4651,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a64da7ac4269b234798b01ab91a193a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 9677df8f88a02244cb5ee7215819610f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4021,8 +4694,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5583084236558663061 CanvasRenderer: @@ -4095,8 +4768,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &390935934211080877 CanvasRenderer: @@ -4169,8 +4842,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 3, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7812343595420071259 CanvasRenderer: @@ -4243,8 +4916,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27.999973} - m_SizeDelta: {x: 170, y: 170} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8762966952440645342 CanvasRenderer: @@ -4317,10 +4990,10 @@ RectTransform: m_Father: {fileID: 7460220109211596834} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 14.499974} - m_SizeDelta: {x: 10, y: 146} + 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: 139, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1804985591823503697 CanvasRenderer: @@ -4350,7 +5023,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1f061f02d2a77544a82d73612c31bab8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46a75f654268c7b4a90b3c313cd7a2cc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4393,8 +5066,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 11.10001} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4092351584174499104 CanvasRenderer: @@ -4467,7 +5140,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 60, y: 63.999973} + m_AnchoredPosition: {x: 49, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1585991603044624818 @@ -4524,7 +5197,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1278156731260996936 RectTransform: m_ObjectHideFlags: 0 @@ -4541,7 +5214,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6098019822220210217 @@ -4615,7 +5288,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 63.999973} + m_AnchoredPosition: {x: 39, y: 39.999973} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4057725599286917001 @@ -4655,6 +5328,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8971564895989509140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8824541870535838973} + - component: {fileID: 6708854455274964270} + - component: {fileID: 4779278776109083242} + - component: {fileID: 3208167556421160110} + m_Layer: 5 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8824541870535838973 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8971564895989509140} + 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: 6730709935535294727} + 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} + m_AnchoredPosition: {x: 0, y: -39} + m_SizeDelta: {x: 160, y: 46.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6708854455274964270 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8971564895989509140} + m_CullTransparentMesh: 0 +--- !u!114 &4779278776109083242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8971564895989509140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.8941177, b: 0.63529414, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u526F\u672C" +--- !u!114 &3208167556421160110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8971564895989509140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.23137257, g: 0.15294118, b: 0.06666667, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1001 &942664120829142748 PrefabInstance: m_ObjectHideFlags: 0 @@ -4667,6 +5435,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -4727,11 +5500,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &8298585180819362860 stripped @@ -4752,6 +5520,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -4812,11 +5585,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &7783773276201446485 stripped @@ -4837,6 +5605,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -4897,11 +5670,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &7862799739177442004 stripped @@ -4922,6 +5690,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -4982,11 +5755,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &7676859068974349745 stripped @@ -5007,6 +5775,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5067,11 +5840,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &2170780910033458949 stripped @@ -5092,6 +5860,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5152,11 +5925,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &2252215818400473861 stripped @@ -5177,6 +5945,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x @@ -5237,11 +6010,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: -0.83 objectReference: {fileID: 0} - - target: {fileID: 7334383654688283673, guid: 7343ee1ef5da62448b0fbf077b50ca72, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2229999 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} --- !u!4 &812851419482674323 stripped @@ -5262,6 +6030,11 @@ PrefabInstance: propertyPath: m_Name value: Effect_UI_ZhuCheng_xuanzhong objectReference: {fileID: 0} + - target: {fileID: 5234553126032746312, guid: 7343ee1ef5da62448b0fbf077b50ca72, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9097125317478839024, guid: 7343ee1ef5da62448b0fbf077b50ca72, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 22e73fb019..589496397b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -40,7 +40,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 98, y: 58} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &348893785 CanvasRenderer: @@ -2206,7 +2206,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: 176, y: 176} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4458337134792049816 CanvasRenderer: @@ -7124,7 +7124,7 @@ RectTransform: - {fileID: 2025934754434711663} - {fileID: 7718091128414328679} m_Father: {fileID: 986452627335843391} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -7611,7 +7611,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 986452627335843391} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8060,9 +8060,9 @@ RectTransform: m_Father: {fileID: 5352445832565045888} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 621.12, y: -36} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 98, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1256521596463652073 @@ -8863,7 +8863,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 98, y: 58} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5808588845638581693 CanvasRenderer: @@ -20022,7 +20022,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1508767087665272957 RectTransform: m_ObjectHideFlags: 0 @@ -20212,16 +20212,16 @@ RectTransform: m_GameObject: {fileID: 2025930671981306296} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7529412, y: 0.7529412, z: 0.7529412} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 791836871433561562} - {fileID: 934965601362156588} m_Father: {fileID: 986452627335843391} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -42, y: -136} + m_AnchoredPosition: {x: -89.5, y: -198.6} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1214399939458572418 @@ -22020,7 +22020,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: 200, y: 200} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2593209274901420195 CanvasRenderer: @@ -22285,8 +22285,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 48, y: 72} - m_SizeDelta: {x: 170, y: 220} + m_AnchoredPosition: {x: 72.849976, y: 72} + m_SizeDelta: {x: 147, y: 866} m_Pivot: {x: 1, y: 1} --- !u!222 &6392692323906310469 CanvasRenderer: @@ -22317,7 +22317,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 7f8196f2128a4e6489a78791b3146f78, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -23838,10 +23838,10 @@ RectTransform: m_Father: {fileID: 5034612710644007650} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74, y: -63} - m_SizeDelta: {x: 148, y: 126} + 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: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &600217400349962022 CanvasRenderer: @@ -34390,7 +34390,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: 200, y: 200} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6646240543550367891 CanvasRenderer: @@ -34465,7 +34465,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: 176, y: 176} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6905228289140813725 CanvasRenderer: @@ -34646,7 +34646,7 @@ RectTransform: m_Children: - {fileID: 7113366927037583587} m_Father: {fileID: 986452627335843391} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -35082,7 +35082,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7094943317510879996 RectTransform: m_ObjectHideFlags: 0 @@ -40526,7 +40526,7 @@ RectTransform: m_Children: - {fileID: 1080492301643067761} m_Father: {fileID: 986452627335843391} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -51110,9 +51110,7 @@ GameObject: - component: {fileID: 4883613866719607552} - component: {fileID: 4890164291228737029} - component: {fileID: 1148295245348429754} - - component: {fileID: 4495607258833565001} - - component: {fileID: 6799165370466724897} - - component: {fileID: 8656524977008347276} + - component: {fileID: 8732985602639913800} m_Layer: 5 m_Name: activityTabPrefab m_TagString: Untagged @@ -51139,8 +51137,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -124.00003, y: -77.999954} - m_SizeDelta: {x: 148, y: 126} + m_AnchoredPosition: {x: -149.00003, y: -77.999954} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.49999973, y: 0.50000036} --- !u!222 &4883613866719607552 CanvasRenderer: @@ -51186,7 +51184,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 4495607258833565001} + m_TargetGraphic: {fileID: 8732985602639913800} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -51211,7 +51209,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &4495607258833565001 +--- !u!114 &8732985602639913800 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -51220,7 +51218,7 @@ MonoBehaviour: m_GameObject: {fileID: 4346368747760932773} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -51231,43 +51229,15 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &6799165370466724897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346368747760932773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 1 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 ---- !u!114 &8656524977008347276 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4346368747760932773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 + m_Sprite: {fileID: 21300000, guid: ce6a5e8caebae894bbb7d3eeb17e8dcb, 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 --- !u!1 &4359420380105879269 GameObject: m_ObjectHideFlags: 0 @@ -56944,7 +56914,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 98, y: 58} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4403198427667689683 CanvasRenderer: @@ -57164,7 +57134,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 98, y: 58} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4962866236656851922 CanvasRenderer: @@ -62716,7 +62686,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5352445832565045888} - - component: {fileID: 2378108424592805360} + - component: {fileID: 2782770848681451653} m_Layer: 5 m_Name: btnRoot m_TagString: Untagged @@ -62745,12 +62715,12 @@ RectTransform: m_Father: {fileID: 8831099743542526053} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 50, y: 264} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74.2, y: -403.5} + m_SizeDelta: {x: 100, y: 505} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2378108424592805360 +--- !u!114 &2782770848681451653 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -62759,20 +62729,21 @@ MonoBehaviour: m_GameObject: {fileID: 5073017324101615129} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 27 + m_Left: 0 m_Right: 0 - m_Top: 7 + m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 38.28 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildAlignment: 1 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 126, y: 126} + m_Spacing: {x: 0, y: 15.17} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &5086572722208604969 GameObject: m_ObjectHideFlags: 0 @@ -67737,7 +67708,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1612271237950830011} - - component: {fileID: 8266236825769241062} + - component: {fileID: 888843197805418026} m_Layer: 5 m_Name: RightUp m_TagString: Untagged @@ -67758,14 +67729,14 @@ RectTransform: m_Children: - {fileID: 5034612710644007650} m_Father: {fileID: 986452627335843391} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -42, y: -150} + m_AnchoredPosition: {x: -42, y: -167} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8266236825769241062 +--- !u!114 &888843197805418026 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -67779,13 +67750,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: 150 + m_Right: 186 m_Top: 15 m_Bottom: 0 m_ChildAlignment: 2 m_StartCorner: 1 m_StartAxis: 0 - m_CellSize: {x: 148, y: 126} + m_CellSize: {x: 126, y: 126} m_Spacing: {x: -15, y: 20} m_Constraint: 1 m_ConstraintCount: 5 @@ -67994,9 +67965,9 @@ RectTransform: m_Father: {fileID: 5352445832565045888} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 484.84, y: -36} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 98, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3844940865433949363 @@ -68678,7 +68649,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: 176, y: 176} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7457120176139238295 CanvasRenderer: @@ -68748,12 +68719,12 @@ RectTransform: - {fileID: 5352445832565045888} - {fileID: 7754725958776047094} m_Father: {fileID: 986452627335843391} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5567815818643116895 MonoBehaviour: @@ -69342,8 +69313,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 48, y: 72} - m_SizeDelta: {x: 160, y: 709.92} + m_AnchoredPosition: {x: 80, y: 72} + m_SizeDelta: {x: 147, y: 709.92} m_Pivot: {x: 1, y: 1} --- !u!114 &6888282265971651260 MonoBehaviour: @@ -69643,13 +69614,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5814791337436474819} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + 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: 791836871433561562} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 3.9000015, y: 64.5} @@ -70887,7 +70858,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -86, y: 214} + m_AnchoredPosition: {x: -86, y: -385} m_SizeDelta: {x: 595.26, y: 346.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &738290502969369036 @@ -70988,7 +70959,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 98, y: 58} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7443465253179528445 CanvasRenderer: @@ -71918,7 +71889,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2034316355286400179 RectTransform: m_ObjectHideFlags: 0 @@ -73056,6 +73027,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5143\u7D20\u62DB\u52DF" LanguageIndex: 0 +--- !u!1 &7114315901366276349 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1672733935988337368} + - component: {fileID: 4744290266620175459} + - component: {fileID: 6295020645524230773} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1672733935988337368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7114315901366276349} + 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: 986452627335843391} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4744290266620175459 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7114315901366276349} + m_CullTransparentMesh: 0 +--- !u!114 &6295020645524230773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7114315901366276349} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f4927a7e4251ed1458a2836b2c89d1e1, 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 --- !u!1 &7141275030227641356 GameObject: m_ObjectHideFlags: 0 @@ -73589,6 +73634,7 @@ RectTransform: - {fileID: 2034316355286400179} - {fileID: 7094943317510879996} - {fileID: 1508767087665272957} + - {fileID: 1672733935988337368} - {fileID: 1470640894515440942} - {fileID: 1612271237950830011} - {fileID: 2763478119683056422} @@ -74230,7 +74276,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: 200, y: 200} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &176560974359026220 CanvasRenderer: @@ -81015,7 +81061,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: 176, y: 176} + m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7976777090235526699 CanvasRenderer: @@ -81311,7 +81357,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: 200, y: 200} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7976777090835231750 CanvasRenderer: @@ -82933,7 +82979,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: 200, y: 200} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7669614767869734815 CanvasRenderer: @@ -93504,7 +93550,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1473827928010218247 RectTransform: m_ObjectHideFlags: 0 @@ -94903,12 +94949,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -95143,12 +95189,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -95233,12 +95279,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -95323,12 +95369,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 @@ -95413,12 +95459,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6459496238626600186, guid: 15143366a3b308741b7041f2c67dbe3c, + - target: {fileID: 8409294634132800246, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab index 742c70800c..f841baaab8 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerHeadView/PlayerHead.prefab @@ -35,7 +35,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: 140, y: 140} + m_SizeDelta: {x: 115, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8170576650023497250 CanvasRenderer: @@ -226,7 +226,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: 200, y: 200} + m_SizeDelta: {x: 141, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4344694812628429666 CanvasRenderer: @@ -256,7 +256,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 79b9bf21df50c0c46bb96bb2d2f68f65, type: 3} + m_Sprite: {fileID: 21300000, guid: 235f511e5ae0aec4f905c2f4df405d91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -300,7 +300,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -57.4, y: 55.5} + m_AnchoredPosition: {x: -40.500008, y: 45.5} m_SizeDelta: {x: 60, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5182294842058479684 diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index 4c06977584..f913026978 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -39,8 +39,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 380.7, y: -36.1} - m_SizeDelta: {x: 138, y: 52} + m_AnchoredPosition: {x: 380.7, y: -32.9} + m_SizeDelta: {x: 134, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &894663350 CanvasRenderer: @@ -225,6 +225,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 8.981068} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5839255540370102065} + - {fileID: 1792926880520076474} - {fileID: 4296880302332140369} - {fileID: 8036838765478876343} - {fileID: 2880307063852156390} @@ -348,7 +350,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1219376904625469092} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -545,7 +547,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: 138, y: 52} + m_SizeDelta: {x: 134, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1410886060457754306 CanvasRenderer: @@ -616,7 +618,7 @@ RectTransform: - {fileID: 916935745634237712} - {fileID: 2826334364291630915} m_Father: {fileID: 1219376904625469092} - m_RootOrder: 3 + 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} @@ -702,7 +704,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1219376904625469092} - m_RootOrder: 1 + 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} @@ -5626,11 +5628,11 @@ RectTransform: m_Father: {fileID: 5482684044178059912} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 6.3050003, y: -21.7} + 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: 55.43, y: 47.77} - m_Pivot: {x: 0, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7139210917050952766 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5661,7 +5663,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 25 + m_FontSize: 23 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -10539,6 +10541,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &3589864628453529200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1792926880520076474} + - component: {fileID: 2476147396081929501} + - component: {fileID: 1478339580858359810} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1792926880520076474 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3589864628453529200} + 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: 1219376904625469092} + 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: 127.03, y: 44} + m_SizeDelta: {x: 201.57, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2476147396081929501 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3589864628453529200} + m_CullTransparentMesh: 0 +--- !u!114 &1478339580858359810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3589864628453529200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 75857acfa9133a247a614d3db9217443, 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 --- !u!1 &3639989804846518891 GameObject: m_ObjectHideFlags: 0 @@ -10570,7 +10646,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1219376904625469092} - m_RootOrder: 2 + 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} @@ -10666,12 +10742,12 @@ RectTransform: m_Children: - {fileID: 7016084463682291430} m_Father: {fileID: 1219376904625469092} - m_RootOrder: 5 + 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} m_AnchoredPosition: {x: -55.21, y: 54.9} - m_SizeDelta: {x: 64.02, y: 43.4} + m_SizeDelta: {x: 52, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6833011947152572346 CanvasRenderer: @@ -10859,6 +10935,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4718219744628311107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5839255540370102065} + - component: {fileID: 9136666721067539071} + - component: {fileID: 2077118162059783938} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5839255540370102065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4718219744628311107} + 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: 1219376904625469092} + 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: -5.7, y: 27.8} + m_SizeDelta: {x: 155, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9136666721067539071 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4718219744628311107} + m_CullTransparentMesh: 0 +--- !u!114 &2077118162059783938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4718219744628311107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 37af0a2fa010b09459c0871325ad81cc, 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 --- !u!1 &4894584253430939105 GameObject: m_ObjectHideFlags: 0 @@ -10958,14 +11108,14 @@ RectTransform: m_GameObject: {fileID: 5199017338206016712} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.85, y: 0.85, z: 1} + m_LocalScale: {x: 1.12, y: 1.12, z: 1} m_Children: [] m_Father: {fileID: 1219376904625469092} - m_RootOrder: 0 + 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} - m_AnchoredPosition: {x: -9.3, y: 9.7} + m_AnchoredPosition: {x: -4.9, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5222084596200555479 @@ -11558,7 +11708,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6408781291614374628 RectTransform: m_ObjectHideFlags: 0 @@ -11725,7 +11875,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 70.3999, y: -65.600006} - m_SizeDelta: {x: 166, y: 162} + m_SizeDelta: {x: 141, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8907333225067989730 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index da8e6ae79a..ae84ed698b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1102,9 +1102,9 @@ function this.SetRightBarSize() this.RightUp2:SetActive(PlayerManager.level >= 5 and SERVER_VERSION == 0) local str = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting") if not str or str == 0 then - this.RightUp2bgSize.sizeDelta = Vector3.New(180,320,0) - this.RightUp2rectSize.sizeDelta = Vector3.New(180,220,0) - this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,-90)) + this.RightUp2bgSize.sizeDelta = Vector3.New(147,320,0) + this.RightUp2rectSize.sizeDelta = Vector3.New(147,220,0) + this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,180)) else local num = 0 for i = 1, this.RightUp2Grid.transform.childCount do @@ -1113,38 +1113,38 @@ function this.SetRightBarSize() end end local y = ySet[num] - this.RightUp2bgSize.sizeDelta =Vector3.New(180,y,0) - this.RightUp2rectSize.sizeDelta = Vector3.New(180,y,0) - this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,90)) + this.RightUp2bgSize.sizeDelta =Vector3.New(147,y,0) + this.RightUp2rectSize.sizeDelta = Vector3.New(147,y,0) + this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,0)) end Util.AddOnceClick(this.RightUp2btn.gameObject,function() local str2 = PlayerPrefs.GetInt(PlayerManager.uid.."MainRightBarSetting") if str2 == 0 then PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",1) --按钮旋转 - DoTween.To(DG.Tweening.Core.DOGetter_float( function () return -90 end), + DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 180 end), DG.Tweening.Core.DOSetter_float(function (t) this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,t)) - end), 90, 0.3):SetEase(Ease.Linear) + end), 0, 0.3):SetEase(Ease.Linear) --底图拉伸 DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 220 end), DG.Tweening.Core.DOSetter_float(function (t) - this.RightUp2rectSize.sizeDelta = Vector3.New(180,t,0) - this.RightUp2bgSize.sizeDelta = Vector3.New(180,t + 100,0) + this.RightUp2rectSize.sizeDelta = Vector3.New(147,t,0) + this.RightUp2bgSize.sizeDelta = Vector3.New(147,t + 100,0) end), this.RightUp2gridSize.sizeDelta.y, 0.3):SetEase(Ease.Linear) this.ShowEffect(true) else PlayerPrefs.SetInt(PlayerManager.uid.."MainRightBarSetting",0) --按钮旋转 - DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 90 end), + DoTween.To(DG.Tweening.Core.DOGetter_float( function () return 0 end), DG.Tweening.Core.DOSetter_float(function (t) this.RightUp2btnImg.rotation = Quaternion.Euler(Vector3.New(0,0,t)) - end), -90, 0.3):SetEase(Ease.Linear) + end), 180, 0.3):SetEase(Ease.Linear) --底图拉伸 DoTween.To(DG.Tweening.Core.DOGetter_float( function () return this.RightUp2gridSize.sizeDelta.y end), DG.Tweening.Core.DOSetter_float(function (t) - this.RightUp2rectSize.sizeDelta = Vector3.New(180,t,0) - this.RightUp2bgSize.sizeDelta = Vector3.New(180,t + 100,0) + this.RightUp2rectSize.sizeDelta = Vector3.New(147,t,0) + this.RightUp2bgSize.sizeDelta = Vector3.New(147,t + 100,0) end), 220, 0.3):SetEase(Ease.Linear) this.ShowEffect(false) end