删除无用注释

back_recharge
lvxinran 2019-10-31 11:51:43 +08:00
parent 6047c1e151
commit 6254f55ced
1 changed files with 0 additions and 390 deletions

View File

@ -893,396 +893,6 @@ public class MapLogic {
int type = SChallengeConfig.sChallengeConfigs.get(curMapId).getType();
return MapEnum.getAbstractMap(type);
}
/**
*
*
* @param session
* @param messageType
*/
// public void fastFight(ISession session, MessageTypeProto.MessageType messageType) throws Exception {
// int uid = session.getUid();
// User user = UserManager.getUser(uid);
// MapManager mapManager = user.getMapManager();
// if (mapManager.getMapInfo() == null) {
// LOGGER.info("fastFight mapManager.getMapInfo() == null");
// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
// }
// if (mapManager.getCanMoveTime() > 0) {
// long leftTime = mapManager.getCanMoveTime() - TimeUtils.now();
// if (leftTime > 0) {
// throw new ErrorCodeException(ErrorCode.HERO_LIVE_AGAIN,Collections.singletonList((leftTime / 1000)+""));
// }
// }
// Cell cell = mapManager.getMapInfo().get(mapManager.getTriggerXY());
// if (cell == null) {
// cell = mapManager.getMapInfo().get(mapManager.getCurXY());
// if (cell == null) {
// LOGGER.info("cell == null xy is wrong =>{} triggerXY=>{}", mapManager.getCurXY(), mapManager.getTriggerXY());
// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
// }
// }
// int bigEventId = cell.getEventId();
// SEventPointConfig sEventPointConfig = STableManager.getConfig(SEventPointConfig.class).get(bigEventId);
// if (sEventPointConfig == null) {
// LOGGER.info("sEventPointConfig == null");
// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
// }
// int[] option = sEventPointConfig.getOption();
// if (option == null) {
// LOGGER.info("option == null sEventPointConfig.getId()=>{}", sEventPointConfig.getId());
// throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
// }
// int groupId = option[0];
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4) {
// Integer newGroupId= STableManager.getFigureConfig(MapStaticConfig.class).getDifficultyMonster().get(groupId);
// if(newGroupId!=null){
// groupId = newGroupId;
// }
// }
// int destoryXY = mapManager.getTriggerXY();
// CommonProto.FightTeamInfo fightTeamInfo = BehaviorUtil.getFightTeamInfo(user, mapManager.getTeamId(), true);
// Map<Integer, List<CommonProto.FightUnitInfo>> monsterByGroup = MonsterUtil.getMonsterByGroup(groupId);
// List<CommonProto.FightTeamInfo> monsterTeamList = new ArrayList<>(3);
// List<CommonProto.FightTeamInfo> monsterGroupList = BehaviorUtil.getFightTeamInfos(groupId, monsterByGroup, Global.MONSTER_1);
// monsterTeamList.addAll(monsterGroupList);
// List<CommonProto.FightTeamInfo> monsterGroupList1 = BehaviorUtil.getFightTeamInfos(groupId, monsterByGroup, Global.MONSTER_2);
// monsterTeamList.addAll(monsterGroupList1);
// List<CommonProto.FightTeamInfo> monsterGroupList2 = BehaviorUtil.getFightTeamInfos(groupId, monsterByGroup, Global.MONSTER_3);
// monsterTeamList.addAll(monsterGroupList2);
// //设置战斗随机种子
// int seed = (int) (System.currentTimeMillis() / 1000);
// LuaValue getFightData = FightDataUtil.getFinalFightData(fightTeamInfo, monsterTeamList);
// LuaValue getOptionData = FightDataUtil.getOptionData("");
// SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId());
// int mostTime = sChallengeConfig.getMostTime();
//
// int[] checkResult = CheckFight.getInstance().checkFight(seed, mostTime, getFightData, getOptionData,FightType.MapExploreFight);
// List<Integer> remainHp = new ArrayList<>(5);
// for (int i = 2; i < checkResult.length; i++) {
// if (checkResult[i] <= 0) {
// remainHp.add(0);
// } else {
// remainHp.add(checkResult[i]);
// }
// }
// //校验结果码 1胜利
// int resultCode = checkResult[0];
// if (resultCode == -1) {
// throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
// }
// int teamId = mapManager.getTeamId();
// mapManager.setLastFightResult(resultCode);
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
// mapManager.updateEndlessFightCount(1+mapManager.getEndlessMapInfo().getFightCount());
// }
// if (resultCode == 0) {
// //todo 无尽副本不复活记得改回去
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4) {
//// //无尽副本复活消耗
// reviveConsumeExecution(user);
// for(Map.Entry<String, Map<Integer, Integer>> entry: mapManager.getHeroAllAttributeMap().entrySet()){
// mapManager.updateHeroOneAttribute(entry.getKey(),HeroAttributeEnum.CurHP.getPropertyId(),0);
// mapManager.updateEndlessHeroHp(entry.getKey(),0);
// }
// }else {
// // 失败需要等待n秒后复活所有英雄
// int dieCount = user.getMapManager().getDieCount();
// dieCount++;
// user.getMapManager().setDieCount(dieCount);
// int[] reviveTime = sChallengeConfig.getReviveTime();
// long time = (long) (MathUtils.calABX(dieCount, reviveTime) * 1000);
// user.getMapManager().setCanMoveTime(TimeUtils.now() + time);
// int leftTime = getLeftTime(user, true);
// remainHp.clear();
// if (leftTime <= (int) (time / 1000)) {
// resetMapInfo(user, false);
// } else {
// initTeamInfo(mapManager.getTeamId(), uid, user, mapManager, 2);
// List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId());
// for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) {
// Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
// if (hero == null) {
// continue;
// }
// Map<Integer, Integer> heroAttributeMap = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId);
// remainHp.add(heroAttributeMap.get(HeroAttributeEnum.CurHP.getPropertyId()));
// }
// }
// }
// CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
// FightInfoProto.FastFightResponse build = FightInfoProto.FastFightResponse
// .newBuilder()
// .setResult(resultCode)
// .setEnventDrop(dropBuilder)
// .addAllRemainHpList(remainHp)
// .setEssenceValue(mapManager.getEssenceValue())
// .setLastXY(mapManager.getLastXY())
// .build();
// mapManager.setCurXY(mapManager.getLastXY());
// MessageUtil.sendMessage(session, 1, messageType.getNumber(), build, true);
// return;
//
// }
// List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
// for (int i = 0 ; i <team.size();i++) {
// Hero hero = user.getHeroManager().getHero(team.get(i).getHeroId());
// Map<Integer, Integer> heroAllAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero,false,teamId);
// int per = (int)(checkResult[i+2] / (double) heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId())*10000);
// mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),per);
// mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]);
// }
//
// }else{
// for (TeamPosHeroInfo teamPosHeroInfo : team) {
// mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]);
// }
// }
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4) {
// endlessRefreshMonster(session,destoryXY);
// }
// //删点之前进行查找
// if (sChallengeConfig.getType() == 2) {
// STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower());
// int[][] randomMonsterType = sTrialConfig.getRandomMonsterType();
// if(cell.getCellId()!=mapManager.getBossXY()){
// if(mapManager.getEssenceValue()!=-1){
// if (randomMonsterType[0][1] == cell.getPointId()) {
// mapManager.setEssenceValue(mapManager.getEssenceValue() + sTrialConfig.getNormalEnergy());
// } else {
// mapManager.setEssenceValue(mapManager.getEssenceValue() + sTrialConfig.getEliteEnergy());
// }
// }
// }
// }
// BehaviorUtil.destoryApointXY(user, destoryXY);
// SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId);
// CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_FAST_FIGHT_REWARD);
// FightInfoProto.FastFightResponse.Builder fastFightResponse = FightInfoProto.FastFightResponse.newBuilder();
//
// if (mapManager.getMonsterId() > 0) {
// BaseBehavior baseBehavior = baseBehaviorMap.get(10);
// baseBehavior.afterFastFight(user, groupId, fastFightResponse);
// }
// fastFightResponse.setEnventDrop(drop.build());
// fastFightResponse.setResult(resultCode);
// fastFightResponse.addAllRemainHpList(remainHp);
// fastFightResponse.setEssenceValue(mapManager.getEssenceValue());
// fastFightResponse.build();
//
//
// fastFightResponse.setEssenceValue(mapManager.getEssenceValue());
//// LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId);
// MapMissionManager.updateMapMission(user, EventType.fightEvent, groupId, checkResult[1]);
//// LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} misson=>{} eventDrop=>{}, missionDrop=>{}", uid, sMonsterGroup.getRewardgroup(), fastFightResponse.getMission(), fastFightResponse.getEnventDrop(), fastFightResponse.getMissionDrop());
// MessageUtil.sendMessage(session, 1, messageType.getNumber(), fastFightResponse.build(), true);
// }
/**
*
*
* @param session
* @param messageType
* @throws Exception
*/
// public void endFight(ISession session, String frames, MessageTypeProto.MessageType messageType,int dropout) throws Exception {
// int uid = session.getUid();
// User user = UserManager.getUser(uid);
// String key = RedisKey.getKey(RedisKey.FIGHT, Integer.toString(uid), false);
// Map<Object, Object> valueMap = RedisUtil.getInstence().hmget(key);
// RedisUtil.getInstence().del(key);
// if (valueMap == null || valueMap.isEmpty()) {
// LOGGER.info("endFight() uid=>{} not start fight", uid);
// throw new ErrorCodeException(ErrorCode.newDefineCode("此战斗已结算过"));
// }
// MapManager mapManager = user.getMapManager();
// if (user.getMapManager().getCanMoveTime() > 0) {
// long leftTime = user.getMapManager().getCanMoveTime() - TimeUtils.now();
// if (leftTime > 0) {
// throw new ErrorCodeException(ErrorCode.HERO_LIVE_AGAIN,Collections.singletonList((leftTime / 1000)+""));
// }
// }
//
// List<Integer> remainHp = new ArrayList<>(5);
// int triggerXY = mapManager.getTriggerXY();
// int optionId = Integer.parseInt((String) valueMap.get(RedisKey.NEED_VICTORY_AFTER));
// int nextEventId = 0;
// SOptionConfig sOptionConfig = SOptionConfig.sOptionConfigMap.get(optionId);
// SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(user.getMapManager().getCurMapId());
// //校验结果码 1胜利
// int resultCode=0;
// int[] checkResult = new int[0];
// int monsterGroupId=0;
// SMonsterGroup sMonsterGroup=null;
// if(dropout ==0){
// int seed = Integer.parseInt((String) valueMap.get(RedisKey.FIGHT_SEED));
// monsterGroupId = Integer.parseInt((String) valueMap.get(RedisKey.FIGHT_GROUPID));
// CommonProto.FightTeamInfo.Builder builder = CommonProto.FightTeamInfo.newBuilder();
// JsonFormat.merge((String) valueMap.get(RedisKey.FIGHT_HEROES), builder);
// CommonProto.FightTeamInfo fightTeamInfo = builder.build();
// List<CommonProto.FightTeamInfo> monsterTeamList = BehaviorUtil.getFightTeamInfos(valueMap);
// sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(monsterGroupId);
// if (sMonsterGroup == null) {
// LOGGER.info("endFight() uid=>{} monsterGroupId=>{} sMonsterGroup == null", uid, monsterGroupId);
// throw new ErrorCodeException(ErrorCode.CFG_NULL);
// }
// LuaValue getFightData = FightDataUtil.getFinalFightData(fightTeamInfo, monsterTeamList);
// LuaValue getOptionData = FightDataUtil.getOptionData(frames);
// int mostTime = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getMostTime();
// checkResult = CheckFight.getInstance().checkFight(seed, mostTime, getFightData, getOptionData, FightType.MapExploreFight);
// resultCode = checkResult[0];
// if (resultCode == -1) {
// throw new ErrorCodeException(ErrorCode.FIGHT_EXCEPTION);
// }
// }
//
// mapManager.setLastFightResult(resultCode);
// if (resultCode == 0 || dropout == 1) {
// //todo 无尽副本复活
// if (SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType() == 4) {
// //无尽副本复活消耗
// reviveConsumeExecution(user);
// for (Map.Entry<String, Map<Integer, Integer>> entry : mapManager.getHeroAllAttributeMap().entrySet()) {
// mapManager.updateHeroOneAttribute(entry.getKey(), HeroAttributeEnum.CurHP.getPropertyId(), 0);
// mapManager.updateEndlessHeroHp(entry.getKey(), 0);
// }
// } else {
// // 失败需要等待n秒后复活所有英雄
// int dieCount = user.getMapManager().getDieCount();
// dieCount++;
// user.getMapManager().setDieCount(dieCount);
// int[] reviveTime = sChallengeConfig.getReviveTime();
// long time = (long) (MathUtils.calABX(dieCount, reviveTime) * 1000);
// user.getMapManager().setCanMoveTime(TimeUtils.now() + time);
// int leftTime = getLeftTime(user, true);
// remainHp.clear();
// if (leftTime <= (int) (time / 1000)) {
// resetMapInfo(user, false);
// } else {
// initTeamInfo(mapManager.getTeamId(), uid, user, mapManager, 2);
// Map<String, Map<Integer, Integer>> heroAllAttributeMap = mapManager.getHeroAllAttributeMap();
// List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId());
// for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) {
// Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
// if (hero == null) {
// continue;
// }
// remainHp.add(heroAllAttributeMap.get(hero.getId()).get(HeroAttributeEnum.CurHP.getPropertyId()));
// }
// }
// }
// CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
// FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse
// .newBuilder();
// fightEndResponse.setResult(resultCode);
// fightEndResponse.setEnventDrop(dropBuilder);
// fightEndResponse.addAllRemainHpList(remainHp);
// fightEndResponse.setLastXY(mapManager.getLastXY());
// mapManager.setCurXY(mapManager.getLastXY());
// if (SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType() == 2) {
// fightEndResponse.setLastTowerTime((int) (mapManager.getCurrTowerTime() / 1000));
// }
//
// if (sOptionConfig != null) {
// int[][] jumpTypeValues = sOptionConfig.getJumpTypeValues();
// if (jumpTypeValues.length > 0 && sOptionConfig.getJumpType() == 3) {
// SOptionAddCondition sOptionAddConditions = SOptionAddCondition.sOptionAddConditionMap.get(jumpTypeValues[1][1]);
// if (sOptionAddConditions != null && sOptionAddConditions.getType() == 7) {
// Cell cell = mapManager.getMapInfo().get(triggerXY);
// if (cell != null) {
// nextEventId = getNextEventId(user, cell, sOptionConfig);
// cell.setEventId(nextEventId);
// mapManager.addOrUpdateCell(triggerXY, cell);
// fightEndResponse.setEventId(nextEventId);
// }
// }
// }
// }
// MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);
// return;
// }
// for (int i = 2; i < checkResult.length; i++) {
// if (checkResult[i] <= 0) {
// remainHp.add(0);
// } else {
// remainHp.add(checkResult[i]);
// }
// }
// int teamId = mapManager.getTeamId();
// List<TeamPosHeroInfo> team = user.getTeamPosManager().getTeamPosForHero().get(teamId);
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){
// mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1);
// if(checkResult[0]>0){
// for (int i = 0 ; i <team.size();i++) {
// Hero hero = user.getHeroManager().getHero(team.get(i).getHeroId());
// Map<Integer, Integer> heroAllAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero,false,teamId);
// int per =(int) (checkResult[i+2] / (double) heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId())*10000);
// mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),per);
// mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]);
// }
// }
// }else{
// for (TeamPosHeroInfo teamPosHeroInfo : team) {
// mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]);
// }
// }
// CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_GENERAL_FIGHT_REWARD);
// FightInfoProto.FightEndResponse.Builder fightEndResponse = FightInfoProto.FightEndResponse.newBuilder();
// fightEndResponse.setEnventDrop(drop.build());
// fightEndResponse.setResult(resultCode);
// fightEndResponse.addAllRemainHpList(remainHp);
// fightEndResponse.build();
//
// if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){
// endlessRefreshMonster(session,triggerXY);
// }
// if (sOptionConfig != null) {
// int behaviorType = sOptionConfig.getBehaviorType();
// int[][] behaviorTypeValues = sOptionConfig.getBehaviorTypeValues();
// BaseBehavior baseBehavior = baseBehaviorMap.get(behaviorType);
// if (baseBehavior != null) {
// baseBehavior.afterFight(user, behaviorTypeValues, fightEndResponse);
// }
// }else{
// BehaviorUtil.destoryApointXY(user,triggerXY);
// }
//
// if (monsterGroupId == mapManager.getSuddenlyBoss()) {
// mapManager.findSuddenlyBoss(0, 0);
//
// }else{
// if(sOptionConfig!=null){
// Cell cell = mapManager.getMapInfo().get(triggerXY);
// if (cell != null ) {
// nextEventId = getNextEventId(user, cell, sOptionConfig);
// cell.setEventId(nextEventId);
// mapManager.addOrUpdateCell(triggerXY, cell);
// }
// }
//
// }
//
//
// fightEndResponse.setEventId(nextEventId);
//// LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId);
// MapMissionManager.updateMapMission(user, EventType.fightEvent, monsterGroupId, checkResult[1]);
//// LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} misson=>{} eventDrop=>{}, missionDrop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getMission(), fightEndResponse.getEnventDrop(), fightEndResponse.getMissionDrop());
// if (monsterGroupId == mapManager.getSuddenlyBoss()) {
// mapManager.findSuddenlyBoss(0, 0);
// }
//// if(mapManager.getBossType()==1)
// if(mapManager.getTower()==STrialConfig.getHighestTower()&&mapManager.getBossType()!=0){
//
// int time = (int)((TimeUtils.now()-mapManager.getTowerStartTime())/1000);
// mapManager.setCurrTowerTime(time*1000);
// LOGGER.info("此层为最后一层,使用时间为{}",time);
// fightEndResponse.setLastTowerTime(time);
// }else{
// fightEndResponse.setLastTowerTime(0);
// }
// MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);
// }
/**
*
* @param teamId