Commit Graph

3560 Commits (9153efbc6290cd722efadeca0dbba4af31375e18)
 

Author SHA1 Message Date
zhangshanxue 26c1259480 任务系统梳理和注释 2020-06-01 15:26:12 +08:00
zhangshanxue 2e3a64205b 缺少判null 2020-06-01 15:19:32 +08:00
zhangshanxue 69a4ac5423 BUG【ID1007698】【成员】进阶弹了恭喜获得 2020-05-30 17:56:51 +08:00
zhangshanxue 778d1f07cf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-29 13:40:37 +08:00
zhangshanxue 32962c32d4 猎妖和数据库检查bug 2020-05-29 13:40:21 +08:00
wangyuan 41f90ab191 对手数据判空处理 2020-05-28 11:39:03 +08:00
zhangshanxue 79daca78ee 猎妖和数据库检查bug 2020-05-28 11:28:57 +08:00
zhangshanxue 5ef80fab01 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-28 19:04:31 +08:00
zhangshanxue e20c183619 定期抽查数据 2020-05-28 18:57:30 +08:00
zhangshanxue 67930da50f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-27 19:25:07 +08:00
zhangshanxue c5edd276e4 数据库对象初始化bug 点金刷新修改 2020-05-27 19:24:58 +08:00
wangyuan 3edf0c609f 抽卡保底修改多次触发保底只触发一次 2020-05-27 11:22:01 +08:00
wangyuan 58444ae61d Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-27 10:01:00 +08:00
wangyuan e428c0059a 修复未给前端发送天空秘宝信息 2020-05-27 10:00:26 +08:00
zhangshanxue e931d53f5c 类型转换漏写 2020-05-27 00:23:34 +08:00
lvxinran 1e5645e21f 删除无用注释 2020-05-26 14:45:31 +08:00
lvxinran b6760d596a 商店时间推送修改 2020-05-27 09:00:39 +08:00
lvxinran 58d6738ca0 点石成金商店修改、无用代码注释 2020-05-26 12:01:47 +08:00
wangyuan d99ef36335 fix 修复天空秘宝周期不对 2020-05-26 10:06:56 +08:00
wangyuan 9d16af655c fix round 2020-05-26 09:51:43 +08:00
zhangshanxue 983234701d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-26 00:03:34 +08:00
zhangshanxue 7b6bbefa22 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-01 23:59:58 +08:00
zhangshanxue 2e97a23f31 点金bug 2020-06-01 23:59:39 +08:00
lvxinran 30e252118f Merge branch 'master' into develop 2020-05-25 19:31:46 +08:00
lvxinran b8a99d8662 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-25 19:31:20 +08:00
lvxinran b9a0eabd4f 十绝阵修改 2020-05-25 19:31:15 +08:00
wangyuan 940625d330 【车迟斗法】没有收到前公会的排行奖励 2020-05-25 14:42:55 +08:00
wangyuan e8307d5664 资质修改 2020-05-25 14:24:51 +08:00
wangyuan 1753fba53e fix 【车迟斗法】挑战和抢夺按钮共同冷却,挑战冷却时过渡到抢夺阶段 【车迟斗法】挑战和抢夺按钮共同冷却,挑战冷却时过渡到抢夺阶段
【车迟斗法】规则是更早到达的排名在前
2020-05-25 14:14:46 +08:00
wangyuan bfa0c6416c fix 周期获取错误 2020-05-25 12:11:30 +08:00
gaoxin 7644fcde13 lua文件提交 2020-05-28 11:05:11 +08:00
lvxinran c31dcffc5d 战斗逻辑 2020-05-24 00:04:06 +08:00
zhangshanxue 9ead3452d4 协议类型分配有问题 2020-05-23 03:05:22 +08:00
zhangshanxue e94cd2d5c4 协议类型分配有问题 2020-05-23 01:03:07 +08:00
zhangshanxue f91f204848 应该是重连上的session 2020-05-23 00:33:06 +08:00
zhangshanxue eda4141f3b BUG【ID1007627】【剑影仙踪】激活豪华月卡后,需要领取一次奖励,才会显示完成条件 2020-05-23 00:18:30 +08:00
zhangshanxue d34556c29c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-22 23:46:11 +08:00
lvxinran 8485c18b7f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-25 11:54:29 +08:00
lvxinran 31150361c1 十绝阵推送提交 2020-05-25 11:54:25 +08:00
lvxinran 142dcb6970 战斗位置修改 2020-05-25 12:36:02 +08:00
lvxinran 1bd3275e5a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-25 11:29:13 +08:00
lvxinran 08b1bd06cf vip修改 2020-05-25 11:29:08 +08:00
zhangshanxue 03a0cb9d51 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 23:45:59 +08:00
zhangshanxue 6302d70fed Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-22 19:08:45 +08:00
zhangshanxue 09cf77fae8 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)时间推送 2020-05-22 19:08:36 +08:00
zhangshanxue dc7bb1a89a Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 05:53:33 +08:00
zhangshanxue 094d64f8ad Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 05:13:25 +08:00
zhangshanxue a6767eb7bf Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 14:07:46 +08:00
lvxinran 4aea1763c8 试炼副本提交 2020-05-20 15:31:08 +08:00
zhangshanxue c332a9b8c3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-20 10:31:39 +08:00