From 908fdb1d5b7e61d484e8a1ea010427c2e5871458 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 15 Jun 2020 16:11:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=8E=E5=A6=96=E4=B9=8B=E8=B7=AF=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8Cboss=E8=8A=82=E7=82=B9=E5=9C=A3=E7=89=A9?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/Expedition/EndExpeditionBattleRequest.java | 4 ++-- .../handler/Expedition/GetExpeditionRequestHandler.java | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index 185beb7c0..2dc0c3c84 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -123,8 +123,8 @@ public class EndExpeditionBattleRequest extends BaseHandler2&&nodeInfo.getType() == ExpeditionLogic.NODETYPE_BOSS)) { + //贪婪节点只有1次战斗机会,若战斗失败后敌人将会逃走,玩家视为通过此节点 //updata node Set nodeInfos = ExpeditionLogic.openLay(user,nodeInfo.getLay(),nodeId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/GetExpeditionRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/GetExpeditionRequestHandler.java index db18972e0..8cabdb14c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/GetExpeditionRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/GetExpeditionRequestHandler.java @@ -5,6 +5,7 @@ import com.ljsd.jieling.core.HandlerLogicThread; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.handler.BaseHandler; +import com.ljsd.jieling.logic.GlobalDataManaager; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.expedition.ExpeditionLogic; @@ -18,6 +19,7 @@ import com.ljsd.jieling.util.MessageUtil; import config.SExpeditionSetting; import config.SGlobalSystemConfig; import manager.STableManager; +import util.TimeUtils; import java.util.ArrayList; import java.util.List; @@ -83,6 +85,13 @@ public class GetExpeditionRequestHandler extends BaseHandler