From 8916a7654334d75f242443f939a93345e581bea1 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 15 Dec 2020 14:44:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 99430e5e6..9ad035b30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -697,7 +697,7 @@ public class ItemLogic { int especialEquipId = scHero.getEquipTalismana()[1]; SEquipTalismana sEquipTalismana = SEquipTalismana.equipTalismanaStarMap.get(especialEquipId).get(hero.getEspecialEquipLevel()); - if (sEquipTalismana == null || sEquipTalismana.getRankupBasicMaterial() == null) { + if (sEquipTalismana == null || sEquipTalismana.getRankupBasicMaterial() == null|| sEquipTalismana.getRankupBasicMaterial().length==0) { throw new ErrorCodeException(ErrorCode.newDefineCode("法宝已最大等级")); } boolean b = ItemUtil.itemCost(user, sEquipTalismana.getRankupBasicMaterial(), BIReason.ESPECIAL_EQUIP_UP_LEVEL_CONSUME, 1); From 5fce8f9920adbce00a614c973433ac2b4416d023 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 15 Dec 2020 15:02:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A5=9E=E6=A0=91=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tablemanager/src/main/java/config/SJewelConfig.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tablemanager/src/main/java/config/SJewelConfig.java b/tablemanager/src/main/java/config/SJewelConfig.java index b58c9d2ca..482317c4d 100644 --- a/tablemanager/src/main/java/config/SJewelConfig.java +++ b/tablemanager/src/main/java/config/SJewelConfig.java @@ -24,8 +24,11 @@ public class SJewelConfig implements BaseConfig { private int[][] rankupResources; - - @Override + private int godHoodPool; + + private int godHoodMaxlv; + + @Override public void init() throws Exception { } @@ -67,5 +70,11 @@ public class SJewelConfig implements BaseConfig { return rankupResources; } + public int getGodHoodPool() { + return godHoodPool; + } + public int getGodHoodMaxlv() { + return godHoodMaxlv; + } } \ No newline at end of file