From e0c18ffa8ebafac9ece9e14cc4fc4aea6de55e39 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 29 Nov 2022 16:32:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=A2=9D=E5=A4=96=E8=8E=B7?= =?UTF-8?q?=E5=BE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/hero/FaBaoSoulUpLvRequestHandler.java | 2 +- .../store/newRechargeInfo/bean/AbstractWelfareBag.java | 10 ++++++++-- .../main/java/config/SRechargeCommodityNewConfig.java | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java index 209ca603b..6f826b818 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hero/FaBaoSoulUpLvRequestHandler.java @@ -35,7 +35,7 @@ public class FaBaoSoulUpLvRequestHandler extends BaseHandler trumpConfig.getLvMax()) { + if (faBaoLv > trumpConfig.getLvMax()) { LOGGER.error("法宝之魂强化等级已达上限"); throw new ErrorCodeException(ErrorCode.HANDLE_FAILED); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java index 3ea057377..d4a7a2c1a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java @@ -104,8 +104,14 @@ public class AbstractWelfareBag extends MongoBase{ if (config.getBaseReward() != null && config.getBaseReward().length > 0){ list.add(config.getBaseReward()); } - if(buyTimes == 1 && config.getFirstMultiple() != null && config.getFirstMultiple().length > 0){ - list.add(config.getFirstMultiple()); + int[][] firstMultiple = config.getFirstMultiple(); + if(buyTimes == 1 && firstMultiple != null && firstMultiple.length > 0){ + list.add(firstMultiple); + }else { + int[][] continuedMultiple = config.getContinuedMultiple(); + if (continuedMultiple != null){ + list.add(continuedMultiple); + } } return list; } diff --git a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java index ea63bf257..7d49f7520 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java @@ -23,6 +23,8 @@ public class SRechargeCommodityNewConfig implements BaseConfig { private int[][] firstMultiple; + private int[][] continuedMultiple; + private int[][] baseReward; private int[] openPrivilege; @@ -118,6 +120,10 @@ public class SRechargeCommodityNewConfig implements BaseConfig { public int[][] getFirstMultiple() { return firstMultiple; } + public int[][] getContinuedMultiple() { + return continuedMultiple; + } + public int[][] getBaseReward() { return baseReward; } public int[] getOpenPrivilege() { return openPrivilege; }