jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix Bug

Browse Source
This commit is contained in:
oc 2018-03-22 20:56:28 +08:00
parent c1c9cb7905
commit a0dcf65a02
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/core.js
View File

@ -281,7 +281,7 @@ core.prototype.init = function (coreData, callback) {
core.setRequestAnimationFrame(); core.setRequestAnimationFrame();
core.showStartAnimate(); core.showStartAnimate();
core.events.initGame();
if (core.isset(functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.plugins)) if (core.isset(functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.plugins))
core.plugin = new functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.plugins.plugin(); core.plugin = new functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a.plugins.plugin();

10
libs/maps.js
View File

@ -65,18 +65,18 @@ maps.prototype.initBlock = function (x, y, id) {
////// 添加一些信息到block上 ////// ////// 添加一些信息到block上 //////
maps.prototype.addInfo = function (block) { maps.prototype.addInfo = function (block) {
if (core.isset(block.event)) { if (core.isset(block.event)) {
if (block.event.cls.indexOf("enemy")==0 && block.event.trigger==undefined) { if (block.event.cls.indexOf("enemy")==0 && !core.isset(block.event.trigger)) {
block.event.trigger = 'battle'; block.event.trigger = 'battle';
} }
if (block.event.cls == 'items' && block.event.trigger==undefined) { if (block.event.cls == 'items' && !core.isset(block.event.trigger)) {
block.event.trigger = 'getItem'; block.event.trigger = 'getItem';
} }
if (block.event.noPass == undefined) { if (!core.isset(block.event.noPass)) {
if (block.event.cls.indexOf("enemy")==0 || block.event.cls.indexOf("npc")==0 || block.event.cls=='terrains') { if (block.event.cls.indexOf("enemy")==0 || block.event.cls.indexOf("npc")==0 || block.event.cls=='terrains') {
block.event.noPass = true; block.event.noPass = true;
} }
} }
if (block.event.animate == undefined) { if (!core.isset(block.event.animate)) {
if (block.event.cls=='enemys' || block.event.cls=='npcs') { if (block.event.cls=='enemys' || block.event.cls=='npcs') {
block.event.animate = 2; block.event.animate = 2;
} }
@ -124,7 +124,7 @@ maps.prototype.addEvent = function (block, x, y, event) {
} }
// 覆盖其他属性 // 覆盖其他属性
for (var key in event) { for (var key in event) {
if (key!="enable" && key!="trigger") { if (key!="enable" && key!="trigger" && key!="noPass") {
block.event[key]=core.clone(event[key]); block.event[key]=core.clone(event[key]);
} }
} }