Commit Graph

2462 Commits (f426a7599d1edc75c177130612966a6f26fe7e4d)

Author SHA1 Message Date
wangyuan f426a7599d fix guild indicaiton 2019-11-27 10:07:40 +08:00
zhangshanxue f09bb2b684 关卡限制活动 2019-11-27 09:52:04 +08:00
zhangshanxue e1786b61f7 关卡限制活动 2019-11-27 09:30:02 +08:00
wangyuan 307768615b fix activity 2019-11-26 17:22:31 +08:00
lvxinran 7d26a0da25 公会宣言长度 2019-11-26 15:29:43 +08:00
zhangshanxue aab51ba39c 五星成长礼按天刷新 2019-12-02 18:32:40 +08:00
zhangshanxue 3cdb228594 五星英雄成长礼 2019-11-25 23:13:52 +08:00
zhangshanxue ba1cb23fb2 五星英雄成长礼 2019-11-25 22:12:44 +08:00
zhangshanxue 26f06a54ae Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 21:53:50 +08:00
zhangshanxue 3cf23b39ff recharge协议合并策略 2019-11-25 21:17:29 +08:00
zhangshanxue 27d7504a0e Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 20:19:12 +08:00
zhangshanxue 28cb6035d4 五星英雄成长礼 2019-11-25 20:17:30 +08:00
wangyuan f4f4b87dc7 fix map mission cal 2019-11-25 17:29:11 +08:00
wangyuan 3785d4c2f1 fix 2019-11-25 15:36:45 +08:00
wangyuan 07210538c5 保底 2019-11-25 14:14:03 +08:00
wangyuan 8807cc06ea 保底 2019-11-25 12:10:05 +08:00
wangyuan 5203b5011e 优先检测活动刷新 2019-12-25 11:14:07 +08:00
wangyuan 368006246b ranfom pool 2019-11-25 10:36:38 +08:00
wangyuan 37f5729309 activity mail 2019-11-23 18:03:31 +08:00
zhangshanxue c369ac8d48 活动修改 2019-11-23 11:21:42 +08:00
wangyuan 1631f01146 activity & chat limit message length 2019-11-25 10:51:08 +08:00
wangyuan 199c559446 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-24 19:42:35 +08:00
wangyuan bda2d610f0 activity 2019-11-24 19:42:22 +08:00
lvxinran c73d9fe16e 充值修改 2019-11-22 19:10:13 +08:00
lvxinran 11c188938e 空物品判断 2019-11-22 17:32:58 +08:00
lvxinran 92736c1034 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-18 00:40:57 +08:00
lvxinran 183c32a12a 工会修改名字 2019-12-18 00:40:42 +08:00
lvxinran b00ab56b99 公会改名提交 2019-12-17 22:15:06 +08:00
lvxinran 460a9ad41a 试炼本修改 2019-12-17 21:56:30 +08:00
lvxinran 88e1a59289 修改退出地图 2019-12-17 00:43:21 +08:00
lvxinran 1ab6d2a649 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-12-17 00:41:09 +08:00
lvxinran eedab65f21 强制退出 2019-12-17 00:40:38 +08:00
lvxinran 28efc91bc9 无尽修改 2019-12-17 00:00:51 +08:00
wangyuan bbbd0d60d7 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-22 16:41:13 +08:00
wangyuan db8aeac335 元素招募 & 新活动(新手福利) 2019-11-22 16:39:54 +08:00
wangyuan 56338b360f reconnect endlessmap 2019-11-21 16:14:45 +08:00
wangyuan f6431e2e0f Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-21 13:44:19 +08:00
wangyuan 9c337089b4 fix mission 2019-11-21 13:43:48 +08:00
lvxinran 78c7305631 无尽删除信息修改 2019-11-21 10:27:17 +08:00
wangyuan d35d459169 fix arena mission 2019-11-21 10:09:40 +08:00
lvxinran 7d02b70750 解散工会修改 2019-11-20 11:59:55 +08:00
lvxinran d786c79bf7 公会战战斗时长修改 2019-11-19 17:58:06 +08:00
lvxinran 16b7479c8c 无尽赛季结束修改 2019-12-10 03:48:23 +08:00
lvxinran a5e797d543 公会战修改血量百分比 2019-11-20 18:34:34 +08:00
wangyuan 40611e8205 fix arena & fix mainlevel 2019-11-18 17:26:39 +08:00
wangyuan 503217bc43 fix thead 2019-11-18 16:21:10 +08:00
lvxinran f79437f32b 公会战星数修改 2019-11-18 18:37:19 +08:00
wangyuan 9053c6c8c5 fix time 2019-11-18 14:00:50 +08:00
wangyuan b31764a7d5 reload role 2019-11-18 10:12:55 +08:00
wangyuan 30af8125d3 mutilplaty login 2019-11-15 16:37:44 +08:00