bdf1/tianta
1
1
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'b19f0' into noAnimate

Browse Source
This commit is contained in:
bdf1 2023-01-03 03:18:16 +13:00
commit 39308e3dd1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/functions.js
View File

@ -1654,7 +1654,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
return; return;
} }
//手册和道具栏画面背景 //手册和道具栏画面背景
if (core.status.event.id === 'book' || core.status.event.id === 'toolbox') { if (core.status.event.id === 'book' || core.status.event.id === 'book-detail' || core.status.event.id === 'toolbox') {
core.dom.caidan1Ctx.drawImage(core.material.images.images['black.png'], 0, 0) core.dom.caidan1Ctx.drawImage(core.material.images.images['black.png'], 0, 0)
core.drawWindowSkin('winskin.png', core.dom.caidan1Ctx, -20, 0, 201, 290); core.drawWindowSkin('winskin.png', core.dom.caidan1Ctx, -20, 0, 201, 290);
core.drawWindowSkin('winskin.png', core.dom.caidan1Ctx, 0, 290, 161, 95); core.drawWindowSkin('winskin.png', core.dom.caidan1Ctx, 0, 290, 161, 95);
@ -1700,7 +1700,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
fill(core.getFlag("juqing", 0), 107, 91 + 35 + 36 + 34 + 32 + 32, '#FF0000'); fill(core.getFlag("juqing", 0), 107, 91 + 35 + 36 + 34 + 32 + 32, '#FF0000');
ctx.textAlign = 'left'; ctx.textAlign = 'left';
if (flags.hard - 4) fill1('[' + core.formatBigNumber(core.getRealStatus('mdef')) + ']', 76, 174, '#FF1495'); if (flags.hard - 4) fill1('[' + core.formatBigNumber(core.getRealStatus('mdef')) + ']', 76, 174, '#FF1495');
if (core.status.event.id !== 'book' && core.status.event.id !== 'toolbox') { if (core.status.event.id !== 'book' && core.status.event.id !== 'book-detail' && core.status.event.id !== 'toolbox') {
core.drawImage(ctx, core.material.images.items, 0, 0, 32, 128, 13, 300, 28, 112); core.drawImage(ctx, core.material.images.items, 0, 0, 32, 128, 13, 300, 28, 112);
fill('黄钥匙', 50, 320, '#FFFF80'); fill('黄钥匙', 50, 320, '#FFFF80');
fill('蓝钥匙', 50, 320 + 28, '#80FFFF'); fill('蓝钥匙', 50, 320 + 28, '#80FFFF');
@ -1720,10 +1720,10 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
fill('游戏时间', 20, 330, '#c0e0ff'); fill('游戏时间', 20, 330, '#c0e0ff');
fill('步数', 20, 425, '#c0e0ff'); fill('步数', 20, 425, '#c0e0ff');
ctx.textAlign = 'right'; ctx.textAlign = 'right';
var hour = Math.floor(core.animateFrame.totalTime / (1000 * 60 * 60)), var hour = Math.floor(core.status.hero.statistics.currTime / (1000 * 60 * 60)) % 24,
minutes = Math.floor(core.animateFrame.totalTime / (1000 * 60)) % 60, minutes = Math.floor(core.status.hero.statistics.currTime / (1000 * 60)) % 60,
seconds = Math.floor(core.animateFrame.totalTime / 1000) % 60, seconds = Math.floor(core.status.hero.statistics.currTime / 1000) % 60,
day = Math.floor(core.animateFrame.totalTime / (1000 * 60 * 60 * 24)), day = Math.floor(core.status.hero.statistics.currTime / (1000 * 60 * 60 * 24)),
step = core.status.hero.steps; step = core.status.hero.steps;
hour = hour < 10 ? '0' + hour : hour; hour = hour < 10 ? '0' + hour : hour;
minutes = minutes < 10 ? '0' + minutes : minutes; minutes = minutes < 10 ? '0' + minutes : minutes;
@ -1733,6 +1733,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
//else //else
fill(hour + ':' + minutes + ':' + seconds, 140, 360, "#ffffff"); fill(hour + ':' + minutes + ':' + seconds, 140, 360, "#ffffff");
fill(step, 140, 455, '#ffffff'); fill(step, 140, 455, '#ffffff');
setTimeout(function(){core.ui.drawStatusBar();}, 100);
} }
} }
} else if (core.flags.extendToolbar && !core.domStyle.isVertical) { // 横屏且隐藏状态栏 } else if (core.flags.extendToolbar && !core.domStyle.isVertical) { // 横屏且隐藏状态栏