From 8bd27071d34f8dbb548f78220e2f1b01280a7ab9 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 4 Sep 2020 02:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=AF=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/core/function/EndlessFunction.java | 4 +++- .../com/ljsd/jieling/handler/map/MapLogic.java | 4 ++-- .../handler/map/behavior/FiftyBehavior.java | 1 + .../jieling/handler/map/mapType/AbstractMap.java | 2 +- .../ljsd/jieling/handler/map/mapType/TowerMap.java | 14 ++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java index 9751ed73e..6a24f453f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java @@ -61,11 +61,13 @@ public class EndlessFunction implements FunctionManager { e.printStackTrace(); } int size = (int)(users.size()*0.85); + int minSize = (int)(users.size()*0.2); + if(size ==0){ return 1; } int level = 0; - for(int i = 0 ; i 0) { @@ -1737,7 +1737,7 @@ public class MapLogic { if (mission.getMissionInfo() != null) { checkMissionReturn.newEventId = mission.getMissionInfo(); } - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMissionEventsConfig.getReward(), 1, 1, BIReason.MAP_MISSION_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMissionEventsConfig.getReward(), 1, 0, BIReason.MAP_MISSION_REWARD); checkMissionReturn.drop = drop; int useTime = getUseTime(user); mission.setTime(useTime); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyBehavior.java index 977fb9166..8769d1e05 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyBehavior.java @@ -26,6 +26,7 @@ public class FiftyBehavior extends BaseBehavior{ TrialInfo trialInfo = mapManager.getTrialInfo(); MapLogic.getInstance().clearNormalMonster(user); mapManager.removeBoss(); + mapManager.setCurMapType(0); mapManager.setTrialFloor(trialInfo.getFloor() + 10000); return true; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java index 334f297a0..fad92986a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapType/AbstractMap.java @@ -361,7 +361,7 @@ public abstract class AbstractMap implements IMap { } //血量更新 // refreshHp(user, mapManager.getTeamId(),checkResult); - CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_GENERAL_FIGHT_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 0, BIReason.MAP_GENERAL_FIGHT_REWARD); builder.setEnventDrop(drop.build()); builder.setResult(resultCode); builder.addAllRemainHpList(remainHp); 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 710d8aa3f..a8303764c 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 @@ -125,6 +125,20 @@ public class TowerMap extends AbstractMap { mapManager.setCurMapType(type); mapEnterResponse.setMapId(mapManager.getCurMapId()); mapEnterResponse.setCurXY(mapManager.getCurXY()); +// MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder() +// .setTower(mapManager.getTrialInfo().getFloor()) +// .setFightCount(mapManager.getFightCount()) +// .setHighestTower(mapManager.getTrialInfo().getHighestTower()) +// .setEssenceValue(mapManager.getTrialInfo().getEnergy()) +// .setMapIntoReset(mapManager.getMapIntoFlag()) +// .setTowerUseTime((int)(mapManager.getCurrTowerTime()/1000)) +// .setKillCount(mapManager.getTrialInfo().getKillCount()) +// .addAllTrialRewardInfo(mapManager.getTrialInfo().getTowerReceivedReward()) +// .setBombUsed(mapManager.getTrialInfo().getBombUseTimes()) +// .build(); +// mapEnterResponse.setTowerInfo(towerCopyInfo); + mapEnterResponse.setCurTower(trialInfo.getFloor()); + mapEnterResponse.setBombUsed(trialInfo.getBombUseTimes()); } @Override