Merge pull request #21 from zhaouv/centerFly

Update CenterFly
This commit is contained in:
Zhang Chen 2017-12-25 18:43:21 +08:00 committed by GitHub
commit 28974e4e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 14 deletions

View File

@ -76,6 +76,9 @@ function core() {
'mouseOutCheck': 1,
'moveStepBeforeStop': [],
// 勇士状态;中心对称飞行器
'usingCenterFly':false,
// event事件
'savePage': null,
'shops': {},
@ -373,7 +376,8 @@ core.prototype.onkeyUp = function(e) {
break;
}
}
core.stopHero();
//core.stopHero();
core.keyUp(e.keyCode);
} else {
core.keyUp(e.keyCode);
}
@ -424,6 +428,33 @@ core.prototype.keyDown = function(keyCode) {
case 40:
core.moveHero('down');
break;
case 51: // 快捷键3
// 因为加入了两次的检测机制,从keydown转移到keyup,同时保证位置信息正确,但以下情况会触发作图的bug:
// 在鼠标的路线移动中使用飞,绿块会滞后一格,显示的位置不对,同时也不会倍以下的代码清除
if (core.status.heroStop && core.hasItem('centerFly')) {
if (core.status.usingCenterFly) {
if (core.canUseItem('centerFly')) {
core.useItem('centerFly');
core.clearMap('ui', core.getHeroLoc('x')*32,core.getHeroLoc('y')*32,32,32);
}
else {
core.drawTip('当前不能使用中心对称飞行器');
core.clearMap('ui', (12-core.getHeroLoc('x'))*32,(12-core.getHeroLoc('y'))*32,32,32);
}
core.status.usingCenterFly = false;
} else {
core.status.usingCenterFly = true;
var fillstyle = 'rgba(255,0,0,0.5)';
if (core.canUseItem('centerFly')) fillstyle = 'rgba(0,255,0,0.5)';
core.fillRect('ui',(12-core.getHeroLoc('x'))*32,(12-core.getHeroLoc('y'))*32,32,32,fillstyle);
}
}
break;
}
if (core.status.usingCenterFly && keyCode!=51) {
core.clearMap('ui', (12-core.getHeroLoc('x'))*32,(12-core.getHeroLoc('y'))*32,32,32);
core.status.usingCenterFly= false;
}
}
@ -547,17 +578,9 @@ core.prototype.keyUp = function(keyCode) {
}
}
break;
case 51: // 快捷键3
if (core.status.heroStop && core.hasItem('centerFly')) {
if (core.canUseItem('centerFly')) {
core.useItem('centerFly');
}
else {
core.drawTip('当前不能使用中心对称飞行器');
}
}
break;
}
core.stopHero();
}
@ -649,6 +672,25 @@ core.prototype.onclick = function (x, y, stepPostfix) {
// 非游戏屏幕内
if (x<0 || y<0 || x>12 || y>12) return;
// 中心对称飞行器
if (core.status.usingCenterFly) {
if (x!=12-core.getHeroLoc('x') || y!=12-core.getHeroLoc('y')) {
core.clearMap('ui', (12-core.getHeroLoc('x'))*32,(12-core.getHeroLoc('y'))*32,32,32);
} else {
if (core.canUseItem('centerFly')) {
core.useItem('centerFly');
core.clearMap('ui', core.getHeroLoc('x')*32,core.getHeroLoc('y')*32,32,32);
return;
}
else {
core.drawTip('当前不能使用中心对称飞行器');
core.clearMap('ui', (12-core.getHeroLoc('x'))*32,(12-core.getHeroLoc('y'))*32,32,32);
}
}
core.status.usingCenterFly= false;
}
// 寻路
if (!core.status.lockControl) {
core.setAutomaticRoute(x, y, stepPostfix);

View File

@ -457,6 +457,13 @@ events.prototype.useItem = function(itemId) {
core.useFly(false);
return;
}
if (itemId=='centerFly') {
core.status.usingCenterFly= true;
var fillstyle = 'rgba(255,0,0,0.5)';
if (core.canUseItem('centerFly')) fillstyle = 'rgba(0,255,0,0.5)';
core.fillRect('ui',(12-core.getHeroLoc('x'))*32,(12-core.getHeroLoc('y'))*32,32,32,fillstyle);
return;
}
if (core.canUseItem(itemId))core.useItem(itemId);
else core.drawTip("当前无法使用"+core.material.items[itemId].name);

View File

@ -15,8 +15,8 @@ main.floors.sample0 = {
[216, 247, 256, 235, 248, 6, 0, 3, 49, 50, 51, 52, 38],
[6, 6, 125, 6, 6, 6, 0, 1, 45, 46, 47, 48, 37],
[224, 254, 212, 232, 204, 5, 0, 1, 31, 32, 34, 33, 36],
[201, 205, 217, 215, 207, 5, 0, 1, 27, 28, 29, 30, 35],
[5, 5, 125, 5, 5, 5, 0, 1, 21, 22, 23, 24, 25],
[201, 205, 217, 215, 207, 5, 50, 1, 27, 28, 29, 30, 35],
[5, 5, 125, 5, 5, 5, 50, 1, 21, 22, 23, 24, 25],
[0, 0, 0, 0, 0, 0, 45, 1, 1, 1, 121, 1, 1],
[4, 4, 126, 4, 4, 4, 0, 0, 0, 0, 0, 85, 124],
[87, 11, 12, 13, 14, 4, 4, 2, 2, 2, 122, 2, 2],