Commit Graph

1169 Commits (0211cf2a6074192b8b208e8e34af9d1ea0b3c51e)

Author SHA1 Message Date
PC-202302260912\Administrator 556891f173 称号添加长图 2025-08-28 11:27:08 +08:00
PC-202302260912\Administrator e06c372ce3 称号图修改 2025-08-27 16:48:53 +08:00
PC-202302260912\Administrator 3537a64193 特权 2025-08-27 16:27:04 +08:00
PC-202302260912\Administrator dfc10e7915 称号图片修正 2025-08-27 15:58:56 +08:00
PC-202302260912\Administrator 576b08b99a 本体图片替换 2025-08-18 19:23:04 +08:00
PC-202302260912\Administrator c1a6d5a0f6 修改基本图标 2025-08-07 19:47:25 +08:00
PC-202302260912\Administrator 15db44c504 修改图片 2025-08-05 18:28:02 +08:00
PC-202302260912\Administrator c0a12a1e68 可合成图片修改字体 2025-07-18 14:09:04 +08:00
DESKTOP-MMO982B\User 27ab77ff40 11111 2025-03-04 18:45:54 +08:00
DESKTOP-MMO982B\User 767a33abf6 1111 2025-03-04 18:45:19 +08:00
DESKTOP-MMO982B\User e2527c40c6 11111 2025-03-04 18:44:59 +08:00
DESKTOP-MMO982B\User 68e18cf57d 1111 2025-03-04 18:44:38 +08:00
DESKTOP-MMO982B\User 76db1d9438 111 2025-03-04 18:43:30 +08:00
DESKTOP-MMO982B\User b914105c7e 1111 2025-03-04 18:42:15 +08:00
DESKTOP-MMO982B\User 95c3da5190 1111 2025-03-04 18:40:29 +08:00
DESKTOP-MMO982B\User 2e43a5a0c9 1111 2025-03-04 18:38:24 +08:00
DESKTOP-MMO982B\User ee099bd0ba 删除无用图片 2025-03-04 18:36:33 +08:00
DESKTOP-MMO982B\User 1176d0cdae Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Atlas/RecruitAtlas/y_yuansu_xiaotu.jpg.meta
2025-02-13 16:23:04 +08:00
DESKTOP-RH64908\Administrator 36e7c66fca Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas/r_tongyong_leijishouyi.png.meta
#	Assets/ManagedResources/Atlas/ExploreAtlas/t_tansuo_jindutubiao.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_shop_item_bg.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_shuachong_info_bg.png.meta
#	Assets/ManagedResources/Atlas/GMAltas/gm_sswzc_bg2.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/r_gonghui_toubiao_01_zh.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/r_gonghui_toubiao_02_zh.png.meta
#	Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/s_shop_yijisi_zh.png.meta
#	Assets/ManagedResources/Atlas/SurpriseBoxAtlas/j_jingxilihe_guizitai.png.meta
#	Assets/ManagedResources/Atlas/SurpriseBoxAtlas/j_jingxilihe_muguijia.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_03.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_04.png.meta
#	Assets/ManagedResources/BG/UI/1All/X1_tongyong_liebiao_08.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_qianneng_36.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_qianneng_38.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_11.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png.meta
#	Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_80.png.meta
#	Assets/ManagedResources/BG/UI/CommonIcons/UI_hz_zhonghe10.png.meta
#	Assets/ManagedResources/BG/UI/DailyMission/UI_hz_richang_Bg.png.meta
#	Assets/ManagedResources/BG/UI/Guild/UI_hz_zhonghe03_58.png.meta
#	Assets/ManagedResources/BG/UI/Login/UI_hz_zhonghe01_29.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0027_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0028_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0029_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0033_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0034_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0035_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0036_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0037_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0038_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0039_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0041_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0042_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0043_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0044_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0045_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0048_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0049_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0050_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0053_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0054_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0055_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0056_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_0057_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ab_00014_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_bgj_00091_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_cff_0049_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_cff_0078_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dj_0008_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dz_00058_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_fhlh_00021_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ghn_0009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_gy_00092_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0001_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0002_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0003_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0004_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0005_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0006_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0007_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0008_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0010_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0011_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0012_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0013_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0014_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0015_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0016_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0017_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0018_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0019_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0020_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0021_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0022_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0023_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0024_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_h_0025_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_hyt_0032_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jbj_0007_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jlzz_00060_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_jzy_00043_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lslz_00046_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lsx_00069_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_lzz_0002_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_md_00064_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_mp_00051_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_nz_00029_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ts_00017_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_wsps_00016_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_xllh_00022_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yc_00052_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yj_00040_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_yn_009_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_zn_tx_001_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_ainilu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_chushisuolong.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_chushiwusuopu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_kapu.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_leili.png.meta
#	Assets/ManagedResources/Icon/Hero/livetu_tenghu.png.meta
2025-02-10 20:21:59 +08:00
DESKTOP-RH64908\Administrator 8d4c3a2213 1 2025-02-10 20:20:21 +08:00
DESKTOP-MMO982B\User 6270a15841 1 2025-02-10 19:48:04 +08:00
DESKTOP-MMO982B\User 4bc055fca6 1 2025-02-10 19:45:30 +08:00
DESKTOP-MMO982B\User dd43aee182 111 2025-02-10 18:54:22 +08:00
DESKTOP-MMO982B\User d939fcaa9c 1 2025-02-10 18:53:14 +08:00
DESKTOP-MMO982B\User d0c580d743 1 2025-02-10 18:50:58 +08:00
PC-202302260912\Administrator 61f25a31c8 1 2024-12-24 14:52:53 +08:00
DESKTOP-RH64908\Administrator 0960d7fc5a 1 2024-12-24 14:43:26 +08:00
PC-202302260912\Administrator d60f3558bc 删除无用图片 2024-12-11 17:26:29 +08:00
PC-202302260912\Administrator 6290782b8e 删除无用图片 2024-12-11 17:23:39 +08:00
PC-202302260912\Administrator bcecec645b 删除无用图片 2024-12-11 17:20:40 +08:00
PC-202302260912\Administrator 955abe15e3 删除 2024-12-11 17:19:33 +08:00
PC-202302260912\Administrator 6735759ff3 两颗星替换 2024-12-09 13:00:32 +08:00
PC-202302260912\Administrator dea737b1c3 法相相关删除 2024-12-03 15:03:36 +08:00
PC-202302260912\Administrator e8926f7d70 删除无用图片 2024-12-02 20:41:11 +08:00
PC-202302260912\Administrator 1840ff0305 删除无用图片 2024-12-02 20:40:34 +08:00
PC-202302260912\Administrator 98e6123052 删除无用图片 2024-12-02 20:38:53 +08:00
PC-202302260912\Administrator d97203bf1a 删除无用图片 2024-12-02 20:37:22 +08:00
PC-202302260912\Administrator b004a6fbc9 删除无用图片 2024-12-02 20:34:57 +08:00
PC-202302260912\Administrator 41d963c257 删除无用 2024-12-02 20:33:43 +08:00
PC-202302260912\Administrator 6305ff1bea 删除无用图片 2024-12-02 20:32:02 +08:00
PC-202302260912\Administrator 885d8a04d1 删除无用图片 2024-12-02 20:30:19 +08:00
PC-202302260912\Administrator e47bd15c1f 删除无用图片 2024-12-02 20:29:29 +08:00
PC-202302260912\Administrator 8c60389463 删除无用图片 2024-12-02 20:28:05 +08:00
PC-202302260912\Administrator 9cf227d66a 图片替换 2024-12-02 20:27:04 +08:00
PC-202302260912\Administrator 7c99cda573 删除无用图片 2024-12-02 20:26:15 +08:00
PC-202302260912\Administrator 2727f64ac2 删除无用图标 2024-12-02 20:24:46 +08:00
PC-202302260912\Administrator 854ea2e46d 删除无用图标 2024-12-02 20:23:51 +08:00
PC-202302260912\Administrator 6839088020 删除无用图标 2024-12-02 20:22:32 +08:00
PC-202302260912\Administrator c8fd332f2d 删除无用图标 2024-12-02 20:20:43 +08:00
PC-202302260912\Administrator 45d9db7ebe 删除无用图片 2024-12-02 20:19:00 +08:00