Commit Graph

2336 Commits (ba4a28d79260d82c662f9733116a13e27adb1c3e)
 

Author SHA1 Message Date
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
zhangshanxue d0728bae5f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 14:16:28 +08:00
zhangshanxue 967a744a81 掉落 2019-09-09 14:16:23 +08:00
wangyuan f85de0b94c fix random 2019-09-09 12:38:21 +08:00
zhangshanxue 9e8cec3727 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 12:00:11 +08:00
zhangshanxue 88dc18da7b 问卷删除缓存 2019-09-09 11:59:34 +08:00
lvxinran a533fd4c1a 无尽副本血量修改 2019-09-09 11:55:30 +08:00
lvxinran 8285f4363e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 11:31:57 +08:00
lvxinran 52a27ee882 法宝等级限制,46行为修改 2019-09-09 11:31:51 +08:00
zhangshanxue 8dc4700f13 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-09 11:28:52 +08:00
zhangshanxue 2e35ab977e 魂印临时背包掉落 2019-09-09 11:28:46 +08:00
wangyuan 9dfd5db209 怪物正常化 2019-09-09 11:12:53 +08:00
wangyuan 082e21cadf fix creature 2019-09-09 11:11:28 +08:00
wangyuan cd38e82643 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-09 10:45:03 +08:00
wangyuan fc2994c577 time 2019-09-09 10:42:13 +08:00
lvxinran 7be649a804 无尽副本修改,法宝修改 2019-09-09 10:39:59 +08:00
lvxinran 6741c28aea 战斗同步后端 2019-09-09 10:14:21 +08:00
lvxinran 54ad281831 试炼精气值 2019-09-09 09:58:45 +08:00
wangyuan 2a5490a030 time 2019-09-07 21:40:45 +08:00
wangyuan 404ea07089 fix 2019-09-07 20:06:57 +08:00
wangyuan 78154b6adc Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SBloodyBattleSetting.java
2019-09-07 20:05:37 +08:00
wangyuan 0db40f7fde bloody 2019-09-07 20:03:06 +08:00
zhangshanxue 47ac97d2ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 19:45:34 +08:00
zhangshanxue 5a05c80ef3 魂印掉落 2019-09-07 19:45:30 +08:00
lvxinran 8bfa9dc498 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 19:26:31 +08:00
lvxinran cb95002a8f 血战时间限制 2019-09-07 19:26:27 +08:00
zhangshanxue 4f9b3404dd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 17:20:46 +08:00
zhangshanxue f5fb83d1b4 token验证 2019-09-07 17:20:41 +08:00
zhangshanxue 91c017cbd5 魂印掉落 2019-09-07 17:18:22 +08:00
lvxinran 3defe3d54c 法宝掉落 2019-09-07 16:31:19 +08:00
lvxinran d88ed321c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-07 15:03:56 +08:00
lvxinran d6f2b203e0 公会修改、试炼修改 2019-09-07 15:03:33 +08:00
wangyuan e1cbbac567 圣火令 2019-09-07 14:48:08 +08:00