Commit Graph

3157 Commits (64fabcd9d7068d77176d5d2203c3fca6b222424a)
 

Author SHA1 Message Date
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
wangyuan 04d4e8b5e0 fix equip 2019-12-02 18:31:20 +08:00
zhangshanxue a17f641d8c Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-02 15:08:51 +08:00
lvxinran 8b0f5aa9c5 配置 2019-12-17 00:09:23 +08:00
lvxinran f16a71e03f 云梦祈福多期 2019-12-17 00:09:13 +08:00
lvxinran 3c0f236e4d Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-02 10:42:04 +08:00
lvxinran bb299e4a22 敏感字 2019-12-02 10:41:58 +08:00
wangyuan bacf2fc3b3 Merge branch 'online_1121'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
2019-12-02 10:36:11 +08:00
zhangshanxue 4e649e323e 获取gid 2019-12-02 10:32:27 +08:00
wangyuan 349d5a0145 fix init mission 2019-12-02 10:25:47 +08:00
lvxinran 340391ca4d 关卡排行榜 2019-12-02 10:18:54 +08:00
lvxinran ac85646ab1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-12-02 10:17:59 +08:00
lvxinran 74fce2865d 排行榜修改 2019-12-02 10:17:44 +08:00
wangyuan 106af8c853 luafight 2019-12-02 10:11:58 +08:00
wangyuan b9d9b69b5a Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-29 18:36:36 +08:00
wangyuan 824e845089 fix minggan 2019-11-29 18:36:13 +08:00
zhangshanxue 7f57df878a redis string获取错误处理 2019-11-29 18:34:26 +08:00