Commit Graph

520 Commits (51da0e539f2a6c139021daa7cc34b1e7cd5ea339)
 

Author SHA1 Message Date
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
jiahuiwen a500703394 地图修改 2019-03-28 17:23:19 +08:00
jiahuiwen 992ed00675 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-28 15:10:59 +08:00
jiahuiwen f5cf36911f 地图修改 2019-03-28 15:08:43 +08:00
mashiyu 76d045cc3d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-28 15:00:01 +08:00
mashiyu 9633f449c6 错误码 2019-03-28 14:59:48 +08:00
wangyuan a549c34d0e 道具背包增量返回给前端 2019-03-28 14:43:48 +08:00
jiahuiwen 3f0f5d4cf6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-28 13:41:27 +08:00
jiahuiwen a6bfd95324 地图修改 2019-03-28 13:41:21 +08:00
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