Commit Graph

2931 Commits (f8dd59fdfc090f8748d3f684b908e14c23e9e874)
 

Author SHA1 Message Date
zhangqiang f8dd59fdfc 【车迟斗法】 我编队为空 或者 对方编队我空 逻辑处理 2020-11-27 17:19:53 +08:00
zhangqiang 80c949c54d 【灵兽】 灵兽数据分页 2020-11-27 10:57:50 +08:00
gaoxin ce78226529 【资源】新增34星英特效资源 2020-11-26 21:04:23 +08:00
ZhangBiao 2df4f34c76 【编队优化】切磋增加一键
(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4)
2020-11-26 16:09:22 +08:00
ZhangBiao 13e2fbb98d Merge branch '0功能/竞技场胜负奖励' into master_xma_local 2020-11-26 11:11:57 +08:00
zhangqiang 3f2029a681 旗开得胜 提交 2020-11-25 21:02:16 +08:00
ZhangBiao 80538ec42f 【竞技场】增加产出 2020-11-25 18:24:23 +08:00
ZhangBiao be9b79897e 【竞技场】增加产出 2020-11-25 18:23:33 +08:00
zhangqiang cf7068da1c 【灵兽特惠】 适配问题 2020-11-24 14:55:46 +08:00
wangzhenxing 4b6578e957 [战斗] 91 112 115 196 256 被动添加特性屏蔽修改 2020-11-24 11:31:02 +09:00
wangzhenxing 2cc096cd18 【战斗】147,206被动修改回原来的效果 2020-11-24 11:24:29 +09:00
wangzhenxing e3e609c87e [战斗] 245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题 2020-11-24 11:23:31 +09:00
ZhangBiao 3bcc15d21d 【主题活动】降龙伏虎banner替换 2020-11-24 11:08:03 +08:00
gaoxin 34ae0ed497 【战斗】无用log删除,技能数量限制初始化数据位置错误 2020-11-23 21:36:34 +08:00
gaoxin 5e4f1a5165 v1.0.7
1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题
2020-11-23 10:08:36 +08:00
ZhangBiao d938acc273 【竞技场】增加输赢奖励掉落 2020-11-23 09:58:22 +08:00
zhangqiang ddb5f1b299 【日常任务】 11.25 bug 宝箱位置修改 2020-11-20 17:36:42 +08:00
gaoxin 85a608d21a Revert "Revert "【战斗】v1.0.5""
This reverts commit 941cb86845.
2020-11-20 15:15:45 +08:00
gaoxin 941cb86845 Revert "【战斗】v1.0.5"
This reverts commit 0548b16015.
2020-11-20 15:07:27 +08:00
gaoxin 2331c8d013 【战斗】添加超时检测 2020-11-20 15:07:08 +08:00
gaoxin 0548b16015 【战斗】v1.0.5
1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限
2020-11-20 14:27:23 +08:00
zhangqiang 899903104f 【特权礼包】加等级显示前端
【公会副本】 加前端五点刷新不能扫荡
2020-11-19 19:30:46 +08:00
jiaoyangna 1303495f3d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 18:31:19 +08:00
jiaoyangna ffdb9c20eb 图片提交 2020-11-19 18:31:11 +08:00
ZhangBiao 532e766de5 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 17:37:28 +08:00
ZhangBiao d789b9e98e 【编队优化】轩辕宝镜一键特殊处理 2020-11-19 17:37:13 +08:00
ZhangBiao c5c4efef63 Merge branch '0功能/增加一键上阵' into master_xma_local 2020-12-03 05:30:39 +08:00
jiaoyangna 8198b24720 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 17:22:33 +08:00
jiaoyangna 1299b62feb 灵兽宝阁位置名称修改 2020-11-19 17:22:10 +08:00
gaoxin 37631ebc67 【战斗】技能特效播放层级修改 2020-11-19 15:44:23 +08:00
jiaoyangna 8ceb1b4a51 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 15:28:27 +08:00
ZhangBiao 68cf2e356a 【竞技场】在线刷新没红点修复 2020-12-03 05:10:15 +08:00
ZhangBiao 3b4826c235 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-12-03 04:56:01 +08:00
ZhangBiao 2fbe5aa120 【大闹天宫】重置前五分钟踢出玩家 2020-12-03 04:55:51 +08:00
jiaoyangna 20564aee0f 【日常副本】解锁所有副本后,没有自动滚动到最后一个副本 2020-11-19 15:28:21 +08:00
jiaoyangna 0914dd6dc8 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-19 15:09:24 +08:00
jiaoyangna 2c72089def 【逍遥游】掷骰子播放时需要加限制,不能点击关闭,或者直接显示结果 2020-11-19 15:09:00 +08:00
gaoxin 59937a1132 【战斗】修改自动下落特效的时间为表配置 2020-11-19 14:53:45 +08:00
jiaoyangna d8f31bab35 主题活动修改提交 2020-11-19 14:26:57 +08:00
jiaoyangna 2a9b4cb5ab 动态立绘修改 2020-11-19 11:49:34 +08:00
jiaoyangna e09872eb7f 限时招募修改提交 2020-11-19 10:35:21 +08:00
jiaoyangna 3e7c24c029 【主题活动】降龙伏虎 2020-11-18 18:15:50 +08:00
ZhangBiao 08657b4ffd 【编队优化】车迟 十绝 增加一键 2020-11-18 10:48:35 +08:00
gaoxin ca1a509cb8 【战斗】修复资源回收顺序错误导致跳过战斗时黑屏的问题 2020-11-17 21:40:36 +08:00
gaoxin 77934cd274 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-17 20:39:38 +08:00
gaoxin 4eb60838b4 【战斗】修复被动112参数错误 2020-11-17 20:39:28 +08:00
zhangqiang a109678fb4 【逍遥游】 天赋图标显示赋值 2020-11-17 20:12:36 +08:00
ZhangBiao 646e3e8061 【编队优化】轩辕宝镜增加一键 2020-11-17 20:01:13 +08:00
ZhangBiao a68a068746 【编队优化】巅峰赛增加一键 2020-11-17 19:59:18 +08:00
ZhangBiao 462484db66 【编队优化】竞技场防守编队增加一键 2020-11-17 19:57:17 +08:00