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 |
mashiyu
|
373664aef1
|
java调用lua
|
2019-03-12 14:05:45 +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 |
jiahuiwen
|
ceac7c04cd
|
行动力,和临时背包
|
2019-03-12 09:40:48 +08:00 |
jiahuiwen
|
724211771b
|
添加字段
|
2019-03-12 09:37:39 +08:00 |
wangyuan
|
9d033a9fc5
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-03-11 18:31:10 +08:00 |
wangyuan
|
f2bdb6126c
|
异妖
|
2019-03-11 18:30:42 +08:00 |
jiahuiwen
|
6d89769a68
|
地图 边缘触发
|
2019-03-09 19:02:07 +08:00 |
jiahuiwen
|
061e0f43c0
|
地图配置表提交
|
2019-03-09 18:05:10 +08:00 |
jiahuiwen
|
af7c0ab359
|
任务赋值
|
2019-03-09 11:51:47 +08:00 |
gaojie
|
0251011110
|
生成地图表数据
|
2019-03-07 20:01:21 +08:00 |
jiahuiwen
|
afaec0973b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-07 19:22:49 +08:00 |
jiahuiwen
|
b06828e290
|
地图行为类型
|
2019-03-07 19:22:44 +08:00 |
wangyuan
|
77212a2f30
|
初始化三个编队
|
2019-03-07 15:00:05 +08:00 |
jiahuiwen
|
9cdc8ff54c
|
配置表
|
2019-03-07 14:07:24 +08:00 |
jiahuiwen
|
5796e96bc5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-07 14:02:00 +08:00 |
jiahuiwen
|
099b7c7488
|
主线任务
|
2019-03-07 14:01:53 +08:00 |
gaojie
|
90e89386a1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-07 11:13:39 +08:00 |
gaojie
|
27578a91da
|
fix
|
2019-03-07 11:13:35 +08:00 |
mashiyu
|
66f21eb937
|
绑定关系
|
2019-03-07 11:12:42 +08:00 |
jiahuiwen
|
e17873e789
|
地图选项配置表
|
2019-03-06 20:56:11 +08:00 |
mashiyu
|
db19eacd16
|
数据存储优化
|
2019-03-06 19:26:29 +08:00 |
jiahuiwen
|
4e53e8e96c
|
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-06 17:30:25 +08:00 |
jiahuiwen
|
f6e0d4b8bf
|
战斗结算
|
2019-03-06 17:29:34 +08:00 |
mashiyu
|
8d19f84382
|
合并代码
|
2019-03-06 16:19:10 +08:00 |
mashiyu
|
5d8c9d35ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FinishMissionBehavior.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-03-06 16:17:34 +08:00 |
mashiyu
|
9c71683e83
|
去掉大小key异常
|
2019-03-06 16:14:18 +08:00 |
jiahuiwen
|
738252ecd5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-06 16:05:07 +08:00 |
jiahuiwen
|
a80f078417
|
地图
|
2019-03-06 16:04:57 +08:00 |
mashiyu
|
9ddf90637f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-03-06 15:07:23 +08:00 |
mashiyu
|
13b8946115
|
数据存贮优化
|
2019-03-06 15:07:12 +08:00 |
wangyuan
|
93ab01facd
|
fix 解析英雄数据表
|
2019-03-06 11:08:42 +08:00 |
jiahuiwen
|
83ef010146
|
初始任务
|
2019-03-05 19:39:52 +08:00 |
mashiyu
|
bf43560c87
|
改数据库
|
2019-03-05 18:59:34 +08:00 |