zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
ZhangBiao
|
d433d2a690
|
【公告】打开公告前获取公告信息
|
2020-11-17 10:44:55 +08:00 |
wangzhenxing
|
383f20aa32
|
【战斗】 被动266去除无用log
|
2020-11-17 10:02:29 +09:00 |
zhangqiang
|
2955a067fa
|
【觉醒】 图鉴未开觉醒功能点进去报错修复提交
|
2020-11-16 21:00:23 +08:00 |
zhangqiang
|
26e7460699
|
【孙悟空】皮肤攻击音效
|
2020-11-16 19:55:06 +08:00 |
gaoxin
|
58c538e41b
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-16 18:34:24 +08:00 |
gaoxin
|
46750846f8
|
【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。
|
2020-11-16 18:34:12 +08:00 |
zhangqiang
|
c73c2404f1
|
【东华帝君】 音效替换 技能预设 修改
|
2020-11-16 18:07:29 +08:00 |
ZhangBiao
|
f384e25ad6
|
【灵兽宝阁】今日召唤上限次数不对修改
(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19 )
|
2020-11-16 17:51:25 +08:00 |
zhangqiang
|
8531323faa
|
推送礼包剔除过期的礼包
|
2020-11-16 17:30:38 +08:00 |
gaoxin
|
f517b5e955
|
【资源】东华帝君技能特效资源显示错误修改
|
2020-11-16 16:45:37 +08:00 |
ZhangBiao
|
6f1b687e9e
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-16 16:20:25 +08:00 |
ZhangBiao
|
9601af33e7
|
【神将详情】排行榜查看他人装备显示出售按钮修复
|
2020-11-16 16:20:15 +08:00 |
zhangqiang
|
e8f15add7f
|
【东华帝君】 音效提交
|
2020-11-16 15:47:47 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
zhangqiang
|
2000240f64
|
【觉醒】 提示文字
|
2020-11-16 14:57:46 +08:00 |
gaoxin
|
5301a91738
|
【战斗】修复被动270普通攻击也能触发的问题
|
2020-11-16 14:04:58 +08:00 |
liujiaqi
|
cec062c993
|
灵兽山 觉醒图标
|
2020-11-16 13:55:15 +08:00 |
gaoxin
|
8edf7dd781
|
【战斗】被动添加
270:技能直接伤害[a]%转化为生命治疗自己
|
2020-11-16 11:50:38 +08:00 |
zhangqiang
|
3348d60c65
|
【觉醒】 图鉴属性取整
|
2020-11-16 10:27:41 +08:00 |
wangzhenxing
|
1287453f10
|
【战斗】 额外技能添加5技能
|
2020-11-14 20:20:06 +09:00 |
wangzhenxing
|
406cf2e1f7
|
【战斗】 被动265效果修改
|
2020-11-14 19:52:47 +09:00 |
wangzhenxing
|
b1549b470b
|
[战斗] 被动268修改
|
2020-11-14 19:20:55 +09:00 |
gaoxin
|
af915fb480
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-14 17:37:42 +08:00 |
gaoxin
|
ede48e5063
|
【测试战斗】添加总伤害数值打印
|
2020-11-14 17:37:24 +08:00 |
gaoxin
|
e6ac0a8845
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-14 17:20:38 +08:00 |
gaoxin
|
b7269ccf89
|
【测试战斗】修复测试战斗按钮层级过高遮挡伤害数字的问题
|
2020-11-14 17:20:33 +08:00 |
wangzhenxing
|
d64ed5e92d
|
[战斗] 268 被动效果修改
|
2020-11-14 17:32:09 +09:00 |
wangzhenxing
|
5e0384b847
|
[战斗]免疫盾修改提交
|
2020-11-14 17:13:37 +09:00 |
wangzhenxing
|
6821324fb1
|
[战斗]减伤盾效果修改提交
|
2020-11-14 15:43:40 +09:00 |
wangzhenxing
|
deb8603b98
|
[战斗]减伤盾效果修改
|
2020-11-14 15:11:32 +09:00 |
gaoxin
|
4fd822a333
|
【战斗】删除战斗艺术字配置,改为即时判断
|
2020-11-13 19:44:55 +08:00 |
gaoxin
|
142d8dee0f
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 19:38:10 +08:00 |
gaoxin
|
56afe786be
|
【战斗】战斗关闭时不再回收灵兽立绘资源,直接销毁,避免在UI上立绘不停播放攻击动作的问题
|
2020-11-13 19:38:04 +08:00 |
gaoxin
|
1face65dbb
|
【战斗】免疫效果自定义类型添加,免疫效果文字显示恢复
|
2020-11-13 19:34:41 +08:00 |
ZhangBiao
|
9424037d9e
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 18:58:47 +08:00 |
ZhangBiao
|
4a0a702fec
|
【灵兽宝阁】凤凰无限飞bug缓解
|
2020-11-13 18:58:35 +08:00 |
ZhangBiao
|
6c8a011528
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 18:01:05 +08:00 |
ZhangBiao
|
46eeceb79d
|
【主题活动】bug修复
|
2020-11-13 18:00:56 +08:00 |
wangzhenxing
|
70e019f837
|
gm 测试战斗添加设置皮肤
|
2020-11-13 17:48:11 +08:00 |
gaoxin
|
bd083a67a3
|
【测试战斗】同步界面修改
|
2020-11-13 17:47:54 +08:00 |
wangzhenxing
|
fee4501004
|
[战斗] 266被动修改
|
2020-11-13 18:42:27 +09:00 |
wangzhenxing
|
d6d5f5cdfa
|
257 561 267 技能修改
|
2020-11-13 17:38:35 +08:00 |
gaoxin
|
1568e2f288
|
【测试战斗】修复添加属性被动时报错
|
2020-11-13 17:27:15 +08:00 |
wangzhenxing
|
8a87f0a8a2
|
【战斗】91 被动修改
|
2020-11-13 18:23:56 +09:00 |
ZhangBiao
|
f091914b4f
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 17:07:44 +08:00 |
ZhangBiao
|
ee04d93830
|
【灵兽宝阁】增加结束时间
|
2020-11-13 17:07:32 +08:00 |
jiaoyangna
|
97cdd13df9
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-13 16:35:29 +08:00 |
jiaoyangna
|
384750e0e9
|
[限时折扣] 修改
|
2020-11-13 16:35:25 +08:00 |
ZhangBiao
|
933f2d4768
|
【灵兽宝阁】增加假战斗
|
2020-11-13 16:25:42 +08:00 |