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
|
d939fcaa9c
|
1
|
2025-02-10 18:53:14 +08:00 |
wangzhenxing
|
443b47d5c9
|
删除多余资源
|
2024-03-01 14:04:49 +08:00 |
wangzhenxing
|
e1d776e741
|
删除不用资源
|
2024-02-07 16:12:03 +08:00 |
wangzhenxing
|
c67c9a9141
|
删除无用资源
|
2024-01-24 11:43:20 +08:00 |
wangzhenxing
|
6c2a9c4a84
|
主城界面修改
|
2023-11-07 18:14:22 +08:00 |
lihaiyang
|
0fe2f64c97
|
修改美术图标
|
2023-06-06 16:14:20 +08:00 |
lihaiyang
|
3e2ef02fca
|
GM特权修改为永久特权
|
2023-06-02 15:48:05 +08:00 |
lihaiyang
|
f0ce97f220
|
修正月卡和特种特权的图
|
2023-06-02 13:54:03 +08:00 |
lihaiyang
|
bc18297d46
|
十万真充改为1万红包
|
2023-06-02 10:05:33 +08:00 |
lihaiyang
|
6d33b61b56
|
修正
|
2023-06-01 11:49:05 +08:00 |
lihaiyang
|
a7a7c3eb42
|
【10万真充】===修改图标
|
2022-12-20 18:16:27 +08:00 |
wangzhenxing
|
4680624d43
|
日常副本预设修改
|
2022-12-06 13:44:29 +08:00 |
wangzhenxing
|
611af0d444
|
日常副本修改提交
|
2022-12-05 14:45:59 +08:00 |
yuanshuai
|
0dad2fdb77
|
超值基金资源修改
|
2022-12-02 17:45:01 +08:00 |
wangzhenxing
|
214b316ac9
|
[bt]========主城鸿蒙镇修改提交
|
2022-12-01 14:24:05 +08:00 |
wangzhenxing
|
032ef3d34d
|
[bt]======充值修改
|
2022-11-29 17:42:48 +08:00 |
wangzhenxing
|
5c49a471da
|
[gm]====送10万充提交
|
2022-11-28 18:40:45 +08:00 |
wangzhenxing
|
dce08e4ce8
|
仙充券图标提交
|
2022-11-23 15:50:09 +08:00 |
wangzhenxing
|
86bfbe1496
|
刷冲特权预设修改
|
2022-11-23 15:45:31 +08:00 |
lihaiyang
|
f3935cc3ca
|
【转盘】=======修改名字
|
2022-11-02 17:29:45 +08:00 |
wangzhenxing
|
f285d5e797
|
寻仙招募图标修改提交
|
2022-11-16 14:06:55 +08:00 |
wangzhenxing
|
3b88556b82
|
gm按钮修改
|
2022-11-10 11:09:10 +08:00 |
wangzhenxing
|
119c186c34
|
[主城]=======按钮修改提交
|
2022-11-08 14:51:51 +08:00 |
lihaiyang
|
2c3da19544
|
【豪华补给】=======修正图标
|
2022-11-03 07:06:40 +08:00 |
wangzhenxing
|
1e62991c2c
|
[gm]=====开服冲榜提交
|
2022-10-31 18:13:41 +08:00 |
wangzhenxing
|
9faaa0cd5d
|
[gm]======冲榜图片提交
|
2022-10-28 19:06:31 +08:00 |
wangzhenxing
|
ac078416dd
|
[gm]======转盘提交
|
2022-10-27 15:32:13 +08:00 |
wangzhenxing
|
5fbc31d8e8
|
[gm]======免费充值界面修改
|
2022-10-25 13:51:43 +08:00 |
wangzhenxing
|
8d63d391a6
|
[gm]==============声望特权提交
|
2022-10-20 17:48:00 +08:00 |
wangzhenxing
|
b0532edcca
|
[gm]======图片资源提交
|
2022-10-14 17:28:39 +08:00 |
wangzhenxing
|
efe732d91d
|
[gm]=============刷冲特权提交
|
2022-09-23 15:24:10 +08:00 |
wangzhenxing
|
a8f46604c9
|
[gm]======创角即送提交
|
2022-09-21 16:08:59 +08:00 |
wangzhenxing
|
fdaec2ac28
|
[gm修改器]=====提交
|
2022-09-20 17:04:48 +08:00 |
lihaiyang
|
f50028cef7
|
[无限资源阁]========界面修改提交
|
2022-09-01 18:22:04 +08:00 |
wangzhenxing
|
ff824e3f3a
|
[全民福利]=====预设修改提交
|
2022-09-14 13:33:22 +08:00 |
wangzhenxing
|
b6b1f53d64
|
[bt]=====无限资源阁提交
|
2022-09-09 16:45:58 +08:00 |