Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
d7fc189d91
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -415,9 +415,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());
|
||||
}
|
||||
|
||||
// 检测该事件点是否已被销毁
|
||||
|
|
Loading…
Reference in New Issue