回合数修改、活动开启判断修改

back_recharge
lvxinran 2020-06-19 18:06:44 +08:00
parent eb124879c8
commit c39f041f21
3 changed files with 6 additions and 4 deletions

View File

@ -3090,7 +3090,7 @@ public class MapLogic {
PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), GlobalsDef.FORMATION_NORMAL, 1000, "", GameFightType.DailyChallenge, sDailyChallengeConfig.getMonsterId(), 3);
FightResult fightResult = FightDispatcher.dispatcher(pveFightEvent);
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
.setFightMaxTime(1000)
.setFightMaxTime(20)
.setFightSeed(fightResult.getSeed())
.setHeroFightInfos(fightResult.getFightTeamInfo())
.addAllMonsterList(fightResult.getMonsterTeamList())
@ -3237,7 +3237,6 @@ public class MapLogic {
}
//初始化
mapGame.initGame(user);
// BehaviorUtil.destoryCurPoint(user);
//回复响应
MapGameInfo mapGameInfo = mapManager.getTrialInfo().getMapGameInfo();
int[] ids = mapGameInfo.getId();
@ -3271,6 +3270,9 @@ public class MapLogic {
if(response==null){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
// if(response.getGameStatus()==0){
// BehaviorUtil.destoryCurPoint(user);
// }
MessageUtil.sendMessage(session,1,messageType.getNumber(),response,true);
}
}

View File

@ -471,7 +471,7 @@ public class TowerMap extends AbstractMap {
private Cell createTransport(int floor){
int transportPoint;
//是否为5层整数倍
if(floor%2==0&&floor<10000){
if(floor%5==0&&floor<10000){
//如果是则进行随机
int[] treasureProbability = STrialSetting.sTrialSetting.getTreasureProbability();
int[] transportPointId= STrialSetting.sTrialSetting.getTransportPoint();

View File

@ -204,7 +204,7 @@ public class HeroLogic{
}
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId());
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);
}
}