From 2050067fb113fbaf8b7ee6b2dfdd2db91c419fa8 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Tue, 14 Sep 2021 20:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BF=AE=E6=94=B9=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 901ab76a3aad4862318a8c76378ea138d21a9095)
---
 .../handler/activity/TasuilingxiaoHandler.java      |  7 ++-----
 .../activity/fourChallenge/FourChallengeLogic.java  |  8 +++++---
 .../jieling/logic/sevenworld/SevenWorldLogic.java   | 13 +++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java
index 0cd7442f4..ff62fe19b 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/TasuilingxiaoHandler.java
@@ -90,14 +90,11 @@ public class TasuilingxiaoHandler extends BaseHandler<ActivityProto.Tasuilingxia
                 bossBlood+=monsterConfig.getHp();
             }
         }
-        // 战斗结果，{战斗结果,战斗时间，单位1剩余血量......}
-        long[] checkResult = fightResult.getCheckResult();
         //输
         double lessBlood;
-
-        if(checkResult[0]==-1){
+        if(fightResult.getResult()==-1){
             throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
-        }else if (checkResult[0] == 1){
+        }else if (fightResult.getResult() == 1){
             lessBlood = bossBlood;
         }else {
             // 输 checkResult第三位开始为血量，下标0开始
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java
index 399b9377c..d3c8fce48 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/fourChallenge/FourChallengeLogic.java
@@ -212,12 +212,14 @@ public class FourChallengeLogic {
             // 战斗逻辑
             PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), teamId, 20, "", GameFightType.FourChallenge, sCampTowerConfig.getMonster(), 3);
             FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
-            long[] checkResult = fightResult.getCheckResult();
             response.setFightData(fightResult.getFightData());
 
             AbstractRank rank = RankContext.getRankEnum(RankEnum.FOUR_CHALLENGE_TIER_RANK.getType());
-
-            if (checkResult[0] == 1) {
+            // 战斗异常
+            if (fightResult.getResult() == -1) {
+                throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
+            }
+            if (fightResult.getResult() == 1) {
                 // 挑战成功，获得道具，更新层数，更新次数
                 drop = ItemUtil.drop(user, sCampTowerConfig.getFirstReward(), BIReason.FOUR_CHALLENGE_FIRST);
                 user.getPlayerInfoManager().updateFourChallengeByIndex(campId - 1, currentFloor + 1);
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java
index 251dcbde4..e8c9f4f26 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java
@@ -214,19 +214,20 @@ public class SevenWorldLogic {
 
         PlayerInfoProto.SevenWorldChallengeResponse.Builder builder = PlayerInfoProto.SevenWorldChallengeResponse.newBuilder();
         // 战斗逻辑
-        PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), TeamEnum.SEVEN_WORLD_TEAM.getTeamId(), 20, "", GameFightType.SEVENWORLD, stage.getMonsterGroup(), 3);
+        PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), TeamEnum.SEVEN_WORLD_TEAM.getTeamId(), 20, "", GameFightType.SevenWorld, stage.getMonsterGroup(), 3);
         FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
-        // 战斗返回结果
-        long[] checkResult = fightResult.getCheckResult();
-
+        // 战斗异常
+        if (fightResult.getResult() == -1) {
+            throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
+        }
         // 挑战成功，计算奖励
-        if (checkResult[0] == 1){
+        if (fightResult.getResult() == 1){
             int[][] reward = rewardBuff(user, fightResult, stage);
             CommonProto.Drop.Builder drop = ItemUtil.drop(user, reward, BIReason.SEVEN_WORLD_CHALLENGE);
             builder.setDrop(drop);
         }
         // 战斗数据
-        builder.setResult((int)checkResult[0]);
+        builder.setResult(fightResult.getResult());
         builder.setFightData(fightResult.getFightData());
 
         return builder.build();