Commit Graph

2380 Commits (f246d8ce74b0d331c4a6dfb0eb8e4698a1d5ff39)
 

Author SHA1 Message Date
zhangshanxue aad18c8bd6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-19 18:03:25 +08:00
lvxinran e1b22f1a1d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 06:31:39 +08:00
wangyuan 510ad468b4 gm 2019-09-28 17:31:19 +08:00
lvxinran bb5a8831b6 公会战暂时注释 2019-09-23 06:31:32 +08:00
lvxinran 65676c7931 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-23 06:01:44 +08:00
wangyuan f596ae7846 close 2019-09-28 16:39:41 +08:00
lvxinran f360226c96 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-01 06:18:25 +08:00
lvxinran cb9a0f555e 无尽修改 2019-10-01 06:18:19 +08:00
lvxinran ebcb4db464 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-01 06:07:37 +08:00
lvxinran 92d8999b7a 无尽踢出图 2019-10-01 06:07:33 +08:00
wangyuan 7aa10156f1 fix user mision 2019-09-28 16:02:59 +08:00
lvxinran bbb56254d5 无尽出图 2019-09-23 06:01:41 +08:00
zhangshanxue 4667c72e15 内存数据修复 2019-09-19 18:03:20 +08:00
wangyuan cf12529bb3 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-19 15:15:19 +08:00
wangyuan 4fe443982e send indication 2019-09-19 15:14:55 +08:00
zhangshanxue 583fb7804b 查看内存数据 2019-09-19 15:05:17 +08:00
zhangshanxue a83b68e790 查看内存数据 2019-09-19 14:47:06 +08:00
zhangshanxue f805f83a25 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-19 11:00:25 +08:00
zhangshanxue 1d2adc565b 累计充值 2019-09-19 10:58:57 +08:00
wangyuan 27d0588bce fix indication 2019-09-19 10:39:52 +08:00
wangyuan 32ba425900 fix 2019-09-18 21:21:02 +08:00
zhangshanxue 5fd1e90b8a 内存战力强制修改 2019-09-18 21:15:38 +08:00
wangyuan 63a587862c fix gm 2019-09-18 20:41:32 +08:00
wangyuan e5578dbab3 fix name 2019-09-18 19:25:34 +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 04531d5128 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-18 18:38:43 +08:00
wangyuan 5bfaaea4b6 fix retry 2019-09-18 18:34:34 +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 ff30ef0341 fix buy 2019-09-18 18:00:37 +08:00
wangyuan c350f920e5 fix buy 2019-09-18 17:51:35 +08:00
wangyuan e852ef1b31 rollback 2019-09-18 17:42:42 +08:00
wangyuan 474180788b fix buy 2019-09-18 17:22:31 +08:00
wangyuan 54a3e50ae6 fix buy not in mongo 2019-09-18 16:45:04 +08:00
lvxinran 247bcbbcd1 修改 2019-09-23 08:20:37 +08:00
lvxinran cf27447f0d 世界等级 2019-09-23 08:15:44 +08:00
lvxinran 67dc20bd41 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-18 11:35:23 +08:00
lvxinran e10ac1ad61 世界等级修改 2019-09-18 11:34:23 +08:00
wangyuan 7dd95c1cfa delete unuse code 2019-09-18 11:22:29 +08:00
wangyuan 44710613f5 online num 2019-09-18 11:21:56 +08:00
wangyuan 24ee84be59 fix proto 2019-09-18 09:32:18 +08:00
wangyuan 13634f35de delete log 2019-09-18 08:53:11 +08:00
wangyuan d632f72afc test 2019-09-17 20:32:28 +08:00
wangyuan 986b7a769d test 2019-09-17 20:07:51 +08:00