Commit Graph

3285 Commits (2498e48c1a6e92a10dfc7b14e6369a4da4c675bc)

Author SHA1 Message Date
zhangshanxue cad5b5bc26 TASK【ID1006397】【活动优化】成长礼金活动邮件删除 2020-06-17 14:48:46 +08:00
zhangshanxue 6519567756 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 09:40:45 +08:00
zhangshanxue 7225ca8ab4 TASK 【ID1006352】【活动需求】升级礼包推送 2020-06-17 09:40:33 +08:00
lvxinran fb1f04ea98 装备bug修改,恢复代码 2020-06-16 06:27:21 +08:00
lvxinran 014e56d37d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-15 18:20:16 +08:00
lvxinran 480259edf8 商店刷新机制修改提交 2020-06-15 18:20:03 +08:00
zhangshanxue 908fdb1d5b 猎妖之路时间和boss节点圣物取消 2020-06-15 16:11:15 +08:00
zhangshanxue 5264ddcb83 猎妖之路招募节点bug 2020-06-13 16:58:08 +08:00
zhangshanxue 344501791f 道具掉落 类型判断和返回 2020-06-13 16:57:06 +08:00
lvxinran 4bcac2e1d8 点金排行提交 2020-06-12 18:16:15 +08:00
lvxinran 724a3b0fb4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	tablemanager/src/main/java/config/SRechargeCommodityConfig.java
2020-06-12 17:08:42 +08:00
lvxinran 2670dcd04a 等级礼包暂时提交 2020-06-12 17:04:47 +08:00
lvxinran 531770178a 森罗环境游戏代码提交 2020-06-12 17:03:59 +08:00
zhangshanxue 99a2b0f0c2 客户端新增了一个道具类型 2020-06-12 16:35:22 +08:00
zhangshanxue 0e6c65163e 客户端新增了一个道具类型 2020-06-12 16:19:01 +08:00
zhangshanxue 6ad732f6f2 去掉远征临时装备背包 2020-06-12 15:37:29 +08:00
zhangshanxue 5dd612ce1a 奖励组拼接bug 2020-06-12 10:46:32 +08:00
zhangshanxue ffee38af5b 内存检查工具 及内纯漏存 2020-06-11 15:42:18 +08:00
zhangshanxue fd7e47ff65 新增消耗道具任务类型 2020-06-11 11:23:07 +08:00
zhangshanxue c015b1ea18 属性计算 目标属性也是万分比计算 (bug多了万分比加成于同一个一级属性 只会有一个生效) 2020-06-11 10:55:25 +08:00
zhangshanxue 0f430e6a09 pvp加成没加上 因为表没配一级属性id 2020-06-10 18:11:30 +08:00
zhangshanxue 4fdf720e84 点将台任务类型更新失败 2020-06-10 17:50:10 +08:00
zhangshanxue 7d53e2c06e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 17:38:57 +08:00
zhangshanxue 4c9f8e4965 pvp加成没加上 2020-06-10 17:38:49 +08:00
zhangshanxue df707a8d8e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 15:17:40 +08:00
zhangshanxue 484a6e9445 TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 15:17:30 +08:00
lvxinran 88ee5cb6ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 14:12:34 +08:00
lvxinran ea57ee2cf7 特权商城修改、点金排行榜添加 2020-06-10 14:12:28 +08:00
lvxinran 97782999d1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-17 10:28:17 +08:00
lvxinran 3dafe6bbad 公会技能重置消耗修改 2020-06-17 10:28:13 +08:00
lvxinran 264df27d8a 宝器入库修改,判空处理 2020-06-17 10:28:00 +08:00
lvxinran 1e56edce3a 试炼buff提交 2020-06-17 10:27:20 +08:00
lvxinran f161ac1e08 车迟时间修改 2020-06-14 20:01:16 +08:00
zhangshanxue 5e550150ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 11:47:48 +08:00
zhangshanxue 3c5b576b0a TASK【ID1006322】【宝箱优化】增加自选宝箱 2020-06-10 11:47:39 +08:00
lvxinran 0f21f209d4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 05:49:18 +08:00
lvxinran 3a1e16feb6 试炼本重置功能,任务提交 2020-06-10 05:49:14 +08:00
zhangshanxue 5e4368aa77 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-10 05:25:14 +08:00
lvxinran 18b2d6c57a 迷宫寻宝随机方式修改 2020-06-10 02:42:54 +08:00
lvxinran 96a44a023f 十绝阵死循环修改 2020-06-10 01:49:22 +08:00
zhangshanxue 761fb9901d 【ID1007808】【ID1007804】【ID1007810】【公会援助】公会援助报错 和猎妖之路圣物不生效 2020-06-09 15:43:19 +08:00
zhangshanxue 4b2c5f5373 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 16:57:33 +08:00
zhangshanxue 7f0313a164 BUG【ID1007804】【公会援助】收到的援助不领取,重启服务器就没了 2020-06-08 16:51:38 +08:00
lvxinran 979348dde1 十绝阵时间判断修改 2020-06-08 15:41:23 +08:00
zhangshanxue 30c54bead0 被动技配置bug 2020-06-08 15:35:47 +08:00
zhangshanxue 019c9e9db2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:51:04 +08:00
zhangshanxue a71818e1b5 功能bug 2020-06-08 10:50:50 +08:00
lvxinran 50831bbee2 功能判空处理 2020-06-08 10:38:07 +08:00
zhangshanxue 0de940f9d0 功能bug 2020-06-08 10:30:58 +08:00
zhangshanxue 758817d5f3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:27:23 +08:00
zhangshanxue d66bee14fc 时间屏蔽 被动技bug 2020-06-08 10:26:22 +08:00
lvxinran ce44abc594 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 10:12:37 +08:00
lvxinran b3d6343f95 公会添加条件提交 2020-06-08 10:12:33 +08:00
zhangshanxue 336ec10895 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 20:50:12 +08:00
zhangshanxue 27a29f771b 去掉注释 2020-06-05 20:49:15 +08:00
zhangshanxue ff485d97c7 //商店刷新 2020-06-06 05:02:15 +08:00
zhangshanxue 6c9dfab0cc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-21 05:42:29 +08:00
zhangshanxue c705182c02 bug每分钟推送道具信息 2020-06-21 05:42:18 +08:00
lvxinran 789afff18c 公会排行榜 2020-06-09 00:54:32 +08:00
lvxinran f47764b1da Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 22:28:33 +08:00
lvxinran 2b0607a26a 车迟发奖bug修改,排行榜第一名bug修改 2020-06-08 22:28:28 +08:00
zhangshanxue cdacaa402a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 16:59:12 +08:00
zhangshanxue dc5792aa0f BUG【ID1007767】【特权】迷宫寻宝未解锁,刷新迷宫寻宝任务完成 2020-06-08 16:59:02 +08:00
zhangshanxue 177454ffed 战斗修改 点金bug 猎妖之路bug 2020-06-08 15:00:20 +08:00
zhangshanxue 78905f7b0b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-08 11:15:49 +08:00
zhangshanxue bd7e3f4749 活动类型不存在 天宫密宝逻辑待查 2020-06-08 11:15:40 +08:00
zhangshanxue bc00118998 TASK 【ID1006339】日常任务及戒灵秘宝调整 2020-06-07 19:21:41 +08:00
zhangshanxue 03b5acec1d Bug【ID1007757】【礼包】每日礼包不刷新 商店刷新时机不对 2020-06-07 16:02:46 +08:00
lvxinran f3c36df669 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 20:37:04 +08:00
lvxinran bcf043facc 无工会修改 2020-06-05 20:36:59 +08:00
lvxinran 886ac0c143 抽卡恢复之前逻辑 2020-06-05 16:49:00 +08:00
lvxinran b2ffa3e799 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 15:17:43 +08:00
lvxinran e6f8b3973d 排行榜优化,抽卡代码回滚 2020-06-05 15:17:22 +08:00
lvxinran ecdf7cebf1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 10:16:15 +08:00
lvxinran 47ad4f8c1c 回春散逻辑提交 2020-06-05 10:16:09 +08:00
lvxinran f60bca059e 十绝阵时间bug修改 2020-06-05 10:13:42 +08:00
zhangshanxue 118b2156f2 任务进度获取bug 2020-06-03 20:40:32 +08:00
zhangshanxue a472f6c553 公会漏存 2020-06-03 19:49:56 +08:00
zhangshanxue ea7f866fbe Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-03 17:02:38 +08:00
zhangshanxue d28a826f38 新增任务类型 2020-06-03 17:02:26 +08:00
lvxinran 9fe73ad43e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-03 16:13:31 +08:00
lvxinran 86b864fc45 森罗幻境提交,部分任务添加 2020-06-03 16:13:26 +08:00
zhangshanxue 01e0b812e9 新增任务类型 2020-06-03 12:02:15 +08:00
zhangshanxue 4defdf8aca 新增任务类型 2020-06-03 11:12:16 +08:00
zhangshanxue 189674d9ca 新增任务类型 2020-06-03 10:25:06 +08:00
zhangshanxue 9942b4abb3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-03 09:53:13 +08:00
zhangshanxue c98f0a985b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-07-05 01:05:54 +08:00
lvxinran c012389b87 试炼副本福利层提交 2020-06-09 05:59:01 +08:00
lvxinran 7c36842867 签到优化提交 2020-06-09 05:55:56 +08:00
zhangshanxue e553272029 新增任务类型 戒灵秘宝积分 2020-06-04 19:10:32 +08:00
lvxinran 7e239b888f 错误修改 2020-06-02 11:18:40 +08:00
lvxinran c3eb254132 分支合并提交 2020-06-02 10:57:56 +08:00
lvxinran 173458590b Merge branch 'master' into develop 2020-06-01 21:10:48 +08:00
lvxinran f132000e65 vip商店调整 2020-06-01 21:09:24 +08:00
lvxinran 407a161831 试炼副本提交 2020-06-01 21:03:48 +08:00
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
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
zhangshanxue e20be3b89b Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-20 10:31:31 +08:00
wangyuan 463ea511fa fix 【开服狂欢】福利礼包报错 初始化user,未放入内存中,初始化活动获取user报错 2020-05-19 17:42:52 +08:00
wangyuan 5b3937b093 成长礼金 & 猎妖之路战斗特殊被动传输数据 & 车迟玩法排行榜问题 2020-05-19 17:18:08 +08:00
lvxinran 4d284c5b50 Merge branch 'master' into develop 2020-05-18 20:43:17 +08:00
lvxinran 41b67cfefb 兽潮来袭删除消耗道具 2020-05-18 20:39:48 +08:00
lvxinran 19e59de463 副本修改 2020-05-18 20:28:54 +08:00
wangyuan e4bca61851 车迟排行榜 个人和工会反了 2020-05-18 18:37:03 +08:00