From 667c1a18451759350e1f7e5d768e7d35961ca6ad Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 2 Nov 2021 10:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E9=AD=82=E7=BB=91=E5=AE=9A=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 566f370b6..c2c1d5b26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -5808,8 +5808,16 @@ public class HeroLogic { }else { SCHero heroConfig=SCHero.getsCHero().get(hero.getTemplateId()); SCHero bindHeroConfig=SCHero.getsCHero().get(bindHero.getTemplateId()); - if (heroConfig.getPropertyName()!=bindHeroConfig.getPropertyName()){//需要同系神将 - return false; + if (heroRankupGroup.getIsSameClan()>0){//需要同系神将 + if (heroConfig.getPropertyName()!=bindHeroConfig.getPropertyName()){ + return false; + } + } + + if (heroRankupGroup.getIsSameJob()>0) {//需要同职业 + if (heroConfig.getProfession()!=bindHeroConfig.getProfession()){ + return false; + } } } }