Commit Graph

2358 Commits (4ca3c49ffe26669a2f9864ad1469e9ba5d41fd97)
 

Author SHA1 Message Date
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
wangyuan f251c3e9dc fix 2019-09-17 19:46:50 +08:00
wangyuan 501f084a03 fix 2019-09-17 19:32:10 +08:00
wangyuan 5048fb2238 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-09-17 19:31:03 +08:00
wangyuan f9bf1d7a67 print log 2019-09-17 19:30:48 +08:00
wangyuan 45fe740b3d cal score 2019-09-19 16:23:17 +08:00
lvxinran 7389d9f0a8 敏感词添加 2019-09-17 17:58:48 +08:00
zhangshanxue 1bf2ab65c7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 17:42:19 +08:00
zhangshanxue aebb3cb843 openid 2019-09-17 17:42:13 +08:00
lvxinran 5383dbade1 禁言相关修改 2019-09-17 17:41:39 +08:00
lvxinran d26f1239ab Key修改 2019-09-17 16:48:57 +08:00
zhangshanxue 1127ca61ce Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 16:36:26 +08:00
zhangshanxue 7949ee19cd 累计充值重开 2019-09-17 16:36:12 +08:00
lvxinran 611dd26e04 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 15:57:39 +08:00
wangyuan 3086a1f5bc fix bloody 2019-09-19 15:46:26 +08:00
lvxinran 7e87ecd563 消耗道具修改 2019-09-17 15:57:29 +08:00
lvxinran 3698f10c46 上报修改 2019-09-17 15:56:30 +08:00
zhangshanxue 02d5e966bb redis 缓存服务器地址 2019-09-17 15:20:39 +08:00
zhangshanxue 24aa3f8536 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 14:58:41 +08:00
zhangshanxue 6b96021e08 redis 缓存服务器地址 2019-09-17 14:58:30 +08:00
wangyuan 0dfd959d5e delete buy indicaiton 2019-09-17 14:05:16 +08:00
lvxinran 55c8c4bdfd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-17 11:22:10 +08:00
lvxinran 678bb38395 法宝星级修改 2019-09-17 11:22:06 +08:00