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 6f02906de..abefe0a95 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 @@ -14,7 +14,6 @@ import com.ljsd.jieling.handler.mission.Mission; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.CheckFight; -import com.ljsd.jieling.logic.fight.CombatLogic; import com.ljsd.jieling.logic.hero.HeroAttributeEnum; import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.mission.GameEvent; @@ -838,6 +837,7 @@ public class MapLogic { if(mapManager.getTower()>mapManager.getHighestTower()){ mapManager.setHighestTower(mapManager.getTower()); } + mapManager.setCurrTowerTime(0); MessageUtil.sendMessage(session, 1, messageType.getNumber(), builder.build(), true); return; } @@ -998,6 +998,7 @@ public class MapLogic { .setResult(resultCode) .setEnventDrop(dropBuilder) .addAllRemainHpList(remainHp) + .setEssenceValue(mapManager.getEssenceValue()) .build(); MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse, true); return; @@ -1022,6 +1023,7 @@ public class MapLogic { fastFightResponse.setEnventDrop(drop.build()); fastFightResponse.setResult(resultCode); fastFightResponse.addAllRemainHpList(remainHp); + fastFightResponse.setEssenceValue(mapManager.getEssenceValue()); fastFightResponse.build(); if (sChallengeConfig.getType() == 2) { STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower()); @@ -1197,8 +1199,9 @@ public class MapLogic { fightEndResponse.setResult(resultCode); fightEndResponse.setEnventDrop(dropBuilder); fightEndResponse.addAllRemainHpList(remainHp); - if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==2&&mapManager.getTower()==STrialConfig.getHighestTower()){ - fightEndResponse.setLastTowerTime((int)mapManager.getCurrTowerTime()/1000); + if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==2){ +// &&mapManager.getTower()==STrialConfig.getHighestTower() + fightEndResponse.setLastTowerTime((int)(mapManager.getCurrTowerTime()/1000)); } MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true); return; @@ -1961,7 +1964,7 @@ public class MapLogic { public String initTrialMap(MapManager mapManager, User user) throws Exception { STrialConfig sTrialConfig = STrialConfig.sTrialConfigMap.get(mapManager.getTower()); - if(mapManager.getTower()>1){ + if(mapManager.getTower()>1&&mapManager.getMapIntoFlag()==0){ for(int i = 1 ; i