gaoxin
|
59fdb6d2aa
|
Merge remote-tracking branch 'origin/xma/dev' into master_xma_local
|
2021-03-30 17:43:39 +08:00 |
gaoxin
|
1689489c3c
|
【战斗】修复敌方灵兽数据判断错误,我方没有灵兽时会导致敌方灵兽消失
|
2021-03-30 17:43:22 +08:00 |
gaoxin
|
03da04762b
|
Merge remote-tracking branch 'origin/xma/dev' into master_xma_local
|
2021-03-30 17:26:16 +08:00 |
gaoxin
|
187ec35fbd
|
【GM】修改获取战斗数据的GM服务器地址
|
2021-03-30 17:25:03 +08:00 |
zhangqiang
|
54dec77b6b
|
【英雄升级特效显示修改】
|
2021-03-30 15:01:49 +08:00 |
wangzhenxing
|
27e4ab6e1a
|
[战斗]============= 获取数组的长度方法修改
|
2021-03-30 11:08:55 +08:00 |
JieLing
|
f81e8ecaab
|
Merge branch 'xma/dev' into master_xma_local
|
2021-03-29 23:34:12 +08:00 |
zhangqiang
|
dc5b4b107b
|
【抽卡灵兽】文字显示
|
2021-03-29 21:27:07 +08:00 |
wangzhenxing
|
f497a63e73
|
[战斗]====================放逐添加表现
|
2021-03-27 20:22:14 +08:00 |
JieLing
|
06ccc3c6a0
|
Merge branch 'xma/dev' into master_xma_local
|
2021-03-27 17:46:18 +08:00 |
JieLing
|
4be640d489
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-27 17:45:06 +08:00 |
JieLing
|
80b9b48367
|
【合并多余修改回滚】
|
2021-03-27 17:35:13 +08:00 |
JieLing
|
857d0112fa
|
Merge branch 'xma/dev' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-03-27 17:11:57 +08:00 |
wangzhenxing
|
9101433578
|
【战斗】==============链接符显示修改,链接符放逐修改,灵兽无目标修改
|
2021-03-27 12:37:50 +08:00 |
wangzhenxing
|
19d7914e78
|
【战斗】=======解决放逐目标有不灭不会被选中;解决只剩放逐目标攻击动画异常问题
|
2021-03-26 16:50:49 +08:00 |
gaoxin
|
feb1e97089
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-26 15:03:32 +08:00 |
zhangqiang
|
9786af645c
|
【本地化魂印】专属魂印适用范围不显示
|
2021-03-26 15:03:27 +08:00 |
wangzhenxing
|
19af51d38f
|
[战斗]========= 放逐后的buff刷新修改,放逐后的被动触发屏蔽,控制类buff 叠层逻辑修改
|
2021-03-26 14:40:23 +08:00 |
wangzhenxing
|
f5a85c4d2e
|
【战斗】===================== 灵兽释放技能逻辑修改, rolemanager 添加获取role接口
|
2021-03-25 15:54:12 +08:00 |
wangzhenxing
|
8f1d56cf8f
|
[战斗]==============灵兽每回合释放技能次数 刷新修改
|
2021-03-25 09:57:51 +08:00 |
wangzhenxing
|
21be2f29dd
|
[战斗]==============添加效果127 任务初始化时被动排序
|
2021-03-24 16:50:55 +08:00 |
jiaoyangna
|
bf3ae927c8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-24 13:57:11 +08:00 |
jiaoyangna
|
e5e8c60c8b
|
主题活动
|
2021-03-24 13:57:08 +08:00 |
zhangqiang
|
73e56f36bd
|
【首充】孙悟空页面详情天赋显示错误
|
2021-03-24 11:14:40 +08:00 |
zhangqiang
|
4bcf4f3586
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-24 10:55:29 +08:00 |
zhangqiang
|
d0da980a3f
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-24 10:37:22 +08:00 |
zhangqiang
|
4f840d9463
|
【神将没有升级材料依旧会出现小红点】
|
2021-03-24 10:36:24 +08:00 |
wangzhenxing
|
57b3c1af9c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-23 20:42:07 +08:00 |
wangzhenxing
|
d0a7ef39ca
|
【战斗】=============添加新灵兽技能逻辑 放逐和麒麟印记
|
2021-03-23 20:41:44 +08:00 |
jiaoyangna
|
a6e553e5aa
|
灵兽提交
(cherry picked from commit 3bd78655a2)
|
2021-03-23 20:36:31 +08:00 |
gaoxin
|
2d407b0dae
|
【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进
|
2021-03-23 18:10:59 +08:00 |
gaoxin
|
689d19776c
|
【bug】修复升级神将立即关闭界面,再次打开界面时显示错误
|
2021-03-23 18:08:22 +08:00 |
gaoxin
|
cf6fc198bb
|
【养成】升级时,战力光效层级不正确
|
2021-03-23 17:59:12 +08:00 |
ZhangBiao
|
aa855b5fdd
|
【关卡】应该改成按钮
(cherry picked from commit f30186c57e)
|
2021-03-23 16:37:40 +08:00 |
gaoxin
|
ca85726e29
|
【bug】修复公会boss点击挑战再返回伤害列表不显示的问题
|
2021-03-22 19:50:34 +08:00 |
gaoxin
|
1e47fc310b
|
【公会】邀请,红包,副本文字显示修改
|
2021-03-22 16:24:45 +08:00 |
gaoxin
|
1e62d7eed0
|
【bug】修复好友列表不能滑动的问题
|
2021-03-18 12:04:46 +08:00 |
gaoxin
|
79bc5b3966
|
【bug】修复替换装备时按钮文字错误
|
2021-03-18 10:17:15 +08:00 |
gaoxin
|
68433c0ecd
|
【bug】点击替换装备,装备图标跟穿戴着的图标一样
|
2021-03-18 10:07:40 +08:00 |
gaoxin
|
4d9dba182c
|
【优化】优化lateUpdate,修复使用lateupdate报错时会使所有lateupdate失效的问题
|
2021-03-17 19:37:24 +08:00 |
gaoxin
|
268a51c519
|
【优化】优化lateUpdate,修复使用lateupdate报错时会使所有lateupdate失效的问题
|
2021-03-17 14:52:09 +08:00 |
gaoxin
|
7a611cc8b2
|
Merge remote-tracking branch 'origin/0功能/本周版本优化内容' into xma/dev
|
2021-03-17 14:41:31 +08:00 |
wangzhenxing
|
5fde5a4473
|
[战斗]=============被动191修改,buff图标叠加添加免疫和连接符
|
2021-03-16 20:25:24 +08:00 |
wangzhenxing
|
15ce997282
|
[战斗]=============被动225修改 增加最大血量客户端特殊处理
|
2021-03-16 15:56:10 +08:00 |
wangzhenxing
|
d1f4aae4cd
|
Revert "Revert "[战斗]==============249修改""
This reverts commit 7a8de27f1c.
|
2021-03-16 10:43:12 +08:00 |
gaoxin
|
5df1a395e7
|
【充值】修改首充奖励规则
|
2021-03-16 09:52:05 +08:00 |
gaoxin
|
39a404ab41
|
【ios】引导战斗添加
|
2021-03-15 20:16:03 +08:00 |
zhangqiang
|
b78df8e290
|
【心魔试炼通关奖励】
|
2021-03-15 16:15:17 +08:00 |
zhangqiang
|
d3f6ee5e2b
|
【竞技场】报错修改
|
2021-03-15 16:09:46 +08:00 |
DESKTOP-98AVA47\Administrator
|
c3cdf85e4d
|
【大闹天宫】试炼节点
|
2021-03-17 11:48:25 +08:00 |