wangyuan
|
85bb61208d
|
upload
|
2019-09-27 14:17:33 +08:00 |
wangyuan
|
7bd4b67364
|
fix item drop
|
2019-09-27 14:10:36 +08:00 |
wangyuan
|
21dba7ff37
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-27 14:05:50 +08:00 |
wangyuan
|
29caa89314
|
fix bug
|
2019-09-27 14:05:30 +08:00 |
lvxinran
|
8867433bf4
|
Merge branch 'project0.93'
|
2019-09-27 13:36:46 +08:00 |
lvxinran
|
6e4ba9ed73
|
公会走路
|
2019-09-27 13:36:09 +08:00 |
lvxinran
|
ffc3e7890d
|
公会战bug
|
2019-09-29 12:06:40 +08:00 |
wangyuan
|
2900cade4c
|
vip特权结算收益
|
2019-09-27 11:53:56 +08:00 |
wangyuan
|
12b13fa6b0
|
OFFLINE TIME
|
2019-09-27 11:40:59 +08:00 |
zhangshanxue
|
b98fd6b273
|
幸运探宝
|
2019-09-27 11:16:35 +08:00 |
wangyuan
|
cc1a749227
|
好友赠送友情点
|
2019-09-27 10:38:13 +08:00 |
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 |
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 |
zhangshanxue
|
4ef73f2406
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-17 10:35:14 +08:00 |
zhangshanxue
|
e8041f756a
|
占星卡池上线通知
|
2019-09-17 10:35:09 +08:00 |
wangyuan
|
c18aaed7aa
|
公式
|
2019-09-16 22:00:09 +08:00 |
wangyuan
|
200905d5a3
|
fix team
|
2019-09-16 21:34:32 +08:00 |
wangyuan
|
dc00f02962
|
print log
|
2019-09-16 20:40:49 +08:00 |
wangyuan
|
4306b7e518
|
fix playerlogic
|
2019-09-16 20:10:13 +08:00 |
wangyuan
|
69b64a7f57
|
fix hot
|
2019-09-16 19:38:24 +08:00 |
wangyuan
|
57ca077510
|
friend tips
|
2019-09-16 16:31:05 +08:00 |
wangyuan
|
c64bf6eee6
|
view team info
|
2019-09-16 15:51:27 +08:00 |
zhangshanxue
|
d5c1d89021
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-16 15:40:28 +08:00 |
zhangshanxue
|
9438cd562a
|
注册服务器信息
|
2019-09-16 15:40:18 +08:00 |
wangyuan
|
95c1506ce1
|
test hot fix
|
2019-09-16 14:18:23 +08:00 |
wangyuan
|
2f4589af04
|
chat log
|
2019-09-16 12:57:35 +08:00 |
zhangshanxue
|
e1de5c8050
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-16 11:39:17 +08:00 |
zhangshanxue
|
ce8fffd10c
|
所有榜单容量不做限制
|
2019-09-16 11:39:13 +08:00 |
wangyuan
|
cd0ff0e95d
|
fix login
|
2019-09-12 18:42:44 +08:00 |
lvxinran
|
11af6398d3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 18:40:45 +08:00 |
lvxinran
|
f06650a72b
|
修改
|
2019-09-12 18:40:41 +08:00 |
wangyuan
|
678c06c998
|
fix reconnect
|
2019-09-12 18:15:23 +08:00 |
zhangshanxue
|
e925b88ffd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 18:06:55 +08:00 |
zhangshanxue
|
258c70642c
|
cdk
|
2019-09-12 18:06:28 +08:00 |
zhangshanxue
|
63fc8dbd14
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-20 19:35:00 +08:00 |
zhangshanxue
|
01810351bb
|
招财猫回退
|
2019-09-20 19:34:42 +08:00 |
wangyuan
|
d24fce49ab
|
data report
|
2019-09-12 16:53:06 +08:00 |
wangyuan
|
70e62476f5
|
test
|
2019-09-12 13:51:19 +08:00 |
wangyuan
|
96bf9d7482
|
fix chat
|
2019-09-12 11:38:09 +08:00 |
wangyuan
|
eddd5459e0
|
fix chat
|
2019-09-12 10:55:31 +08:00 |
wangyuan
|
5a59ae0090
|
chat
|
2019-09-12 10:11:35 +08:00 |
lvxinran
|
a11a644dca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 10:05:35 +08:00 |
lvxinran
|
135b9756c6
|
物品流水日志
|
2019-09-12 10:05:31 +08:00 |
wangyuan
|
001477cbb6
|
friend limit
|
2019-09-11 14:27:58 +08:00 |
lvxinran
|
c032ea2eaa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 14:22:32 +08:00 |
lvxinran
|
4f84f0d815
|
无尽副本修改
|
2019-09-11 14:22:28 +08:00 |
lvxinran
|
16cbf1c5ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-14 12:26:04 +08:00 |
lvxinran
|
d5a202d28e
|
任务修改
|
2019-09-14 12:26:00 +08:00 |
lvxinran
|
fb8a4bcc70
|
法宝任务添加
|
2019-09-14 11:27:32 +08:00 |
lvxinran
|
e401393677
|
任务添加
|
2019-09-14 11:27:04 +08:00 |
wangyuan
|
ed379a2524
|
flushtime
|
2019-09-11 11:52:31 +08:00 |
zhangshanxue
|
521b7d062a
|
一键装备
|
2019-09-11 10:51:48 +08:00 |
zhangshanxue
|
da3ad5f06e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 10:23:52 +08:00 |
zhangshanxue
|
4481b5a8c0
|
gm 跑马灯
|
2019-09-11 10:10:01 +08:00 |
zhangshanxue
|
5545dec693
|
问卷重开
|
2019-09-10 21:12:26 +08:00 |
zhangshanxue
|
049975b931
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 20:41:57 +08:00 |
zhangshanxue
|
ba608937cc
|
装备战力
|
2019-09-10 20:41:50 +08:00 |
wangyuan
|
f7f54df716
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-10 20:12:30 +08:00 |
lvxinran
|
08324adb91
|
匹配时星数显示
|
2019-09-13 12:19:12 +08:00 |
lvxinran
|
d49eb6114b
|
聊天检测
|
2019-09-12 12:12:51 +08:00 |
wangyuan
|
c3dc931ea2
|
fix
|
2019-09-10 20:09:30 +08:00 |
zhangshanxue
|
952b1dd161
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 18:24:52 +08:00 |
lvxinran
|
3ef8b5766b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 18:44:50 +08:00 |
lvxinran
|
b52d314375
|
无尽修改N。。。
|
2019-09-12 18:44:46 +08:00 |
lvxinran
|
4f39ea2210
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 16:19:28 +08:00 |
lvxinran
|
713a0b7c04
|
无尽修改
|
2019-09-12 16:19:23 +08:00 |
zhangshanxue
|
de65f12114
|
在线人数
|
2019-09-10 18:24:46 +08:00 |
wangyuan
|
135450f507
|
fix network
|
2019-09-10 16:10:28 +08:00 |
zhangshanxue
|
dfeaf4bae0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 15:55:46 +08:00 |
zhangshanxue
|
14d21eb6ec
|
移除功能开启检查
|
2019-09-10 15:55:42 +08:00 |
zhangshanxue
|
a3b84a9b2d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 14:30:47 +08:00 |
zhangshanxue
|
9bb332835e
|
魂印功能限制
|
2019-09-10 14:30:42 +08:00 |
wangyuan
|
2810683713
|
fix time
|
2019-09-10 14:14:32 +08:00 |
wangyuan
|
98d92373ac
|
fix table
|
2019-09-10 14:03:51 +08:00 |
wangyuan
|
5633e399e9
|
fix
|
2019-09-10 13:50:38 +08:00 |
wangyuan
|
d1efc48e47
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-09-10 13:49:50 +08:00 |
zhangshanxue
|
abd7ebd875
|
观星开启
|
2019-09-10 13:25:53 +08:00 |
wangyuan
|
11376e12b1
|
fix map team
|
2019-09-10 12:01:05 +08:00 |
zhangshanxue
|
f36c71cada
|
问卷修改
|
2019-09-10 11:54:20 +08:00 |
lvxinran
|
30d56d2ad1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-12 11:08:59 +08:00 |
lvxinran
|
a1e0d88052
|
无尽本报错
|
2019-09-12 11:08:55 +08:00 |
zhangshanxue
|
91582654ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 10:21:38 +08:00 |
zhangshanxue
|
33d1cf6a03
|
魂印
|
2019-09-10 10:21:01 +08:00 |
wangyuan
|
2a286218e6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
|
2019-09-10 10:07:55 +08:00 |
wangyuan
|
4f57f75d6d
|
增加赛季开启类型
|
2019-09-10 10:05:03 +08:00 |
zhangshanxue
|
a51abcbe92
|
魂印
|
2019-09-10 10:02:59 +08:00 |
zhangshanxue
|
f8ab3f7967
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-10 00:01:38 +08:00 |
lvxinran
|
46e7fd5c23
|
血量修改
|
2019-09-11 23:29:45 +08:00 |
lvxinran
|
acbbc8ee4f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-11 22:21:06 +08:00 |
lvxinran
|
9eb7a469ff
|
法宝、公会战无尽副本修改
|
2019-09-11 22:21:02 +08:00 |
zhangshanxue
|
d04f6fe3bf
|
掉落
|
2019-09-10 00:01:17 +08:00 |
zhangshanxue
|
84104a5971
|
问卷调查优化
|
2019-09-09 20:35:00 +08:00 |
zhangshanxue
|
2aa64192a4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 16:35:15 +08:00 |
zhangshanxue
|
08d29d6cce
|
更新bug
|
2019-09-09 16:35:03 +08:00 |
wangyuan
|
f5ec857e24
|
自动发现服务器
|
2019-09-09 16:07:11 +08:00 |
zhangshanxue
|
5ff27b049c
|
token验证
|
2019-09-09 15:04:39 +08:00 |
zhangshanxue
|
1b61c88da1
|
token验证
|
2019-09-09 14:23:29 +08:00 |
zhangshanxue
|
d0728bae5f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 14:16:28 +08:00 |
zhangshanxue
|
967a744a81
|
掉落
|
2019-09-09 14:16:23 +08:00 |
wangyuan
|
f85de0b94c
|
fix random
|
2019-09-09 12:38:21 +08:00 |
zhangshanxue
|
9e8cec3727
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 12:00:11 +08:00 |
zhangshanxue
|
88dc18da7b
|
问卷删除缓存
|
2019-09-09 11:59:34 +08:00 |
lvxinran
|
a533fd4c1a
|
无尽副本血量修改
|
2019-09-09 11:55:30 +08:00 |
lvxinran
|
8285f4363e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 11:31:57 +08:00 |
lvxinran
|
52a27ee882
|
法宝等级限制,46行为修改
|
2019-09-09 11:31:51 +08:00 |
zhangshanxue
|
8dc4700f13
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-09 11:28:52 +08:00 |
zhangshanxue
|
2e35ab977e
|
魂印临时背包掉落
|
2019-09-09 11:28:46 +08:00 |
wangyuan
|
cd38e82643
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-09 10:45:03 +08:00 |
wangyuan
|
fc2994c577
|
time
|
2019-09-09 10:42:13 +08:00 |
lvxinran
|
7be649a804
|
无尽副本修改,法宝修改
|
2019-09-09 10:39:59 +08:00 |
lvxinran
|
54ad281831
|
试炼精气值
|
2019-09-09 09:58:45 +08:00 |
wangyuan
|
2a5490a030
|
time
|
2019-09-07 21:40:45 +08:00 |
wangyuan
|
78154b6adc
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SBloodyBattleSetting.java
|
2019-09-07 20:05:37 +08:00 |
wangyuan
|
0db40f7fde
|
bloody
|
2019-09-07 20:03:06 +08:00 |
zhangshanxue
|
47ac97d2ca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 19:45:34 +08:00 |
zhangshanxue
|
5a05c80ef3
|
魂印掉落
|
2019-09-07 19:45:30 +08:00 |
lvxinran
|
8bfa9dc498
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 19:26:31 +08:00 |
lvxinran
|
cb95002a8f
|
血战时间限制
|
2019-09-07 19:26:27 +08:00 |
zhangshanxue
|
4f9b3404dd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 17:20:46 +08:00 |
zhangshanxue
|
f5fb83d1b4
|
token验证
|
2019-09-07 17:20:41 +08:00 |
zhangshanxue
|
91c017cbd5
|
魂印掉落
|
2019-09-07 17:18:22 +08:00 |
lvxinran
|
3defe3d54c
|
法宝掉落
|
2019-09-07 16:31:19 +08:00 |
lvxinran
|
d88ed321c8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 15:03:56 +08:00 |
lvxinran
|
d6f2b203e0
|
公会修改、试炼修改
|
2019-09-07 15:03:33 +08:00 |
wangyuan
|
e1cbbac567
|
圣火令
|
2019-09-07 14:48:08 +08:00 |
wangyuan
|
69057cf41b
|
Merge branch 'split'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/blood/BloodLogic.java
|
2019-09-07 14:15:04 +08:00 |
wangyuan
|
a5a285f081
|
血战积分奖励
|
2019-09-07 14:13:25 +08:00 |
wangyuan
|
201f510e38
|
bloody
|
2019-09-07 14:12:09 +08:00 |
lvxinran
|
c7d61c098d
|
无尽本修改
|
2019-09-07 13:56:30 +08:00 |
zhangshanxue
|
5ef6a8debc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-07 13:34:41 +08:00 |
zhangshanxue
|
c8cbfcaa43
|
魂印掉落
|
2019-09-07 13:34:36 +08:00 |
lvxinran
|
d95f112bd0
|
法宝默认
|
2019-09-06 20:46:56 +08:00 |
lvxinran
|
50c2758b5f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-06 20:41:38 +08:00 |
lvxinran
|
f16ee71a54
|
法宝
|
2019-09-06 20:41:34 +08:00 |
zhangshanxue
|
c118c195f4
|
排行榜显示
|
2019-09-06 14:54:00 +08:00 |
wangyuan
|
932a2bfe1b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/StringUtil.java
|
2019-09-06 11:09:05 +08:00 |
wangyuan
|
1b09b921f9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-06 11:04:28 +08:00 |
zhangshanxue
|
9406f2c28f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-09-06 11:01:43 +08:00 |
zhangshanxue
|
0bc5d8fb90
|
魂印
|
2019-09-06 10:59:49 +08:00 |
lvxinran
|
1423c2fb3b
|
多余代码删除
|
2019-09-05 20:39:12 +08:00 |
lvxinran
|
75dec9d9b8
|
无尽修改
|
2019-09-05 20:26:26 +08:00 |
lvxinran
|
1215fdafdc
|
无尽设置跳过战斗、科技树修改
|
2019-09-05 19:51:07 +08:00 |
lvxinran
|
0d93202a6c
|
血战排行榜
|
2019-09-05 17:34:46 +08:00 |
lvxinran
|
702c7c705e
|
无尽修改
|
2019-09-05 16:57:16 +08:00 |
lvxinran
|
b45af85013
|
GM修改
|
2019-09-05 14:47:08 +08:00 |
lvxinran
|
6030413d3f
|
血战邮件
|
2019-09-05 14:15:20 +08:00 |
lvxinran
|
8129e8cb2c
|
血战排行榜
|
2019-09-05 12:01:47 +08:00 |
lvxinran
|
f823388c75
|
无尽副本血量计算
|
2019-09-05 09:56:18 +08:00 |
lvxinran
|
a960ad504c
|
无尽修改血量
|
2019-09-04 20:50:06 +08:00 |
lvxinran
|
489f906a00
|
法宝升星
|
2019-09-04 19:08:14 +08:00 |
lvxinran
|
2c4a2f2218
|
48、49行为类型修改
|
2019-09-04 16:07:13 +08:00 |
lvxinran
|
234bddfed8
|
发货修改
|
2019-09-04 15:46:49 +08:00 |
wangyuan
|
bc1c252c02
|
delete check amount
|
2019-09-04 15:42:19 +08:00 |
lvxinran
|
509878f535
|
无尽刷小怪
|
2019-09-04 15:40:50 +08:00 |
wangyuan
|
aa316cc206
|
table
|
2019-09-04 15:01:44 +08:00 |
lvxinran
|
ea6a775a3b
|
法宝gm,无尽地图小怪刷新
|
2019-09-04 15:00:25 +08:00 |
zhangshanxue
|
aaf700ca6c
|
问卷
|
2019-09-04 14:25:12 +08:00 |
zhangshanxue
|
734f47cbdb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2019-09-04 11:54:13 +08:00 |
zhangshanxue
|
14ce0d866c
|
问卷调查
|
2019-09-04 11:53:35 +08:00 |
lvxinran
|
3f0bc58b51
|
无尽副本战力显示
|
2019-09-04 11:46:18 +08:00 |
lvxinran
|
4970f48e9d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-04 11:08:51 +08:00 |
lvxinran
|
6de5deaa40
|
我要变强等级限制
|
2019-09-04 11:08:47 +08:00 |
wangyuan
|
bf9bf974c6
|
fix buygood logic
|
2019-09-04 10:37:12 +08:00 |
lvxinran
|
a04ab6ee5a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 20:49:18 +08:00 |
lvxinran
|
3caea6d9d2
|
我要变强
|
2019-09-03 20:49:14 +08:00 |
wangyuan
|
26ab22db56
|
activity
|
2019-09-03 20:16:44 +08:00 |
lvxinran
|
b782ee0a8a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 19:41:11 +08:00 |
lvxinran
|
463d63a7fb
|
法宝
|
2019-09-03 19:41:07 +08:00 |
wangyuan
|
3f16d2c1ca
|
scene
|
2019-09-03 19:30:40 +08:00 |
lvxinran
|
c770a95a09
|
修改提交
|
2019-09-03 11:18:39 +08:00 |
lvxinran
|
c5a704d494
|
法宝表对应
|
2019-09-03 11:17:52 +08:00 |
lvxinran
|
bfdfdef554
|
法宝加成
|
2019-09-03 10:47:52 +08:00 |
wangyuan
|
64afe28900
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-03 10:42:38 +08:00 |
wangyuan
|
def88c3daf
|
fix 法宝加成
|
2019-09-03 10:42:19 +08:00 |
zhangshanxue
|
ea47d19a4d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-03 10:39:21 +08:00 |
zhangshanxue
|
34d6559258
|
绑定手机号
|
2019-09-03 10:38:06 +08:00 |
lvxinran
|
6cd00f0f63
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismana.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SEquipTalismanaRankup.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2019-09-03 10:27:16 +08:00 |
lvxinran
|
61cfce258f
|
无尽副本、法宝
|
2019-09-03 10:24:04 +08:00 |
wangyuan
|
2ed3864e16
|
store
|
2019-09-03 10:23:51 +08:00 |
wangyuan
|
1b7fd4fb56
|
monster hp
|
2019-09-02 20:05:33 +08:00 |
wangyuan
|
e8b835207b
|
walk
|
2019-09-02 19:51:20 +08:00 |
wangyuan
|
c4a7952075
|
recovery
|
2019-09-02 16:54:14 +08:00 |
wangyuan
|
f15ecf3ba6
|
fix differdemon null
|
2019-09-02 16:12:16 +08:00 |
wangyuan
|
c785e9b813
|
fix fight
|
2019-09-02 15:05:21 +08:00 |
wangyuan
|
7b8f7e8f7e
|
fix check fight data
|
2019-09-02 14:26:21 +08:00 |
wangyuan
|
3ee89d5862
|
add bloody
|
2019-09-02 14:17:54 +08:00 |
wangyuan
|
31bbc0a27c
|
fix fight data
|
2019-09-02 14:04:53 +08:00 |
wangyuan
|
2db0ac3d10
|
delete log
|
2019-09-02 13:37:54 +08:00 |
wangyuan
|
31ffa233f1
|
fix pokenmon
|
2019-09-02 12:07:15 +08:00 |
zhangshanxue
|
e26857c2a5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-02 11:02:58 +08:00 |
zhangshanxue
|
3c2d3bad70
|
新增装备品质
|
2019-09-02 10:59:22 +08:00 |
lvxinran
|
195409ee4e
|
我要变强、公会修改
|
2019-09-01 17:47:20 +08:00 |
wangyuan
|
de2cd9a21a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-31 13:46:04 +08:00 |
wangyuan
|
7cea36baab
|
血战&异妖战斗
|
2019-08-31 13:45:45 +08:00 |
lvxinran
|
b9f2d0d096
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-31 20:32:41 +08:00 |
lvxinran
|
2d33fbb7f9
|
公会战、公会功能修改
|
2019-08-31 20:32:37 +08:00 |
zhangshanxue
|
efe69e34b7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-30 19:03:11 +08:00 |
zhangshanxue
|
3003546116
|
战力排行头像
|
2019-08-30 19:03:02 +08:00 |
zhangshanxue
|
9eac78b1eb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-30 16:48:05 +08:00 |
lvxinran
|
ddd512e78e
|
上报错误修改
|
2019-09-01 15:01:22 +08:00 |
lvxinran
|
f92a9499d5
|
怪物战力显示
|
2019-09-01 14:49:49 +08:00 |
lvxinran
|
ab47c25f0c
|
公会修改、无尽本修改
|
2019-09-01 14:27:27 +08:00 |
zhangshanxue
|
716567ab68
|
绑定手机号
|
2019-08-30 13:51:50 +08:00 |
zhangshanxue
|
9c676a4c6f
|
改名推送
|
2019-08-29 16:21:50 +08:00 |
zhangshanxue
|
48d7ee726c
|
改名推送
|
2019-08-29 15:51:19 +08:00 |
zhangshanxue
|
49445bf595
|
玩家改名消耗道具
|
2019-08-29 15:13:39 +08:00 |
zhangshanxue
|
1e02099200
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 14:49:18 +08:00 |
zhangshanxue
|
db52e6b0be
|
gm支持
|
2019-08-29 14:49:09 +08:00 |
lvxinran
|
ca28591b48
|
生成妖灵师资质修改
|
2019-08-29 11:08:24 +08:00 |
lvxinran
|
7f801ad0b3
|
禁言解禁
|
2019-08-29 09:44:58 +08:00 |
lvxinran
|
215068ee7a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 09:41:15 +08:00 |
lvxinran
|
1b45fb4710
|
禁言解禁提交
|
2019-08-29 09:41:11 +08:00 |
lvxinran
|
183e4954c1
|
无尽副本提交
|
2019-08-29 05:52:36 +08:00 |
lvxinran
|
6bbd27d1f5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 05:13:42 +08:00 |
lvxinran
|
5d41aff570
|
function out
|
2019-08-29 05:13:38 +08:00 |
lvxinran
|
e7df45c50f
|
公会战代码重构
|
2019-08-29 03:58:45 +08:00 |
lvxinran
|
37bab876b3
|
时间工具类修改
|
2019-08-29 03:00:31 +08:00 |
lvxinran
|
caa57c1d5d
|
无尽副本信息,公户战修改
|
2019-08-29 03:00:03 +08:00 |
zhangshanxue
|
3b4bf37a8b
|
gm支持
|
2019-08-28 20:21:24 +08:00 |
zhangshanxue
|
7b09870bb7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-28 19:46:50 +08:00 |
zhangshanxue
|
bb0cdea20c
|
封号
|
2019-08-28 19:46:46 +08:00 |
dengdan
|
6f843b3a23
|
战斗改为多选称,ThreadLocal存储
|
2019-08-28 15:08:49 +08:00 |
zhangshanxue
|
1b7c67346c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-28 11:53:04 +08:00 |
zhangshanxue
|
9a5c1ec50b
|
gm支持
|
2019-08-28 11:53:00 +08:00 |
wangyuan
|
7614cf3aaa
|
fix differ
|
2019-08-28 11:21:35 +08:00 |
lvxinran
|
31590ea1c8
|
公会战代码重构
|
2019-08-29 00:23:54 +08:00 |
lvxinran
|
eca20927e6
|
无尽副本部分修改
|
2019-08-27 21:03:46 +08:00 |
wangyuan
|
43883d4722
|
reconnect
|
2019-08-27 17:38:22 +08:00 |
zhangshanxue
|
6f1b0dcbf9
|
协议推送
|
2019-08-27 16:07:10 +08:00 |
zhangshanxue
|
3bb041a711
|
Merge branch 'project0.92'
|
2019-08-27 15:05:27 +08:00 |
wangyuan
|
5c96eb3756
|
fix indicaiton
|
2019-08-27 12:04:05 +08:00 |
wangyuan
|
af97d1b74b
|
Merge branch 'project0.92'
|
2019-08-27 11:30:41 +08:00 |
lvxinran
|
c6321bba2f
|
公会战标志位修改
|
2019-09-02 12:54:25 +08:00 |
lvxinran
|
7797b5bfff
|
公会战
|
2019-09-02 12:13:09 +08:00 |
wangyuan
|
a173bcc00d
|
delete mail
|
2019-08-27 10:46:22 +08:00 |
wangyuan
|
20a8438465
|
fix remove store
|
2019-08-27 10:08:28 +08:00 |
zhangshanxue
|
689a227324
|
合并协议
|
2019-08-26 21:04:17 +08:00 |
wangyuan
|
58f9d17b8f
|
fix mail
|
2019-08-26 20:53:56 +08:00 |
zhangshanxue
|
64e66e941a
|
背包协议同步合并
|
2019-08-26 17:17:15 +08:00 |
wangyuan
|
08447fdb97
|
Merge branch 'project0.92'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
|
2019-08-26 15:31:15 +08:00 |
wangyuan
|
c78898e0e9
|
add white & fix curHp
|
2019-08-26 15:27:50 +08:00 |
wangyuan
|
04234ab0fa
|
user from cache
|
2019-08-26 15:11:09 +08:00 |
zhangshanxue
|
9f5600049d
|
Merge branch 'project0.92' of http://60.1.1.230/backend/jieling_server into project0.92
|
2019-09-02 14:05:23 +08:00 |
zhangshanxue
|
a1a1a8a49f
|
bug和异常处理
|
2019-09-02 14:04:50 +08:00 |
wangyuan
|
c0a45928ba
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-26 14:50:55 +08:00 |
lvxinran
|
447445a29f
|
公会战修改
|
2019-08-29 12:02:08 +08:00 |
lvxinran
|
bf36633caf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-31 06:24:20 +08:00 |
lvxinran
|
9c6f7c277b
|
公会战提交
|
2019-08-31 06:24:15 +08:00 |
wangyuan
|
70d2f8165a
|
reconnect server
|
2019-08-26 14:50:13 +08:00 |
wangyuan
|
d2b5b95463
|
buffer effect target
|
2019-08-26 13:51:30 +08:00 |
wangyuan
|
cdc13a639a
|
arena rank
|
2019-08-26 11:43:10 +08:00 |
zhangshanxue
|
c650902fef
|
bug和异常处理
|
2019-09-02 11:30:26 +08:00 |
wangyuan
|
28067420f0
|
不推荐自己
|
2019-08-23 11:31:38 +08:00 |
zhangshanxue
|
6fbb86fad2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-30 10:26:23 +08:00 |
zhangshanxue
|
7c13d67a5c
|
升星
|
2019-08-30 10:26:15 +08:00 |
zhangshanxue
|
f76a69da1a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-29 19:55:59 +08:00 |
zhangshanxue
|
3cfb6564ff
|
进阶妖灵师返回奖励
|
2019-08-29 19:53:59 +08:00 |
zhangshanxue
|
1e4275aed1
|
acitvity
|
2019-09-28 21:48:27 +08:00 |
zhangshanxue
|
72d36d633f
|
acitvity
|
2019-09-28 21:38:01 +08:00 |
zhangshanxue
|
a2ffa2fbfe
|
acitvity
|
2019-08-26 21:14:09 +08:00 |
wangyuan
|
30afcf32b0
|
friend
|
2019-08-23 09:56:17 +08:00 |
wangyuan
|
6f2955e08f
|
fix take
|
2019-08-23 09:50:53 +08:00 |
wangyuan
|
cf0b06fa8c
|
fix online
|
2019-08-23 09:41:13 +08:00 |
wangyuan
|
08615efd4f
|
fix friend
|
2019-08-22 20:01:56 +08:00 |
wangyuan
|
3a1a415024
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-22 19:59:40 +08:00 |
wangyuan
|
1ed2fd4489
|
check mail
|
2019-08-22 19:59:23 +08:00 |
wangyuan
|
6ee1c9fc4a
|
fix bug
|
2019-08-22 19:39:57 +08:00 |
wangyuan
|
9c6925a159
|
fix buffer
|
2019-08-22 18:38:12 +08:00 |
wangyuan
|
989d0a2d85
|
fix activity
|
2019-08-21 20:59:50 +08:00 |
wangyuan
|
7b988d70c2
|
process openId
|
2019-08-21 20:31:29 +08:00 |
wangyuan
|
2b78ebf9ea
|
fix mail bug
|
2019-08-21 20:01:14 +08:00 |
wangyuan
|
264540e796
|
虚拟币
|
2019-08-21 19:45:04 +08:00 |
zhangshanxue
|
ce71b8a4db
|
魂晶累计
|
2019-08-26 19:35:52 +08:00 |
wangyuan
|
c19d6b2e26
|
fix mongo url
|
2019-08-21 19:07:04 +08:00 |
lvxinran
|
e38fb0f41d
|
修改
|
2019-08-21 18:59:03 +08:00 |
lvxinran
|
133e0acac7
|
修改
|
2019-08-21 18:51:34 +08:00 |
lvxinran
|
0b211bbed1
|
发送邮件,踢下线
|
2019-08-21 18:42:06 +08:00 |
wangyuan
|
6baf3711b1
|
kt new appid
|
2019-08-21 18:26:25 +08:00 |
wangyuan
|
620b055aad
|
appkey
|
2019-08-21 17:38:10 +08:00 |
lvxinran
|
51b9b1ce7e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 15:55:52 +08:00 |
lvxinran
|
3312b7993c
|
37敏感字校验
|
2019-08-21 15:55:47 +08:00 |
wangyuan
|
9d4473f31d
|
同步
|
2019-08-21 15:30:40 +08:00 |
lvxinran
|
0f783608d2
|
敏感字
|
2019-08-21 15:30:28 +08:00 |
wangyuan
|
b8cfc5a572
|
fight
|
2019-08-21 15:14:43 +08:00 |
zhangshanxue
|
1dc59a7af0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 14:52:38 +08:00 |
zhangshanxue
|
bbc05c8c33
|
37接口数据
|
2019-08-21 14:52:08 +08:00 |
wangyuan
|
c8295ea4e7
|
mail
|
2019-08-21 14:50:37 +08:00 |
lvxinran
|
58d3b86212
|
邮件定时发送,37上报控制
|
2019-08-21 14:45:38 +08:00 |
zhangshanxue
|
f0443e1a21
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 14:36:54 +08:00 |
zhangshanxue
|
bb8ad768b5
|
37接口数据
|
2019-08-21 14:36:37 +08:00 |
zhangshanxue
|
5c9168607d
|
招财猫 22测试后回退
|
2019-08-24 20:20:37 +08:00 |
lvxinran
|
bcfc9a92d6
|
邮件定时检测发送,工会图腾信息,工会战绩,37敏感字检测
|
2019-08-21 14:06:02 +08:00 |
lvxinran
|
3ba8de06f2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2019-08-21 14:03:49 +08:00 |
lvxinran
|
668e58147d
|
加入图腾
|
2019-08-21 14:02:32 +08:00 |
wangyuan
|
7dbcc6e007
|
head
|
2019-08-20 20:27:55 +08:00 |
zhangshanxue
|
0f9897eeac
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 15:47:31 +08:00 |
zhangshanxue
|
3e00a693da
|
report
|
2019-08-20 15:47:13 +08:00 |
wangyuan
|
7fb6e6dc95
|
random
|
2019-08-20 15:46:16 +08:00 |
wangyuan
|
2df1e6b44c
|
battle
|
2019-08-20 15:38:33 +08:00 |
lvxinran
|
622d22d4a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 15:10:06 +08:00 |
lvxinran
|
785bd98be9
|
mapLogic
|
2019-08-20 15:10:02 +08:00 |
wangyuan
|
fe4e9509e5
|
fix arena
|
2019-08-20 15:00:59 +08:00 |
lvxinran
|
f52d970ea6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 14:36:02 +08:00 |
lvxinran
|
d7e05f0c4d
|
试炼币修改
|
2019-08-20 14:35:56 +08:00 |
zhangshanxue
|
919c05ae33
|
兽潮排行榜同波次根据时间排名
|
2019-08-20 14:15:49 +08:00 |
wangyuan
|
1abfb2e66d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-19 20:12:01 +08:00 |
lvxinran
|
ac1ac7a734
|
商店修改,公会战信息移除修改
|
2019-08-27 15:07:44 +08:00 |
lvxinran
|
22689acb20
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-26 22:29:12 +08:00 |
wangyuan
|
48be1a6fe6
|
fix activity
|
2019-09-19 14:15:16 +08:00 |
lvxinran
|
c9179ffa5b
|
公会战buff修改
|
2019-08-26 22:29:08 +08:00 |
lvxinran
|
a3908a9927
|
暂时注释
|
2019-08-21 14:56:01 +08:00 |
lvxinran
|
9b63ef108c
|
修改
|
2019-08-21 14:09:14 +08:00 |
lvxinran
|
7e7d5a2eb4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.ja
|
2019-08-21 11:11:13 +08:00 |
lvxinran
|
de6bee5ac6
|
公会战逻辑
|
2019-08-21 11:08:31 +08:00 |
wangyuan
|
b3e7188023
|
session
|
2019-08-19 20:11:26 +08:00 |
wangyuan
|
69d72692df
|
boss
|
2019-08-19 20:09:16 +08:00 |
wangyuan
|
d750f4a5d4
|
fix days
|
2019-08-19 13:59:29 +08:00 |
wangyuan
|
b2c5279b93
|
sendmail
|
2019-08-19 13:42:35 +08:00 |
wangyuan
|
5f7d6aec18
|
random
|
2019-08-19 11:07:51 +08:00 |
zhangshanxue
|
7b8fe61d8a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-19 10:43:09 +08:00 |
zhangshanxue
|
16a60a6fc6
|
妖兽gm
|
2019-08-19 10:42:47 +08:00 |
zhangshanxue
|
b5932dec2a
|
战力排行 日志开关
|
2019-08-21 05:12:50 +08:00 |
wangyuan
|
069d544420
|
random
|
2019-08-19 10:41:16 +08:00 |
wangyuan
|
0a4dc241b3
|
boss id
|
2019-08-19 10:19:25 +08:00 |
wangyuan
|
e2f3dcd278
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-17 18:51:23 +08:00 |
wangyuan
|
e81666ab37
|
add task & mail
|
2019-08-17 18:50:47 +08:00 |
wangyuan
|
7b94b53fd9
|
guild walk
|
2019-08-17 16:21:23 +08:00 |
zhangshanxue
|
aded46d464
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-17 15:26:48 +08:00 |
zhangshanxue
|
0de3509425
|
异妖拍脸
|
2019-08-17 15:26:37 +08:00 |
wangyuan
|
4459367da4
|
Merge branch 'project0.9'
|
2019-08-17 15:25:32 +08:00 |
wangyuan
|
8005f5d2c7
|
fix type
|
2019-08-17 15:23:40 +08:00 |
wangyuan
|
37d9d36e18
|
fix protobean
|
2019-08-17 15:17:48 +08:00 |
zhangshanxue
|
9456e7a1cc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2019-08-17 15:04:21 +08:00 |
wangyuan
|
134c51cdfa
|
change adventure
|
2019-08-17 15:02:36 +08:00 |
wangyuan
|
4c9dc4245b
|
fxi store
|
2019-08-17 14:49:17 +08:00 |
wangyuan
|
299f00200d
|
fix store
|
2019-08-17 14:48:06 +08:00 |
wangyuan
|
92df10cfa7
|
fix bug
|
2019-08-17 14:44:25 +08:00 |
zhangshanxue
|
d48947533b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-17 14:16:56 +08:00 |
zhangshanxue
|
7e80be3a92
|
兽潮来袭 37数据上报
|
2019-08-17 14:16:52 +08:00 |
zhangshanxue
|
5ef3705a1d
|
acitvity
|
2019-08-17 13:46:40 +08:00 |
zhangshanxue
|
cf4a4a61ab
|
activity bug
|
2019-08-16 18:29:40 +08:00 |
wangyuan
|
f154488f7f
|
fix mission
|
2019-08-16 16:37:57 +08:00 |
zhangshanxue
|
d83a28c2b3
|
acitvity
|
2019-08-16 16:12:51 +08:00 |
zhangshanxue
|
cf996208a8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2019-08-16 10:10:21 +08:00 |
zhangshanxue
|
aa102c8d29
|
妖兽来袭
|
2019-08-16 10:09:39 +08:00 |
zhangshanxue
|
d6a6f25e82
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-21 08:56:11 +08:00 |
zhangshanxue
|
10470c3dc8
|
修复玩家活动数据
|
2019-08-21 08:56:02 +08:00 |
zhangshanxue
|
334083029e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-18 06:06:07 +08:00 |
zhangshanxue
|
9f5725f1ef
|
连续充值bug
|
2019-08-18 06:06:01 +08:00 |
wangyuan
|
37ea59cc50
|
发送全服数据
|
2019-08-20 19:43:45 +08:00 |
wangyuan
|
1f452b87f1
|
fix friend
|
2019-08-20 19:39:44 +08:00 |
wangyuan
|
cc43c55367
|
工坊等级限制
|
2019-08-16 13:49:12 +08:00 |
lvxinran
|
0f4ef7a59e
|
战斗血量修改
|
2019-08-16 05:03:05 +08:00 |
wangyuan
|
87c2c32a44
|
fix mission
|
2019-08-15 21:04:40 +08:00 |
lvxinran
|
ed50688201
|
公会战
|
2019-08-16 11:13:52 +08:00 |
wangyuan
|
07d68f5c69
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-15 18:30:01 +08:00 |
lvxinran
|
b7cd108b76
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 08:16:58 +08:00 |
lvxinran
|
ec0000e220
|
第一次十连抽
|
2019-08-20 08:16:53 +08:00 |
wangyuan
|
714599814e
|
add task
|
2019-08-15 18:29:46 +08:00 |
wangyuan
|
95e7381a2e
|
print tlog
|
2019-08-15 16:49:19 +08:00 |
wangyuan
|
94302befde
|
fix activity
|
2019-08-14 15:14:29 +08:00 |
lvxinran
|
02e214f754
|
名字修改
|
2019-08-14 11:56:54 +08:00 |
lvxinran
|
cd4ad1da3a
|
日志修改
|
2019-08-14 11:44:23 +08:00 |
lvxinran
|
2e72e3e3f6
|
名字长度
|
2019-08-14 11:31:17 +08:00 |
lvxinran
|
38715c4bfd
|
功绩修改
|
2019-08-14 13:12:54 +08:00 |
wangyuan
|
f44da1b677
|
basehandler 构造方法
|
2019-08-18 18:15:07 +08:00 |
wangyuan
|
6046207b77
|
fix mail & store num & indication user level
|
2019-08-18 17:21:25 +08:00 |
zhangshanxue
|
6631ea50f3
|
协议解析
|
2019-08-13 17:11:38 +08:00 |
wangyuan
|
4255e37558
|
reason
|
2019-08-13 14:35:27 +08:00 |
lvxinran
|
80f7c4331e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 14:25:27 +08:00 |
lvxinran
|
39efb51a56
|
功绩难度修改
|
2019-08-13 14:25:23 +08:00 |
zhangshanxue
|
0fac895eb7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 13:18:49 +08:00 |
wangyuan
|
20a228b9b9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-19 00:01:07 +08:00 |
zhangshanxue
|
1638c42ea1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-13 10:36:03 +08:00 |
zhangshanxue
|
fd7b37fc4a
|
acitvity
|
2019-09-13 10:35:54 +08:00 |
wangyuan
|
c20652705b
|
fix ission
|
2019-08-19 00:00:56 +08:00 |
zhangshanxue
|
ab42fa69bf
|
活动提示
|
2019-08-13 13:18:42 +08:00 |
lvxinran
|
829e51356d
|
RedisUtil
|
2019-08-13 10:12:13 +08:00 |
lvxinran
|
9a1c002c4b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 10:09:37 +08:00 |
lvxinran
|
5e5832178d
|
公会战
|
2019-08-13 10:09:32 +08:00 |
lvxinran
|
d301d88bdf
|
修改名字
|
2019-08-13 10:08:49 +08:00 |
wangyuan
|
f16f1dbc99
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-13 10:08:16 +08:00 |
zhangshanxue
|
3844229238
|
acitvity
|
2019-08-13 10:07:57 +08:00 |
zhangshanxue
|
8c5e6a4cba
|
acitvity
|
2019-09-13 09:35:30 +08:00 |
zhangshanxue
|
1d01fcf712
|
acitvity
|
2019-09-12 21:54:42 +08:00 |
zhangshanxue
|
f76ce9cb43
|
acitvity
|
2019-09-12 21:39:52 +08:00 |
zhangshanxue
|
c0293bd314
|
acitvity
|
2019-09-12 21:36:54 +08:00 |
wangyuan
|
480936bdc5
|
删除无效日志
|
2019-08-13 10:07:57 +08:00 |
zhangshanxue
|
087d03e8dc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 21:07:17 +08:00 |
lvxinran
|
7b62901318
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 20:52:58 +08:00 |
lvxinran
|
81a443322a
|
公会战
|
2019-08-12 20:52:54 +08:00 |
zhangshanxue
|
4b3435799d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 20:27:43 +08:00 |
zhangshanxue
|
b2d3f59164
|
活动结束补发奖励
|
2019-08-12 20:27:36 +08:00 |
wangyuan
|
4cdb969929
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 17:49:35 +08:00 |
wangyuan
|
db8c4d43d9
|
同步用户状态
|
2019-08-12 17:49:20 +08:00 |
lvxinran
|
f46031890a
|
上个修改
|
2019-08-12 17:32:06 +08:00 |
lvxinran
|
d8fa42b0f4
|
公会战查看对战信息
|
2019-08-12 17:31:49 +08:00 |
lvxinran
|
9497535341
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 17:23:42 +08:00 |
lvxinran
|
e27985bab6
|
功绩17修改
|
2019-08-12 17:23:38 +08:00 |
lvxinran
|
29c22526b5
|
增加RedisKey
|
2019-08-12 16:06:06 +08:00 |
lvxinran
|
6924500cd1
|
公会战逻辑修改
|
2019-08-12 16:05:43 +08:00 |
zhangshanxue
|
a33043d8de
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 16:00:58 +08:00 |
zhangshanxue
|
c0509d25f2
|
acitvity
|
2019-08-12 16:00:36 +08:00 |
wangyuan
|
a7ee427a08
|
fix limmit
|
2019-08-12 15:50:47 +08:00 |
lvxinran
|
1fe64c05cb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 14:30:36 +08:00 |
lvxinran
|
9364fbda6d
|
公会战开始战斗提交
|
2019-08-12 14:30:32 +08:00 |
wangyuan
|
cbb6178449
|
delete log
|
2019-08-12 13:57:51 +08:00 |
wangyuan
|
a076812220
|
fix special
|
2019-08-12 12:16:20 +08:00 |
zhangshanxue
|
f6e25e2bae
|
acitvity
|
2019-08-12 12:03:15 +08:00 |
wangyuan
|
cff26b2110
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 11:15:51 +08:00 |
wangyuan
|
968cf84ebd
|
delete unuse log
|
2019-08-12 11:15:41 +08:00 |
lvxinran
|
8395912f43
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 11:15:25 +08:00 |
lvxinran
|
acc29668bc
|
编队ID修改
|
2019-08-12 11:15:21 +08:00 |
wangyuan
|
042f9310fe
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 10:29:02 +08:00 |
wangyuan
|
a4144852d3
|
mission 合并
|
2019-08-12 10:28:49 +08:00 |
lvxinran
|
f8645932db
|
计算英雄属性加入teamId
|
2019-08-12 10:28:00 +08:00 |
lvxinran
|
50606d6e24
|
0点刷新
|
2019-08-12 10:18:07 +08:00 |
wangyuan
|
e7a8d82ec3
|
fix pool
|
2019-08-16 18:38:47 +08:00 |
wangyuan
|
25df23fd53
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-16 17:46:49 +08:00 |
zhangshanxue
|
22b1156d7f
|
acitvity
|
2019-08-18 05:01:41 +08:00 |
wangyuan
|
a32e878367
|
51 task
|
2019-08-16 17:46:18 +08:00 |
wangyuan
|
725910f363
|
修改进度
|
2019-08-16 17:33:06 +08:00 |
wangyuan
|
64d7de1587
|
fix time
|
2019-08-10 17:19:30 +08:00 |
wangyuan
|
2011f1426b
|
fix take time
|
2019-08-10 17:09:25 +08:00 |
wangyuan
|
7192faf883
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-10 17:08:46 +08:00 |
lvxinran
|
eb6cdbc27b
|
名字限制
|
2019-08-10 16:36:21 +08:00 |
lvxinran
|
dcf5a3bcfa
|
名字限制
|
2019-08-10 16:09:04 +08:00 |
wangyuan
|
975cd3f045
|
refresh
|
2019-08-10 15:51:43 +08:00 |
lvxinran
|
ca477db687
|
名字限制修改
|
2019-08-10 15:34:22 +08:00 |
wangyuan
|
3719f64ec8
|
rank
|
2019-08-10 15:22:14 +08:00 |
wangyuan
|
0af7eb4a4c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-10 14:48:20 +08:00 |
wangyuan
|
707724627c
|
guild walk
|
2019-08-10 14:47:56 +08:00 |
lvxinran
|
cfe7d058f8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 14:46:57 +08:00 |
lvxinran
|
6ede1219a9
|
公会战布防接口
|
2019-08-10 14:46:53 +08:00 |
zhangshanxue
|
7a275f2ae0
|
签到刷新
|
2019-08-10 14:34:18 +08:00 |
zhangshanxue
|
56017c2dee
|
签到刷新
|
2019-10-01 05:01:31 +08:00 |
wangyuan
|
dd0cab498d
|
log
|
2019-08-10 12:08:03 +08:00 |
wangyuan
|
e456ed0bd8
|
log
|
2019-08-10 11:57:18 +08:00 |
wangyuan
|
efcb80483c
|
store
|
2019-08-10 11:45:40 +08:00 |
wangyuan
|
c0f7cefaaa
|
store
|
2019-08-10 11:33:20 +08:00 |
wangyuan
|
4fd9a928b8
|
reward
|
2019-08-10 11:23:27 +08:00 |
wangyuan
|
3a2a281b81
|
progress
|
2019-08-10 11:17:03 +08:00 |
lvxinran
|
43458f5fc6
|
公会战
|
2019-08-10 10:58:30 +08:00 |
lvxinran
|
69c4b45ac3
|
公会战信息类
|
2019-08-10 10:58:12 +08:00 |
lvxinran
|
eb040c2818
|
删除无用语句
|
2019-08-10 10:54:22 +08:00 |
lvxinran
|
4ab8b5f64c
|
删除防守方法提交
|
2019-08-10 10:53:29 +08:00 |
lvxinran
|
3d76b09eaf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 10:53:02 +08:00 |
lvxinran
|
24bcf89270
|
公会战修改
|
2019-08-10 10:52:58 +08:00 |
lvxinran
|
e1824e12d5
|
个人战力
|
2019-08-10 10:52:16 +08:00 |
wangyuan
|
5d79d6ac4d
|
extra add
|
2019-08-10 10:35:07 +08:00 |
zhangshanxue
|
c20d6e97c5
|
活动开启bug
|
2019-08-10 21:17:43 +08:00 |
wangyuan
|
01c7ac7c8d
|
商店增益
|
2019-08-09 17:48:54 +08:00 |
wangyuan
|
957664c498
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
|
2019-08-09 17:17:20 +08:00 |
wangyuan
|
15ffc5a164
|
fix mission & guild walk
|
2019-08-09 17:14:45 +08:00 |
lvxinran
|
65bcc67faf
|
公会战布防修改
|
2019-08-09 15:06:00 +08:00 |
lvxinran
|
50cb1525c2
|
公会发送indication
|
2019-08-09 15:04:12 +08:00 |
lvxinran
|
e3d9585568
|
功绩14、18修改
|
2019-08-09 14:34:30 +08:00 |
lvxinran
|
6d79100c20
|
功绩18修改
|
2019-08-09 11:43:10 +08:00 |
wangyuan
|
516c45c2da
|
fix map mission
|
2019-08-09 11:14:33 +08:00 |
lvxinran
|
727cee1960
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-09 10:57:50 +08:00 |
lvxinran
|
7831d1bd16
|
公会信息
|
2019-08-09 10:57:30 +08:00 |
wangyuan
|
c7fb73040b
|
fix process
|
2019-08-09 10:56:00 +08:00 |
lvxinran
|
2c89f0782c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-09 10:44:49 +08:00 |
lvxinran
|
e0388232dd
|
RedisUtil冲突修改
|
2019-08-09 10:44:45 +08:00 |
lvxinran
|
aaa15e6f29
|
公会修改
|
2019-08-09 10:42:37 +08:00 |
lvxinran
|
da884a9773
|
功绩14修改
|
2019-08-09 10:42:09 +08:00 |
wangyuan
|
91c54cc985
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-09 10:24:35 +08:00 |
wangyuan
|
b172a2971e
|
guild
|
2019-08-09 10:24:17 +08:00 |
zhangshanxue
|
8ffaafc666
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-09 10:21:25 +08:00 |
zhangshanxue
|
d325506268
|
activity
|
2019-08-09 10:21:15 +08:00 |
wangyuan
|
aa519b6112
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-09 10:08:07 +08:00 |
wangyuan
|
e7bcf6f9c0
|
mission
|
2019-08-09 10:06:43 +08:00 |
zhangshanxue
|
8293f6228f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-08 20:50:24 +08:00 |
zhangshanxue
|
b7ef0d56fb
|
activity
|
2019-08-08 20:50:15 +08:00 |
zhangshanxue
|
b858e5f40a
|
activity
|
2019-08-13 06:22:01 +08:00 |
zhangshanxue
|
d43c1dbb6d
|
activity
|
2019-08-13 05:13:22 +08:00 |
zhangshanxue
|
da226e1311
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-15 16:51:35 +08:00 |
zhangshanxue
|
00d007663e
|
acitvity
|
2019-08-09 16:50:55 +08:00 |
wangyuan
|
b5e8f34b6f
|
外敌
|
2019-08-08 16:45:17 +08:00 |
lvxinran
|
cb51c86ab6
|
功绩无法完成标识
|
2019-08-08 16:26:35 +08:00 |
lvxinran
|
83adab494f
|
功绩20修改
|
2019-08-08 16:22:30 +08:00 |
lvxinran
|
49ad73610d
|
功绩修改
|
2019-08-08 15:50:56 +08:00 |
wangyuan
|
b0e090433a
|
fix mission
|
2019-08-08 13:58:04 +08:00 |
wangyuan
|
4cd52c43f9
|
fix
|
2019-08-08 13:56:57 +08:00 |
wangyuan
|
e096e71441
|
fix mission
|
2019-08-08 13:55:39 +08:00 |
wangyuan
|
a58732ac9b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-08 13:52:13 +08:00 |
zhangshanxue
|
785fef38e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-08 13:49:41 +08:00 |
zhangshanxue
|
183d243708
|
达人排行
|
2019-10-08 13:49:37 +08:00 |
wangyuan
|
1c420aba0c
|
扣卷
|
2019-08-08 13:51:50 +08:00 |
wangyuan
|
b2a4a89d4c
|
新手任务
|
2019-08-08 13:36:53 +08:00 |
wangyuan
|
2761bc3b76
|
fix activity
|
2019-08-08 11:35:15 +08:00 |