diff --git a/conf/server/LotterySetting.txt b/conf/server/LotterySetting.txt index 60cbe0c8b..f2135d487 100644 --- a/conf/server/LotterySetting.txt +++ b/conf/server/LotterySetting.txt @@ -1,6 +1,6 @@ -Id OrderBoxOpenTime OrderBoxContinue OrderBoxInterval OrderBoxPool DiamondBoxInterval Cost GetHerosInterval DiamondBoxContain TenTimesMustGetItem PerCount +Id OrderBoxOpenTime OrderBoxContinue OrderBoxInterval OrderBoxPool DiamondBoxInterval CostItem GetHerosInterval DiamondBoxContain TenTimesMustGetItem PerCount int int int int mut,int#int,1 int mut,int#int,1 int mut,int#int,2 mut,int#int,2 int -1 56 48 120 11#12#13#14 0 3#10 0 null null 10 -2 56 48 120 11#12#13#14 0 3#1 0 null null 1 -11 0 0 0 null 0 220 150 1#100 3#1 10 -12 0 0 0 null 2160 2200 0 1#100 null 1 +1 56 48 120 11#12#13#14 0 20#10 0 null null 10 +2 56 48 120 11#12#13#14 0 20#1 0 null null 1 +11 0 0 0 null 0 19#10 150 1#100 3#1 10 +12 0 0 0 null 2160 19#1 0 1#100 null 1 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java index 4413df164..bc61139a9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SLotterySetting.java @@ -28,6 +28,8 @@ public class SLotterySetting implements BaseConfig { private int[][] tenTimesMustGetItem; + private int[] costItem; + private int perCount; private static Map sLotterySettingByType; @@ -89,5 +91,7 @@ public class SLotterySetting implements BaseConfig { return perCount; } - + public int[] getCostItem() { + return costItem; + } } \ No newline at end of file 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 5f84ec52e..6b308c541 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 @@ -28,10 +28,11 @@ public class HeroLogic { } + public void random(ISession session,int type) throws Exception { int uid = session.getUid(); + User user = UserManager.getUser(uid); SLotterySetting sLotterySetting = SLotterySetting.getsLotterySettingMap().get(type); - //检验消耗 //筛选卡池 StringBuilder reward = new StringBuilder(); @@ -40,8 +41,21 @@ public class HeroLogic { boolean isSpecial = false; if(sLotterySetting.getOrderBoxPool()!=null && sLotterySetting.getOrderBoxPool().length>0){ pooId = getOrderBoxPoolId(sLotterySetting); + if(pooId == 0){ + MessageUtil.sendErrorResponse(session, 0, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE,""); + return; + } isSpecial = true; } + + //检验消耗 + int [][] costItems = new int[][]{sLotterySetting.getCostItem()}; + boolean enoughCost = ItemUtil.itemCost(user, costItems); + if(!enoughCost){ + MessageUtil.sendErrorResponse(session, 0, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE,"道具不足"); + return; + } + for(int i=0;i