回合数修改、活动开启判断修改
parent
eb124879c8
commit
c39f041f21
|
@ -3090,7 +3090,7 @@ public class MapLogic {
|
||||||
PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.FORMATION_NORMAL, 1000, "", GameFightType.DailyChallenge, sDailyChallengeConfig.getMonsterId(), 3);
|
PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.FORMATION_NORMAL, 1000, "", GameFightType.DailyChallenge, sDailyChallengeConfig.getMonsterId(), 3);
|
||||||
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
|
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
|
||||||
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
|
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
|
||||||
.setFightMaxTime(1000)
|
.setFightMaxTime(20)
|
||||||
.setFightSeed(fightResult.getSeed())
|
.setFightSeed(fightResult.getSeed())
|
||||||
.setHeroFightInfos(fightResult.getFightTeamInfo())
|
.setHeroFightInfos(fightResult.getFightTeamInfo())
|
||||||
.addAllMonsterList(fightResult.getMonsterTeamList())
|
.addAllMonsterList(fightResult.getMonsterTeamList())
|
||||||
|
@ -3237,7 +3237,6 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
//初始化
|
//初始化
|
||||||
mapGame.initGame(user);
|
mapGame.initGame(user);
|
||||||
// BehaviorUtil.destoryCurPoint(user);
|
|
||||||
//回复响应
|
//回复响应
|
||||||
MapGameInfo mapGameInfo = mapManager.getTrialInfo().getMapGameInfo();
|
MapGameInfo mapGameInfo = mapManager.getTrialInfo().getMapGameInfo();
|
||||||
int[] ids = mapGameInfo.getId();
|
int[] ids = mapGameInfo.getId();
|
||||||
|
@ -3271,6 +3270,9 @@ public class MapLogic {
|
||||||
if(response==null){
|
if(response==null){
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||||
}
|
}
|
||||||
|
// if(response.getGameStatus()==0){
|
||||||
|
// BehaviorUtil.destoryCurPoint(user);
|
||||||
|
// }
|
||||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true);
|
MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -471,7 +471,7 @@ public class TowerMap extends AbstractMap {
|
||||||
private Cell createTransport(int floor){
|
private Cell createTransport(int floor){
|
||||||
int transportPoint;
|
int transportPoint;
|
||||||
//是否为5层整数倍
|
//是否为5层整数倍
|
||||||
if(floor%2==0&&floor<10000){
|
if(floor%5==0&&floor<10000){
|
||||||
//如果是则进行随机
|
//如果是则进行随机
|
||||||
int[] treasureProbability = STrialSetting.sTrialSetting.getTreasureProbability();
|
int[] treasureProbability = STrialSetting.sTrialSetting.getTreasureProbability();
|
||||||
int[] transportPointId= STrialSetting.sTrialSetting.getTransportPoint();
|
int[] transportPointId= STrialSetting.sTrialSetting.getTransportPoint();
|
||||||
|
|
|
@ -204,7 +204,7 @@ public class HeroLogic{
|
||||||
}
|
}
|
||||||
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId());
|
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId());
|
||||||
long endTimeLong = ToolsUtil.getEndTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), user.getPlayerInfoManager().getCreateTime(), activity.getGapTime());
|
long endTimeLong = ToolsUtil.getEndTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), user.getPlayerInfoManager().getCreateTime(), activity.getGapTime());
|
||||||
if(TimeUtils.now()>endTimeLong){
|
if(endTimeLong!=0&&TimeUtils.now()>endTimeLong){
|
||||||
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
|
throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue