Commit Graph

15955 Commits (TCX_LongZhu)
 

Author SHA1 Message Date
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
DESKTOP-MMO982B\User 88c0e9a608 1 2025-02-10 18:47:32 +08:00
DESKTOP-MMO982B\User 6a3a9ca370 1 2025-02-10 18:46:03 +08:00
DESKTOP-MMO982B\User 517efd7263 11 2025-02-10 18:43:45 +08:00
DESKTOP-MMO982B\User 43f2ed05a3 1 2025-02-10 18:42:47 +08:00
DESKTOP-MMO982B\User cf8176da65 111 2025-02-10 18:41:41 +08:00
DESKTOP-MMO982B\User d997710a07 删除海贼相关图片 2025-02-10 18:37:19 +08:00
PC-202302260912\Administrator dfb8e416db 优化页面背包和图鉴 2025-02-06 15:08:06 +08:00
PC-202302260912\Administrator d74663bdd7 1 2025-02-05 17:53:04 +08:00
PC-202302260912\Administrator bb66650d8a 1 2025-02-05 17:51:40 +08:00
PC-202302260912\Administrator 57eb853f84 图鉴 2025-02-05 16:40:17 +08:00
PC-202302260912\Administrator b9c91c430d 修改装备页面 2025-02-05 16:00:25 +08:00
PC-202302260912\Administrator 4b9fdcc9c1 11111 2025-01-11 19:01:16 +08:00
PC-202302260912\Administrator ecc7a86683 优化页面 2025-01-11 18:40:43 +08:00
PC-202302260912\Administrator adc4d77c97 1111 2025-01-17 17:37:24 +08:00
PC-202302260912\Administrator f1271a4b2d 未完成临时上传 2025-01-17 14:39:26 +08:00
PC-202302260912\Administrator 59f7a2c7a4 龙珠优化页面 2025-01-17 14:16:10 +08:00
PC-202302260912\Administrator 9eae5e9f0c 修改页面 2025-01-14 15:00:17 +08:00
PC-202302260912\Administrator a2fc500bdf 添加修改 2025-01-13 14:14:57 +08:00
PC-202302260912\Administrator 2c51d60a0a 龙珠 2025-01-13 14:10:35 +08:00
PC-202302260912\Administrator 2fe0d1c168 适配修改 2025-01-03 16:52:31 +08:00
PC-202302260912\Administrator 9bb4154514 修改预设 2025-01-03 15:19:22 +08:00
PC-202302260912\Administrator 4899633e54 挖矿修改 2025-01-03 14:55:32 +08:00
PC-202302260912\Administrator 981ba3db5b 图片修改 2025-01-03 14:54:46 +08:00
PC-202302260912\Administrator 76c2754eea 行军镐修改 2025-01-03 14:39:47 +08:00
PC-202302260912\Administrator d68f5ae673 修改行军镐 2025-01-03 14:39:36 +08:00
PC-202302260912\Administrator 37caafc3fc 修改图标 2025-01-03 14:35:26 +08:00
PC-202302260912\Administrator aa1e0294a6 修改图标 2025-01-03 14:34:50 +08:00
PC-202302260912\Administrator 6df29eabfd 遗漏的图片添加 2025-01-03 14:17:48 +08:00
PC-202302260912\Administrator c4c2d7c4c2 修改购买金币的图片 2025-01-03 14:14:33 +08:00
PC-202302260912\Administrator 50881559bc 修改图片 2025-01-03 14:11:45 +08:00
PC-202302260912\Administrator 7fc871f3bb 首充预设修改 2025-01-03 13:47:07 +08:00
PC-202302260912\Administrator b7654e0ae1 对号添加 2025-01-03 13:46:09 +08:00
PC-202302260912\Administrator 5e6352461a 修改按钮 2025-01-02 20:09:26 +08:00