From 84093dd1a410e0ed314c86b7d8f4255bc68b37bc Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 26 Jun 2019 16:02:31 +0800 Subject: [PATCH 1/3] battle --- luafight/Modules/Battle/Logic/Base/Effect.lua | 2 ++ luafight/Modules/Battle/Logic/Base/Passivity.lua | 2 ++ .../java/com/ljsd/jieling/handler/map/MapMissionManager.java | 1 + 3 files changed, 5 insertions(+) diff --git a/luafight/Modules/Battle/Logic/Base/Effect.lua b/luafight/Modules/Battle/Logic/Base/Effect.lua index 008842305..44dd3851c 100644 --- a/luafight/Modules/Battle/Logic/Base/Effect.lua +++ b/luafight/Modules/Battle/Logic/Base/Effect.lua @@ -20,6 +20,8 @@ local propertyList = { RoleDataName.TreatFacter, RoleDataName.MaxHp, RoleDataName.MaxHp, + RoleDataName.CureFacter, + RoleDataName.Tenacity, } local function buffRandomAction(random, caster, target, buffType, duration, ...) diff --git a/luafight/Modules/Battle/Logic/Base/Passivity.lua b/luafight/Modules/Battle/Logic/Base/Passivity.lua index e5a6dcb31..4db0260dd 100644 --- a/luafight/Modules/Battle/Logic/Base/Passivity.lua +++ b/luafight/Modules/Battle/Logic/Base/Passivity.lua @@ -21,6 +21,8 @@ local propertyList = { RoleDataName.TreatFacter, RoleDataName.MaxHp, RoleDataName.MaxHp, + RoleDataName.CureFacter, + RoleDataName.Tenacity, } --被动技能表 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java index edf1bc5ee..f6e321c26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java @@ -222,6 +222,7 @@ public class MapMissionManager { needUpdate =true; } } + break; } } } From 5dbcbb4bd3cd35ee63005515ec987a8193853013 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 26 Jun 2019 16:25:39 +0800 Subject: [PATCH 2/3] fix --- .../java/com/ljsd/jieling/handler/map/MapMissionManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java index f6e321c26..23a6da136 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java @@ -153,6 +153,9 @@ public class MapMissionManager { MapManager mapManager = user.getMapManager(); SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()); + if(sChallengeConfig.getType() !=3){ + return; + } int mapId = sChallengeConfig.getMapId(); MapMission copyMissionProgres = mapManager.getCopyMissionProgresById(mapId); int difficultType = sChallengeConfig.getDifficultType(); From ec6c26e8a9a9e7de19b9ef4827acc9846097052c Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 26 Jun 2019 18:04:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=B2=BE=E8=8B=B1=E6=80=AA=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/map/MapLogic.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 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 c559094c0..9c450600a 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 @@ -1163,19 +1163,24 @@ public class MapLogic { } int nextEventId = 0; int triggerXY = mapManager.getTriggerXY(); - Cell cell = mapManager.getMapInfo().get(triggerXY); - if (cell != null) { - nextEventId = getNextEventId(user, cell, sOptionConfig); - cell.setEventId(nextEventId); - mapManager.addOrUpdateCell(triggerXY, cell); + if (monsterGroupId == mapManager.getSuddenlyBoss()) { + mapManager.findSuddenlyBoss(0, 0); + BehaviorUtil.destoryApointXY(user,triggerXY); + }else{ + Cell cell = mapManager.getMapInfo().get(triggerXY); + if (cell != null) { + nextEventId = getNextEventId(user, cell, sOptionConfig); + cell.setEventId(nextEventId); + mapManager.addOrUpdateCell(triggerXY, cell); + } } + + fightEndResponse.setEventId(nextEventId); // LOGGER.info("endFight() uid=>{},nextEventId=>{}", uid, nextEventId); MapMissionManager.updateMapMission(mapManager, EventType.fightEvent, monsterGroupId, monsterGroupId); // LOGGER.info("endFight() uid=>{} sMonsterGroup.getRewardgroup()=>{} misson=>{} eventDrop=>{}, missionDrop=>{}", uid, sMonsterGroup.getRewardgroup(), fightEndResponse.getMission(), fightEndResponse.getEnventDrop(), fightEndResponse.getMissionDrop()); - if (monsterGroupId == mapManager.getSuddenlyBoss()) { - mapManager.findSuddenlyBoss(0, 0); - } + MessageUtil.sendMessage(session, 1, messageType.getNumber(), fightEndResponse.build(), true);