mashiyu
|
ab67577ff6
|
提交
|
2019-03-20 18:36:58 +08:00 |
mashiyu
|
700c6f4d4c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-20 18:36:19 +08:00 |
wangyuan
|
7e4c8f7a7e
|
update data
|
2019-03-20 16:14:45 +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 |
jiahuiwen
|
dc2dff5378
|
数据提交
|
2019-03-14 15:45:29 +08:00 |
wangyuan
|
68b5336df8
|
绑定关系
|
2019-03-14 14:46:29 +08:00 |
wangyuan
|
1262ac5fda
|
绑定user
|
2019-03-14 14:37:04 +08:00 |
jiahuiwen
|
96abec7248
|
配置表提交
|
2019-03-14 12:08:51 +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 |
jiahuiwen
|
0eec365385
|
地图数据
|
2019-03-13 16:43:01 +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 |