From c39f041f21fdb62f9321252fb399252852688a5c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 19 Jun 2020 18:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=90=88=E6=95=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E6=B4=BB=E5=8A=A8=E5=BC=80=E5=90=AF=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/handler/map/MapLogic.java | 6 ++++-- .../java/com/ljsd/jieling/handler/map/mapType/TowerMap.java | 2 +- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) 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 3e0a917a4..30f4c546d 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 @@ -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); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java index 056ca9ec8..d8e54e02c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/TowerMap.java @@ -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(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 568018245..a70a8c791 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -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); } }