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

Fix SetInterval Bug

Browse Source
This commit is contained in:
ckcz123 2018-02-25 12:31:13 +08:00
parent a2d85bbc63
commit be2696c406
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/core.js
View File

@ -19,7 +19,6 @@ function core() {
'turnHeroTimeout': null, 'turnHeroTimeout': null,
} }
this.interval = { this.interval = {
'heroMoveTriggerInterval': null,
'heroMoveInterval': null, 'heroMoveInterval': null,
"tipAnimate": null, "tipAnimate": null,
'openDoorAnimate': null, 'openDoorAnimate': null,
@ -801,7 +800,6 @@ 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();
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
}); });
@ -1153,7 +1151,6 @@ 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.startReplay(route); core.startReplay(route);
}); });
}, function () { }, function () {
@ -2045,17 +2042,17 @@ core.prototype.moveHero = function (direction, callback) {
if (!core.isset(callback)) { // 如果不存在回调函数，则使用heroMoveTrigger if (!core.isset(callback)) { // 如果不存在回调函数，则使用heroMoveTrigger
core.status.heroStop = false; core.status.heroStop = false;
core.status.automaticRoute.moveDirectly = false; core.status.automaticRoute.moveDirectly = false;
if (core.interval.heroMoveTriggerInterval==null) {
core.moveAction(); var doAction = function () {
core.interval.heroMoveTriggerInterval = setInterval(function () {
if (!core.status.heroStop) { if (!core.status.heroStop) {
core.moveAction(); core.moveAction();
setTimeout(doAction, 50);
} }
else { else {
core.stopHero(); core.stopHero();
} }
}, 50)
} }
doAction();
} }
else { // 否则，只向某个方向移动一步，然后调用callback else { // 否则，只向某个方向移动一步，然后调用callback
core.moveAction(function () { core.moveAction(function () {
@ -2163,9 +2160,6 @@ core.prototype.waitHeroToStop = function(callback) {
////// 停止勇士的移动状态 ////// ////// 停止勇士的移动状态 //////
core.prototype.stopHero = function () { core.prototype.stopHero = function () {
core.status.heroStop = true; core.status.heroStop = true;
core.status.automaticRoute.moveDirectly = false;
clearInterval(core.interval.heroMoveTriggerInterval);
core.interval.heroMoveTriggerInterval=null;
} }
////// 绘制勇士 ////// ////// 绘制勇士 //////
@ -4451,7 +4445,6 @@ core.prototype.doSL = function (id, type) {
core.resetStatus(core.firstData.hero, data.hard, core.firstData.floorId, null, core.initStatus.maps); core.resetStatus(core.firstData.hero, data.hard, core.firstData.floorId, null, core.initStatus.maps);
core.events.setInitData(data.hard); core.events.setInitData(data.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.startReplay(core.decodeRoute(data.route)); core.startReplay(core.decodeRoute(data.route));
}); });
} }
@ -4777,7 +4770,6 @@ 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();
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
}); });
} }