Commit Graph

2368 Commits (e8f10f1f04c9a72220fd66ec7b4b155f56c27333)
 

Author SHA1 Message Date
zhangshanxue 521b7d062a 一键装备 2019-09-11 10:51:48 +08:00
zhangshanxue da3ad5f06e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 10:23:52 +08:00
zhangshanxue 4481b5a8c0 gm 跑马灯 2019-09-11 10:10:01 +08:00
zhangshanxue 5545dec693 问卷重开 2019-09-10 21:12:26 +08:00
zhangshanxue 049975b931 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 20:41:57 +08:00
zhangshanxue ba608937cc 装备战力 2019-09-10 20:41:50 +08:00
wangyuan f7f54df716 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-10 20:12:30 +08:00
lvxinran 08324adb91 匹配时星数显示 2019-09-13 12:19:12 +08:00
lvxinran d49eb6114b 聊天检测 2019-09-12 12:12:51 +08:00
wangyuan c3dc931ea2 fix 2019-09-10 20:09:30 +08:00
zhangshanxue 952b1dd161 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 18:24:52 +08:00
lvxinran 3ef8b5766b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 18:44:50 +08:00
lvxinran b52d314375 无尽修改N。。。 2019-09-12 18:44:46 +08:00
lvxinran 4f39ea2210 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 16:19:28 +08:00
lvxinran 713a0b7c04 无尽修改 2019-09-12 16:19:23 +08:00
zhangshanxue de65f12114 在线人数 2019-09-10 18:24:46 +08:00
wangyuan 135450f507 fix network 2019-09-10 16:10:28 +08:00
zhangshanxue dfeaf4bae0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 15:55:46 +08:00
zhangshanxue 14d21eb6ec 移除功能开启检查 2019-09-10 15:55:42 +08:00
zhangshanxue a3b84a9b2d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 14:30:47 +08:00
zhangshanxue 9bb332835e 魂印功能限制 2019-09-10 14:30:42 +08:00
wangyuan 2810683713 fix time 2019-09-10 14:14:32 +08:00
wangyuan 98d92373ac fix table 2019-09-10 14:03:51 +08:00
wangyuan 5633e399e9 fix 2019-09-10 13:50:38 +08:00
wangyuan d1efc48e47 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-09-10 13:49:50 +08:00
zhangshanxue abd7ebd875 观星开启 2019-09-10 13:25:53 +08:00
wangyuan 11376e12b1 fix map team 2019-09-10 12:01:05 +08:00
zhangshanxue f36c71cada 问卷修改 2019-09-10 11:54:20 +08:00
lvxinran b5b563c2dc 战斗修改 2019-09-12 12:34:43 +08:00
lvxinran 30d56d2ad1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-12 11:08:59 +08:00
lvxinran a1e0d88052 无尽本报错 2019-09-12 11:08:55 +08:00
zhangshanxue 91582654ae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 10:21:38 +08:00
zhangshanxue 33d1cf6a03 魂印 2019-09-10 10:21:01 +08:00
wangyuan 2a286218e6 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GameApplication.java
2019-09-10 10:07:55 +08:00
wangyuan 4f57f75d6d 增加赛季开启类型 2019-09-10 10:05:03 +08:00
zhangshanxue a51abcbe92 魂印 2019-09-10 10:02:59 +08:00
zhangshanxue f8ab3f7967 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-10 00:01:38 +08:00
lvxinran 46e7fd5c23 血量修改 2019-09-11 23:29:45 +08:00
lvxinran acbbc8ee4f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-11 22:21:06 +08:00
lvxinran 9eb7a469ff 法宝、公会战无尽副本修改 2019-09-11 22:21:02 +08:00
zhangshanxue d04f6fe3bf 掉落 2019-09-10 00:01:17 +08:00
zhangshanxue 84104a5971 问卷调查优化 2019-09-09 20:35:00 +08:00
wangyuan 5bc5543ce5 进入游戏狂欢时刻 2019-09-09 20:34:10 +08:00
zhangshanxue 2aa64192a4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 16:35:15 +08:00
zhangshanxue 08d29d6cce 更新bug 2019-09-09 16:35:03 +08:00
wangyuan f9263ece0b conf 2019-09-09 16:23:09 +08:00
wangyuan f1f8d67076 conf 2019-09-09 16:22:43 +08:00
wangyuan f5ec857e24 自动发现服务器 2019-09-09 16:07:11 +08:00
zhangshanxue 5ff27b049c token验证 2019-09-09 15:04:39 +08:00
zhangshanxue 1b61c88da1 token验证 2019-09-09 14:23:29 +08:00