Merge branch 'master_test_hw' into master_test_hw_sheji

back_recharge
zhangshanxue 2020-10-25 17:01:48 +08:00
commit df0850d74b
3 changed files with 8 additions and 9 deletions

View File

@ -624,9 +624,7 @@ public class MapManager extends MongoBase {
return monsterTempSkill; return monsterTempSkill;
} }
public void updateMonsterTempSkill(int monsterGroupId,int skillId,int count){ public void updateMonsterTempSkill(int monsterGroupId,int skillId,int count){
if(monsterTempSkill.get(monsterGroupId)==null){ monsterTempSkill.computeIfAbsent(monsterGroupId, k -> new HashMap<>());
monsterTempSkill.put(monsterGroupId,new HashMap<>());
}
monsterTempSkill.get(monsterGroupId).put(skillId,count); monsterTempSkill.get(monsterGroupId).put(skillId,count);
updateString("monsterTempSkill." + monsterGroupId +"." + skillId, count); updateString("monsterTempSkill." + monsterGroupId +"." + skillId, count);
} }
@ -662,7 +660,7 @@ public class MapManager extends MongoBase {
endlessMapInfo.getEndlessHeroInfo().put(heroId,percent); endlessMapInfo.getEndlessHeroInfo().put(heroId,percent);
} }
public void updateEndlessHeroHp(String heroId,int hp){ public void updateEndlessHeroHp(String heroId,int hp){
updateString("endlessMapInfo."+heroId,hp); updateString("endlessMapInfo.endlessHeroInfo."+heroId,hp);
endlessMapInfo.getEndlessHeroInfo().put(heroId,hp); endlessMapInfo.getEndlessHeroInfo().put(heroId,hp);
} }
public void updateEndlessLocation(int cellId){ public void updateEndlessLocation(int cellId){

View File

@ -72,13 +72,14 @@ public class EndlessMap extends AbstractMap{
} }
EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo(); 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()); // StoreLogic.initOnsStoereWithTime(user, SEndlessMapConfig.sEndlessMapConfigMap.get(4001).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime());
mapManager.updateEndlessSeason(MapLogic.endlessSeason); mapManager.updateEndlessSeason(openTimeOfFuntionCacheByType.getTimes());
mapManager.updateEndlessMapId(0); mapManager.updateEndlessMapId(0);
mapManager.endlessWalkCellSave(new HashSet<>()); mapManager.endlessWalkCellSave(new HashSet<>());
mapManager.endlessMapInfoSave(new HashMap<>()); mapManager.endlessMapInfoSave(new HashMap<>());
mapManager.setWalkCells(new HashSet<>());
//清除当前副本信息 //清除当前副本信息
//新创建地图 //新创建地图

View File

@ -49,8 +49,8 @@ public class GuildMyInfo extends MongoBase {
public void clearOfLevelGuild(){ public void clearOfLevelGuild(){
path.clear(); path.clear();
curPos = STableManager.getFigureConfig(CommonStaticConfig.class).getInitPos(); curPos = STableManager.getFigureConfig(CommonStaticConfig.class).getInitPos();
guildChallengeDamage = 0; setGuildChallengeDamage(0);
lastMonsterId = 0; setLastMonsterId(0);
setCurPos(curPos); setCurPos(curPos);
//更新的是new ArrayList<>() 再加上指令更新优化 大key的存在 原path将更新不进去 //更新的是new ArrayList<>() 再加上指令更新优化 大key的存在 原path将更新不进去
//setPath(new ArrayList<>()); //setPath(new ArrayList<>());