diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java index 0a1094d28..da79ef302 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaInfoRequestHandler.java @@ -52,6 +52,9 @@ public class GetWorldArenaInfoRequestHandler extends BaseHandler setting.getRestTime()[0] && diff < setting.getRestTime()[1]) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 1b55d95ce..35fb0e766 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -98,7 +98,7 @@ public class GlobalDataManaager implements IManager { public TimeControllerOfFunction getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum functionIdEnum){ Map sGlobalSystemConfigMap = STableManager.getConfig(SGlobalSystemConfig.class); for(Map.Entry item : openTimeOfFuntionCache.entrySet()){ - SGlobalSystemConfig sGlobalSystemConfig = sGlobalSystemConfigMap.get(item.getKey()); + SGlobalSystemConfig sGlobalSystemConfig = sGlobalSystemConfigMap.get(item.getKey()); if(sGlobalSystemConfig.getIsIDdSame() == functionIdEnum.getFunctionType()){ return item.getValue(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java index 1e073c92c..190c12869 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java @@ -716,12 +716,13 @@ public class EquipLogic { int nowLv = baubles.getLevel(); int tgLv = nowLv + upLv; - Map talismanaMap = SEquipTalismana.equipTalismanaStarMap.get(baubles.getEquipId()); - SEquipTalismana equipTalismana = talismanaMap.get(tgLv); - if (equipTalismana == null){ + + int limit = SSpecialConfig.getIntegerValue("EquipTalismanaUpperLimit"); + if (tgLv > limit){ throw new ErrorCodeException(ErrorCode.LEVE_MAX, "法宝已到达最大等级:"+tgLv); } + Map talismanaMap = SEquipTalismana.equipTalismanaStarMap.get(baubles.getEquipId()); HashMap costItemMap = new HashMap<>(); int count = 0; for (int i = 0; i < upLv; i++) {