Commit Graph

485 Commits (225ebb443ae5a3bfd46475024734d7ba8d6158d6)

Author SHA1 Message Date
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 a6bfd95324 地图修改 2019-03-28 13:41:21 +08:00
jiahuiwen 06f5ad260a 支持最大最小值相等 2019-03-28 10:46:45 +08:00
jiahuiwen 096a5e4509 增加判断 2019-03-27 21:18:05 +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
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
mashiyu 5b5bf07eec 战斗血量bug 2019-03-27 15:47:27 +08:00
jiahuiwen d6cd2edb89 属性判断 2019-03-27 11:36:12 +08:00
jiahuiwen b0ada06c36 回城给道具 2019-03-27 10:17:49 +08:00
jiahuiwen d9c34ba5cd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-26 20:45:31 +08:00
jiahuiwen d272ad0ea1 临时背包bug 2019-03-26 20:45:25 +08:00
wangyuan e8893ce66b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-26 20:21:19 +08:00
wangyuan 38a9d7e339 fix 2019-03-26 20:20:00 +08:00
jiahuiwen ea458568c5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-26 19:28:16 +08:00
jiahuiwen 38dee193ec 添加道具bug 2019-03-26 19:28:10 +08:00
mashiyu 947cf95b1b 优化 2019-03-26 19:25:26 +08:00
mashiyu 5fa8c7f88b 存一个response 2019-03-26 18:04:01 +08:00
jiahuiwen fee1e82d74 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-26 17:35:15 +08:00
jiahuiwen e53a8fe6cd 任务没有就不推 2019-03-26 17:35:00 +08:00
wangyuan 85b423d36a fix null 2019-03-26 17:05:36 +08:00
mashiyu a874e8623d bug 2019-03-26 17:03:23 +08:00
jiahuiwen ffeb61578f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-26 16:42:27 +08:00
jiahuiwen fc39cefe82 pointId 2019-03-26 16:42:14 +08:00
wangyuan 41e7d9ce30 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-26 15:55:58 +08:00
wangyuan dd93f6f8a9 fix 2019-03-26 15:55:47 +08:00
jiahuiwen 5794900e80 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-26 15:39:00 +08:00
jiahuiwen 1ff4143220 战斗地图点先不销毁 2019-03-26 15:37:53 +08:00
wangyuan a086df2e8a fix 2019-03-26 14:15:32 +08:00
jiahuiwen 30c154d407 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-26 14:03:14 +08:00
wangyuan 9791ae66fd 解决出地图探索度为空 2019-03-26 14:02:19 +08:00
jiahuiwen 7cae5ca7ca 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-26 13:58:48 +08:00
jiahuiwen 8918c88a1b 保存事件进度 2019-03-26 13:56:52 +08:00
wangyuan e9b57014bf fix 2019-03-26 11:46:00 +08:00
wangyuan 0bd0d709ea Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
2019-03-26 11:21:47 +08:00
wangyuan fb403ea174 地图探索度 2019-03-26 11:18:43 +08:00
jiahuiwen 36206f288c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-25 17:51:02 +08:00
jiahuiwen 96379e36f5 增加行为类型24 2019-03-25 17:50:58 +08:00
mashiyu 96312e7a21 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-25 11:46:20 +08:00
mashiyu a628ea0507 失败处理 2019-03-25 11:46:09 +08:00
jiahuiwen bb6c70c8f5 注释log 2019-03-25 11:31:16 +08:00
jiahuiwen 1f37783914 注释log 2019-03-25 11:30:26 +08:00
mashiyu 0f9e39fd77 bug 2019-03-25 11:28:10 +08:00
gaojie 32089c7f76 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	serverlogic/src/main/java/com/ljsd/jieling/config/SSkillLogicConfig.java
2019-03-25 11:24:49 +08:00
gaojie b348f81919 初始化技能数据 2019-03-25 11:20:25 +08:00
mashiyu cc9b412f63 bug 2019-03-25 10:58:38 +08:00
mashiyu 0805e3c16e 种子随机 2019-03-23 18:17:38 +08:00
mashiyu c7c43110e6 bug 2019-03-23 18:14:38 +08:00
jiahuiwen 81a603e0dc Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
2019-03-23 17:15:30 +08:00
jiahuiwen 8d9b8e1ff8 地图修改 2019-03-23 17:14:18 +08:00
mashiyu 347ec0a577 数据bug 2019-03-23 17:06:14 +08:00
mashiyu bb3fd97b0d log 2019-03-22 19:06:00 +08:00
mashiyu ce3a58641a 错误码 2019-03-22 18:57:17 +08:00
mashiyu 7a779b3ee3 战斗验证 2019-03-22 18:36:24 +08:00
wangyuan 2b06b9ace0 fix 驻扎时间 2019-03-22 17:43:20 +08:00
wangyuan 65f2bd5692 修改推荐妖灵师奖励 2019-03-22 16:16:12 +08:00
mashiyu 1793ddffd9 test 2019-03-22 15:00:06 +08:00
jiahuiwen a165c759de Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-22 14:28:29 +08:00
jiahuiwen 1dca447d0c 空掉落 2019-03-22 14:28:13 +08:00
mashiyu 2e0244059c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-22 11:00:23 +08:00
mashiyu e227cefbad 提交 2019-03-22 11:00:12 +08:00
jiahuiwen d035de5a9e Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	conf/server/OptionConfig.txt
2019-03-22 10:11:49 +08:00
jiahuiwen ec1f65e8e1 地图修改 2019-03-22 10:10:49 +08:00
wangyuan 322c7a3e68 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-03-22 10:03:58 +08:00
wangyuan 705e2d5b7b 冒险推荐英雄 2019-03-22 10:02:46 +08:00
mashiyu 60f1dd0aff 优化 2019-03-21 17:48:37 +08:00
mashiyu 2c098f4db0 更新 2019-03-21 17:24:21 +08:00
jiahuiwen 6ed02aa302 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-21 15:30:05 +08:00
jiahuiwen cce1214a65 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-03-21 15:29:25 +08:00
mashiyu ad4178af44 路径 2019-03-21 15:29:22 +08:00
jiahuiwen f6f1cac98e 事件点触发方式 2019-03-21 15:28:21 +08:00
mashiyu 0dd082a3b2 log 2019-03-21 15:24:31 +08:00
mashiyu a37e7310f6 优化 2019-03-21 15:01:27 +08:00
mashiyu e56acaea56 战斗验证 2019-03-21 14:33:56 +08:00