Commit Graph

545 Commits (c1ca5b3503618f1125844cb1e5e7fd9aeb453ee5)
 

Author SHA1 Message Date
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
jiahuiwen 51da0e539f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-01 11:27:27 +08:00
jiahuiwen 126df5e58b 销毁事件点 需要保存事件信息 2019-04-01 11:27:03 +08:00
gaojie 77b9db852b 生成txt文件 2019-04-01 11:16:21 +08:00
mashiyu f9249bef01 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-01 09:52:38 +08:00
mashiyu 597b25e3ed bug 2019-04-01 09:52:18 +08:00
jiahuiwen 88b30cf287 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-04-01 09:49:07 +08:00
jiahuiwen 9b92f1295b 配置表提交 2019-04-01 09:49:02 +08:00
wangyuan 8e4cd3c83d add data 2019-03-29 19:12:22 +08:00
wangyuan d0e785b44a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-29 19:11:08 +08:00
wangyuan c922681143 fix get map event id 2019-03-29 19:10:51 +08:00
jiahuiwen b76f4bd76a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-29 18:52:30 +08:00
jiahuiwen 7b54dcc2c0 任务事件点更新 2019-03-29 18:52:08 +08:00
wangyuan 74d7139b5e 更新事件点 2019-03-29 18:06:25 +08:00
wangyuan 4228fcd592 探索任务类型 2019-03-29 15:54:32 +08:00
wangyuan 45ccd2f782 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-29 15:48:11 +08:00
wangyuan 12e75f690e fix 2019-03-29 15:47:49 +08:00
jiahuiwen e7a7c2b686 开地图 GM 2019-03-29 15:37:08 +08:00
jiahuiwen a1cf44bbca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-29 15:05:56 +08:00
jiahuiwen b68757f7f7 地图bug,开图gm 2019-03-29 15:05:44 +08:00
wangyuan 271ffd9b3d 精力 2019-03-28 20:51:17 +08:00
jiahuiwen 6e413a7129 出地图 2019-03-28 19:56:53 +08:00
jiahuiwen ec510c3e8c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-28 18:49:04 +08:00
jiahuiwen 993def6d33 边缘触发和覆盖触发 2019-03-28 18:48:59 +08:00
wangyuan fc15794db3 精力 2019-03-28 18:32:08 +08:00
jiahuiwen d40956b247 地图提交 2019-03-28 18:20:18 +08:00