From fc42f6c65588f7ceb0ee28e8869bf422c9217c30 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 9 Oct 2019 18:04:36 +0800 Subject: [PATCH] limit --- .../java/com/ljsd/jieling/config/SSpecialConfig.java | 1 + .../java/com/ljsd/jieling/globals/GlobalItemType.java | 2 +- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java index 4f5fa9678..94cec730d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java @@ -26,6 +26,7 @@ public class SSpecialConfig implements BaseConfig { public static final String ADVENTURE_RANKINGSHOWNUM = "Adventure_RankingShowNum";//外敌入侵排行榜上榜显示排名 public static final String COMBAT_RANKINGSHOWNUM = "Combat_RankingShowNum";//战力排行榜上榜显示排名 public static final String EQUIPSIGN_LIMIT = "EquipSign_limit";//仓库中的魂印上限 + public static final String EquipTalismana_limit = "EquipTalismana_limit";//仓库中的法宝上限 public static final String FRIENDAMOUNT_LIMIT = "FriendAmount_limit";//好友上限 public static final String FRIENDAPPLYAMOUNT_LIMIT = "FriendApplyAmount_limit";//好友申请上限 public static final String Friend_Gift = "Friend_Gift";//好友赠送友情点 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index fb8fd8ef6..9c4200d74 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -21,7 +21,7 @@ public interface GlobalItemType { int SecretBox=10; // 宝箱 int HEAD_FRAME = 11;//头像框 int CHANGE_NAME_CARD = 12;//改名道具卡 - int SOUL_MARK =13;// + int SOUL_MARK =13;// 魂印 int ESPECIAL_EQUIP = 14;//法宝 int EXP = 17;//经验 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 153513749..590514de8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1295,6 +1295,16 @@ public class ItemUtil { if (hasEquipNum >= gameSetting.getEquipNumlimit()){ return true; } + }else if(itemType == GlobalItemType.SOUL_MARK){ + int limit = SSpecialConfig.getIntegerValue(SSpecialConfig.EQUIPSIGN_LIMIT); + if (user.getEquipManager().getSoulEquipMap().size() >=limit){ + return false; + } + }else if(itemType == GlobalItemType.ESPECIAL_EQUIP){ + int limit = SSpecialConfig.getIntegerValue(SSpecialConfig.EquipTalismana_limit); + if (user.getEquipManager().getEspecialEquipMap().size() >=limit){ + return false; + } } } return false;