Commit Graph

62 Commits (071219b06841e76d52240f43b84564ebde2649f1)

Author SHA1 Message Date
lvxinran 4320ed3650 战斗修改 2020-04-10 18:04:21 +08:00
zhangshanxue 4e5542393c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-02-09 19:53:28 +08:00
zhangshanxue 4769cadda1 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-09 19:48:55 +08:00
lvxinran c72b28d1de 日志修改 2020-01-09 15:59:27 +08:00
wangyuan a0fe74fa22 vip校验方法名称修改 2020-01-07 19:24:55 +08:00
wangyuan 6b38f4f77e 修改战斗计算结果 2019-12-24 14:23:23 +08:00
wangyuan f90796f702 推送巅峰赛进度信息 2019-12-12 18:32:54 +08:00
wangyuan 3b52fbfa63 fix globaldata & champion in redis 2019-12-12 11:42:56 +08:00
wangyuan b28d31d8ae 巅峰赛 2019-12-06 20:25:52 +08:00
wangyuan b3834ed6ee fix fight 2019-11-27 10:33:27 +08:00
wangyuan df7b1345b6 change fight 2019-11-25 16:13:24 +08:00
wangyuan 1b09b921f9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-06 11:04:28 +08:00