wangyuan
|
c70ea68e76
|
delete log
|
2019-09-27 10:25:23 +08:00 |
wangyuan
|
514a4086b6
|
fix
|
2019-09-27 10:22:42 +08:00 |
wangyuan
|
ac8466f081
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java
|
2019-09-27 10:21:16 +08:00 |
wangyuan
|
405ab16ed0
|
new fight
|
2019-09-27 10:18:38 +08:00 |
lvxinran
|
0319fcefae
|
公会优化
|
2019-09-27 04:52:58 +08:00 |
lvxinran
|
9d90c6f661
|
工会申请列表红点
|
2019-09-26 17:56:15 +08:00 |
lvxinran
|
63687ab6cd
|
Merge branch 'project0.93'
|
2019-09-27 04:53:12 +08:00 |
lvxinran
|
ae3e1e9a71
|
Merge branch 'project0.93'
|
2019-09-27 04:51:30 +08:00 |
wangyuan
|
9357d3e802
|
fix team id
|
2019-09-26 15:53:27 +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 |
wangyuan
|
ae1b86a695
|
fix
|
2019-09-26 11:04:43 +08:00 |
wangyuan
|
cb46ed50c8
|
Merge branch 'newfight'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/STestWelfare.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2019-09-26 10:36:41 +08:00 |
wangyuan
|
201765fd9f
|
fix maxlevel
|
2019-09-26 10:27:28 +08:00 |
wangyuan
|
9067ca3e07
|
new fight & workshoplevel & herolevel
|
2019-09-26 10:06:55 +08:00 |
lvxinran
|
1cd0fe5ce7
|
孙龙宝藏重置
|
2019-09-26 09:54:17 +08:00 |
zhangshanxue
|
cf8066ae5c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-25 15:39:23 +08:00 |
zhangshanxue
|
e76e1f93c6
|
定时系统邮件
|
2019-09-25 15:39:17 +08:00 |
lvxinran
|
b5d2808ec8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-25 14:48:00 +08:00 |
lvxinran
|
04002b3fac
|
公会相关
|
2019-09-25 14:47:54 +08:00 |
lvxinran
|
ffd91d6adb
|
gm无尽商店
|
2019-09-28 08:22:40 +08:00 |
wangyuan
|
0b2d08276c
|
log
|
2019-09-25 14:06:58 +08:00 |
lvxinran
|
c2be0dc3f8
|
无尽商店
|
2019-09-25 10:54:27 +08:00 |
lvxinran
|
38ff05edb4
|
怪物战力
|
2019-09-25 10:53:34 +08:00 |
wangyuan
|
e0aaca6306
|
fix
|
2019-09-25 10:37:14 +08:00 |
wangyuan
|
a7f07c668e
|
log
|
2019-09-25 10:34:09 +08:00 |
lvxinran
|
7ebb58041c
|
表格报错
|
2019-09-25 10:26:52 +08:00 |
wangyuan
|
95d82b59bd
|
fix store
|
2019-09-25 10:14:46 +08:00 |
wangyuan
|
20e9b0f8ec
|
new fight
|
2019-09-25 09:58:02 +08:00 |
lvxinran
|
c208d37eb5
|
邮件修改
|
2019-09-24 21:38:26 +08:00 |
lvxinran
|
2cb3065187
|
无尽地图
|
2019-09-28 08:09:58 +08:00 |
lvxinran
|
63ee75cc2d
|
地图修改
|
2019-09-28 07:03:09 +08:00 |
lvxinran
|
711ae66483
|
无尽修改
|
2019-09-28 07:02:27 +08:00 |
lvxinran
|
e88fb2a1ec
|
无尽地图
|
2019-10-12 11:02:09 +08:00 |
lvxinran
|
b7d95499b9
|
无尽出生点
|
2019-10-12 09:17:18 +08:00 |
lvxinran
|
3214ede819
|
无尽商店
|
2019-10-05 08:41:39 +08:00 |
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 |
zhangshanxue
|
d54dbb502f
|
占星优化
|
2019-09-24 11:09:16 +08:00 |
lvxinran
|
6cb28477c9
|
Merge branch 'develop'
|
2019-09-28 05:59:53 +08:00 |
wangyuan
|
08d695dd53
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-24 10:23:05 +08:00 |
wangyuan
|
90debb83e6
|
chat type
|
2019-09-24 10:22:30 +08:00 |
zhangshanxue
|
aa12e2ecd0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-24 10:21:36 +08:00 |
zhangshanxue
|
001bc4bedc
|
占星优化
|
2019-09-24 10:21:17 +08:00 |
wangyuan
|
54b3b65c51
|
Merge branch 'develop'
|
2019-09-24 10:17:20 +08:00 |
wangyuan
|
8fe3bf74b0
|
new fight
|
2019-09-24 10:17:09 +08:00 |
zhangshanxue
|
67590bf4dd
|
热更后回退
|
2019-09-23 23:40:04 +08:00 |
zhangshanxue
|
f28972f9d3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-23 18:51:35 +08:00 |
zhangshanxue
|
bff92f29f0
|
占星优化
|
2019-09-23 18:51:31 +08:00 |
wangyuan
|
67344d6bf9
|
Merge branch 'develop'
|
2019-09-23 18:03:14 +08:00 |
wangyuan
|
730bafb538
|
chat
|
2019-09-23 18:02:39 +08:00 |
zhangshanxue
|
266808f042
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-23 17:58:45 +08:00 |
zhangshanxue
|
68daab49d7
|
占星优化
|
2019-09-23 17:58:07 +08:00 |
wangyuan
|
388b2e5495
|
bloody
|
2019-09-23 17:56:22 +08:00 |
wangyuan
|
eb6cf6f62b
|
reconnect
|
2019-09-23 17:39:25 +08:00 |
wangyuan
|
bdc84eb2fc
|
reconnect
|
2019-09-23 17:20:02 +08:00 |
zhangshanxue
|
9af1ae4196
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-23 14:22:39 +08:00 |
zhangshanxue
|
8b5210be28
|
占星优化
|
2019-09-23 14:22:34 +08:00 |
wangyuan
|
4872f629d2
|
delete red
|
2019-09-23 11:35:51 +08:00 |
zhangshanxue
|
9c96318b63
|
2级 改名卡
|
2019-09-20 19:52:47 +08:00 |
zhangshanxue
|
00e4818aff
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-20 19:40:06 +08:00 |
zhangshanxue
|
5af0c05c6b
|
达人活动
|
2019-09-20 19:34:41 +08:00 |
wangyuan
|
1e6ab3dfa4
|
fix map null
|
2019-09-20 23:22:54 +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
|
c399c67a2a
|
fix force
|
2019-09-20 18:24:34 +08:00 |
zhangshanxue
|
e1c8e2fdc6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-20 17:40:41 +08:00 |
zhangshanxue
|
5d487705da
|
内存数据修复
|
2019-09-20 17:39:55 +08:00 |
wangyuan
|
6296f1e1ed
|
fix herologic
|
2019-09-20 17:11:44 +08:00 |
wangyuan
|
c0aa602e21
|
fix force
|
2019-09-20 17:04:52 +08:00 |
wangyuan
|
1c7dbd7b4d
|
close activity
|
2019-09-20 14:02:24 +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 |
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
|
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 |
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 |