wangyuan
|
cb747e49dc
|
delete open server mail
|
2019-07-04 23:12:58 +08:00 |
wangyuan
|
b4828b943c
|
fix adventure left
|
2019-07-04 23:05:37 +08:00 |
wangyuan
|
4c799d300a
|
adventure fix
|
2019-07-04 21:54:41 +08:00 |
lvxinran
|
5238704d95
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 21:48:10 +08:00 |
lvxinran
|
72a7ef8a1f
|
修复重置扫荡
|
2019-07-04 21:46:21 +08:00 |
wangyuan
|
16b8210460
|
fix force
|
2019-07-04 21:44:13 +08:00 |
wangyuan
|
a4d3c653fe
|
kt
|
2019-07-04 21:27:18 +08:00 |
lvxinran
|
3870c87694
|
字段修改
|
2019-07-04 20:26:26 +08:00 |
lvxinran
|
232159bf22
|
BIReason修改,副本难度暂存修改
|
2019-07-04 20:19:44 +08:00 |
lvxinran
|
1d17e074d1
|
精英副本难度记录实现
|
2019-07-04 17:58:37 +08:00 |
wangyuan
|
9e74d3dbc4
|
delete http pool
|
2019-07-04 17:46:59 +08:00 |
gaojie
|
3946bdc27b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 17:27:20 +08:00 |
gaojie
|
9547d08080
|
使用道具
|
2019-07-04 17:27:16 +08:00 |
wangyuan
|
f6bb11312f
|
print log
|
2019-07-07 15:46:49 +08:00 |
wangyuan
|
0c11ff2e4d
|
conf & test lua & mission
|
2019-07-04 17:11:08 +08:00 |
gaojie
|
ea2353bb06
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 15:43:16 +08:00 |
gaojie
|
ea09857a64
|
好友信息
|
2019-07-04 15:42:57 +08:00 |
lvxinran
|
a2d5ecd93a
|
试炼掉出地图重置修改
|
2019-07-04 15:38:01 +08:00 |
gaojie
|
6fafd9c49b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 14:41:52 +08:00 |
gaojie
|
788c92b0e8
|
httppool fix
|
2019-07-04 14:41:47 +08:00 |
lvxinran
|
39825d03cd
|
开天接数据方法提交
|
2019-07-04 14:40:01 +08:00 |
wangyuan
|
14983f6ccb
|
log
|
2019-07-06 14:11:52 +08:00 |
wangyuan
|
a76bfb8249
|
skip new player
|
2019-07-06 13:51:13 +08:00 |
wangyuan
|
f9b7f8b7c2
|
mail
|
2019-07-06 12:24:38 +08:00 |
gaojie
|
3a73c47823
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 11:33:52 +08:00 |
wangyuan
|
bf451dd19b
|
log
|
2019-07-05 22:36:07 +08:00 |
gaojie
|
31988bce68
|
fix
|
2019-07-04 11:33:18 +08:00 |
lvxinran
|
85b0837e31
|
战斗buff修复
|
2019-07-03 21:48:06 +08:00 |
lvxinran
|
997a6edb3e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 21:47:37 +08:00 |
lvxinran
|
1d994ccee2
|
GM外敌
|
2019-07-03 21:15:47 +08:00 |
wangyuan
|
1f538c8faa
|
conf & map & ktbean
|
2019-07-03 20:57:47 +08:00 |
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
|
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 |
lvxinran
|
69f2522702
|
日志打印修改
|
2019-07-03 10:00:29 +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
|
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 |
lvxinran
|
4e670fea26
|
fix tower shop
|
2019-07-02 09:57:19 +08:00 |
wangyuan
|
ba2a9bf57a
|
mission
|
2019-07-10 22:37:28 +08:00 |
wangyuan
|
8576327656
|
mission
|
2019-07-10 22:37:13 +08:00 |
wangyuan
|
1e34fc8993
|
fix
|
2019-07-08 22:03:17 +08:00 |
wangyuan
|
b74d2b13b6
|
fix
|
2019-07-08 22:02:39 +08:00 |
wangyuan
|
4f2b52a685
|
扫荡计数
|
2019-07-08 21:22:26 +08:00 |
wangyuan
|
aaa50d506f
|
fix type
|
2019-07-08 21:10:37 +08:00 |
wangyuan
|
ee5a9d752f
|
fix
|
2019-07-07 21:08:36 +08:00 |
wangyuan
|
c8b8961ac4
|
mission open
|
2019-07-07 21:07:53 +08:00 |
wangyuan
|
eb81581ee1
|
fix function type
|
2019-07-07 20:38:48 +08:00 |
lvxinran
|
dc92619cbe
|
爬塔最后一层时间、爬塔扫荡、退出地图修改
|
2019-07-01 20:28:42 +08:00 |
wangyuan
|
1c7be8d183
|
FIX
|
2019-07-07 20:22:38 +08:00 |
wangyuan
|
38950f5f46
|
修复体力80问题
|
2019-07-06 18:51:56 +08:00 |
wangyuan
|
7a4ef76467
|
fix
|
2019-07-06 18:25:12 +08:00 |
wangyuan
|
bd54eea409
|
fix mission
|
2019-07-06 18:22:14 +08:00 |
wangyuan
|
1f4eea88c0
|
fix hero
|
2019-07-06 18:04:17 +08:00 |
lvxinran
|
1846fed4c9
|
爬塔修改
|
2019-07-01 18:00:39 +08:00 |
lvxinran
|
58a2d9e87a
|
试炼更新
|
2019-07-01 17:29:39 +08:00 |
wangyuan
|
6e71bccd2a
|
conf
|
2019-07-02 13:01:43 +08:00 |
gaojie
|
fb63575f3f
|
体力上限
|
2019-07-01 12:00:55 +08:00 |
gaojie
|
681e26ae0a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-01 11:28:24 +08:00 |
gaojie
|
4d31031f31
|
log
|
2019-07-01 11:26:42 +08:00 |
wangyuan
|
be4cabc23b
|
fix mission
|
2019-06-29 16:49:09 +08:00 |
lvxinran
|
de2b8cf853
|
试炼副本相关提交
|
2019-06-29 16:29:28 +08:00 |
wangyuan
|
92d17073ae
|
fix force
|
2019-06-29 16:22:34 +08:00 |
wangyuan
|
51257cda85
|
坐标
|
2019-06-29 11:06:33 +08:00 |
lvxinran
|
4dd64f4237
|
试炼爬塔副本相关提交
|
2019-06-29 10:11:52 +08:00 |
lvxinran
|
23aa6369c7
|
Hero信息修改
|
2019-06-28 19:19:00 +08:00 |
wangyuan
|
50fdae30bf
|
fix
|
2019-06-30 20:14:40 +08:00 |
wangyuan
|
d064d102ab
|
new event type
|
2019-06-30 20:11:34 +08:00 |
wangyuan
|
0f7550d798
|
misison
|
2019-06-30 19:59:49 +08:00 |
wangyuan
|
f979eb10a2
|
任务
|
2019-06-30 19:24:45 +08:00 |
wangyuan
|
62340bf943
|
击杀奖励
|
2019-06-30 15:39:15 +08:00 |
wangyuan
|
8ec7059ba1
|
fix
|
2019-06-28 11:54:26 +08:00 |
wangyuan
|
1128d19217
|
领取秘境奖励次数
|
2019-06-28 11:24:17 +08:00 |
wangyuan
|
a13cd2de02
|
fix work shop
|
2019-06-27 20:50:42 +08:00 |
wangyuan
|
0204a27a38
|
fix skip fight
|
2019-06-27 19:32:03 +08:00 |
wangyuan
|
121c465496
|
创角时间
|
2019-06-27 18:06:00 +08:00 |
wangyuan
|
18cd2bd4b9
|
fix 40
|
2019-06-27 17:45:25 +08:00 |
wangyuan
|
82c1fc4dd8
|
挂机
|
2019-06-27 17:34:21 +08:00 |
wangyuan
|
1655043499
|
fix skip boss
|
2019-06-27 17:08:56 +08:00 |
lvxinran
|
09a19a126b
|
表格信息更改
|
2019-06-27 14:56:23 +08:00 |
wangyuan
|
e5cf962cee
|
地图类型40
|
2019-06-27 14:08:10 +08:00 |
wangyuan
|
f7ee8b388e
|
修复日常任务多穿了一个参数
|
2019-06-26 20:55:11 +08:00 |
jiahuiwen
|
2a3c2988f2
|
删除
|
2019-06-26 19:01:43 +08:00 |
jiahuiwen
|
7cea727ea5
|
删除多余方法
|
2019-06-26 18:57:58 +08:00 |
jiahuiwen
|
79bc55a648
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-26 18:56:47 +08:00 |
jiahuiwen
|
6a806eca6d
|
爬塔副本
|
2019-06-26 18:56:15 +08:00 |
wangyuan
|
ec6c26e8a9
|
自动删除精英怪坐标
|
2019-06-26 18:04:54 +08:00 |
wangyuan
|
5dbcbb4bd3
|
fix
|
2019-06-26 16:25:39 +08:00 |
wangyuan
|
84093dd1a4
|
battle
|
2019-06-26 16:02:31 +08:00 |
wangyuan
|
587c317dc4
|
fix
|
2019-06-26 15:02:21 +08:00 |
lvxinran
|
9245d843b7
|
线程管理单例修改
|
2019-06-26 14:49:47 +08:00 |
lvxinran
|
7ee6ab2961
|
修改系统时间延迟修改
|
2019-06-26 13:40:20 +08:00 |
wangyuan
|
a9f8d02ece
|
功绩奖励-》一维数组
|
2019-06-26 10:36:11 +08:00 |
jiahuiwen
|
4b612732ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 20:03:41 +08:00 |
jiahuiwen
|
d9bf43b0d1
|
爬塔副本
|
2019-06-25 20:03:36 +08:00 |
gaojie
|
62f5c925e0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 19:41:26 +08:00 |
gaojie
|
7fe45e7d71
|
装备打造跑马灯
|
2019-06-25 19:41:18 +08:00 |
jiahuiwen
|
9c4d61065b
|
炸弹id
|
2019-06-25 18:06:16 +08:00 |
jiahuiwen
|
c010b09b78
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 17:14:15 +08:00 |
jiahuiwen
|
c3037991e6
|
爬塔副本
|
2019-06-25 17:14:08 +08:00 |
wangyuan
|
990e3bada9
|
回复英雄副本时间
|
2019-06-25 17:06:54 +08:00 |
wangyuan
|
eb8d6f6038
|
秘境邮件
|
2019-06-25 15:59:31 +08:00 |
wukang
|
a47395fcea
|
add log
|
2019-06-25 15:37:09 +08:00 |
wukang
|
1e6044b691
|
fix
|
2019-06-25 15:29:49 +08:00 |
jiahuiwen
|
ee1234ad2c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-25 15:29:36 +08:00 |
jiahuiwen
|
505547fa66
|
爬塔副本信息(试炼副本)
|
2019-06-25 15:28:07 +08:00 |
wangyuan
|
24e9d35228
|
fix 取mission问题
|
2019-06-25 14:21:26 +08:00 |
wangyuan
|
65f9592f68
|
2-->3
|
2019-06-25 13:58:13 +08:00 |
jiahuiwen
|
9eeabfdbe7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-25 12:08:06 +08:00 |
jiahuiwen
|
f4e77f9ada
|
爬塔副本初版
|
2019-06-25 12:06:41 +08:00 |
wangyuan
|
1116f2de9c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-25 12:02:48 +08:00 |
wangyuan
|
2b28e768fb
|
地图任务
|
2019-06-25 12:02:10 +08:00 |