From f6f1cac98eebf9283a0cd2ace4e3ae5f664bc5b3 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 21 Mar 2019 15:28:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=82=B9=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E6=96=B9=E5=BC=8F?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 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 77b13ba3d..aa0270d35 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 @@ -417,9 +417,9 @@ public class MapLogic { } } if (mapPointConfig.getTriggerRules() == 1) { - cell = mapManager.getMapInfo().get(mapManager.getCurXY()); - } else { cell = mapManager.getMapInfo().get(mapManager.getTriggerXY()); + } else { + cell = mapManager.getMapInfo().get(mapManager.getCurMapId()); } // 检测该事件点是否已被销毁 From 13a95395f8e465d57ec35c6c5be6fcf8b249b1a1 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 21 Mar 2019 15:29:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/EventPointConfig.txt | 2 ++ conf/server/MapPointConfig.txt | 3 +++ conf/server/OptionConfig.txt | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 5b8cb0114..91ddde6e0 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -30,6 +30,8 @@ int mut,int#int,1 100028 100030 100029 100031 100030 100032 +100031 100033 +100032 100034 101001 10101 101002 10102 101003 10110 diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 6d25c974e..16f9e8b57 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -37,6 +37,9 @@ int int int int int int int 101030 5 3 1 0 101207 0 101031 5 0 0 0 101210 0 101032 5 0 0 0 0 0 +101033 0 0 2 0 0 0 +101034 0 0 2 0 0 0 +101035 0 0 2 0 0 0 0 0 0 0 0 0 0 102001 1 2 1 0 102001 0 102002 1 2 1 0 102002 0 diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index c8f435347..9ba0facb0 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -31,7 +31,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100029 0 0 null null 1 100028 100030 0 27 2 null 1 100029 100031 0 19 1#100#20#29 null 4 null -100032 0 26 2 null 4 null +100032 0 0 null null 1 null +100033 0 0 null null 1 null +100034 0 26 2 null 4 null 101001 1 2 1503#1 1001#1101#1201#1301 4 null 101002 0 0 null null 4 null 101003 0 5 0 null 4 null