From 689d3ae25574c7ad6c38351d3f5469150867ceb5 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 20 Jun 2019 19:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E8=8B=B1=E6=80=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/map/FightEndRequestHandler.java | 4 ++- .../ljsd/jieling/handler/map/MapLogic.java | 27 ++++++++++--------- .../handler/map/StartFightRequestHandler.java | 5 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/FightEndRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/FightEndRequestHandler.java index d1791ac72..896baefcd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/FightEndRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/FightEndRequestHandler.java @@ -24,8 +24,10 @@ public class FightEndRequestHandler extends BaseHandler { int fightId = fightEndRequest.getFightId(); if (type == 1){ MapLogic.getInstance().endDifficultyFight(iSession, frames,fightId,MessageTypeProto.MessageType.FIGHT_END_RESPONSE); - }else{ + }else if(type == 2){ MapLogic.getInstance().endFight(iSession, frames, MessageTypeProto.MessageType.FIGHT_END_RESPONSE); + }else if(type == 3){ + MapLogic.getInstance().endSuddlenlyFight(iSession, frames, MessageTypeProto.MessageType.FIGHT_END_RESPONSE); } } } 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 c8e8d2614..7a878efb6 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 @@ -412,6 +412,21 @@ public class MapLogic { return; } } + int pointId = cell.getPointId(); + MapPointConfig mapPointConfig = MapPointConfig.getScMapEventMap().get(pointId); + if(mapPointConfig.getStyle() == EventType.suddenlyBoss){ + int suddenlyBoss = mapManager.getSuddenlyBoss(); + SEventPointConfig sEventPointConfig = SEventPointConfig.sEventPointConfigMap.get(cell.getEventId()); + if(suddenlyBoss==0){ + int now = (int)(TimeUtils.now()/1000); + int bossId =sEventPointConfig.getOption()[0]; + mapManager.findSuddenlyBoss(bossId,now); + } + }else if(mapPointConfig.getStyle() == EventType.businessman){ + if(! user.getStoreManager().getStoreInfoMap().containsKey(3)){ + StoreLogic.initOneStore(user,3); + } + } mapManager.setTriggerXY(triggerXY); mapManager.addWalkCells(new HashSet<>(cells)); mapManager.setCurXY(curXY); @@ -519,18 +534,6 @@ public class MapLogic { return; } } - if(mapPointConfig.getStyle() == EventType.suddenlyBoss){ - int suddenlyBoss = mapManager.getSuddenlyBoss(); - if(suddenlyBoss==0){ - int now = (int)(TimeUtils.now()/1000); - int bossId = option[0]; - mapManager.findSuddenlyBoss(bossId,now); - } - }else if(mapPointConfig.getStyle() == EventType.businessman){ - if(! user.getStoreManager().getStoreInfoMap().containsKey(3)){ - StoreLogic.initOneStore(user,3); - } - } if (mapPointConfig.getTriggerRules() == 1) { cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); } else { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java index 679ed33a0..2676e45a6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/StartFightRequestHandler.java @@ -40,8 +40,9 @@ public class StartFightRequestHandler extends BaseHandler{ MapLogic.getInstance().startFight(iSession, MessageTypeProto.MessageType.FIGHT_START_RESPONSE); }else if(type == 3){ - MapLogic.getInstance().startFight(iSession, MessageTypeProto.MessageType.FIGHT_START_RESPONSE); - + MapLogic.getInstance().startSuddlenlyFight(iSession,teamId, MessageTypeProto.MessageType.FIGHT_START_RESPONSE); + }else{ + MessageUtil.sendErrorResponse(iSession, 0, MessageTypeProto.MessageType.FIGHT_START_RESPONSE.getNumber(),"type is wrong"); } } }