diff --git a/conf/server/GameSetting.txt b/conf/server/GameSetting.txt index 03ef0686e..73dd656cd 100644 --- a/conf/server/GameSetting.txt +++ b/conf/server/GameSetting.txt @@ -1,3 +1,3 @@ -Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh NatureName ItemNumlimit -int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int string int -1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 60 数值策划专场 999999 +Id BornItem SpeedFormula InitialEnergy EnergyRecoverSpeed ActionPowerRormula Speed HeroNumlimit EquipNumlimit WorldTalking BornPosition AdventureRefresh NatureName +int mut,int#int,2 mut,float#float,1 int mut,int#int,1 mut,int#int,1 mut,int#int,1 int int int mut,int#int,1 int string +1 10046#1|2#80 0#0#0.3164#0 80 1#6 0#0#1#0 70#100 999 9999 1 08#19 60 数值策划专场 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 64db6f771..75891f776 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -263,16 +263,13 @@ public class ItemUtil { item = itemManager.newItem(entry.getKey(), itemNum); } else { if (item.getItemNum() + entry.getValue() >= sItem.getItemNumlimit()){ - itemNum = sItem.getItemNumlimit() - entry.getValue(); + itemNum = 0; item.setItemNum(sItem.getItemNumlimit()); }else{ itemNum = item.getItemNum() + entry.getValue(); item.setItemNum(itemNum); } } - if (itemNum < 0 ){ - itemNum = 0; - } itemProtoList.add(CBean2Proto.getItem(item,itemNum)); } if (dropBuilder != null) {