lvxinran
|
8f20e52680
|
公会战最终提交。。。
|
2019-09-24 21:34:38 +08:00 |
|
lvxinran
|
5a6b460d8b
|
Merge branch 'develop' of http://60.1.1.230/backend/jieling_server into develop
|
2019-09-26 14:30:59 +08:00 |
|
lvxinran
|
a2edf93d0a
|
公会战修改
|
2019-09-26 14:30:49 +08:00 |
|
lvxinran
|
8e87514b8f
|
无尽修改
|
2019-09-27 12:52:28 +08:00 |
|
lvxinran
|
f708a2f546
|
公会战战力修改
|
2019-09-26 12:56:11 +08:00 |
|
lvxinran
|
494c3dbe17
|
公会战
|
2019-09-25 12:41:23 +08:00 |
|
lvxinran
|
0d24ba3784
|
公会战跨服
|
2019-09-24 12:45:56 +08:00 |
wangyuan
|
730bafb538
|
chat
|
2019-09-23 18:02:39 +08:00 |
|
lvxinran
|
2d869c875d
|
无尽修改
|
2019-09-20 18:34:52 +08:00 |
|
lvxinran
|
c2d214d337
|
无尽地图修改
|
2019-09-20 18:34:29 +08:00 |
|
lvxinran
|
ab11d72809
|
无尽副本难度添加
|
2019-09-23 06:02:35 +08:00 |
|
lvxinran
|
60862fa351
|
无尽提交
|
2019-10-18 03:13:06 +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 |
|
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 |