mashiyu
|
3676c49c2b
|
战斗更新
|
2019-03-28 11:56:26 +08:00 |
wangyuan
|
7471064777
|
commit data
|
2019-03-28 10:50:18 +08:00 |
jiahuiwen
|
06f5ad260a
|
支持最大最小值相等
|
2019-03-28 10:46:45 +08:00 |
jiahuiwen
|
096a5e4509
|
增加判断
|
2019-03-27 21:18:05 +08:00 |
mashiyu
|
b70c41e9ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-27 20:52:55 +08:00 |
mashiyu
|
333446f2eb
|
属性bug
|
2019-03-27 20:52:43 +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 |
mashiyu
|
1ec26b5c8b
|
怪物表
|
2019-03-27 17:08:40 +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 |
wangyuan
|
ecb6e2a810
|
提交配置数据
|
2019-03-27 10:43:13 +08:00 |
jiahuiwen
|
1c42a47e42
|
配置文件
|
2019-03-27 10:24:40 +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 |
mashiyu
|
6c5411b8b6
|
回血
|
2019-03-26 20:19:15 +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 |
mashiyu
|
6fb4dee9c6
|
同步战斗
|
2019-03-26 15:11:47 +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 |
mashiyu
|
5bcd5583c9
|
关闭日志
|
2019-03-26 11:45:28 +08:00 |
wangyuan
|
88a1188dcf
|
data commit
|
2019-03-26 11:23:06 +08:00 |