From e4e241192a057ef74aeff87cbb56fb7039550699 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Wed, 3 Mar 2021 14:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=81=B5=E5=85=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E4=BB=A3=E7=A0=81=E5=86=97=E4=BD=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ljsd/jieling/util/MonsterUtil.java    | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java
index 45ec0f532..c265046f8 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java
@@ -171,29 +171,21 @@ public class MonsterUtil {
         return (int)(maxForce*(0.8+groupIds.length*0.2));
     }
 
+    /**
+     * 根据怪物组id获取对应的灵兽信息
+     * @param groupId
+     * @return
+     */
     public static List<CommonProto.FightUnitInfo> getMonsterPokemonByGroup(int groupId) {
         int[][] animal = SMonsterGroup.getsMonsterGroupMap().get(groupId).getAnimal();
-        if (animal==null||animal.length<1||animal[0].length<1){
-            return null;
-        }
-        List<CommonProto.FightUnitInfo> pokemonInfo = new ArrayList<>();
-        for(int i = 0 ; i <animal.length;i++){
-            CommonProto.FightUnitInfo.Builder info = CommonProto.FightUnitInfo.newBuilder();
-            info.setUnitId(String.valueOf(animal[i][0]));
-            info.setStar(animal[i][1]);
-            info.setPosition(i+1);
-            SSpiritAnimalSkill sSpiritAnimalSkill = SSpiritAnimalSkill.skillByAnimalAndStar.get(animal[i][0]).get(animal[i][1]);
-            info.setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId()));
-
-            Map<Integer, Integer> map = HeroLogic.getInstance().calOnePokemonAttribute(animal[i][0], animal[i][1], animal[i][2]);
-
-            info.setProperty(HeroLogic.getInstance().getOnePokemonProperty(map,animal[i][2]).toString());
-
-            pokemonInfo.add(info.build());
-        }
-        return pokemonInfo;
+        return getMonsterPokemon(animal);
     }
 
+    /**
+     * 根据灵兽的二维数组获取灵兽信息
+     * @param animal
+     * @return
+     */
     public static List<CommonProto.FightUnitInfo> getMonsterPokemon(int[][] animal) {
         List<CommonProto.FightUnitInfo> pokemonInfo = new ArrayList<>();
         if (animal==null||animal.length<1||animal[0].length<1){