Commit Graph

3451 Commits (f3c36df6695262a2b5eca553aab7b9d3b01864af)
 

Author SHA1 Message Date
lvxinran f3c36df669 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-06-05 20:37:04 +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 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 0f2bb15952 商店条件添加 2020-06-01 21:11:15 +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