From 195535617efc8c6331376224ed6b9efc5f659e8e Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 16 Jul 2019 18:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=BA=97=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/config/SChallengeStarBox.java | 6 ++++++ .../config/SRechargeCommodityConfig.java | 17 +++++++++++++++-- .../com/ljsd/jieling/config/SStoreConfig.java | 4 ++-- .../com/ljsd/jieling/config/STrialConfig.java | 6 ++++++ .../com/ljsd/jieling/config/STrialSetting.java | 6 ++++++ .../ljsd/jieling/logic/store/StoreLogic.java | 15 ++++++++------- .../com/ljsd/jieling/logic/store/StoreType.java | 6 +++++- 7 files changed, 48 insertions(+), 12 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeStarBox.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeStarBox.java index ed52a5108..b33733fa5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeStarBox.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SChallengeStarBox.java @@ -21,6 +21,8 @@ public class SChallengeStarBox implements BaseConfig{ private int[][] reward; + private int[][] extraReward; + public int getId() { return id; } @@ -32,4 +34,8 @@ public class SChallengeStarBox implements BaseConfig{ public int[][] getReward() { return reward; } + + public int[][] getExtraReward() { + return extraReward; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java index ee5be9447..53930e3da 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java @@ -19,7 +19,7 @@ public class SRechargeCommodityConfig implements BaseConfig { private int[][] baseReward; - private int[][] extraReward; + private int[][][] extraReward; private int limit; @@ -32,6 +32,11 @@ public class SRechargeCommodityConfig implements BaseConfig { private int order; private int accumulativeRecharge; + + private int[][] playerLevel; + + private int[] openPrivilege; + public static Map rechargeCommodityConfigMap; public static Map rechargeLevelMap; @@ -73,7 +78,7 @@ public class SRechargeCommodityConfig implements BaseConfig { return baseReward; } - public int[][] getExtraReward() { + public int[][][] getExtraReward() { return extraReward; } @@ -100,4 +105,12 @@ public class SRechargeCommodityConfig implements BaseConfig { public int getAccumulativeRecharge() { return accumulativeRecharge; } + + public int[][] getPlayerLevel() { + return playerLevel; + } + + public int[] getOpenPrivilege() { + return openPrivilege; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SStoreConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SStoreConfig.java index 92c535572..15b90ef8f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SStoreConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SStoreConfig.java @@ -24,7 +24,7 @@ public class SStoreConfig implements BaseConfig { private int[] openLv; - private int[] goods; + private int[][] goods; private int weight; @@ -83,7 +83,7 @@ public class SStoreConfig implements BaseConfig { return openLv; } - public int[] getGoods() { + public int[][] getGoods() { return goods; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/STrialConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/STrialConfig.java index 91bfeff01..c1a004e26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/STrialConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/STrialConfig.java @@ -72,6 +72,8 @@ public class STrialConfig implements BaseConfig { */ private static int highestTower; + private int[][] floorReward; + public int getId() { return id; } @@ -117,4 +119,8 @@ public class STrialConfig implements BaseConfig { public static int getHighestTower() { return highestTower; } + + public int[][] getFloorReward() { + return floorReward; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/STrialSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/STrialSetting.java index 5751c6f49..5c4a96f61 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/STrialSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/STrialSetting.java @@ -34,6 +34,8 @@ public class STrialSetting implements BaseConfig{ private int limitTime; + private int[] privilegeReward; + public int getId() { return id; @@ -54,4 +56,8 @@ public class STrialSetting implements BaseConfig{ public int getLimitTime() { return limitTime; } + + public int[] getPrivilegeReward() { + return privilegeReward; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java index cf72e942e..fc34e441b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java @@ -218,11 +218,12 @@ public class StoreLogic { MessageUtil.sendErrorResponse(iSession,0,msgId,err); return; } - int goodsId = sStoreConfig.getGoods()[0]; - int goodsNum = sStoreConfig.getGoods()[1]*itemNum; - String reward = goodsId +"#"+goodsNum; - CommonProto.Drop.Builder drop = ItemUtil.drop(user, StringUtil.parseFiledInt2(reward), BIReason.STORE_BUY_ITEM); - user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,goodsId,itemNum); + + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sStoreConfig.getGoods(), BIReason.STORE_BUY_ITEM); + if(SStoreTypeConfig.getsStoreTypeConfigMap().get(storeId).getStoreType() != StoreType.GIFT_STORE.getType()){ + user.getUserMissionManager().onGameEvent(user, GameEvent.BUY_MATERIAL,sStoreConfig.getGoods()[0][0],itemNum); + } + PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(iSession, 1,msgId, builder, true); } @@ -248,7 +249,7 @@ public class StoreLogic { boolean check =true; if(relatedtoVIP == 1){ if(limit == 6){ - int goodsNum = sStoreConfig.getGoods()[1]*itemNum; + int goodsNum = sStoreConfig.getGoods()[0][1]*itemNum; check = playerInfoManager.check(limit, goodsNum); }else{ check = playerInfoManager.check(limit, itemNum); @@ -268,7 +269,7 @@ public class StoreLogic { if(relatedtoVIP == 1 && limit!=0){ int updateValue = itemNum; if(limit == 6){ - updateValue= sStoreConfig.getGoods()[1]*itemNum; + updateValue= sStoreConfig.getGoods()[0][1]*itemNum; } playerInfoManager.updateVipPrivilage(limit,updateValue); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreType.java index cf1c18ce0..ef42a2550 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreType.java @@ -8,7 +8,11 @@ public enum StoreType { SOUL_CRYSTAL_STORE(5), SECRET_STORE(6), FUNCTION_STORE(7), - TRIAL_STORE(8) + TRIAL_STORE(8), + GIFT_STORE(9), + + + ; private int type;