Commit Graph

1594 Commits (d555d983ea0c042249e70c0f2a7f1aa63af0311f)

Author SHA1 Message Date
jiaoyangna d555d983ea 累计充值修改提交, 灵兽提交 2020-10-21 16:05:33 +08:00
jiaoyangna b26ba765bc 勇往直前 提交 2020-10-21 14:16:02 +08:00
gaoxin b72d6b46bb Revert "【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题"
This reverts commit b8eabfe641.
2020-10-20 21:17:26 +08:00
gaoxin b8eabfe641 【战斗0.0.7】修复熬丙十星天赋不对追加得技能生效得问题 2020-10-20 20:36:44 +08:00
gaoxin 8081350fbe 【战斗0.0.6】修复判断数据是否存在接口错误 2020-10-20 20:26:44 +08:00
wangzhenxing a3b8be0abe 技能期间只触发一次被动触发条件修改 2020-10-20 16:20:14 +09:00
ZhangBiao 23f4b9c65d 【推送礼包】推送最新礼包的拍脸
(cherry picked from commit 958234c826)
2020-10-20 14:59:25 +08:00
jiaoyangna 2d4ce422da monterr gift patface 2020-10-19 21:59:07 +08:00
jiaoyangna 1d8ac73a44 拍脸commit 2020-10-19 21:57:56 +08:00
jiaoyangna 1677642f3b tuisonglibao patface 2020-10-19 21:57:39 +08:00
wangzhenxing 63adfc1097 修改188被动 义结金兰不触发其他被动 2020-10-19 21:28:47 +09:00
wangzhenxing 4a21eae8f4 188被动普攻排序修改 2020-10-19 21:22:13 +09:00
wangzhenxing cddd7a8824 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-19 21:08:17 +09:00
gaoxin f006531707 【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题 2020-10-19 21:05:05 +08:00
wangzhenxing f7865231ef 被动188 改为血量百分比排序 2020-10-19 21:07:53 +09:00
gaoxin 27d9738696 【战斗0.0.4】修复战斗开始时偶现卡牌人物裁切显示错误的问题 2020-10-19 16:48:23 +08:00
gaoxin 539be2d810 【自动恢复物品】物品恢复机制改为前端计算 2020-10-19 16:46:24 +08:00
gaoxin be2230ba6d 【战斗 0.0.3】尝试修复偶现战斗卡死得问题 2020-10-19 14:38:57 +08:00
gaoxin 5e12a55f33 【战斗0.0.2】修复新增的被动技能非技能出发时报错的问题 2020-10-19 14:19:48 +08:00
gaoxin 538660584e 【战斗0.0.1】删除log接口参数 2020-10-17 18:42:09 +08:00
gaoxin fecc48acc2 修复关卡推送礼包报错的问题 2020-10-17 18:36:29 +08:00
gaoxin 8b24a89d56 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-17 16:34:34 +08:00
ZhangBiao d029e1866e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-23 17:35:59 +08:00
ZhangBiao 90a5c3f28d 限时召唤 更换主Up神将 2020-10-23 17:35:47 +08:00
gaoxin 149a1f09ac 修复治疗暴击时治疗量为0的问题 2020-10-17 16:34:24 +08:00
zhangqiang 7d2016c812 加跳转 2020-10-16 17:13:14 +08:00
ZhangBiao dcf74880bc 主题活动,势不可挡 霸哥修改 2020-10-16 13:58:51 +08:00
gaoxin aa72f7dd0d 修复活动刷新会导致引导报错的问题 2020-10-15 13:36:48 +08:00
jiaoyangna 2e0acab378 主题活动修改 提交 2020-10-10 18:00:16 +08:00
wangzhenxing 81c39c7422 回合数变化以后,添加延时操作,用于一些监听回合变化消息的被动首先执行 2020-10-14 16:44:04 +09:00
jiaoyangna 85dbe2d053 主题活动修改 2020-10-10 14:37:04 +08:00
jiaoyangna 398e7f070b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-16 12:00:21 +08:00
jiaoyangna 19aee3b717 轩辕宝镜黑屏问题解决 2020-10-16 12:00:09 +08:00
jiaoyangna ea4166a6e3 神州令跳转修改 2020-10-15 21:49:04 +08:00
jiaoyangna 2e574adea8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-15 21:26:23 +08:00
jiaoyangna 5a17813275 森罗幻境 修改 2020-10-15 21:26:19 +08:00
jiaoyangna b4da41b5e5 势不可挡页签修改提交 2020-10-15 20:50:05 +08:00
ZhangBiao 9265a8883c 无尽副本出图多次请求商店 修复 2020-10-14 11:55:40 +08:00
gaoxin 63e5be4088 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 22:30:12 +08:00
gaoxin c3198d413d 修复无尽副本过渡期间依然可以进入的问题 2020-10-13 22:30:06 +08:00
jiaoyangna aa4c2a3f9c 势不可挡 提交 2020-10-13 20:36:01 +08:00
wangzhenxing 2f8801a230 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 20:51:21 +09:00
wangzhenxing 65a8e0048a 118被动修改: 额外技能不会触发伤害加成,但是会享受加成收益 2020-10-13 20:50:57 +09:00
ZhangBiao 2e57796328 礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
2020-10-13 19:12:24 +08:00
ZhangBiao e063c2c23d 推送礼包。。。。 2020-10-13 18:39:55 +08:00
ZhangBiao b359ae2df9 推送礼包 完事儿 2020-10-13 17:21:27 +08:00
jiaoyangna 89c7961154 推送礼包修改 2020-10-22 03:24:22 +08:00
jiaoyangna 598eac1d3a 推送礼包修改 2020-10-22 02:57:40 +08:00
ZhangBiao 45c9c20dd6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 13:52:41 +08:00
ZhangBiao 63a1588f66 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-13 13:51:11 +08:00