Commit Graph

2196 Commits (c0aa602e21e8a513fea573884d26aa94380b5234)
 

Author SHA1 Message Date
wangyuan c0aa602e21 fix force 2019-09-20 17:04:52 +08:00
wangyuan 1c7dbd7b4d close activity 2019-09-20 14:02:24 +08:00
wangyuan 1e6ab3dfa4 fix map null 2019-09-20 23:22:54 +08:00
zhangshanxue 23cd3657e2 月卡修复 2019-09-19 22:59:44 +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 e9d0b2d27f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-19 21:16:57 +08:00
zhangshanxue 35c64d19e7 月卡修复 2019-09-19 21:16:27 +08:00
wangyuan 2a5d4fe922 log 2019-09-19 20:33:47 +08:00
wangyuan fb7e229a60 fix 2019-09-19 20:31:54 +08:00
wangyuan 7d84edc660 fix reconnect 2019-09-19 20:21:06 +08:00
wangyuan 0f229baaa4 print log 2019-09-19 19:26:46 +08:00
wangyuan 1615f53a15 fix charge 2019-09-19 18:57:47 +08:00
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