Replace 13/416 with core.__SIZE__

This commit is contained in:
oc 2019-03-18 01:42:29 +08:00
parent 6041236a0b
commit 6e38f533bf
2 changed files with 15 additions and 15 deletions

View File

@ -761,8 +761,8 @@ control.prototype.drawHero = function (direction, x, y, status, offset) {
offset = offset || 0; offset = offset || 0;
var way = core.utils.scan[direction]; var way = core.utils.scan[direction];
var dx = way.x, dy = way.y, offsetX = dx * offset, offsetY = dy * offset; var dx = way.x, dy = way.y, offsetX = dx * offset, offsetY = dy * offset;
core.bigmap.offsetX = core.clamp((x - 6) * 32 + offsetX, 0, 32*core.bigmap.width-core.__PIXELS__); core.bigmap.offsetX = core.clamp((x - core.__HALF_SIZE__) * 32 + offsetX, 0, 32*core.bigmap.width-core.__PIXELS__);
core.bigmap.offsetY = core.clamp((y - 6) * 32 + offsetY, 0, 32*core.bigmap.height-core.__PIXELS__); core.bigmap.offsetY = core.clamp((y - core.__HALF_SIZE__) * 32 + offsetY, 0, 32*core.bigmap.height-core.__PIXELS__);
core.clearAutomaticRouteNode(x+dx, y+dy); core.clearAutomaticRouteNode(x+dx, y+dy);
core.clearMap('hero'); core.clearMap('hero');
@ -814,10 +814,10 @@ control.prototype.setGameCanvasTranslate = function(canvas,x,y){
c.style.OTransform='translate('+x+'px,'+y+'px)'; c.style.OTransform='translate('+x+'px,'+y+'px)';
c.style.MozTransform='translate('+x+'px,'+y+'px)'; c.style.MozTransform='translate('+x+'px,'+y+'px)';
if(main.mode==='editor' && editor.isMobile){ if(main.mode==='editor' && editor.isMobile){
c.style.transform='translate('+(x/416*96)+'vw,'+(y/416*96)+'vw)'; c.style.transform='translate('+(x/core.__PIXELS__*96)+'vw,'+(y/core.__PIXELS__*96)+'vw)';
c.style.webkitTransform='translate('+(x/416*96)+'vw,'+(y/416*96)+'vw)'; c.style.webkitTransform='translate('+(x/core.__PIXELS__*96)+'vw,'+(y/core.__PIXELS__*96)+'vw)';
c.style.OTransform='translate('+(x/416*96)+'vw,'+(y/416*96)+'vw)'; c.style.OTransform='translate('+(x/core.__PIXELS__*96)+'vw,'+(y/core.__PIXELS__*96)+'vw)';
c.style.MozTransform='translate('+(x/416*96)+'vw,'+(y/416*96)+'vw)'; c.style.MozTransform='translate('+(x/core.__PIXELS__*96)+'vw,'+(y/core.__PIXELS__*96)+'vw)';
} }
}; };
@ -1037,10 +1037,10 @@ control.prototype.setWeather = function (type, level) {
if (!core.isset(level)) level=5; if (!core.isset(level)) level=5;
if (level<1) level=1; if (level>10) level=10; if (level<1) level=1; if (level>10) level=10;
level *= parseInt(20*core.bigmap.width*core.bigmap.height/169); level *= parseInt(20*core.bigmap.width*core.bigmap.height/(core.__SIZE__*core.__SIZE__));
// 计算当前的宽高 // 计算当前的宽高
core.createCanvas('weather', 0, 0, 416, 416, 80); core.createCanvas('weather', 0, 0, core.__PIXELS__, core.__PIXELS__, 80);
core.animateFrame.weather.type = type; core.animateFrame.weather.type = type;
core.animateFrame.weather.level = level; core.animateFrame.weather.level = level;
core.animateFrame.weather.nodes = []; core.animateFrame.weather.nodes = [];
@ -1099,7 +1099,7 @@ control.prototype.setFg = function(color, time, callback) {
if (time==0) { if (time==0) {
// 直接变色 // 直接变色
core.clearMap('curtain'); core.clearMap('curtain');
core.fillRect('curtain', 0, 0, 416, 416, core.arrayToRGBA(color)); core.fillRect('curtain', 0, 0, core.__PIXELS__, core.__PIXELS__, core.arrayToRGBA(color));
core.status.curtainColor = color; core.status.curtainColor = color;
if (core.isset(callback)) callback(); if (core.isset(callback)) callback();
return; return;
@ -1115,7 +1115,7 @@ control.prototype.setFg = function(color, time, callback) {
(nowColor[3]*(step-1)+color[3])/step, (nowColor[3]*(step-1)+color[3])/step,
]; ];
core.clearMap('curtain'); core.clearMap('curtain');
core.fillRect('curtain', 0, 0, 416, 416, core.arrayToRGBA(nowColor)); core.fillRect('curtain', 0, 0, core.__PIXELS__, core.__PIXELS__, core.arrayToRGBA(nowColor));
step--; step--;
if (step <= 0) { if (step <= 0) {
@ -1612,13 +1612,13 @@ control.prototype.replay = function () {
var shop=core.status.shops[shopId]; var shop=core.status.shops[shopId];
if (core.isset(shop) && shop.visited) { // 商店可用 if (core.isset(shop) && shop.visited) { // 商店可用
var choices = shop.choices; var choices = shop.choices;
var topIndex = 6 - parseInt(choices.length / 2); var topIndex = core.__HALF_SIZE__ - parseInt(choices.length / 2);
core.status.event.selection = parseInt(selections.shift()); core.status.event.selection = parseInt(selections.shift());
core.events.openShop(shopId, false); core.events.openShop(shopId, false);
var shopInterval = setInterval(function () { var shopInterval = setInterval(function () {
if (!core.actions._clickShop(6, topIndex+core.status.event.selection)) { if (!core.actions._clickShop(core.__HALF_SIZE__, topIndex+core.status.event.selection)) {
clearInterval(shopInterval); clearInterval(shopInterval);
core.stopReplay(); core.stopReplay();
core.drawTip("录像文件出错"); core.drawTip("录像文件出错");
@ -1626,7 +1626,7 @@ control.prototype.replay = function () {
} }
if (selections.length==0) { if (selections.length==0) {
clearInterval(shopInterval); clearInterval(shopInterval);
core.actions._clickShop(6, topIndex+choices.length); core.actions._clickShop(core.__HALF_SIZE__, topIndex+choices.length);
core.replay(); core.replay();
return; return;
} }

View File

@ -1894,8 +1894,8 @@ control.prototype.jumpHero = function (ex, ey, time, callback) {
core.clearMap('hero', drawX()-core.bigmap.offsetX, drawY()-height+32-core.bigmap.offsetY, 32, height); core.clearMap('hero', drawX()-core.bigmap.offsetX, drawY()-height+32-core.bigmap.offsetY, 32, height);
updateJump(); updateJump();
var nowx = drawX(), nowy = drawY(); var nowx = drawX(), nowy = drawY();
core.bigmap.offsetX = core.clamp(nowx - 32*6, 0, 32*core.bigmap.width-416); core.bigmap.offsetX = core.clamp(nowx - 32*core.__HALF_SIZE__, 0, 32*core.bigmap.width-core.__PIXELS__);
core.bigmap.offsetY = core.clamp(nowy - 32*6, 0, 32*core.bigmap.height-416); core.bigmap.offsetY = core.clamp(nowy - 32*core.__HALF_SIZE__, 0, 32*core.bigmap.height-core.__PIXELS__);
core.control.updateViewport(); core.control.updateViewport();
core.drawImage('hero', core.material.images.hero, heroIcon[status] * 32, heroIcon.loc * height, 32, height, core.drawImage('hero', core.material.images.hero, heroIcon[status] * 32, heroIcon.loc * height, 32, height,
nowx - core.bigmap.offsetX, nowy + 32-height - core.bigmap.offsetY, 32, height); nowx - core.bigmap.offsetX, nowy + 32-height - core.bigmap.offsetY, 32, height);