diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 7a878efb6..99e140c7f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1614,14 +1614,6 @@ public class MapLogic { public void endSuddlenlyFight(ISession session, String frames ,MessageTypeProto.MessageType messageType) throws Exception { int uid = session.getUid(); User user = UserManager.getUser(uid); - String fightKey = RedisKey.getKey(RedisKey.SUDDLENLY_FIGHT, String.valueOf(uid), false); - String fightInfos = (String) RedisUtil.getInstence().get(fightKey); - if (fightInfos.isEmpty()){ - LOGGER.info("endFight() uid=>{} fightKey={},fightInfos is empty", uid, fightKey); - MessageUtil.sendErrorResponse(session,0, messageType.getNumber(), ""); - return; - } - String key = RedisKey.getKey(RedisKey.SUDDLENLY_FIGHT, Integer.toString(user.getId()) , false); Map valueMap = RedisUtil.getInstence().hmget(key); RedisUtil.getInstence().del(key); @@ -1641,7 +1633,6 @@ public class MapLogic { SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getFindSuddenlyBossMapId()); int[] checkResult = CheckFight.getInstance().checkFight(seed,sChallengeConfig.getMostTime(),getFightData, getOptionData); - LevelDifficultyManager levelDifficultyManager = user.getLevelDifficultyManager(); //校验结果码 1:胜利 int resultCode = checkResult[0]; if (resultCode == -1){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index 8eff57d57..e078065e9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -50,6 +50,21 @@ public class WorkShopLogic { MessageUtil.sendErrorResponse(iSession,0,msgId,"maxLevel"); return; } + int[] openRules = sWorkShopTechnology.getOpenRules(); + if(openRules!=null){ + int preTechId = openRules[0]; + int preTechLevel = openRules[1]; + SWorkShopTechnology preSWorkShopTechnology = SWorkShopTechnology.getsWorkTechMapByTechIdAndLevel(techId, oldLevl); + int preProfession = preSWorkShopTechnology.getProfession(); + int preMineLevl = 0; + if( workShopController.getTechnologyMap().containsKey(preProfession) && workShopController.getTechnologyMap().get(preProfession).containsKey(preTechId)){ + preMineLevl = workShopController.getTechnologyMap().get(preProfession).get(preTechId); + } + if(preMineLevl