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 |