From fbb03e44f8ab258695518daab3f4108eea0fc063 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 5 Oct 2020 02:11:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/map/MapLogic.java | 2 +- .../map/behavior/FourtyTwoBehavior.java | 1 + .../jieling/handler/map/mapType/TowerMap.java | 20 +++++++++++-------- .../ljsd/jieling/logic/hero/HeroLogic.java | 6 +++--- 4 files changed, 17 insertions(+), 12 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 bbb160bf2..5ac0b6b7b 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 @@ -804,7 +804,7 @@ public class MapLogic { MapMissionManager.updateMapMission(user, EventType.updatePonintEvent, pointId, pointId); CommonProto.Drop.Builder dropBuilder = null; if (sOptionConfig.getReward().length > 0) { - dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1, 1, BIReason.MAP_EVENET_REWARD); + dropBuilder = ItemUtil.drop(user, sOptionConfig.getReward(), 1, 0, BIReason.MAP_EVENET_REWARD); } List eventBehaviorValuesList = new ArrayList<>(); for (int i = 0; i < sOptionConfig.getBehaviorTypeValues().length; i++) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java index dfb98f380..41d17e10b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FourtyTwoBehavior.java @@ -62,6 +62,7 @@ public class FourtyTwoBehavior extends BaseBehavior { mapManager.setTrialFloor(floor + 1); mapManager.setTrialEnergy(0); mapManager.setMapIntoFlag(2); + mapManager.setCurMapType(0); mapManager.updateTrialMapInfo(new HashMap<>()); //换层清除数据 mapManager.updateMapMonsterHp(new HashMap<>()); 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 3f04d92d0..710d8aa3f 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 @@ -76,14 +76,18 @@ public class TowerMap extends AbstractMap { TrialInfo trialInfo = mapManager.getTrialInfo(); if(mapManager.getCurMapType()!=0&&mapManager.getCurMapType()!=type){ MapLogic.getInstance().getMap(user).autoExitMap(user); - } - if(!trialInfo.getMapInfo().isEmpty()){ - mapManager.setMapInfo(trialInfo.getMapInfo()); - mapManager.setCurMapId(trialInfo.getQuitMapId()); - mapManager.setCurXY(trialInfo.getCurXY()); - }else{ - //进新图 + if(!trialInfo.getMapInfo().isEmpty()){ + mapManager.setMapInfo(trialInfo.getMapInfo()); + mapManager.setCurMapId(trialInfo.getQuitMapId()); + mapManager.setCurXY(trialInfo.getCurXY()); + }else{ + //进新图 // super.enterMap(uid,mapEnterResponse); + initMap(mapManager,user); + } + } + if(mapManager.getCurMapType()==0){ + //换层 initMap(mapManager,user); } Map heroInfo = trialInfo.getHeroInfo(); @@ -441,7 +445,7 @@ public class TowerMap extends AbstractMap { //------------ SMonsterGroup sMonsterGroup = SMonsterGroup.getsMonsterGroupMap().get(groupId); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_FAST_FIGHT_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_FAST_FIGHT_REWARD); // mapManager. if (mapManager.getMonsterId() > 0) { 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 0dabdf1c7..2f474f323 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 @@ -1776,7 +1776,7 @@ public class HeroLogic{ Integer propertyId = item.getKey(); float propertyValue = item.getValue(); if(propertyId == HeroAttributeEnum.EquipForce.getPropertyId()){ - LOGGER.info("the equipScore={}",propertyValue); +// LOGGER.info("the equipScore={}",propertyValue); continue; } SPropertyConfig sPropertyConfig = SPropertyConfig.getsPropertyConfigByPID(propertyId); @@ -1786,9 +1786,9 @@ public class HeroLogic{ float score = sPropertyConfig.getScore(); result += propertyValue*score; - LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={},result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score); +// LOGGER.info("the propertyId={} the value is ={},propertyValue={},score={},result ={},the value={}",propertyId,propertyValue*score,propertyValue,score,result,propertyValue*score); } - System.out.println(result); +// System.out.println(result); return (int)result; }