From 9610d134d3f379361a55b6a67188c61e566d7080 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 17 Nov 2022 16:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=A4=BC=E5=8C=85=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E6=8E=89=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 9 +++++++++ .../main/java/config/SRechargeCommodityNewConfig.java | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index ded761d12..c4a1760b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -250,9 +250,18 @@ public class BuyGoodsNewLogic { } List list = bag.getDropByBag(); int[][] gainFame = config.getGainFame(); + // 购买礼包额外补助 if (gainFame != null && gainFame.length > 0){ list.add(gainFame); } + // gm购买礼包不参与补助 + if (!orderId.equals(gm_modifier)){ + int[][] gainCrystal = config.getGainCrystal(); + if (gainCrystal != null && gainCrystal.length > 0){ + list.add(gainCrystal); + } + } + //发货 sendGoodsByType(user,config,list); diff --git a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java index 674ccff2b..daed43056 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java @@ -69,8 +69,8 @@ public class SRechargeCommodityNewConfig implements BaseConfig { private int isRecommond; private int[][] extraReward; - private int[][] gainFame; + private int[][] gainCrystal; public static Map configMap; public static Map sdkconfigMap; @@ -230,4 +230,8 @@ public class SRechargeCommodityNewConfig implements BaseConfig { public int[][] getGainFame() { return gainFame; } + + public int[][] getGainCrystal() { + return gainCrystal; + } }