From 64fcc5a485d8a7f0fa64baf6e65bff2b4e795f6d Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 23 Oct 2020 14:09:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=97=A0=E5=B0=BD=E5=89=AF?= =?UTF-8?q?=E6=9C=AC=E8=BF=B7=E9=9B=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/handler/map/MapManager.java | 2 +- .../com/ljsd/jieling/handler/map/mapType/EndlessMap.java | 7 ++++--- .../main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 117ce5f29..342063017 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -662,7 +662,7 @@ public class MapManager extends MongoBase { endlessMapInfo.getEndlessHeroInfo().put(heroId,percent); } public void updateEndlessHeroHp(String heroId,int hp){ - updateString("endlessMapInfo."+heroId,hp); + updateString("endlessMapInfo.endlessHeroInfo."+heroId,hp); endlessMapInfo.getEndlessHeroInfo().put(heroId,hp); } public void updateEndlessLocation(int cellId){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java index 22506ec36..622e1d96f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/EndlessMap.java @@ -72,13 +72,14 @@ public class EndlessMap extends AbstractMap{ } EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo(); //是否是新的周期 - if(endlessMapInfo.getSeason()!=MapLogic.endlessSeason){ - TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless); + TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless); + if(endlessMapInfo.getSeason()!=openTimeOfFuntionCacheByType.getTimes()){ // StoreLogic.initOnsStoereWithTime(user, SEndlessMapConfig.sEndlessMapConfigMap.get(4001).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime()); - mapManager.updateEndlessSeason(MapLogic.endlessSeason); + mapManager.updateEndlessSeason(openTimeOfFuntionCacheByType.getTimes()); mapManager.updateEndlessMapId(0); mapManager.endlessWalkCellSave(new HashSet<>()); mapManager.endlessMapInfoSave(new HashMap<>()); + mapManager.setWalkCells(new HashSet<>()); //清除当前副本信息 //新创建地图 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java index fc4d64e67..daa5a30c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java @@ -49,8 +49,8 @@ public class GuildMyInfo extends MongoBase { public void clearOfLevelGuild(){ path.clear(); curPos = STableManager.getFigureConfig(CommonStaticConfig.class).getInitPos(); - guildChallengeDamage = 0; - lastMonsterId = 0; + setGuildChallengeDamage(0); + setLastMonsterId(0); setCurPos(curPos); //更新的是new ArrayList<>() 再加上指令更新优化 大key的存在 原path将更新不进去 //setPath(new ArrayList<>()); From 3cece5a571a0e011d0df381f3604fefbf32af195 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 23 Oct 2020 14:11:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/handler/map/MapManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 342063017..5477c8a8b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -624,9 +624,7 @@ public class MapManager extends MongoBase { return monsterTempSkill; } public void updateMonsterTempSkill(int monsterGroupId,int skillId,int count){ - if(monsterTempSkill.get(monsterGroupId)==null){ - monsterTempSkill.put(monsterGroupId,new HashMap<>()); - } + monsterTempSkill.computeIfAbsent(monsterGroupId, k -> new HashMap<>()); monsterTempSkill.get(monsterGroupId).put(skillId,count); updateString("monsterTempSkill." + monsterGroupId +"." + skillId, count); }