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

Merge branch 'noAnimate' into hasAnimate

Browse Source
This commit is contained in:
bdf1 2022-11-08 04:45:51 +13:00
commit 996a0abfb8
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/config.json
View File

@ -1 +1 @@
{"viewportLoc":[0,0],"editorLastFloorId":"QISHI"}
{"viewportLoc":[0,0],"editorLastFloorId":"mishi"}

48
project/functions.js
View File

@ -1599,7 +1599,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
else core.drawImage('caidan','caidan.png',-161,0);
core.dom.caidan1Ctx.drawImage(core.material.images.images['caidan.png'],0,0)
var ctx, fill = function (text, x, y, style) {
core.ui.setFont(ctx, /*(/\w+/.test(text) ? 'italic ' : '') + */'18px fzchyjw');
core.ui.setFont(ctx, /*(/\w+/.test(text) ? 'italic ' : '') + */'21px fzchyjw');
core.ui.fillText(ctx, text, x, y, style);
}, fill1 = function (text, x, y, style) {
core.ui.setFont(ctx, '10px fzchyjw');
@ -1624,37 +1624,39 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.drawImage(ctx, core.statusBar.icons.exp, 6, 70, 25, 25);
fill(core.formatBigNumber(core.status.hero.exp), 42, 90);
} else if (!core.flags.extendToolbar) { // 横屏且未隐藏状态栏
core.drawImage(ctx, core.material.images.images[flags.hard == 4 ? 'status.png' : 'status2.png'],0,56);
core.drawImage(ctx, core.statusBar.icons.floor, 120, 12, 32, 32);
core.drawImage(ctx, core.material.images.images[flags.hard == 4 ? 'status.png' : 'status2.png'],0,63);
core.drawImage(ctx, core.statusBar.icons.floor, 124, 24, 32, 32);
ctx.textAlign = 'left';
fill((core.status.thisMap || {}).title || "Loading", 0, 37, '#000000');
fill((core.status.thisMap || {}).title || "Loading", 0, 49, '#000000');
//core.drawImage(ctx, core.statusBar.icons.hp, 6, 43, 25, 25);
ctx.textAlign = 'right';
fill(core.formatBigNumber(core.getRealStatus('hp')), 108, 82, '#000000');
fill(core.formatBigNumber(core.getRealStatus('hp')), 107, 91, '#000000');
//core.drawImage(ctx, core.statusBar.icons.atk, 6, 77, 25, 25);
fill(core.formatBigNumber(core.getRealStatus('atk')), 108, 82 + 35, '#000000');
fill(core.formatBigNumber(core.getRealStatus('atk')), 107, 91 + 35, '#000000');
//core.drawImage(ctx, core.statusBar.icons.def, 6, 111, 25, 25);
fill(core.formatBigNumber(core.getRealStatus('def')), 108, 82 + 35 + 36, '#000000');
fill(core.formatBigNumber(core.getRealStatus('def')), 107, 91 + 35 + 36, '#000000');
//core.drawImage(ctx, core.statusBar.icons.mdef, 6, 145, 25, 25);
//core.drawImage(ctx, core.statusBar.icons.money, 6, 179, 25, 25);
fill(core.formatBigNumber(core.status.hero.exp), 108, 82 + 35 + 36 + 33, '#000000');
fill(core.formatBigNumber(core.status.hero.exp), 107, 91 + 35 + 36 + 34, '#000000');
//core.drawImage(ctx, core.statusBar.icons.exp, 6, 213, 25, 25);
fill(core.formatBigNumber(core.status.hero.money), 108, 82 + 35 + 36 + 33 + 33, '#000000');
fill(core.getFlag("juqing", 0), 108, 82 + 35 + 36 + 33 + 33 + 32, '#FF0000');
fill(core.formatBigNumber(core.status.hero.money), 107, 91 + 35 + 36 + 34 + 32, '#000000');
fill(core.getFlag("juqing", 0), 107, 91 + 35 + 36 + 34 + 32 + 32, '#FF0000');
ctx.textAlign = 'left';
if (flags.hard - 4) fill1(core.formatBigNumber(core.getRealStatus('mdef')), 76, 166, '#FF1495');
core.drawImage(ctx, core.material.images.items, 0, 0, 32, 128, 13, 260, 26, 104);
fill('黄钥匙', 55, 280, '#F0E6BC');
fill(core.itemCount('yellowKey'), 130, 280, '#F0E6BC');
fill('蓝钥匙', 55, 280 + 26, '#7FFFD4');
fill(core.itemCount('blueKey'), 130, 280 + 26, '#7FFFD4');
fill('红钥匙', 55, 280 + 52, '#E9967A');
fill(core.itemCount('redKey'), 130, 280 + 52, '#E9967A');
fill('黑钥匙', 55, 280 + 78, '#000000');
fill(core.itemCount('greenKey'), 130, 280 + 78, '#000000');
core.drawImage(ctx, core.material.images.images[['00005.png','00001.png','00002.png','00003.png','00004.png','00005.png'][flags.hard || 0]], 0, 423 - [0,10,10,0,0,0][flags.hard || 0]);
if (flags.poison) fill("中毒", 5, 60, '#00CD00');
if (flags.weak) fill("衰弱", 50, 60, '#FF1493');
if (flags.hard - 4) fill1('[' + core.formatBigNumber(core.getRealStatus('mdef')) + ']', 76, 174, '#FF1495');
core.drawImage(ctx, core.material.images.items, 0, 0, 32, 128, 13, 300, 28, 112);
fill('黄钥匙', 50, 320, '#F0E6BC');
fill('蓝钥匙', 50, 320 + 28, '#7FFFD4');
fill('红钥匙', 50, 320 + 56, '#E9967A');
fill('黑钥匙', 50, 320 + 84, '#000000');
ctx.textAlign = 'right';
fill(core.itemCount('yellowKey'), 140, 320, '#F0E6BC');
fill(core.itemCount('blueKey'), 140, 320 + 28, '#7FFFD4');
fill(core.itemCount('redKey'), 140, 320 + 56, '#E9967A');
fill(core.itemCount('greenKey'), 140, 320 + 84, '#000000');
core.drawImage(ctx, core.material.images.images[['00005.png','00001.png','00002.png','00003.png','00004.png','00005.png'][flags.hard || 0]], 7, 404 - [0,10,10,0,0,0][flags.hard || 0]);
ctx.textAlign = 'left';
if (flags.poison) fill("中毒", 8, 282, '#00CD00');
if (flags.weak) fill("衰弱", 64, 282, '#FF1493');
}
} else if (core.flags.extendToolbar && !core.domStyle.isVertical) { // 横屏且隐藏状态栏
if (!core.dymCanvas['status'])