diff --git a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01.png b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01.png rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01_zh.png diff --git a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01.png.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01_zh.png.meta index 781375a3b9..b796ad66f3 100644 --- a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/c_ydsj_banner01_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cbc5a01e18dd38b43997fe963603b553 +guid: 2fe5809ea1d16d446a0f2cb061534b18 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 3a6aaf417e016a1418b45c8fc26da77f + spriteID: 9f78bbd93865cd048aa3bb49c7c057b5 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner.png b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner.png rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.png diff --git a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner.png.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.png.meta index 88b1fd6fda..7cfb56adda 100644 --- a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 812ce33fb86f7074d9a212c8f233c8ae +guid: 5e323d7b79ad63046a2c91925b71f9bf TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 965576f7a5219a54680f1a6fc9bcdc54 + spriteID: 77d1c3e1375df314fb30f0832e0da452 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01.png b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01.png rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01_zh.png diff --git a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01.png.meta b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01_zh.png.meta similarity index 95% rename from Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01.png.meta rename to Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01_zh.png.meta index 16cafcc298..0f9bb59918 100644 --- a/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01.png.meta +++ b/Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/x_xianshizaohuan_solgan01_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ea79daaf9419d445acf5fe149172699 +guid: 5674aa92233f8ac4d9c8a5f5ae5b175f TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 974587b4372579a4182667e6eb3ba6ca + spriteID: 542b1fcca64d97b44af70b1bf81c4fd0 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index c3b05547fa..d1394900ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -214,7 +214,7 @@ local activityType = { [2]={name="Bg2/hero3",id=10004,hero="x_xianshizaohuan_shenjiang3"}, --慈航道人 [3]={name="Bg2/hero2",id=10023,hero="c_ccfy_kuang03"}, --孙悟空 }, - title = "x_xianshizaohuan_solgan01", + title = "x_xianshizaohuan_solgan01_zh", helptype = HELP_TYPE.TimeLimitedCall }, --勇冠三军 限时召唤 @@ -225,7 +225,7 @@ local activityType = { [2]={name="Bg2/hero3",id=10019,hero="c_ygsj_kuang003"}, --巨灵神 [3]={name="Bg2/hero2",id=10024,hero="c_ygsj_kuang002"}, --姜子牙 }, - title = "c_ydsj_slogan", + title = "c_ydsj_slogan_zh", helptype = HELP_TYPE.TimeLimitedCall }, } diff --git a/FontArt/ArtFont_en/jl_slfb_zi_en.png b/FontArt/ArtFont_en/jl_slfb_zi_en.png new file mode 100644 index 0000000000..5277ae2656 Binary files /dev/null and b/FontArt/ArtFont_en/jl_slfb_zi_en.png differ diff --git a/FontArt/ArtFont_en/r_zjm_icon-chengyuan001_en.png b/FontArt/ArtFont_en/r_zjm_icon-chengyuan001_en.png new file mode 100644 index 0000000000..b28b037dba Binary files /dev/null and b/FontArt/ArtFont_en/r_zjm_icon-chengyuan001_en.png differ diff --git a/FontArt/ArtFont_en/r_zjm_icon-chengyuan002_en.png b/FontArt/ArtFont_en/r_zjm_icon-chengyuan002_en.png new file mode 100644 index 0000000000..c3ad22ac7b Binary files /dev/null and b/FontArt/ArtFont_en/r_zjm_icon-chengyuan002_en.png differ diff --git a/FontArt/ArtFont_en/r_zjm_icon_huaxuntan_en.png b/FontArt/ArtFont_en/r_zjm_icon_huaxuntan_en.png new file mode 100644 index 0000000000..46c93fc0f4 Binary files /dev/null and b/FontArt/ArtFont_en/r_zjm_icon_huaxuntan_en.png differ diff --git a/FontArt/ArtFont_zh/c_ydsj_banner01_zh.png b/FontArt/ArtFont_zh/c_ydsj_banner01_zh.png new file mode 100644 index 0000000000..f9f5638e68 Binary files /dev/null and b/FontArt/ArtFont_zh/c_ydsj_banner01_zh.png differ diff --git a/FontArt/ArtFont_zh/jl_slfb_zi_zh.png b/FontArt/ArtFont_zh/jl_slfb_zi_zh.png new file mode 100644 index 0000000000..f2823e24d1 Binary files /dev/null and b/FontArt/ArtFont_zh/jl_slfb_zi_zh.png differ diff --git a/FontArt/ArtFont_zh/p_pozhengzhuxian_banner_zh.png b/FontArt/ArtFont_zh/p_pozhengzhuxian_banner_zh.png new file mode 100644 index 0000000000..79f8b799d7 Binary files /dev/null and b/FontArt/ArtFont_zh/p_pozhengzhuxian_banner_zh.png differ diff --git a/FontArt/ArtFont_zh/x_xianshizaohuan_solgan01_zh.png b/FontArt/ArtFont_zh/x_xianshizaohuan_solgan01_zh.png new file mode 100644 index 0000000000..61d19135ba Binary files /dev/null and b/FontArt/ArtFont_zh/x_xianshizaohuan_solgan01_zh.png differ diff --git a/FontArt/中英文不一致资源/en/r_zjm_icon_huaxuntan_en.png b/FontArt/中英文不一致资源/en/r_zjm_icon_huaxuntan_en.png new file mode 100644 index 0000000000..46c93fc0f4 Binary files /dev/null and b/FontArt/中英文不一致资源/en/r_zjm_icon_huaxuntan_en.png differ diff --git a/FontArt/中英文不一致资源/en/x_xianshizaohuan_solgan01_en.png b/FontArt/中英文不一致资源/en/x_xianshizaohuan_solgan01_en.png deleted file mode 100644 index 092dbed49b..0000000000 Binary files a/FontArt/中英文不一致资源/en/x_xianshizaohuan_solgan01_en.png and /dev/null differ diff --git a/FontArt/中英文不一致资源/zh/c_ydsj_banner01_zh.png b/FontArt/中英文不一致资源/zh/c_ydsj_banner01_zh.png new file mode 100644 index 0000000000..f9f5638e68 Binary files /dev/null and b/FontArt/中英文不一致资源/zh/c_ydsj_banner01_zh.png differ diff --git a/FontArt/中英文不一致资源/zh/p_pozhengzhuxian_banner_zh.png b/FontArt/中英文不一致资源/zh/p_pozhengzhuxian_banner_zh.png new file mode 100644 index 0000000000..79f8b799d7 Binary files /dev/null and b/FontArt/中英文不一致资源/zh/p_pozhengzhuxian_banner_zh.png differ diff --git a/FontArt/中英文不一致资源/zh/r_zjm_icon-chengyuan001_zh.png b/FontArt/中英文不一致资源/zh/r_zjm_icon-chengyuan001_zh.png deleted file mode 100644 index d97f16275e..0000000000 Binary files a/FontArt/中英文不一致资源/zh/r_zjm_icon-chengyuan001_zh.png and /dev/null differ diff --git a/FontArt/中英文不一致资源/zh/r_zjm_icon-chengyuan002_zh.png b/FontArt/中英文不一致资源/zh/r_zjm_icon-chengyuan002_zh.png deleted file mode 100644 index 18fd993153..0000000000 Binary files a/FontArt/中英文不一致资源/zh/r_zjm_icon-chengyuan002_zh.png and /dev/null differ