wangyuan
|
b1736e56bc
|
fix activity limit
|
2019-11-29 11:37:46 +08:00 |
lvxinran
|
07cfe90a46
|
logic提交
|
2019-11-29 11:20:36 +08:00 |
lvxinran
|
fea1806186
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-29 11:20:01 +08:00 |
lvxinran
|
262be7dde8
|
排行榜修改
|
2019-11-29 11:19:48 +08:00 |
zhangshanxue
|
83aaad0721
|
战斗同步
|
2019-11-28 19:27:35 +08:00 |
wangyuan
|
aaead3ecdb
|
fix stable
|
2019-11-28 15:50:06 +08:00 |
wangyuan
|
87a14e3131
|
Merge branch 'online_1121'
|
2019-11-28 15:16:23 +08:00 |
wangyuan
|
d69db99784
|
rename
|
2019-11-28 15:14:52 +08:00 |
wangyuan
|
8e843c1195
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-28 14:57:17 +08:00 |
wangyuan
|
14678739f8
|
fix remove hero
|
2019-11-28 14:55:47 +08:00 |
wangyuan
|
7de4d9bc9e
|
set login time
|
2019-11-28 14:38:31 +08:00 |
wangyuan
|
99dc03a323
|
fix check token
|
2019-11-28 13:37:42 +08:00 |
wangyuan
|
d30972da3c
|
session
|
2019-11-28 12:14:15 +08:00 |
lvxinran
|
26016b3bf0
|
add redis key
|
2019-11-28 11:46:41 +08:00 |
wangyuan
|
1bc50cff0c
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-28 11:34:01 +08:00 |
wangyuan
|
bee222b3c1
|
save
|
2019-11-28 10:53:51 +08:00 |
wangyuan
|
a204fe82b1
|
fix equip
|
2019-11-28 10:48:47 +08:00 |
lvxinran
|
e89ed8c7f0
|
限时抽卡排行
|
2019-11-27 18:09:31 +08:00 |
wangyuan
|
83aac51969
|
reconnect send heart
|
2019-11-27 17:05:09 +08:00 |
lvxinran
|
2c5148e1ed
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-11-27 16:10:41 +08:00 |
lvxinran
|
3eddd7610c
|
战力排行榜
|
2019-11-27 15:43:24 +08:00 |
lvxinran
|
e19da91240
|
战力排行榜部分修改
|
2019-11-27 13:36:11 +08:00 |
lvxinran
|
0de4e4b58d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-27 10:49:11 +08:00 |
lvxinran
|
2e21d0f580
|
排行榜重构修改
|
2019-11-27 10:49:05 +08:00 |
wangyuan
|
02c9baf2a3
|
luafight
|
2019-11-27 10:40:20 +08:00 |
wangyuan
|
b3834ed6ee
|
fix fight
|
2019-11-27 10:33:27 +08:00 |
wangyuan
|
f426a7599d
|
fix guild indicaiton
|
2019-11-27 10:07:40 +08:00 |
zhangshanxue
|
f09bb2b684
|
关卡限制活动
|
2019-11-27 09:52:04 +08:00 |
zhangshanxue
|
e1786b61f7
|
关卡限制活动
|
2019-11-27 09:30:02 +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 |
wangyuan
|
307768615b
|
fix activity
|
2019-11-26 17:22:31 +08:00 |
zhangshanxue
|
f1dc0fcb4c
|
网络模块优化
|
2019-11-26 16:45:29 +08:00 |
zhangshanxue
|
ff0279bddc
|
回退多注释的
|
2019-11-26 15:55:29 +08:00 |
lvxinran
|
7d26a0da25
|
公会宣言长度
|
2019-11-26 15:29:43 +08:00 |
zhangshanxue
|
aab51ba39c
|
五星成长礼按天刷新
|
2019-12-02 18:32:40 +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 |
zhangshanxue
|
3cdb228594
|
五星英雄成长礼
|
2019-11-25 23:13:52 +08:00 |
zhangshanxue
|
ba1cb23fb2
|
五星英雄成长礼
|
2019-11-25 22:12:44 +08:00 |
zhangshanxue
|
26f06a54ae
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-11-25 21:53:50 +08:00 |
zhangshanxue
|
3cf23b39ff
|
recharge协议合并策略
|
2019-11-25 21:17:29 +08:00 |
zhangshanxue
|
27d7504a0e
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-11-25 20:19:12 +08:00 |
zhangshanxue
|
28cb6035d4
|
五星英雄成长礼
|
2019-11-25 20:17:30 +08:00 |
wangyuan
|
f4f4b87dc7
|
fix map mission cal
|
2019-11-25 17:29:11 +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 |