From af7e96dfa324add77815abb84c6e2450beee93ed Mon Sep 17 00:00:00 2001 From: gaojie Date: Fri, 25 Jan 2019 10:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/globals/GlobalItemType.java | 9 +++++---- .../java/com/ljsd/jieling/util/ItemUtil.java | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 6 deletions(-) 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 a8655d6f5..66dd7345a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -7,9 +7,10 @@ public interface GlobalItemType { int SUCCESSIVELY_RANDOM = 2; // 依次随机 // 物品类型 - int GEM = 3; // 钻石Id(充值获得) - int ITEM = 10; //道具 - int CARD = 11; // 卡牌 - int EQUIP = 12; //装备 + int GEM = 3; // 钻石Id(充值获得) + int ITEM = 0; //道具 + int CARD = 1; // 卡牌 + int CARD_FRAGMENT = 2; // 卡牌碎片 + int EQUIP = 3; //装备 } 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 5d3c7c066..2c1c1c022 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -139,7 +139,8 @@ public class ItemUtil { private static void getMap(int itemId ,int itemNum, Map itemMap, Map cardMap,Map equipMap,float dropRatio) { SItem sItem = SItem.getsItemMap().get(itemId); - switch (sItem.getItemType()) { + int itemType =getItemType(sItem.getItemType()); + switch (itemType) { case GlobalItemType.ITEM: putcountMap(itemId,MathUtils.numRount((itemNum * dropRatio)) , itemMap); break; @@ -154,6 +155,17 @@ public class ItemUtil { } } + private static int getItemType(int itemType) { + switch (itemType) { + case GlobalItemType.CARD_FRAGMENT: + itemType = GlobalItemType.ITEM; + break; + default: + break; + } + return itemType; + } + private static void putcountMap(int itemId,int itemNum, Map map) { map.merge(itemId, itemNum, (a, b) -> b + a); } @@ -330,7 +342,8 @@ public class ItemUtil { int itemId = costItem[0]; int itemNum = costItem[1]; SItem sItem = SItem.getsItemMap().get(itemId); - switch (sItem.getItemType()) { + int itemType = getItemType(sItem.getItemType()); + switch (itemType) { case GlobalItemType.GEM: putcountMap(itemId,itemNum,moneyMap); break;