From c1e1eecb538d996340b64f0c09c04499053c27a3 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 21 Dec 2023 18:40:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fightmanager/src/main/java/com/ljsd/fight/FightType.java | 6 +++--- .../handler/Expedition/StartExpeditionBattleRequest.java | 7 ++++--- .../situationHandler/SituationChallengeHandler.java | 1 + .../eventhandler/MainLineOrInnerDemonFightHandler.java | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fightmanager/src/main/java/com/ljsd/fight/FightType.java b/fightmanager/src/main/java/com/ljsd/fight/FightType.java index a2292d28f..d60e0b8e4 100644 --- a/fightmanager/src/main/java/com/ljsd/fight/FightType.java +++ b/fightmanager/src/main/java/com/ljsd/fight/FightType.java @@ -2,19 +2,19 @@ package com.ljsd.fight; public enum FightType { CrossLuofuFight(0),//跨服罗浮争锋 - StoryFight(1), //故事副本 + StoryFight(1), //故事副本(主线) MapExploreFight(2), // 地图探索 ArenaFight(3), //竞技场 InvasionBossFight(4),//秘境boss AdventureLock(5), // 解锁秘境 GuildFight(6), // 公会站 BloodyFight(7), // 血战 - MonterFight(8), // 兽潮 + MonterFight(8), // 兽潮(心魔试炼) TOPFight(9), // 巅峰赛 GuildBossFight(10), // 工会boss CarBossFight(11), // 车迟斗法挑战boss CarPersonFight(12), // 车迟斗法抢夺 - EXPEDITION(13), // 远征 + EXPEDITION(13), // 远征(大闹天宫) GuildChallenge(14), //公会副本 NewGeneral(15),//新将 TenDespairArray(16),//十绝阵 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java index eee172fbd..d6712c94a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java @@ -62,7 +62,7 @@ public class StartExpeditionBattleRequest extends BaseHandler teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); - if (teamPosHeroInfos == null || teamPosHeroInfos.size() == 0) { + if (teamPosHeroInfos == null || teamPosHeroInfos.isEmpty()) { throw new ErrorCodeException(ErrorCode.newDefineCode("阵容有误!!")); } @@ -108,13 +108,14 @@ public class StartExpeditionBattleRequest extends BaseHandler