wangyuan
|
b3834ed6ee
|
fix fight
|
2019-11-27 10:33:27 +08:00 |
wangyuan
|
4f8bc6ba15
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-26 17:42:38 +08:00 |
wangyuan
|
ad4a55b2ce
|
fight opti
|
2019-11-26 17:41:38 +08:00 |
zhangshanxue
|
f1dc0fcb4c
|
网络模块优化
|
2019-11-26 16:45:29 +08:00 |
zhangshanxue
|
ff0279bddc
|
回退多注释的
|
2019-11-26 15:55:29 +08:00 |
zhangshanxue
|
8c16c9d9c5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-26 11:17:32 +08:00 |
zhangshanxue
|
ff37fa5d2c
|
网络模块优化
|
2019-11-26 11:17:06 +08:00 |
lvxinran
|
300e03d91a
|
S表初始化修改
|
2019-11-26 10:59:33 +08:00 |
lvxinran
|
2c35bf1b38
|
部分表字段初始化代码修改
|
2019-11-25 17:11:21 +08:00 |
wangyuan
|
26309eb920
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-25 16:13:57 +08:00 |
wangyuan
|
df7b1345b6
|
change fight
|
2019-11-25 16:13:24 +08:00 |
lvxinran
|
9c68ef183a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java
|
2019-12-10 03:38:00 +08:00 |
lvxinran
|
55549574e4
|
一键异妖GM,一键科技树GM
|
2019-12-10 03:34:16 +08:00 |
lvxinran
|
0e18ea70da
|
字段添加
|
2019-11-25 11:42:07 +08:00 |
lvxinran
|
89122a8afd
|
function修改
|
2019-11-25 11:34:34 +08:00 |
lvxinran
|
813ffebec6
|
检测功能开启修改
|
2019-11-23 17:56:42 +08:00 |
lvxinran
|
e266403589
|
功能开启关闭修改
|
2019-11-23 17:15:18 +08:00 |
zhangshanxue
|
85eae5a303
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-23 14:20:13 +08:00 |
zhangshanxue
|
c4fbe5379b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
# serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
# serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java
|
2019-11-23 14:17:58 +08:00 |
lvxinran
|
3c59042b88
|
合并online分支
|
2019-11-23 14:11:20 +08:00 |
zhangshanxue
|
12692a6ff9
|
网络模块重构和服务器启动优化
|
2019-11-23 12:11:03 +08:00 |
zhangshanxue
|
c369ac8d48
|
活动修改
|
2019-11-23 11:21:42 +08:00 |
wangyuan
|
1631f01146
|
activity & chat limit message length
|
2019-11-25 10:51:08 +08:00 |
wangyuan
|
199c559446
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-24 19:42:35 +08:00 |
wangyuan
|
bda2d610f0
|
activity
|
2019-11-24 19:42:22 +08:00 |
zhangshanxue
|
843e4f921d
|
活动修改
|
2019-11-23 11:15:43 +08:00 |
lvxinran
|
7cd52a347a
|
巅峰赛类型修改,坐骑升级修改
|
2019-12-17 02:30:07 +08:00 |
lvxinran
|
fc7ed5bde3
|
坐骑、装饰代码提交
|
2019-11-26 00:12:32 +08:00 |
lvxinran
|
c73d9fe16e
|
充值修改
|
2019-11-22 19:10:13 +08:00 |
lvxinran
|
11c188938e
|
空物品判断
|
2019-11-22 17:32:58 +08:00 |
lvxinran
|
92736c1034
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-18 00:40:57 +08:00 |
lvxinran
|
183c32a12a
|
工会修改名字
|
2019-12-18 00:40:42 +08:00 |
lvxinran
|
b00ab56b99
|
公会改名提交
|
2019-12-17 22:15:06 +08:00 |
lvxinran
|
460a9ad41a
|
试炼本修改
|
2019-12-17 21:56:30 +08:00 |
lvxinran
|
88e1a59289
|
修改退出地图
|
2019-12-17 00:43:21 +08:00 |
lvxinran
|
1ab6d2a649
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-12-17 00:41:09 +08:00 |
lvxinran
|
eedab65f21
|
强制退出
|
2019-12-17 00:40:38 +08:00 |
lvxinran
|
28efc91bc9
|
无尽修改
|
2019-12-17 00:00:51 +08:00 |
wangyuan
|
bbbd0d60d7
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-22 16:41:13 +08:00 |
wangyuan
|
db8aeac335
|
元素招募 & 新活动(新手福利)
|
2019-11-22 16:39:54 +08:00 |
wangyuan
|
56338b360f
|
reconnect endlessmap
|
2019-11-21 16:14:45 +08:00 |
wangyuan
|
f6431e2e0f
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-21 13:44:19 +08:00 |
wangyuan
|
9c337089b4
|
fix mission
|
2019-11-21 13:43:48 +08:00 |
lvxinran
|
78c7305631
|
无尽删除信息修改
|
2019-11-21 10:27:17 +08:00 |
wangyuan
|
d35d459169
|
fix arena mission
|
2019-11-21 10:09:40 +08:00 |
lvxinran
|
a5e797d543
|
公会战修改血量百分比
|
2019-11-20 18:34:34 +08:00 |
lvxinran
|
95b447e494
|
外观装饰获取提交
|
2019-11-20 18:01:45 +08:00 |
lvxinran
|
04bc46d6d7
|
修改装饰提交
|
2019-11-20 17:59:41 +08:00 |
lvxinran
|
7d02b70750
|
解散工会修改
|
2019-11-20 11:59:55 +08:00 |
lvxinran
|
d786c79bf7
|
公会战战斗时长修改
|
2019-11-19 17:58:06 +08:00 |