Commit Graph

160 Commits (c7ebded36d38901e31ac9c9b4af6afb5386c1eac)

Author SHA1 Message Date
DESKTOP-MMO982B\User c7ebded36d 房子上传 2025-03-04 18:14:39 +08:00
DESKTOP-MMO982B\User f0b66839ec 添加四个工会图标 2025-03-03 15:28:30 +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 984039fe83 1111 2025-02-26 14:35:04 +08:00
DESKTOP-MMO982B\User e5ebbf7427 11111 2025-03-21 17:03:07 +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-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
PC-202302260912\Administrator e8a51d4cc4 漏传的按钮 2025-02-10 19:22:56 +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 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 981ba3db5b 图片修改 2025-01-03 14:54:46 +08:00
PC-202302260912\Administrator b7654e0ae1 对号添加 2025-01-03 13:46:09 +08:00
PC-202302260912\Administrator 2b20067239 优化页面 2024-12-31 10:46:24 +08:00
PC-202302260912\Administrator 1cf7907475 核心图片上传 2024-12-24 11:57:03 +08:00
PC-202302260912\Administrator 197bff8991 等级提升图片 2024-12-24 11:56:26 +08:00
PC-202302260912\Administrator 341e60fb63 添加图标 2024-12-24 11:02:05 +08:00
PC-202302260912\Administrator 6236c56557 背景图添加 2024-12-24 11:01:18 +08:00
PC-202302260912\Administrator 832518d924 上传页面 2024-12-23 17:02:55 +08:00
PC-202302260912\Administrator 600cbe24fe 漏传的背景图 2024-12-23 16:56:26 +08:00
PC-202302260912\Administrator d448f112a4 羁绊页面修改 2024-12-23 15:15:32 +08:00
PC-202302260912\Administrator f9f25cd1c1 111 2024-12-05 20:37:02 +08:00
PC-202302260912\Administrator 2b4b79923c 折扣图片修改 2024-12-05 20:10:41 +08:00
PC-202302260912\Administrator 2978347823 111 2024-12-05 18:59:12 +08:00
PC-202302260912\Administrator d9e65bfd1c 111 2024-12-05 17:59:53 +08:00
PC-202302260912\Administrator b6c99d6166 添加1 2024-12-05 17:42:46 +08:00
PC-202302260912\Administrator ccd7d6941c 对号 2024-12-05 17:42:08 +08:00
PC-202302260912\Administrator 584e247032 添加图片 2024-12-05 17:38:17 +08:00
PC-202302260912\Administrator 06a783f973 优化页面 2024-12-09 17:50:57 +08:00
PC-202302260912\Administrator 4ba04bc343 1 2024-12-02 15:47:58 +08:00
PC-202302260912\Administrator 18a5d7a8f6 优化页面1 2024-12-02 15:12:25 +08:00
PC-202302260912\Administrator d68ed80886 添加页面 2024-12-02 13:48:55 +08:00
PC-202302260912\Administrator 88db117538 页面添加 2024-12-02 13:26:34 +08:00
PC-202302260912\Administrator 37dc41068d 添加图片 2024-11-26 13:15:49 +08:00
PC-202302260912\Administrator 9a9cdd46e4 添加一张图片 2024-11-23 10:51:09 +08:00
DESKTOP-RH64908\Administrator 351f192b82 1 2024-11-22 20:12:01 +08:00
PC-202302260912\Administrator b844a90e18 漏传的图标和修改的UI 2024-11-13 15:05:03 +08:00
PC-202302260912\Administrator 8cdea0c7fd 战斗页面修改 2024-11-13 13:42:53 +08:00
zhangjiannan add2914126 Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu 2024-11-13 10:31:36 +08:00
zhangjiannan 699c903e8d 删除多余资源 2024-11-13 10:29:52 +08:00
PC-202302260912\Administrator 709c27781c 奖励 2024-11-12 18:17:24 +08:00
PC-202302260912\Administrator 4d72b97d7a 修改图片 2024-11-08 15:50:04 +08:00
PC-202302260912\Administrator 6ddce72569 神印界面 2024-11-08 12:58:38 +08:00