From 1fa16cadd04b0e946e4c36a3ab378da0262561e5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" Date: Thu, 24 Sep 2020 21:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=8E=E5=A6=96=E4=B9=8B=E8=B7=AF=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/expedition/ExpeditionLogic.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 2bb65771f..0fe2ec0b3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -905,19 +905,21 @@ public class ExpeditionLogic { } int i1 = ranndomFromWeight(cfg); SExpeditionRecruitConfig sExpeditionRecruitConfig = STableManager.getConfig(SExpeditionRecruitConfig.class).get(i1); - SCHero hero1 = SCHero.getsCHero().get(sExpeditionRecruitConfig.getHeroId()); - i++; - if(hero1==null){ - LOGGER.error("英雄配置不存在"+i1); - continue; - } - int propertyName = hero1.getPropertyName(); - if(tempType.contains(propertyName)){ - continue; - } + if(type == 1){ + SCHero hero1 = SCHero.getsCHero().get(sExpeditionRecruitConfig.getHeroId()); + i++; + if(hero1==null){ + LOGGER.error("英雄配置不存在"+i1); + continue; + } + int propertyName = hero1.getPropertyName(); + if(tempType.contains(propertyName)){ + continue; + } + tempType.add(propertyName); + } tempid.add(i1); - tempType.add(propertyName); i++; }