gaojie
|
19c2e880ee
|
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-07-03 19:16:48 +08:00 |
gaojie
|
134c779373
|
同步数据
|
2019-07-03 19:15:54 +08:00 |
lvxinran
|
63107c3af7
|
41行为类型添加
|
2019-07-03 18:28:04 +08:00 |
lvxinran
|
4d4a47dd0f
|
爬塔奖励第一层修改
|
2019-07-03 17:00:05 +08:00 |
lvxinran
|
24b4080062
|
扫荡修改
|
2019-07-03 16:25:25 +08:00 |
lvxinran
|
181649ee07
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 16:16:20 +08:00 |
lvxinran
|
12bb758a38
|
试炼奖励修复
|
2019-07-03 16:16:16 +08:00 |
wangyuan
|
becff88ad7
|
kill reward
|
2019-07-03 14:22:54 +08:00 |
wangyuan
|
49c738a616
|
conf file
|
2019-07-03 14:11:15 +08:00 |
wangyuan
|
46e9d4c318
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-03 14:08:59 +08:00 |
wangyuan
|
bd763bcb1c
|
fix map sweep
|
2019-07-03 14:08:51 +08:00 |
lvxinran
|
78d14781c8
|
服务器报错修改
|
2019-07-03 12:14:03 +08:00 |
gaojie
|
d6079d0964
|
fix
|
2019-07-03 11:59:35 +08:00 |
gaojie
|
5781cad3f8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 11:53:35 +08:00 |
gaojie
|
6ef92b7d2d
|
上报数据
|
2019-07-03 11:53:30 +08:00 |
lvxinran
|
5cf515aa1a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 11:41:03 +08:00 |
lvxinran
|
309069c622
|
试炼精气值修改
|
2019-07-03 11:40:59 +08:00 |
gaojie
|
4bd4b07f88
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 11:32:48 +08:00 |
gaojie
|
c76141c21e
|
fix
|
2019-07-03 11:31:59 +08:00 |
lvxinran
|
3e3de9e38d
|
试炼重置修改
|
2019-07-03 11:17:41 +08:00 |
wangyuan
|
2252704adf
|
conf
|
2019-07-03 10:31:08 +08:00 |
lvxinran
|
69f2522702
|
日志打印修改
|
2019-07-03 10:00:29 +08:00 |
wangyuan
|
8ca885264d
|
conf
|
2019-07-03 09:53:09 +08:00 |
lvxinran
|
57d77bea09
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 22:51:11 +08:00 |
lvxinran
|
ec27295b72
|
日志修改,重置buff修改
|
2019-07-02 22:51:07 +08:00 |
wangyuan
|
c7ef7294ff
|
food buffer
|
2019-07-02 22:49:27 +08:00 |
wangyuan
|
33cd931e82
|
fix
|
2019-07-02 22:09:38 +08:00 |
wangyuan
|
c5261cc9be
|
mapmanager
|
2019-07-02 21:58:04 +08:00 |
lvxinran
|
f4f72607cc
|
爬塔时间修改
|
2019-07-02 21:37:59 +08:00 |
wangyuan
|
ab5f807e7d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-02 21:16:14 +08:00 |
wangyuan
|
fe3bac1880
|
rechage
|
2019-07-02 21:14:48 +08:00 |
lvxinran
|
71f01bc239
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 21:10:47 +08:00 |
lvxinran
|
8b5daa805d
|
时间修改
|
2019-07-02 21:10:42 +08:00 |
wangyuan
|
4622b3ff8e
|
Merge branches 'master' and 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-02 19:54:02 +08:00 |
wangyuan
|
4bc16b9c3a
|
每日任务首次计数
|
2019-07-02 19:45:52 +08:00 |
wangyuan
|
19fcb74513
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-02 18:57:06 +08:00 |
jiahuiwen
|
2cac0935cb
|
爬塔副本 未初始精英怪bug
|
2019-07-02 18:12:27 +08:00 |
gaojie
|
074cd07972
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 17:52:40 +08:00 |
gaojie
|
feb2dbe8f4
|
关卡扫荡
|
2019-07-02 17:52:31 +08:00 |
wangyuan
|
57a9809a48
|
sweep
|
2019-07-02 17:19:32 +08:00 |
lvxinran
|
07d172257a
|
爬塔buff修改
|
2019-07-02 17:12:51 +08:00 |
wangyuan
|
659f0f6945
|
修复迷雾森林
|
2019-07-02 16:38:11 +08:00 |
gaojie
|
f834a14c59
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 15:36:31 +08:00 |
wangyuan
|
b0b08481d4
|
fight
|
2019-07-12 15:29:53 +08:00 |
wangyuan
|
0a832f3e08
|
修复任务
|
2019-07-12 15:20:03 +08:00 |
wangyuan
|
b449d4166e
|
fix daily mission
|
2019-07-12 15:14:11 +08:00 |
gaojie
|
5724c775ec
|
系统邮件一分钟从数据库中取一次
|
2019-07-02 15:35:58 +08:00 |
lvxinran
|
caafce3a02
|
回滚
|
2019-07-02 15:01:31 +08:00 |
lvxinran
|
02124be971
|
爬塔商店修改
|
2019-07-02 13:56:57 +08:00 |
wangyuan
|
8698f042f1
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-11 10:00:38 +08:00 |