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 |