Commit Graph

30 Commits (981191c053b7ea8e630278078256559f0663f759)

Author SHA1 Message Date
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 b98fd6b273 幸运探宝 2019-09-27 11:16:35 +08:00
zhangshanxue aff8be52f7 Merge branch 'project0.94'
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java
2019-09-26 14:20:13 +08:00
zhangshanxue f10ff47dc4 gm命令 异步事件分发 探宝活动 2019-09-26 14:18:27 +08:00
wangyuan 24c49c8cfe fix report 2019-09-26 13:44:35 +08:00
lvxinran ffd91d6adb gm无尽商店 2019-09-28 08:22:40 +08:00
wangyuan e0aaca6306 fix 2019-09-25 10:37:14 +08:00
zhangshanxue 67590bf4dd 热更后回退 2019-09-23 23:40:04 +08:00
wangyuan c399c67a2a fix force 2019-09-20 18:24:34 +08:00
zhangshanxue 5d487705da 内存数据修复 2019-09-20 17:39:55 +08:00
wangyuan d00793e1d8 fix gm 2019-09-20 11:12:16 +08:00
wangyuan 80745fc233 log 2019-09-20 10:56:30 +08:00
wangyuan 144fadf156 log 2019-09-20 10:36:14 +08:00
wangyuan 94451b542c log 2019-09-20 10:35:03 +08:00
wangyuan 1797e04edf fix 2019-09-20 10:05:01 +08:00
zhangshanxue 35c64d19e7 月卡修复 2019-09-19 21:16:27 +08:00
wangyuan 1615f53a15 fix charge 2019-09-19 18:57:47 +08:00
wangyuan 510ad468b4 gm 2019-09-28 17:31:19 +08:00
wangyuan a4a81a34f5 test gm 2019-09-18 19:25:12 +08:00
wangyuan d2f70c74c2 test gm 2019-09-18 19:11:32 +08:00
wangyuan f4376dc49c test gm 2019-09-18 19:05:50 +08:00
wangyuan 89efd6a239 test 2019-09-18 19:02:03 +08:00
wangyuan 1368c28d55 fix gm 2019-09-18 18:40:36 +08:00
zhangshanxue 16934bfa74 内存战力强制修改 2019-09-18 18:30:38 +08:00
zhangshanxue 51eff6e873 内存战力强制修改 2019-09-18 18:25:39 +08:00
zhangshanxue b84afdf49a Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GmService.java
2019-09-18 18:14:56 +08:00
zhangshanxue fc90b4d129 内存战力强制修改 2019-09-18 18:13:35 +08:00
wangyuan 54a3e50ae6 fix buy not in mongo 2019-09-18 16:45:04 +08:00
zhangshanxue bb0cdea20c 封号 2019-08-28 19:46:46 +08:00
zhangshanxue 9a5c1ec50b gm支持 2019-08-28 11:53:00 +08:00