DESKTOP-RH64908\Administrator
|
37df5b1028
|
Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
# Conflicts:
# Assets/ManagedResources/PublicArtRes/Textures/Casting_effect_GuangYun.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/Casting_effect_di.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/Casting_effect_mingzi_di.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/Casting_effect_mingzi_di_xia.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_MuBiaoJiangLi_Import_01.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_MuBiaoJiangLi_Import_02.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_MuBiaoJiangLi_Import_03.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_MuBiaoJiangLi_Import_04.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_MuBiaoJiangLi_Import_05.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_MuBiaoJiangLi_Import_06.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_beimu.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_shengli03.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/baoxiang-01-1.png.meta
# Assets/ManagedResources/PublicArtRes/Textures/baoxiang-01-2.png.meta
|
2026-06-08 18:31:19 +08:00 |
 xiejun
|
43d80275b9
|
神将部分UI替换
|
2023-08-04 18:58:14 +08:00 |
gaoxin
|
6d2253347a
|
【icon】添加新的出包ICon
|
2021-08-31 15:42:25 +08:00 |
zhangqiang
|
baf39fc1a3
|
【动游】场景
|
2021-07-19 11:02:25 +08:00 |
|
zhangqiang
|
a0526542cf
|
【猕猴桃专服配置添加】
|
2021-06-08 21:01:59 +08:00 |
|
gaoxin
|
1b55441abc
|
【配置】新增草花渠道相关配置
|
2021-06-07 16:49:58 +08:00 |
|
gaoxin
|
6b0ff9668d
|
【配置】包配置添加
|
2021-05-31 17:31:31 +08:00 |
|
gaoxin
|
40bfa7c586
|
【配置】国内相关修改
|
2021-03-17 17:30:13 +08:00 |
|
zhangqiang
|
d452d76d05
|
显示活动选中修改 替换出包图片资源
|
2020-08-27 16:54:26 +08:00 |
|
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |