wangyuan
|
fc15794db3
|
精力
|
2019-03-28 18:32:08 +08:00 |
jiahuiwen
|
d40956b247
|
地图提交
|
2019-03-28 18:20:18 +08:00 |
jiahuiwen
|
a500703394
|
地图修改
|
2019-03-28 17:23:19 +08:00 |
jiahuiwen
|
992ed00675
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-28 15:10:59 +08:00 |
jiahuiwen
|
f5cf36911f
|
地图修改
|
2019-03-28 15:08:43 +08:00 |
mashiyu
|
76d045cc3d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-28 15:00:01 +08:00 |
mashiyu
|
9633f449c6
|
错误码
|
2019-03-28 14:59:48 +08:00 |
wangyuan
|
a549c34d0e
|
道具背包增量返回给前端
|
2019-03-28 14:43:48 +08:00 |
jiahuiwen
|
a6bfd95324
|
地图修改
|
2019-03-28 13:41:21 +08:00 |
jiahuiwen
|
06f5ad260a
|
支持最大最小值相等
|
2019-03-28 10:46:45 +08:00 |
jiahuiwen
|
096a5e4509
|
增加判断
|
2019-03-27 21:18:05 +08:00 |
wangyuan
|
8e276c9be2
|
行动力
|
2019-03-27 20:30:33 +08:00 |
jiahuiwen
|
531285484a
|
漏提
|
2019-03-27 19:59:55 +08:00 |
jiahuiwen
|
3c51f87439
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-27 19:59:14 +08:00 |
jiahuiwen
|
83812a7c0d
|
任务刷新放在战斗胜利后
|
2019-03-27 19:59:08 +08:00 |
wangyuan
|
90dff5ecc7
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-27 19:58:26 +08:00 |
wangyuan
|
ebebe1b2c4
|
相连地图快判断
|
2019-03-27 19:57:43 +08:00 |
jiahuiwen
|
f5fc376c1e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-27 17:11:17 +08:00 |
jiahuiwen
|
d1600d94a9
|
完善地图
|
2019-03-27 17:11:12 +08:00 |
wangyuan
|
d0083ee1ee
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-27 15:53:27 +08:00 |
wangyuan
|
6d6bee9b39
|
探索度 -》 行动力
|
2019-03-27 15:51:01 +08:00 |
mashiyu
|
5b5bf07eec
|
战斗血量bug
|
2019-03-27 15:47:27 +08:00 |
jiahuiwen
|
d6cd2edb89
|
属性判断
|
2019-03-27 11:36:12 +08:00 |
jiahuiwen
|
b0ada06c36
|
回城给道具
|
2019-03-27 10:17:49 +08:00 |
jiahuiwen
|
d9c34ba5cd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 20:45:31 +08:00 |
jiahuiwen
|
d272ad0ea1
|
临时背包bug
|
2019-03-26 20:45:25 +08:00 |
wangyuan
|
e8893ce66b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-26 20:21:19 +08:00 |
wangyuan
|
38a9d7e339
|
fix
|
2019-03-26 20:20:00 +08:00 |
jiahuiwen
|
ea458568c5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 19:28:16 +08:00 |
jiahuiwen
|
38dee193ec
|
添加道具bug
|
2019-03-26 19:28:10 +08:00 |
mashiyu
|
947cf95b1b
|
优化
|
2019-03-26 19:25:26 +08:00 |
mashiyu
|
5fa8c7f88b
|
存一个response
|
2019-03-26 18:04:01 +08:00 |
jiahuiwen
|
fee1e82d74
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 17:35:15 +08:00 |
jiahuiwen
|
e53a8fe6cd
|
任务没有就不推
|
2019-03-26 17:35:00 +08:00 |
wangyuan
|
85b423d36a
|
fix null
|
2019-03-26 17:05:36 +08:00 |
mashiyu
|
a874e8623d
|
bug
|
2019-03-26 17:03:23 +08:00 |
jiahuiwen
|
ffeb61578f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 16:42:27 +08:00 |
jiahuiwen
|
fc39cefe82
|
pointId
|
2019-03-26 16:42:14 +08:00 |
wangyuan
|
41e7d9ce30
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-26 15:55:58 +08:00 |
wangyuan
|
dd93f6f8a9
|
fix
|
2019-03-26 15:55:47 +08:00 |
jiahuiwen
|
5794900e80
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 15:39:00 +08:00 |
jiahuiwen
|
1ff4143220
|
战斗地图点先不销毁
|
2019-03-26 15:37:53 +08:00 |
wangyuan
|
a086df2e8a
|
fix
|
2019-03-26 14:15:32 +08:00 |
jiahuiwen
|
30c154d407
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-26 14:03:14 +08:00 |
wangyuan
|
9791ae66fd
|
解决出地图探索度为空
|
2019-03-26 14:02:19 +08:00 |
jiahuiwen
|
7cae5ca7ca
|
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-03-26 13:58:48 +08:00 |
jiahuiwen
|
8918c88a1b
|
保存事件进度
|
2019-03-26 13:56:52 +08:00 |
wangyuan
|
e9b57014bf
|
fix
|
2019-03-26 11:46:00 +08:00 |
wangyuan
|
0bd0d709ea
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-03-26 11:21:47 +08:00 |
wangyuan
|
fb403ea174
|
地图探索度
|
2019-03-26 11:18:43 +08:00 |
jiahuiwen
|
36206f288c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-25 17:51:02 +08:00 |
jiahuiwen
|
96379e36f5
|
增加行为类型24
|
2019-03-25 17:50:58 +08:00 |
mashiyu
|
96312e7a21
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-25 11:46:20 +08:00 |
mashiyu
|
a628ea0507
|
失败处理
|
2019-03-25 11:46:09 +08:00 |
jiahuiwen
|
bb6c70c8f5
|
注释log
|
2019-03-25 11:31:16 +08:00 |
jiahuiwen
|
1f37783914
|
注释log
|
2019-03-25 11:30:26 +08:00 |
mashiyu
|
0f9e39fd77
|
bug
|
2019-03-25 11:28:10 +08:00 |
gaojie
|
32089c7f76
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
serverlogic/src/main/java/com/ljsd/jieling/config/SSkillLogicConfig.java
|
2019-03-25 11:24:49 +08:00 |
gaojie
|
b348f81919
|
初始化技能数据
|
2019-03-25 11:20:25 +08:00 |
mashiyu
|
cc9b412f63
|
bug
|
2019-03-25 10:58:38 +08:00 |
mashiyu
|
0805e3c16e
|
种子随机
|
2019-03-23 18:17:38 +08:00 |
mashiyu
|
c7c43110e6
|
bug
|
2019-03-23 18:14:38 +08:00 |
jiahuiwen
|
81a603e0dc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
|
2019-03-23 17:15:30 +08:00 |
jiahuiwen
|
8d9b8e1ff8
|
地图修改
|
2019-03-23 17:14:18 +08:00 |
mashiyu
|
347ec0a577
|
数据bug
|
2019-03-23 17:06:14 +08:00 |
mashiyu
|
bb3fd97b0d
|
log
|
2019-03-22 19:06:00 +08:00 |
mashiyu
|
ce3a58641a
|
错误码
|
2019-03-22 18:57:17 +08:00 |
mashiyu
|
7a779b3ee3
|
战斗验证
|
2019-03-22 18:36:24 +08:00 |
wangyuan
|
2b06b9ace0
|
fix 驻扎时间
|
2019-03-22 17:43:20 +08:00 |
wangyuan
|
65f2bd5692
|
修改推荐妖灵师奖励
|
2019-03-22 16:16:12 +08:00 |
mashiyu
|
1793ddffd9
|
test
|
2019-03-22 15:00:06 +08:00 |
jiahuiwen
|
a165c759de
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-22 14:28:29 +08:00 |
jiahuiwen
|
1dca447d0c
|
空掉落
|
2019-03-22 14:28:13 +08:00 |
mashiyu
|
2e0244059c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-22 11:00:23 +08:00 |
mashiyu
|
e227cefbad
|
提交
|
2019-03-22 11:00:12 +08:00 |
jiahuiwen
|
d035de5a9e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/OptionConfig.txt
|
2019-03-22 10:11:49 +08:00 |
jiahuiwen
|
ec1f65e8e1
|
地图修改
|
2019-03-22 10:10:49 +08:00 |
wangyuan
|
322c7a3e68
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-22 10:03:58 +08:00 |
wangyuan
|
705e2d5b7b
|
冒险推荐英雄
|
2019-03-22 10:02:46 +08:00 |
mashiyu
|
60f1dd0aff
|
优化
|
2019-03-21 17:48:37 +08:00 |
mashiyu
|
2c098f4db0
|
更新
|
2019-03-21 17:24:21 +08:00 |
jiahuiwen
|
6ed02aa302
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-21 15:30:05 +08:00 |
jiahuiwen
|
cce1214a65
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-21 15:29:25 +08:00 |
mashiyu
|
ad4178af44
|
路径
|
2019-03-21 15:29:22 +08:00 |
jiahuiwen
|
f6f1cac98e
|
事件点触发方式
|
2019-03-21 15:28:21 +08:00 |
mashiyu
|
0dd082a3b2
|
log
|
2019-03-21 15:24:31 +08:00 |
mashiyu
|
a37e7310f6
|
优化
|
2019-03-21 15:01:27 +08:00 |
mashiyu
|
e56acaea56
|
战斗验证
|
2019-03-21 14:33:56 +08:00 |
gaojie
|
5ed6302f7e
|
技能
|
2019-03-21 12:41:25 +08:00 |
mashiyu
|
c2b163f29c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 20:04:24 +08:00 |
mashiyu
|
8eff75e7c6
|
优化
|
2019-03-20 20:04:14 +08:00 |
jiahuiwen
|
04c60c2ac9
|
战斗修改
|
2019-03-20 19:50:21 +08:00 |
jiahuiwen
|
60db6c0005
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 19:01:41 +08:00 |
jiahuiwen
|
697487642c
|
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-03-20 19:01:35 +08:00 |
mashiyu
|
1dc2dff60a
|
引用jar
|
2019-03-20 19:01:18 +08:00 |
jiahuiwen
|
618a1903e1
|
任务
|
2019-03-20 18:39:37 +08:00 |
mashiyu
|
ab67577ff6
|
提交
|
2019-03-20 18:36:58 +08:00 |
mashiyu
|
5dae658da3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 16:09:06 +08:00 |
wangyuan
|
e10e8b9c55
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-20 16:08:14 +08:00 |
wangyuan
|
1bfe45c373
|
function control
|
2019-03-20 16:07:46 +08:00 |
mashiyu
|
dae6b91053
|
啊啊啊
|
2019-03-20 16:01:44 +08:00 |
mashiyu
|
0e42332a4b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 15:24:04 +08:00 |
gaojie
|
65d2d64219
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 15:05:45 +08:00 |
gaojie
|
245118a707
|
fix
|
2019-03-20 15:05:41 +08:00 |
wangyuan
|
3e21db3b92
|
驻扎错误信息
|
2019-03-20 14:48:25 +08:00 |
mashiyu
|
f1bb8dae15
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 11:55:21 +08:00 |
gaojie
|
20b1628d6c
|
增加怪物组技能
|
2019-03-20 11:54:43 +08:00 |
mashiyu
|
fb7bfcb669
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
|
2019-03-20 10:19:00 +08:00 |
mashiyu
|
333caa887c
|
提交
|
2019-03-20 10:15:34 +08:00 |
wangyuan
|
c9ead9d4d3
|
前端获取服务器时间
|
2019-03-19 20:08:51 +08:00 |
jiahuiwen
|
64b0a75b7e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-19 19:57:44 +08:00 |
jiahuiwen
|
774828dcc9
|
选择跳转bug
|
2019-03-19 19:57:34 +08:00 |
wangyuan
|
83fcba59f8
|
精力
|
2019-03-19 18:34:14 +08:00 |
jiahuiwen
|
73ae2a9bf4
|
地图新增两个行为
|
2019-03-19 18:12:36 +08:00 |
jiahuiwen
|
b40c61d92d
|
任务可领取
|
2019-03-19 16:15:28 +08:00 |
jiahuiwen
|
6db6e061a5
|
地图探索修改
|
2019-03-19 15:54:37 +08:00 |
jiahuiwen
|
b3a7c9838f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-19 11:15:24 +08:00 |
jiahuiwen
|
e1f606e1ed
|
地图
|
2019-03-19 11:15:19 +08:00 |
wangyuan
|
139a7562a1
|
food buffer first version
|
2019-03-18 18:13:34 +08:00 |
wangyuan
|
0507cb91de
|
拼接英雄属性
|
2019-03-18 13:57:07 +08:00 |
wangyuan
|
b2e560c8bc
|
异妖属性加成
|
2019-03-18 11:40:33 +08:00 |
jiahuiwen
|
f62eda7bda
|
地图刷新
|
2019-03-15 17:08:13 +08:00 |
jiahuiwen
|
ca1f5d5021
|
总步数增加5
|
2019-03-15 14:04:46 +08:00 |
jiahuiwen
|
00c4283490
|
打开行动力
|
2019-03-15 10:35:41 +08:00 |
wangyuan
|
68b5336df8
|
绑定关系
|
2019-03-14 14:46:29 +08:00 |
wangyuan
|
1262ac5fda
|
绑定user
|
2019-03-14 14:37:04 +08:00 |
jiahuiwen
|
bc98404e7a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-14 11:46:21 +08:00 |
jiahuiwen
|
01e6e0c89b
|
添加道具bug
|
2019-03-14 11:46:16 +08:00 |
wangyuan
|
78df2af776
|
change weight
|
2019-03-14 11:13:05 +08:00 |
wangyuan
|
a1e84b5a16
|
randhero
|
2019-03-13 21:04:12 +08:00 |
jiahuiwen
|
483dabee0e
|
数据提交
|
2019-03-13 20:11:45 +08:00 |
wangyuan
|
b847700469
|
upload data
|
2019-03-13 16:41:21 +08:00 |
mashiyu
|
87c14fd895
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-13 14:03:10 +08:00 |
mashiyu
|
eec1857cdc
|
提交
|
2019-03-13 14:02:54 +08:00 |
jiahuiwen
|
810452915c
|
注释行动力,打开临时背包到背包
|
2019-03-13 13:55:09 +08:00 |
jiahuiwen
|
b5eb0629a3
|
打开临时背包
|
2019-03-13 13:48:33 +08:00 |
jiahuiwen
|
90bc0c62c6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-13 13:46:39 +08:00 |
jiahuiwen
|
34495dd9b0
|
临时背包
|
2019-03-13 13:46:33 +08:00 |
wangyuan
|
c840962396
|
fix unload equip
|
2019-03-13 10:59:58 +08:00 |
gaojie
|
a45aae40e2
|
注释临时背包
|
2019-03-12 20:10:46 +08:00 |
wangyuan
|
e4b65bc7aa
|
change mongo
|
2019-03-12 18:59:14 +08:00 |
mashiyu
|
a5ade7d53b
|
优化
|
2019-03-12 17:01:40 +08:00 |
wangyuan
|
c259bb3e57
|
ActionPower
|
2019-03-12 14:30:20 +08:00 |
mashiyu
|
3c5ea4af8b
|
依赖
|
2019-03-12 14:17:01 +08:00 |
mashiyu
|
ae2bc788dc
|
战斗校验
|
2019-03-12 14:11:16 +08:00 |
gaojie
|
e5d66d4bd3
|
技能
|
2019-03-12 14:03:08 +08:00 |
gaojie
|
c5d0813b68
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-12 11:10:23 +08:00 |
gaojie
|
aa9ea25018
|
技能静态表初始化
|
2019-03-12 11:10:19 +08:00 |
wangyuan
|
88d9ee72cb
|
校验星级
|
2019-03-12 10:17:32 +08:00 |
jiahuiwen
|
004cfbe4f0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-12 09:41:15 +08:00 |