root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://60.1.1.230/backend/jieling_server

back_recharge
gaojie 2019-07-04 15:43:16 +08:00
parent ea09857a64 a2d5ecd93a
commit ea2353bb06
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
View File

@ -805,24 +805,25 @@ public class MapLogic {
User user = UserManager.getUser(uid);
MapManager mapManager = user.getMapManager();
SChallengeConfig challengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId());
if(challengeConfig.getType()==2){
// int time = (int)((System.currentTimeMillis()-mapManager.getStartExporeTime())/1000);
// mapManager.setCurrTowerTime(time);
// if(mapManager.getEveryTowerTime()!=null&&mapManager.getEveryTowerTime().get(mapManager.getTower())!=null){
// mapManager.setTowerTimeByTower(mapManager.getTower(),time);
// }
if(mapManager.getTower()>=1){
mapManager.setMapIntoFlag(1);
}
}
MapInfoProto.MapOutResponse.Builder builder = MapInfoProto.MapOutResponse.newBuilder();
if(outType == 0||mapManager.getTower()-1==STrialConfig.getHighestTower()){
if(mapManager.getTowerUnusedBuffer()!=null){
mapManager.setTowerUnusedBuffer(null);
};
LOGGER.info("退出地图");
if(challengeConfig.getType()==2){
// int time = (int)((System.currentTimeMillis()-mapManager.getStartExporeTime())/1000);
// mapManager.setCurrTowerTime(time);
// if(mapManager.getEveryTowerTime()!=null&&mapManager.getEveryTowerTime().get(mapManager.getTower())!=null){
// mapManager.setTowerTimeByTower(mapManager.getTower(),time);
// }
if(mapManager.getTower()>=1){
mapManager.setMapIntoFlag(1);
}
}
mapManager.setEssenceValue(0);
boolean result = onlyLevelMap(user, true);
if (!result) {

2
serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java
View File

@ -39,7 +39,7 @@ public class FourtyTwoBehavior extends BaseBehavior{
mapManager.setCurrTowerTime(time);
LOGGER.info("上层使用时间{}",time);
mapManager.setStartExporeTime(0);
mapManager.setMapIntoFlag(1);
mapManager.setMapIntoFlag(2);
user.getUserMissionManager().onGameEvent(user, GameEvent.COPY_TOWER_LEVEL,mapManager.getTower());
MapLogic.getInstance().initTrialMap(mapManager, user);
return true;