From feb2dbe8f4dcd23013692404e28436ddd4c7540b Mon Sep 17 00:00:00 2001 From: gaojie Date: Tue, 2 Jul 2019 17:52:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E6=89=AB=E8=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/map/SweepLogic.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/SweepLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/SweepLogic.java index 44b2705d3..140c98282 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/SweepLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/SweepLogic.java @@ -84,14 +84,16 @@ public class SweepLogic { boolean change = false; List dropList = new CopyOnWriteArrayList<>(); for (int i = 0 ; i < sweepTimes ;i++){ + if (targetItem!= 0){ + Item item = user.getItemManager().getItem(targetItem); + if(item!=null && item.getItemNum()>=targetNum){ + sweepTimes=i; + change = true; + break; + } + } CommonProto.Drop.Builder drop = ItemUtil.drop(user, sLevelDifficultyConfig.getRandomReward(), 1, 0, BIReason.LEVELDIFFICULTY_SWEEP_REWARD); dropList.add(drop.build()); - Item item = user.getItemManager().getItem(targetItem); - if(item!=null && item.getItemNum()>=targetNum){ - sweepTimes=i; - change = true; - break; - } } if(change){ cost = MapLogic.getInstance().getCost(sLevelDifficultyConfig, sweepTimes); @@ -99,6 +101,7 @@ public class SweepLogic { //扣除道具 ItemUtil.itemCost(user, cost,BIReason.SWEEP_FIGHT_CONSUME,fightId); MapLogic.getInstance().userLevelUp(user,sLevelDifficultyConfig.getExp() * sweepTimes); + LOGGER.info("sweepFight=>uid={},sweepTimes={},exp={}",uid,sweepTimes,sLevelDifficultyConfig.getExp()); FightInfoProto.SweepRightResponse.Builder builder = FightInfoProto.SweepRightResponse.newBuilder(); builder.addAllDrop(dropList); levelDifficulty.setChallengeTimes(levelDifficulty.getChallengeTimes() +sweepTimes); From 2cac0935cbe55415853ae49b87991d40b1ab2d64 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Tue, 2 Jul 2019 18:12:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=88=AC=E5=A1=94=E5=89=AF=E6=9C=AC=20?= =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E7=B2=BE=E8=8B=B1=E6=80=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3fd4d3064..ce05d8e61 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 @@ -2023,7 +2023,7 @@ public class MapLogic { int x = scMap1.getGroups()[randomIndex][0]; int y = scMap1.getGroups()[randomIndex][1]; int xy = CellUtil.xy2Pos(x, y); - MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(sTrialConfig.getRandomMonsterType()[0][1]); + MapPointConfig mapPointConfig = MapPointConfig.scMapEventMap.get(sTrialConfig.getRandomMonsterType()[1][1]); if (mapPointConfig == null) { LOGGER.info("====initTrialMap()====mapPointConfig == null======>{}", scMap1.getEvent()); continue;