Commit Graph

2876 Commits (5e817c87fff9079cfe8d6835689bcff875ebe153)
 

Author SHA1 Message Date
lvxinran 5e817c87ff 异妖上阵修改 2019-12-23 18:04:13 +08:00
lvxinran e823180834 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-21 10:19:24 +08:00
lvxinran 46a12c155c 抽卡修改 2019-12-21 10:19:18 +08:00
wangyuan 1b99d00270 coins position 2019-12-20 19:31:17 +08:00
wangyuan 8b249ba977 fix data 2019-12-20 18:48:04 +08:00
zhangshanxue ecd3695037 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-21 05:01:55 +08:00
zhangshanxue 9ab22c2b24 Task【累计充值改成常驻/按日刷新】 2019-12-21 05:01:44 +08:00
wangyuan fcdba1a654 fix champion 2019-12-20 15:42:25 +08:00
wangyuan c0d2d8d1d6 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-20 14:12:06 +08:00
wangyuan 80fbfd6f7f 是否是当前竞猜信息,0 2019-12-20 14:12:02 +08:00
lvxinran a2cd81dc37 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-20 11:14:36 +08:00
lvxinran e266207332 寻龙诀上限修改 2019-12-20 11:14:30 +08:00
zhangshanxue a6ab8bcdc0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-19 15:33:13 +08:00
zhangshanxue 17db265446 TASK【ID1005242】 【选人起名】 2019-12-19 15:33:05 +08:00
lvxinran 790a0916db 上限修改 2019-12-19 14:48:14 +08:00
lvxinran f64e9e3be5 迷宫领奖修改 2019-12-19 11:55:00 +08:00
zhangshanxue 23b617fcde Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-19 10:36:47 +08:00
zhangshanxue 31c5e9184d Task【ID1005229】【特权调整】 2019-12-19 10:36:35 +08:00
wangyuan a84a8213d3 回收资源 2019-12-18 20:17:02 +08:00
wangyuan 4c47ac3d76 修复竞猜数据&回收巅峰赛资源(redis) 2019-12-18 20:00:14 +08:00
lvxinran 94b83a97dc 寻龙诀上限 2019-12-19 07:29:12 +08:00
lvxinran bca69953e7 物品数量限制 2019-12-19 06:16:01 +08:00
lvxinran dfea99d11c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-18 14:06:12 +08:00
lvxinran 628902282d 迷宫寻宝 2019-12-18 14:06:07 +08:00
wangyuan 06a1d9178a 删除我的队伍信息 2019-12-17 18:00:12 +08:00
lvxinran 23488394d9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-17 15:32:45 +08:00
lvxinran 3f40a3cedf 英雄限制,关卡排行榜修改 2019-12-17 15:32:41 +08:00
wangyuan 617c395096 fix send mutli goods info 2019-12-17 13:53:03 +08:00
wangyuan 8dc99083d5 fix round 2019-12-17 12:00:30 +08:00
zhangshanxue 96c02199d1 关闭测试 2019-12-17 11:46:00 +08:00
zhangshanxue 915f3ea59a 关闭死锁 2019-12-17 11:40:17 +08:00
zhangshanxue db90677dcd 网络模块关闭修改 2019-12-17 11:30:33 +08:00
zhangshanxue 5bc49f2ad8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-17 11:13:31 +08:00
zhangshanxue 1fd6cf3102 网络模块关闭修改 2019-12-17 11:13:25 +08:00
lvxinran 295bb58b16 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-17 10:30:10 +08:00
lvxinran 39048ea87b 好友任务 2019-12-17 10:30:01 +08:00
zhangshanxue 647391a628 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-17 10:27:19 +08:00
zhangshanxue 113c7514c8 【ID1005229】【特权调整】月卡bugTask 2019-12-17 10:27:09 +08:00
lvxinran 3d6c621618 好友任务 2019-12-17 10:11:08 +08:00
lvxinran 73d07c8754 刷新必出 2019-12-17 09:54:32 +08:00
wangyuan f0ae6a5c13 add arena id 2019-12-16 21:03:29 +08:00
wangyuan 6d950dc2b7 add fix schedule 2019-12-16 20:48:40 +08:00
wangyuan 00cf1b77da add pokemon 2019-12-16 20:19:55 +08:00
wangyuan 1b6811a4be 巅峰赛32 4 2019-12-16 18:14:10 +08:00
lvxinran c6e4fb21d4 迷宫寻宝、表格提交 2019-12-16 10:37:42 +08:00
wangyuan c754c7b063 fix 2019-12-13 21:18:29 +08:00
wangyuan 456d88c346 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-13 21:13:54 +08:00
wangyuan 95b94c95f2 巅峰赛数据 2019-12-13 21:13:42 +08:00
lvxinran 19944b9009 无尽等级修改,迷宫寻宝派遣加速 2019-12-13 18:02:56 +08:00
zhangshanxue 8e38757d85 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-16 15:40:44 +08:00