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 |