Commit Graph

2313 Commits (0ac0b161f5363a6efa7d21ee949b585f1dfbe32a)
 

Author SHA1 Message Date
zhangshanxue 0ac0b161f5 活动奖励领完 重置进度 2019-10-09 18:16:13 +08:00
zhangshanxue 2062561e7e 热加载新类 2019-10-09 17:03:46 +08:00
zhangshanxue 5916e26239 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-09 16:51:53 +08:00
zhangshanxue f45b6d4e83 热加载新类 2019-10-09 16:51:49 +08:00
wangyuan 2f3701fe49 fix indicaiton 2019-10-09 16:07:27 +08:00
wangyuan 0d58fa4b38 黑名单 2019-10-09 15:58:55 +08:00
zhangshanxue f47b80ea14 幸运探宝 2019-10-09 15:25:06 +08:00
zhangshanxue 5eb8af467a jar中查找类 2019-10-09 15:23:11 +08:00
zhangshanxue e8e1f7b744 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-09 15:12:16 +08:00
zhangshanxue 981191c053 jar中查找类 2019-10-09 15:12:11 +08:00
wangyuan ee140b7495 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-09 14:38:04 +08:00
wangyuan 81b5ec7236 fix final fight 2019-10-09 14:36:48 +08:00
wangyuan 0e44a8795f fix fastreward & fix especialEquip misison 2019-10-09 14:13:23 +08:00
zhangshanxue c6cf91aa70 非注解handler注入 2019-10-09 10:33:37 +08:00
zhangshanxue f9dab7ddae Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-08 18:56:28 +08:00
zhangshanxue 0758d2da32 兽潮快速战斗 2019-10-08 18:56:05 +08:00
wangyuan 03c948bf9a des 2019-10-08 18:06:45 +08:00
wangyuan 29a6ab23a3 des 2019-10-08 16:38:02 +08:00
wangyuan 0da5001de3 battle 2019-10-08 16:35:19 +08:00
wangyuan 65d1405b13 hero lock & fix msg 2019-10-08 16:30:00 +08:00
wangyuan d302e893b4 hero lock 2019-10-08 15:59:36 +08:00
wangyuan 36340f3a18 跑马灯& 回溯 2019-10-08 15:31:28 +08:00
zhangshanxue 6f1972e902 幸运探宝 2019-10-08 10:04:26 +08:00
zhangshanxue dd496531a3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2019-09-28 11:01:22 +08:00
zhangshanxue 13cb402343 幸运探宝 2019-09-28 11:00:06 +08:00
wangyuan 6cbab124e9 add login white 2019-09-27 18:11:26 +08:00
wangyuan 8d92dcbfdc fix map 2019-09-27 17:38:17 +08:00
lvxinran 162b0880b7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-27 15:02:56 +08:00
lvxinran 4fa201093a 已加入工会提示 2019-09-27 15:02:46 +08:00
wangyuan 9c33a505a6 Merge branch 'project0.93' 2019-09-27 14:58:45 +08:00
wangyuan 3f17df4540 fix gm 2019-09-27 14:53:07 +08:00
wangyuan 85bb61208d upload 2019-09-27 14:17:33 +08:00
wangyuan 7bd4b67364 fix item drop 2019-09-27 14:10:36 +08:00
wangyuan 21dba7ff37 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-27 14:05:50 +08:00
wangyuan 29caa89314 fix bug 2019-09-27 14:05:30 +08:00
lvxinran 8867433bf4 Merge branch 'project0.93' 2019-09-27 13:36:46 +08:00
lvxinran 6e4ba9ed73 公会走路 2019-09-27 13:36:09 +08:00
lvxinran ffc3e7890d 公会战bug 2019-09-29 12:06:40 +08:00
wangyuan 2900cade4c vip特权结算收益 2019-09-27 11:53:56 +08:00
wangyuan 12b13fa6b0 OFFLINE TIME 2019-09-27 11:40:59 +08:00
zhangshanxue b98fd6b273 幸运探宝 2019-09-27 11:16:35 +08:00
wangyuan cc1a749227 好友赠送友情点 2019-09-27 10:38:13 +08:00
wangyuan c70ea68e76 delete log 2019-09-27 10:25:23 +08:00
wangyuan 514a4086b6 fix 2019-09-27 10:22:42 +08:00
wangyuan ac8466f081 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java
2019-09-27 10:21:16 +08:00
wangyuan 405ab16ed0 new fight 2019-09-27 10:18:38 +08:00
lvxinran 0319fcefae 公会优化 2019-09-27 04:52:58 +08:00
lvxinran 9d90c6f661 工会申请列表红点 2019-09-26 17:56:15 +08:00
lvxinran 63687ab6cd Merge branch 'project0.93' 2019-09-27 04:53:12 +08:00
lvxinran ae3e1e9a71 Merge branch 'project0.93' 2019-09-27 04:51:30 +08:00