jiahuiwen
|
baf73f9440
|
bug修改
|
2019-04-09 09:28:37 +08:00 |
jiahuiwen
|
225ebb443a
|
bug 修改
|
2019-04-08 20:52:54 +08:00 |
jiahuiwen
|
982a34d49e
|
bug
|
2019-04-08 20:41:34 +08:00 |
jiahuiwen
|
afd2df23c1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-08 17:14:22 +08:00 |
wangyuan
|
6d328867a8
|
修复挂机删除时间
|
2019-04-08 17:57:01 +08:00 |
jiahuiwen
|
37f085b31c
|
保存信息
|
2019-04-08 17:14:10 +08:00 |
jiahuiwen
|
6bd50b34de
|
添加行为,可以开启其他地图点
|
2019-04-08 14:51:12 +08:00 |
mashiyu
|
c2f03f171c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-04 14:36:24 +08:00 |
mashiyu
|
98fe33d735
|
战斗校验服
|
2019-04-04 14:36:07 +08:00 |
jiahuiwen
|
f15d513483
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-04 14:03:57 +08:00 |
jiahuiwen
|
1d7c0587d3
|
配置表提交
|
2019-04-04 14:02:50 +08:00 |
wangyuan
|
b7d51deb04
|
红点
|
2019-04-04 14:00:49 +08:00 |
jiahuiwen
|
0be47a26fa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-03 20:43:07 +08:00 |
jiahuiwen
|
c6a892ab23
|
迷雾
|
2019-04-03 20:43:03 +08:00 |
wangyuan
|
5495dab69a
|
fix
|
2019-04-03 19:20:25 +08:00 |
wangyuan
|
72760b449f
|
fix gm
|
2019-04-03 17:39:38 +08:00 |
wangyuan
|
eb7c619eb5
|
探索度支持多事件点
|
2019-04-03 16:28:43 +08:00 |
wangyuan
|
f59f3ab9d8
|
修改挂机奖励
|
2019-04-03 15:26:13 +08:00 |
wangyuan
|
27aebc60bb
|
gm 一键背包
|
2019-04-02 20:52:10 +08:00 |
jiahuiwen
|
b03071035d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 20:26:11 +08:00 |
jiahuiwen
|
251e724a2e
|
地图保存bug
|
2019-04-02 20:26:02 +08:00 |
wangyuan
|
747d2e4a53
|
修改英雄当前生命枚举值为6
|
2019-04-02 17:42:34 +08:00 |
wangyuan
|
80678b540f
|
fix
|
2019-04-02 17:21:54 +08:00 |
jiahuiwen
|
f3961d007f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 16:39:07 +08:00 |
jiahuiwen
|
b97039772d
|
事件点保存
|
2019-04-02 16:39:00 +08:00 |
wangyuan
|
c1ca5b3503
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
|
2019-04-02 16:29:30 +08:00 |
wangyuan
|
1a40372803
|
吃食物buffer一次性生效,做延缓处理
|
2019-04-02 16:28:39 +08:00 |
jiahuiwen
|
bf235d3fc9
|
buff赋值
|
2019-04-02 16:05:54 +08:00 |
jiahuiwen
|
319a31df60
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 15:51:58 +08:00 |
jiahuiwen
|
b04bce96a9
|
行为类型 吃buff
|
2019-04-02 15:51:45 +08:00 |
wangyuan
|
371d8af39d
|
穿多件装备
|
2019-04-02 14:51:17 +08:00 |
jiahuiwen
|
65cb996af4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:28:45 +08:00 |
wangyuan
|
b8907cded2
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-02 14:28:26 +08:00 |
wangyuan
|
5f9f164320
|
修改食物buffer
|
2019-04-02 14:28:13 +08:00 |
jiahuiwen
|
17a5cddd82
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:27:55 +08:00 |
jiahuiwen
|
501ff8f221
|
地图增加两个行为类型,配置表
|
2019-04-02 14:27:47 +08:00 |
gaojie
|
ffdf1067fa
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-02 14:26:24 +08:00 |
gaojie
|
d1d06274da
|
初始化开服邮件
|
2019-04-02 14:26:20 +08:00 |
jiahuiwen
|
5de5a252ed
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 20:33:21 +08:00 |
jiahuiwen
|
de37dcd698
|
地图 gm
|
2019-04-01 20:31:54 +08:00 |
wangyuan
|
221c102815
|
fightdata
|
2019-04-01 19:49:18 +08:00 |
gaojie
|
215fa27996
|
修改数据类型
|
2019-04-01 19:34:26 +08:00 |
gaojie
|
54d2172361
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 19:24:09 +08:00 |
wangyuan
|
77a480f955
|
map gm
|
2019-04-15 05:29:35 +08:00 |
gaojie
|
7fe39cdeac
|
怪物技能属性
|
2019-04-01 19:24:05 +08:00 |
jiahuiwen
|
741c60fccf
|
地图GM,跳转判断
|
2019-04-01 18:57:58 +08:00 |
jiahuiwen
|
dc46b843bb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-01 17:11:35 +08:00 |
jiahuiwen
|
d0077f94cc
|
触发顺序
|
2019-04-01 17:11:10 +08:00 |
mashiyu
|
e5aac81546
|
同步表
|
2019-04-01 14:40:07 +08:00 |
jiahuiwen
|
3118cd9fd1
|
保存地图事件 bug
|
2019-04-01 14:16:27 +08:00 |