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

Modify trigger

Browse Source
This commit is contained in:
oc 2018-02-04 12:00:04 +08:00
parent e0b7331a1a
commit 53ca30a913
4 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
libs/core.js
View File

@ -33,7 +33,6 @@ function core() {
'boxAnimate': null, 'boxAnimate': null,
'heroMoveTriggerInterval': null, 'heroMoveTriggerInterval': null,
'heroMoveInterval': null, 'heroMoveInterval': null,
'heroAutoMoveScan': null,
"tipAnimate": null, "tipAnimate": null,
'openDoorAnimate': null 'openDoorAnimate': null
} }
@ -86,7 +85,6 @@ function core() {
// 自动寻路相关 // 自动寻路相关
'automaticRoute': { 'automaticRoute': {
'autoHeroMove': false, 'autoHeroMove': false,
'automaticRouting': false,
'autoStep': 0, 'autoStep': 0,
'movedStep': 0, 'movedStep': 0,
'destStep': 0, 'destStep': 0,
@ -557,7 +555,7 @@ core.prototype.startGame = function (hard, callback) {
core.resetStatus(core.firstData.hero, hard, core.firstData.floorId, null, core.initStatus.maps); core.resetStatus(core.firstData.hero, hard, core.firstData.floorId, null, core.initStatus.maps);
core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() { core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() {
core.setHeroMoveTriggerInterval(); //core.setHeroMoveTriggerInterval();
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
}); });
@ -652,7 +650,7 @@ core.prototype.pressKey = function (keyCode) {
////// 根据按下键的code来执行一系列操作 ////// ////// 根据按下键的code来执行一系列操作 //////
core.prototype.keyDown = function(keyCode) { core.prototype.keyDown = function(keyCode) {
if (core.isset(core.status.replay)&&core.status.replay.replaying) return; if (core.isset(core.status.replay)&&core.status.replay.replaying) return;
if (core.isset(core.status.automaticRoute)&&core.status.automaticRoute.automaticRouting) { if (core.isset(core.status.automaticRoute)&&core.status.automaticRoute.autoHeroMove) {
core.stopAutomaticRoute(); core.stopAutomaticRoute();
} }
if (core.status.lockControl) { if (core.status.lockControl) {
@ -907,7 +905,7 @@ core.prototype.keyUp = function(keyCode) {
core.resetStatus(core.firstData.hero, hard, core.firstData.floorId, null, core.initStatus.maps); core.resetStatus(core.firstData.hero, hard, core.firstData.floorId, null, core.initStatus.maps);
core.events.setInitData(hard); core.events.setInitData(hard);
core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() { core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() {
core.setHeroMoveTriggerInterval(); //core.setHeroMoveTriggerInterval();
core.startReplay(route); core.startReplay(route);
}); });
}, function () { }, function () {
@ -1256,24 +1254,30 @@ core.prototype.stopAutomaticRoute = function () {
if (!core.status.played) { if (!core.status.played) {
return; return;
} }
core.stopAutoHeroMove(); core.status.automaticRoute.autoHeroMove = false;
core.status.automaticRoute.automaticRouting = false; core.status.automaticRoute.autoStep = 0;
core.status.automaticRoute.destStep = 0;
core.status.automaticRoute.movedStep = 0;
core.status.automaticRoute.autoStepRoutes = []; core.status.automaticRoute.autoStepRoutes = [];
core.status.automaticRoute.destX=null; core.status.automaticRoute.destX=null;
core.status.automaticRoute.destY=null; core.status.automaticRoute.destY=null;
core.stopHero();
if (core.status.automaticRoute.moveStepBeforeStop.length==0) if (core.status.automaticRoute.moveStepBeforeStop.length==0)
core.canvas.ui.clearRect(0, 0, 416, 416); core.canvas.ui.clearRect(0, 0, 416, 416);
core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop');
} }
////// 继续剩下的自动寻路操作 ////// ////// 继续剩下的自动寻路操作 //////
core.prototype.continueAutomaticRoute = function () { core.prototype.continueAutomaticRoute = function () {
// 此函数只应由events.afterOpenDoor和events.afterBattle调用 // 此函数只应由events.afterOpenDoor和events.afterBattle调用
var moveStep = core.status.automaticRoute.moveStepBeforeStop; var moveStep = core.status.automaticRoute.moveStepBeforeStop;
core.status.automaticRoute.moveStepBeforeStop = []; //core.status.automaticRoute.moveStepBeforeStop = [];
if(moveStep.length===0)return; if(moveStep.length===0 || (moveStep.length===1 && moveStep[0].step===1)) {
if(moveStep.length===1 && moveStep[0].step===1)return; core.status.automaticRoute.moveStepBeforeStop = [];
core.status.automaticRoute.automaticRouting = true; }
core.setAutoHeroMove(moveStep); else {
core.setAutoHeroMove(moveStep);
}
} }
////// 清空剩下的自动寻路列表 ////// ////// 清空剩下的自动寻路列表 //////
@ -1288,7 +1292,7 @@ core.prototype.setAutomaticRoute = function (destX, destY, stepPostfix) {
return; return;
} }
// 正在寻路中 // 正在寻路中
if (core.status.automaticRoute.automaticRouting) { if (core.status.automaticRoute.autoHeroMove) {
var lastX = core.status.automaticRoute.destX, lastY=core.status.automaticRoute.destY; var lastX = core.status.automaticRoute.destX, lastY=core.status.automaticRoute.destY;
core.stopAutomaticRoute(); core.stopAutomaticRoute();
if (lastX==destX && lastY==destY) { if (lastX==destX && lastY==destY) {
@ -1406,7 +1410,6 @@ core.prototype.setAutomaticRoute = function (destX, destY, stepPostfix) {
core.canvas.ui.restore(); core.canvas.ui.restore();
// 立刻移动 // 立刻移动
core.status.automaticRoute.automaticRouting = true;
core.setAutoHeroMove(); core.setAutoHeroMove();
} }
@ -1538,18 +1541,6 @@ core.prototype.clearStepPostfix = function () {
/////////// 自动行走 & 行走控制 /////////// /////////// 自动行走 & 行走控制 ///////////
////// 停止勇士的自动行走 //////
core.prototype.stopAutoHeroMove = function () {
core.status.automaticRoute.autoHeroMove = false;
core.status.automaticRoute.automaticRouting = false;
core.status.automaticRoute.autoStep = 0;
core.status.automaticRoute.destStep = 0;
core.status.automaticRoute.movedStep = 0;
core.status.automaticRoute.autoStepRoutes = [];
core.stopHero();
clearInterval(core.interval.heroAutoMoveScan);
}
////// 设置勇士的自动行走路线 ////// ////// 设置勇士的自动行走路线 //////
core.prototype.setAutoHeroMove = function (steps) { core.prototype.setAutoHeroMove = function (steps) {
steps=steps||core.status.automaticRoute.autoStepRoutes; steps=steps||core.status.automaticRoute.autoStepRoutes;
@ -1557,25 +1548,10 @@ core.prototype.setAutoHeroMove = function (steps) {
return; return;
} }
core.status.automaticRoute.autoStepRoutes=steps; core.status.automaticRoute.autoStepRoutes=steps;
core.status.automaticRoute.autoStep = 0;
clearInterval(core.interval.heroAutoMoveScan);
core.interval.heroAutoMoveScan = window.setInterval(function () {
if (!core.status.automaticRoute.autoHeroMove) {
if (core.status.automaticRoute.autoStep == core.status.automaticRoute.autoStepRoutes.length) {
core.stopAutoHeroMove();
return;
}
core.autoHeroMove(core.status.automaticRoute.autoStepRoutes[core.status.automaticRoute.autoStep].direction, core.status.automaticRoute.autoStepRoutes[core.status.automaticRoute.autoStep].step);
core.status.automaticRoute.autoStep++;
}
}, 80);
}
////// 让勇士开始自动行走 //////
core.prototype.autoHeroMove = function (direction, step) {
core.status.automaticRoute.autoHeroMove = true; core.status.automaticRoute.autoHeroMove = true;
core.status.automaticRoute.destStep = step; core.status.automaticRoute.autoStep = 1;
core.moveHero(direction); core.status.automaticRoute.destStep = steps[0].step;
core.moveHero(steps[0].direction);
} }
////// 设置行走的效果动画 ////// ////// 设置行走的效果动画 //////
@ -1612,15 +1588,6 @@ core.prototype.setHeroMoveInterval = function (direction, x, y, callback) {
}, 12.5 / core.status.replay.speed); }, 12.5 / core.status.replay.speed);
} }
////// 设置勇士行走过程中对事件的触发检测 //////
core.prototype.setHeroMoveTriggerInterval = function () {
core.interval.heroMoveTriggerInterval = window.setInterval(function () {
if (!core.status.heroStop) {
core.moveAction();
}
}, 50);
}
////// 实际每一步的行走过程 ////// ////// 实际每一步的行走过程 //////
core.prototype.moveAction = function (callback) { core.prototype.moveAction = function (callback) {
if (core.interval.openDoorAnimate!=null) return; // 开门判断 if (core.interval.openDoorAnimate!=null) return; // 开门判断
@ -1636,10 +1603,20 @@ core.prototype.moveAction = function (callback) {
var noPass = core.noPass(x + scan[direction].x, y + scan[direction].y), canMove = core.canMoveHero(); var noPass = core.noPass(x + scan[direction].x, y + scan[direction].y), canMove = core.canMoveHero();
if (noPass || !canMove) { if (noPass || !canMove) {
core.status.route.push(direction); core.status.route.push(direction);
core.status.automaticRoute.moveStepBeforeStop = [];
if (canMove) // 非箭头：触发 if (canMove) // 非箭头：触发
core.trigger(x + scan[direction].x, y + scan[direction].y); core.trigger(x + scan[direction].x, y + scan[direction].y);
core.drawHero(direction, x, y, 'stop'); core.drawHero(direction, x, y, 'stop');
// core.clearContinueAutomaticRoute();
if (core.status.automaticRoute.moveStepBeforeStop.length==0) {
core.clearContinueAutomaticRoute();
core.stopAutomaticRoute();
}
/*
if (core.status.automaticRoute.autoHeroMove) { if (core.status.automaticRoute.autoHeroMove) {
core.status.automaticRoute.movedStep++; core.status.automaticRoute.movedStep++;
if (core.status.automaticRoute.destStep == core.status.automaticRoute.movedStep) { if (core.status.automaticRoute.destStep == core.status.automaticRoute.movedStep) {
core.status.automaticRoute.autoHeroMove = false; core.status.automaticRoute.autoHeroMove = false;
@ -1650,8 +1627,10 @@ core.prototype.moveAction = function (callback) {
} }
} }
else { else {
core.status.heroStop = true; // core.status.heroStop = true;
core.stopHero();
} }
*/
if (core.isset(callback)) if (core.isset(callback))
callback(); callback();
} }
@ -1660,11 +1639,16 @@ core.prototype.moveAction = function (callback) {
if (core.status.automaticRoute.autoHeroMove) { if (core.status.automaticRoute.autoHeroMove) {
core.status.automaticRoute.movedStep++; core.status.automaticRoute.movedStep++;
if (core.status.automaticRoute.destStep == core.status.automaticRoute.movedStep) { if (core.status.automaticRoute.destStep == core.status.automaticRoute.movedStep) {
core.status.automaticRoute.autoHeroMove = false; if (core.status.automaticRoute.autoStep == core.status.automaticRoute.autoStepRoutes.length) {
core.status.automaticRoute.destStep = 0; core.clearContinueAutomaticRoute();
core.status.automaticRoute.movedStep = 0; core.stopAutomaticRoute();
core.stopHero(); }
core.drawHero(core.getHeroLoc('direction'), core.getHeroLoc('x'), core.getHeroLoc('y'), 'stop'); else {
core.status.automaticRoute.movedStep = 0;
core.status.automaticRoute.destStep = core.status.automaticRoute.autoStepRoutes[core.status.automaticRoute.autoStep].step;
core.setHeroLoc('direction', core.status.automaticRoute.autoStepRoutes[core.status.automaticRoute.autoStep].direction);
core.status.automaticRoute.autoStep++;
}
} }
} }
else if (core.status.heroStop) { else if (core.status.heroStop) {
@ -1760,6 +1744,16 @@ core.prototype.moveHero = function (direction, callback) {
core.setHeroLoc('direction', direction); core.setHeroLoc('direction', direction);
if (!core.isset(callback)) { // 如果不存在回调函数，则使用heroMoveTrigger if (!core.isset(callback)) { // 如果不存在回调函数，则使用heroMoveTrigger
core.status.heroStop = false; core.status.heroStop = false;
if (core.interval.heroMoveTriggerInterval==null) {
core.interval.heroMoveTriggerInterval = setInterval(function () {
if (!core.status.heroStop) {
core.moveAction();
}
else {
core.stopHero();
}
}, 50)
}
} }
else { // 否则，只向某个方向移动一步，然后调用callback else { // 否则，只向某个方向移动一步，然后调用callback
core.moveAction(function () { core.moveAction(function () {
@ -1866,6 +1860,8 @@ core.prototype.waitHeroToStop = function(callback) {
////// 停止勇士的移动状态 ////// ////// 停止勇士的移动状态 //////
core.prototype.stopHero = function () { core.prototype.stopHero = function () {
core.status.heroStop = true; core.status.heroStop = true;
clearInterval(core.interval.heroMoveTriggerInterval);
core.interval.heroMoveTriggerInterval=null;
} }
////// 绘制勇士 ////// ////// 绘制勇士 //////
@ -1942,7 +1938,7 @@ core.prototype.openDoor = function (id, x, y, needKey, callback) {
core.status.automaticRoute.moveStepBeforeStop=core.status.automaticRoute.autoStepRoutes.slice(core.status.automaticRoute.autoStep-1,core.status.automaticRoute.autoStepRoutes.length); core.status.automaticRoute.moveStepBeforeStop=core.status.automaticRoute.autoStepRoutes.slice(core.status.automaticRoute.autoStep-1,core.status.automaticRoute.autoStepRoutes.length);
if (core.status.automaticRoute.moveStepBeforeStop.length>=1)core.status.automaticRoute.moveStepBeforeStop[0].step-=core.status.automaticRoute.movedStep; if (core.status.automaticRoute.moveStepBeforeStop.length>=1)core.status.automaticRoute.moveStepBeforeStop[0].step-=core.status.automaticRoute.movedStep;
} }
core.stopHero();
core.stopAutomaticRoute(); core.stopAutomaticRoute();
var speed=30; var speed=30;
if (needKey) { if (needKey) {
@ -4280,7 +4276,7 @@ core.prototype.loadData = function (data, callback) {
core.events.afterLoadData(data); core.events.afterLoadData(data);
core.changeFloor(data.floorId, null, data.hero.loc, 0, function() { core.changeFloor(data.floorId, null, data.hero.loc, 0, function() {
core.setHeroMoveTriggerInterval(); //core.setHeroMoveTriggerInterval();
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
}); });
} }

6
libs/events.js
View File

@ -753,6 +753,9 @@ events.prototype.afterBattle = function(enemyId,x,y,callback) {
if (core.status.event.id == null) { if (core.status.event.id == null) {
core.continueAutomaticRoute(); core.continueAutomaticRoute();
} }
else {
core.clearContinueAutomaticRoute();
}
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
} }
@ -775,6 +778,9 @@ events.prototype.afterOpenDoor = function(doorId,x,y,callback) {
if (core.status.event.id == null) { if (core.status.event.id == null) {
core.continueAutomaticRoute(); core.continueAutomaticRoute();
} }
else {
core.clearContinueAutomaticRoute();
}
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
} }

2
main.js
View File

@ -438,7 +438,7 @@ main.dom.replayGame.onclick = function () {
core.resetStatus(core.firstData.hero, obj.hard, core.firstData.floorId, null, core.initStatus.maps); core.resetStatus(core.firstData.hero, obj.hard, core.firstData.floorId, null, core.initStatus.maps);
core.events.setInitData(obj.hard); core.events.setInitData(obj.hard);
core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() { core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() {
core.setHeroMoveTriggerInterval(); //core.setHeroMoveTriggerInterval();
core.startReplay(core.decodeRoute(obj.route)); core.startReplay(core.decodeRoute(obj.route));
}); });
}, function () { }, function () {

1
更新说明.txt
View File

@ -5,6 +5,7 @@
键盘支持自动寻路操作。 键盘支持自动寻路操作。
未成功打怪和开门则不自动存档。 未成功打怪和开门则不自动存档。
重新支持楼梯穿透。 重新支持楼梯穿透。
支持多结局，成绩将分开统计。
修复所有已知Bug。 修复所有已知Bug。
----------------------------------------------------------------------- -----------------------------------------------------------------------