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 |
wukang
|
7b51289291
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 10:14:55 +08:00 |
wukang
|
7b9eeb78f1
|
add log
|
2019-06-25 10:14:36 +08:00 |
wangyuan
|
c7fdef8058
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-25 10:12:51 +08:00 |
wangyuan
|
b99522734d
|
地图探索任务
|
2019-06-25 10:12:25 +08:00 |
wukang
|
7295109844
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 10:06:02 +08:00 |
wukang
|
4f5477e3c2
|
副本星级奖励
|
2019-06-25 10:05:49 +08:00 |
wangyuan
|
cdda69bad3
|
conf
|
2019-06-24 19:48:53 +08:00 |
wangyuan
|
ba55893b1d
|
装备属性不进行合并
|
2019-06-24 19:36:34 +08:00 |
wangyuan
|
abff2b134e
|
优化地图探索度
|
2019-06-24 19:10:24 +08:00 |
wangyuan
|
8ad8890274
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-24 12:07:13 +08:00 |
wangyuan
|
b1e9d4040d
|
fix read s table
|
2019-06-24 12:06:48 +08:00 |
gaojie
|
71f98c4887
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-24 11:44:10 +08:00 |
gaojie
|
560b97590a
|
赠送体力状态刷新
|
2019-06-24 11:44:06 +08:00 |
wangyuan
|
098024c896
|
add lua log
|
2019-06-24 11:21:25 +08:00 |
wangyuan
|
30ceef6fb2
|
fix
|
2019-06-24 10:38:20 +08:00 |
jiahuiwen
|
3e0801d1ce
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-22 15:56:30 +08:00 |
jiahuiwen
|
c231cdda2f
|
删除多个点
|
2019-06-22 15:56:26 +08:00 |