diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon1_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon1_zh.png index 0e9c4f0b5c..8f2832a59f 100644 Binary files a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon1_zh.png and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon2_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon2_zh.png index cc00d7d09f..294ef5dff8 100644 Binary files a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon2_zh.png and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/s_suoxiangpimi_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon1_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon1_zh.png index dc30ed91d2..57c2203cc3 100644 Binary files a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon1_zh.png and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon2_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon2_zh.png index f6eeaeb481..db9812a5bb 100644 Binary files a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon2_zh.png and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon1_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon1_zh.png index adccd64a09..39be3ee56f 100644 Binary files a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon1_zh.png and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon2_zh.png b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon2_zh.png index 4d8c463873..6c73e51642 100644 Binary files a/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon2_zh.png and b/Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xialuxiangfeng_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon1_zh.png index 78afe0ee3e..ab75528108 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon2_zh.png index 3e24d5d49b..232378c464 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon1_zh.png index 107c6fe064..075b2d482c 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon2_zh.png index 52645cc950..b738ee6fd6 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bowenduoshi_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon1_zh.png index dbca96c0d0..b93825f2e7 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon2_zh.png index 53da1525d6..4f166a4b10 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_01_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_01_zh.png index 109508465d..0b9f9dfa64 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_01_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_02_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_02_zh.png index ea7aec53ad..6c2fd27446 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_02_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ydsj_anniu_02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon1_zh.png index a3b9439c4b..6570234988 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon2_zh.png new file mode 100644 index 0000000000..5b03e2539c Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon2_zh.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon2_zh.png.meta new file mode 100644 index 0000000000..0a0253d448 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_bicon2_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 30095c1f59d176945ab1e84df2cebffb +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 90a99766cbfd54840b6f38b9d6fa816e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_anniu_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_anniu_zh.png index fe5fc8c974..70ee74f07f 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_anniu_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_anniu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_xianshibiao0_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_xianshibiao0_zh.png index d88b889f3a..266539b394 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_xianshibiao0_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/l_lishoutehui_xianshibiao0_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_01_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_01_zh.png index 5248bfa691..ab247dd1e0 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_01_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_02_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_02_zh.png index ab3202f5d6..11ec07e71e 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_02_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/p_pozhengzhuxian_anniu_02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon1_zh.png index 82c7ab7ea6..78db40277d 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon2_zh.png index 677137acef..eb07c3d94e 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shibukedang_bicon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon1_zh.png index 8da348cb79..989e7b15a8 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon2_zh.png index 53e91cf19a..8c68f98a0a 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_yongwangzhiqian_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon1_zh.png index f663f23109..c93489e7ee 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon2_zh.png index e8cfcf2908..f3f5f67fb8 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/t_tianxiangjiren_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon1_zh.png index b05edaac0f..26e1840bbd 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon2_zh.png index d86237a483..b7cc206772 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianglongfuhu_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon1_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon1_zh.png index cdf1244078..7ef88cd9f0 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon1_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon2_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon2_zh.png index 1eab848173..8fa47ccc66 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon2_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xuanjimiaosuan_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_01_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_01_zh.png index cb14bd4f6a..fa976bff66 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_01_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_02_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_02_zh.png index 6842dc2b12..258f7048cf 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_02_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yishandaohai_anniu_02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu01_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu01_zh.png index 3e448491e0..3c36d12cda 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu01_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu02_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu02_zh.png index e38ed2108d..4b921ebd86 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu02_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/y_yunchouweiwo_anniu02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_01_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_01_zh.png index 72f65e69d1..97111269ea 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_01_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_zh.png index db632ee586..eed16c8915 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_dianjinanniu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_01_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_01_zh.png index 3b78d60aa4..5d1388267a 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_01_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_02_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_02_zh.png index 5a2ab0e47d..ee2f4c4152 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_02_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_shengji_02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_01_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_01_zh.png index 6a3a6f5a56..7964e5bcc8 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_01_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_02_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_02_zh.png index b8411ee13b..58b4660c21 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_02_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_03_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_03_zh.png new file mode 100644 index 0000000000..e467c04780 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_03_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_03_zh.png.meta b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_03_zh.png.meta new file mode 100644 index 0000000000..31f767d481 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_shop_yunyou_03_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 0f66536273ea5b040ab30ce1d3a2feb9 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b2cf92af58afd604997e6b9863da23eb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagButtonAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua index 90099ab83b..735c4f2124 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua @@ -47,6 +47,8 @@ function CardRendererManager.GetSpineTexture(pos, liveName, scaleV3, posV3, isRe -- 创建新资源 local parent = this.renderList[this.indexFlag].transform + parent.transform.localScale = Vector3.one + parent.transform.localPosition = Vector3(0, 0, 0) local liveNode = poolManager:LoadLive(liveName, parent, scaleV3, posV3 + Vector3(0, -120, 0), onClear) this.liveList[this.indexFlag] = { name = liveName, diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 4e63299b33..7961d1c81e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -331,7 +331,7 @@ function Practice:RefreshBtn() local nextConFig = XinXianConfig[PracticeManager.PracticeLevel + 1] LogYellow("self.curLevelConfig "..nextConFig.Id) if nextConFig.IsOpen == 0 then--未开启 - self.noOpenTip:GetComponent("Text").text = string.format("【%s期】暂未开放,请等待后续更新",nextConFig.NameFontColor,nextConFig.RealmName) + self.noOpenTip:GetComponent("Text").text = string.format("【%s期】暂未开放,请等待后续更新",nextConFig.NameFontColor,nextConFig.RealmName) Util.SetGray(self.button,true) self.button:GetComponent("Button").enabled = false self.noOpenTip:SetActive(true)