From 46a12c155c0f749450ddbc833f08509333a8e3dd Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 21 Dec 2019 10:19:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 11 +++++++++-- .../src/main/java/config/SLotterySetting.java | 4 ++-- 2 files changed, 11 insertions(+), 4 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 cedf23e45..534682da9 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 @@ -220,8 +220,15 @@ public class HeroLogic{ allowFree = user.getPlayerInfoManager().check(VipPrivilegeType.FREE_HERO_RANDOM, 1); } if(!allowFree){ - int [][] costItems = new int[][]{sLotterySetting.getCostItem()}; - boolean enoughCost = ItemUtil.itemCost(user, costItems,BIReason.RANDOM_HERO_CONSUME,type); + + boolean enoughCost = false; + for (int[] cost:sLotterySetting.getCostItem()){ + int [][] costItems = new int[][]{cost}; + enoughCost = ItemUtil.itemCost(user, costItems,BIReason.RANDOM_HERO_CONSUME,type); + if(enoughCost){ + break; + } + } if(!enoughCost){ throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } diff --git a/tablemanager/src/main/java/config/SLotterySetting.java b/tablemanager/src/main/java/config/SLotterySetting.java index 7a402e50d..c19dbf9c6 100644 --- a/tablemanager/src/main/java/config/SLotterySetting.java +++ b/tablemanager/src/main/java/config/SLotterySetting.java @@ -25,7 +25,7 @@ public class SLotterySetting implements BaseConfig { private int[][] tenTimesMustGetItem; - private int[] costItem; + private int[][] costItem; private int perCount; @@ -88,7 +88,7 @@ public class SLotterySetting implements BaseConfig { return perCount; } - public int[] getCostItem() { + public int[][] getCostItem() { return costItem; }