Commit Graph

2823 Commits (95b94c95f280878016ce61a9f40e5d3530a8d171)
 

Author SHA1 Message Date
wangyuan 95b94c95f2 巅峰赛数据 2019-12-13 21:13:42 +08:00
wangyuan f49bfe6f1f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-12 18:32:58 +08:00
zhangshanxue 79363da8a6 TASK【ID1005286】【达人活动的排行榜优化】 2019-12-15 16:15:57 +08:00
wangyuan f90796f702 推送巅峰赛进度信息 2019-12-12 18:32:54 +08:00
zhangshanxue cc0f4c51c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-12 14:00:41 +08:00
wangyuan 2efcce2614 fix bet 2019-12-12 13:45:09 +08:00
zhangshanxue ea5ec20b2f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-12 13:37:26 +08:00
zhangshanxue 926b00a691 Task【ID1005229】【特权调整】 2019-12-12 13:35:58 +08:00
wangyuan 4b2d619df6 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-12 11:43:01 +08:00
wangyuan 3b52fbfa63 fix globaldata & champion in redis 2019-12-12 11:42:56 +08:00
zhangshanxue efb20d445e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-12 11:04:10 +08:00
lvxinran cb6702ac8e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-13 17:19:31 +08:00
lvxinran aa56fb73b7 限时抽卡预告 2019-12-13 17:19:26 +08:00
zhangshanxue de89214bb4 BUG【ID1005727】限时活动排行榜奖励邮件,部分玩家没有收到 2019-12-13 15:42:20 +08:00
zhangshanxue 530fc08267 Task【ID1005229】【特权调整】 2019-12-12 10:59:33 +08:00
zhangshanxue ed7545aba3 控制台gm命令 netty关闭流程修改 2019-12-11 15:19:38 +08:00
lvxinran a82d645499 活动预告 2019-12-11 15:06:49 +08:00
lvxinran 867f81836a 限时抽卡 2019-12-13 08:06:58 +08:00
lvxinran d3e04b3ec1 热更文件 2019-12-09 17:10:38 +08:00
lvxinran 0d19b9d141 限时抽卡 2019-12-09 17:10:23 +08:00
lvxinran d9c2104c8c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-09 17:01:25 +08:00
lvxinran e8512767c5 幸运榜 2019-12-09 01:23:10 +08:00
lvxinran e268424768 幸运榜 2019-12-09 00:17:16 +08:00
lvxinran 4d4ccd4703 Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-12-08 01:28:38 +08:00
zhangshanxue 7670285223 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-08 13:42:07 +08:00
zhangshanxue 9e9ef767b4 【ID1005236】【异妖配件属性修改】 2019-12-08 13:41:44 +08:00
lvxinran d5bb15ce14 限时抽卡排行榜 2019-12-07 21:08:19 +08:00
zhangshanxue e9833d8142 【ID1005236】
【异妖配件属性修改】
2019-12-07 17:25:11 +08:00
wangyuan 206aae7aa3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2019-12-06 20:26:50 +08:00
wangyuan b28d31d8ae 巅峰赛 2019-12-06 20:25:52 +08:00
wangyuan f35bd27201 fix adventure 2019-12-05 14:35:17 +08:00
lvxinran f755892340 公会一键删除,怪物组为空,获取编队为空,地图id为空处理 2019-12-07 21:35:48 +08:00
zhangshanxue dbc049a621 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-08 11:42:04 +08:00
zhangshanxue 217da21fb9 打印内存表数据 2019-12-08 11:41:23 +08:00
zhangshanxue d3f2023ec8 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-08 11:31:19 +08:00
zhangshanxue d207c33e28 充值接口屏蔽 2019-12-08 11:30:53 +08:00
wangyuan b75301ba76 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-12-05 11:35:12 +08:00
wangyuan 954b30e598 fix friend 2019-12-05 11:35:02 +08:00
wangyuan ce74ccb327 fix activity 2019-12-05 10:44:18 +08:00
zhangshanxue 8e959d450b 活动修改 2019-12-04 16:31:16 +08:00
lvxinran fa36f01f5a 五星成长礼修改 2019-12-06 23:46:22 +08:00
lvxinran ea908c0c8c 任务修改 2019-12-06 06:59:58 +08:00
lvxinran ca99629f91 好友申请列表 2019-12-06 04:10:48 +08:00
zhangshanxue 460d47c20a Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/LoginRequestHandler.java
2019-12-04 14:57:21 +08:00
zhangshanxue d96b323657 登录gid记录 2019-12-04 14:56:08 +08:00
lvxinran 83338c7510 全部同意好友申请修改 2019-12-03 16:36:10 +08:00
lvxinran c4522db36a 关卡排行榜 2019-12-03 16:35:20 +08:00
lvxinran c8ddf8c077 兽潮排行榜 2019-12-17 05:46:08 +08:00
wangyuan 0ccb33b366 fix guild & mail 2019-12-03 14:22:21 +08:00
wangyuan 35bc1e5322 fix gm 2019-12-03 12:30:34 +08:00