Commit Graph

15938 Commits (60b09e947a6f81a1e78f940f6cb9554230ae8e61)
 

Author SHA1 Message Date
DESKTOP-MMO982B\User 60b09e947a 优化战斗页面按钮 2025-03-24 18:05:43 +08:00
DESKTOP-MMO982B\User 05b51d1e21 修改图片大小 2025-03-06 15:35:53 +08:00
DESKTOP-MMO982B\User e3645c828a 修改图片 2025-03-06 14:58:19 +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 ae0a016b6b 111 2025-03-04 18:31:56 +08:00
DESKTOP-MMO982B\User 11ad24e1b9 11111 2025-03-04 18:31:40 +08:00
DESKTOP-MMO982B\User c7ebded36d 房子上传 2025-03-04 18:14:39 +08:00
DESKTOP-MMO982B\User aa0aa2884a 11111 2025-03-04 14:31:35 +08:00
DESKTOP-MMO982B\User 2f94a35446 修改页面 2025-03-03 15:32:21 +08:00
DESKTOP-MMO982B\User f0b66839ec 添加四个工会图标 2025-03-03 15:28:30 +08:00
DESKTOP-MMO982B\User dd826a03b1 1111 2025-02-27 18:31:22 +08:00
DESKTOP-MMO982B\User 021313aa23 邮件页面修改 2025-02-27 17:13:19 +08:00
DESKTOP-MMO982B\User 89cc2595e1 数字小游戏相关调整 2025-02-26 17:34:51 +08:00
DESKTOP-MMO982B\User 7ea22b9dfd 1111 2025-02-26 15:57:39 +08:00
DESKTOP-MMO982B\User aa722c8705 111 2025-02-26 15:54:28 +08:00
DESKTOP-MMO982B\User 240d75c93a 111 2025-02-26 15:53:36 +08:00
DESKTOP-MMO982B\User 52c40592db 11 2025-02-26 14:43:54 +08:00
DESKTOP-MMO982B\User 984039fe83 1111 2025-02-26 14:35:04 +08:00
DESKTOP-MMO982B\User 83a1bc5d57 天赋图标修改 2025-03-21 17:36:34 +08:00
DESKTOP-MMO982B\User cc2cf23943 页面修改 2025-03-21 17:31:12 +08:00
DESKTOP-MMO982B\User e5ebbf7427 11111 2025-03-21 17:03:07 +08:00
DESKTOP-MMO982B\User de0a84bcc5 修改页面 2025-03-21 15:13:35 +08:00
DESKTOP-MMO982B\User a090ae3fe7 添加两个图片 2025-03-21 15:01:52 +08:00
DESKTOP-MMO982B\User 8ad4f1fd32 添加更改 2025-03-21 15:00:00 +08:00
DESKTOP-MMO982B\User e0fd2d3850 111 2025-03-21 14:08:58 +08:00
DESKTOP-MMO982B\User 53e2c22c62 1 2025-03-21 13:24:23 +08:00
DESKTOP-MMO982B\User 456fb83d83 111 2025-02-20 18:20:58 +08:00
DESKTOP-MMO982B\User 75f1909fd1 1 2025-02-18 16:44:00 +08:00
DESKTOP-MMO982B\User c4010830a5 meta的更改 2025-02-18 12:14:37 +08:00
DESKTOP-MMO982B\User 4695f117eb 添加图片 2025-02-18 12:10:47 +08:00
DESKTOP-MMO982B\User 2f36dd4ea1 替换图标1 2025-02-13 20:59:18 +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-MMO982B\User 1bb295c28b 1 2025-02-13 16:18:52 +08:00
DESKTOP-MMO982B\User 3945da0793 1 2025-02-13 16:18:23 +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
PC-202302260912\Administrator e8a51d4cc4 漏传的按钮 2025-02-10 19:22:56 +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