ZhangBiao
|
133bce077e
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:05
|
2021-07-23 10:35:06 +08:00 |
ZhangBiao
|
4ebfef77f6
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:34:30
|
2021-07-23 10:34:31 +08:00 |
DESKTOP-98AVA47\Administrator
|
821f012981
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 20:25:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
01f9ec621d
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 20:25:32 +08:00 |
gaoxin
|
6461dbc161
|
【灵兽特惠】修复全面屏时间显示位置错误
|
2021-07-22 20:16:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
ede748149f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 20:03:14 +08:00 |
DESKTOP-98AVA47\Administrator
|
875325fabb
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 20:03:03 +08:00 |
ZhangBiao
|
ac3178d7f6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 19:55:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
25aed04450
|
报错修改
|
2021-07-22 19:55:19 +08:00 |
ZhangBiao
|
79aab3d3b4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 19:53:39 +08:00 |
ZhangBiao
|
a33be944cc
|
【万象商会】提交
|
2021-07-22 19:53:25 +08:00 |
DESKTOP-98AVA47\Administrator
|
f676618e42
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 19:50:38 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
gaoxin
|
a16d134d2d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 19:37:13 +08:00 |
gaoxin
|
1d49490fe3
|
【热更工具】提交热更文件到git时,如果目录不存在则创建
|
2021-07-22 19:37:06 +08:00 |
gaoxin
|
a228c18c50
|
【MapPlayerView】随机使用lua原生的方法
|
2021-07-22 19:36:17 +08:00 |
gaoxin
|
9d7a51fd57
|
【容错】登录容错添加,服务器发送不存在的活动时,不再卡死
|
2021-07-22 19:35:22 +08:00 |
ZhangBiao
|
1e822443f9
|
Merge branch '0优化/副本界面' into china/dev
|
2021-07-22 18:19:42 +08:00 |
ZhangBiao
|
b0d10a29d2
|
【公会】公会按钮位置调整
|
2021-07-22 17:41:01 +08:00 |
luyao
|
5555f33715
|
玲珑宝镜音效修改提交
|
2021-07-22 17:25:17 +08:00 |
DESKTOP-98AVA47\Administrator
|
916230ead6
|
音效添加
|
2021-07-22 17:04:03 +08:00 |
ZhangBiao
|
056d3dc094
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 17:01:32 +08:00 |
ZhangBiao
|
789c6b3d91
|
【新副本界面】上方不可点击修改
|
2021-07-22 17:01:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
1c75527f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 16:41:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
5684cbd89f
|
修改资源名称错误
|
2021-07-22 16:41:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
2424a8090b
|
添加玲珑宝镜音效
|
2021-07-22 16:40:53 +08:00 |
jiaoyangna
|
7959f803c4
|
取消注释
|
2021-07-22 16:15:47 +08:00 |
jiaoyangna
|
b0f868485e
|
无尽秘宝推送
|
2021-07-22 16:05:58 +08:00 |
jiaoyangna
|
997eae4e2c
|
已获得修改提交
|
2021-07-22 15:48:56 +08:00 |
ZhangBiao
|
db258d27cb
|
【副本界面】调整
|
2021-07-22 15:13:24 +08:00 |
luyao
|
d63abe2679
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 15:12:04 +08:00 |
luyao
|
ed9ea5c3f9
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/22,15:11:34
|
2021-07-22 15:11:34 +08:00 |
jiaoyangna
|
457ee33353
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 14:17:44 +08:00 |
jiaoyangna
|
ce8751bbee
|
乾坤宝盒 提示修改
|
2021-07-22 14:17:40 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
ZhangBiao
|
63c2a33c84
|
【报错修改】
|
2021-07-22 11:40:13 +08:00 |
ZhangBiao
|
5fa9f25c09
|
【点将台】白片修改
|
2021-07-22 10:53:27 +08:00 |
ZhangBiao
|
443ecf9112
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 10:36:45 +08:00 |
ZhangBiao
|
b7d7b3270a
|
【主题活动】分页处理
|
2021-07-22 10:36:35 +08:00 |
zhangqiang
|
5c5edd8a13
|
【资源冲突处理】
|
2021-07-22 10:28:50 +08:00 |
zhangqiang
|
e28d538565
|
【资源冲突处理】
|
2021-07-22 10:23:09 +08:00 |
ZhangBiao
|
2bf92fdfdd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-21 18:37:25 +08:00 |
ZhangBiao
|
683e0eefc4
|
【心愿抽卡】界面调整
|
2021-07-21 18:37:15 +08:00 |
jiaoyangna
|
5150fd2edf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-21 18:27:17 +08:00 |
jiaoyangna
|
c131d41d58
|
装备界面改动
|
2021-07-21 18:27:03 +08:00 |
ZhangBiao
|
30edf664da
|
Merge branch 'china/dev' into 0优化/新增心愿神将提示
|
2021-07-21 18:26:34 +08:00 |
ZhangBiao
|
2b08ff111e
|
【心愿抽卡】去除log
|
2021-07-21 18:26:12 +08:00 |
ZhangBiao
|
183cd238d3
|
【心愿抽卡】完成
|
2021-07-21 18:22:24 +08:00 |
jiaoyangna
|
1d2ed2a4f7
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 18:03:23 +08:00 |
jiaoyangna
|
8477043738
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:38:27 +08:00 |