From b97547062ca280c32d9725c377e3c77f5295c4ca Mon Sep 17 00:00:00 2001 From: bdf1 Date: Sat, 22 Oct 2022 08:44:14 +1300 Subject: [PATCH] statusBar --- _server/config.json | 2 +- project/data.js | 12 ++++- project/functions.js | 55 ++++++++++++++-------- project/images/{状态.png => status.png} | Bin project/images/{状态2.png => status2.png} | Bin 5 files changed, 47 insertions(+), 22 deletions(-) rename project/images/{状态.png => status.png} (100%) rename project/images/{状态2.png => status2.png} (100%) diff --git a/_server/config.json b/_server/config.json index 2d481e1..b672bb5 100644 --- a/_server/config.json +++ b/_server/config.json @@ -1 +1 @@ -{"viewportLoc":[0,0],"editorLastFloorId":"shuoming"} \ No newline at end of file +{"viewportLoc":[0,0],"editorLastFloorId":"MT0"} \ No newline at end of file diff --git a/project/data.js b/project/data.js index 542e20d..00cc7de 100644 --- a/project/data.js +++ b/project/data.js @@ -202,6 +202,11 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = ], "floorPartitions": [], "images": [ + "00001.png", + "00002.png", + "00003.png", + "00004.png", + "00005.png", "0cheating.png", "0easy.png", "0hard.png", @@ -348,6 +353,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "shengxiao.png", "shijian.png", "shu.png", + "status.png", + "status2.png", "tawaijiuren.png", "terrains.png", "tiantawai.png", @@ -620,7 +627,9 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "zone.mp3", "zoneogg.mp3" ], - "fonts": ["fzchyjw"], + "fonts": [ + "fzchyjw" + ], "nameMap": { "确定": "confirm.mp3", "取消": "cancel.mp3", @@ -697,7 +706,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "version": "Ver 2.10.0", "floorId": "nandu", "hero": { - "image": "hero.png", "animate": false, "name": "邵虎", diff --git a/project/functions.js b/project/functions.js index e623118..98e9cd8 100644 --- a/project/functions.js +++ b/project/functions.js @@ -1596,8 +1596,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = core.dom.caidan1Ctx.drawImage(core.material.images.images['caidan.png'],0,0) core.drawImage('caidan','caidan.png',-161,0) var ctx, fill = function (text, x, y, style) { - core.ui.setFont(ctx, (/\w+/.test(text) ? 'italic ' : '') + 'bold 18px Verdana'); - core.ui.fillBoldText(ctx, text, x, y, style); + core.ui.setFont(ctx, /*(/\w+/.test(text) ? 'italic ' : '') + */'18px fzchyjw'); + core.ui.fillText(ctx, text, x, y, style); + }, fill1 = function (text, x, y, style) { + core.ui.setFont(ctx, '10px fzchyjw'); + core.ui.fillText(ctx, text, x, y, style); }; if (core.flags.statusCanvas) { // 系统开关「自绘状态栏」开启 core.ui.clearMap(ctx = core.dom.statusCanvasCtx); // 清空状态栏 @@ -1618,23 +1621,37 @@ 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.statusBar.icons.floor, 6, 9, 25, 25); - fill((core.status.thisMap || {}).name || "Loading", 42, 29); - core.drawImage(ctx, core.statusBar.icons.hp, 6, 43, 25, 25); - fill(core.formatBigNumber(core.getRealStatus('hp')), 42, 63); - core.drawImage(ctx, core.statusBar.icons.atk, 6, 77, 25, 25); - fill(core.formatBigNumber(core.getRealStatus('atk')), 42, 97); - core.drawImage(ctx, core.statusBar.icons.def, 6, 111, 25, 25); - fill(core.formatBigNumber(core.getRealStatus('def')), 42, 131); - core.drawImage(ctx, core.statusBar.icons.mdef, 6, 145, 25, 25); - fill(core.formatBigNumber(core.getRealStatus('mdef')), 42, 165); - core.drawImage(ctx, core.statusBar.icons.money, 6, 179, 25, 25); - fill(core.formatBigNumber(core.status.hero.money), 42, 199); - core.drawImage(ctx, core.statusBar.icons.exp, 6, 213, 25, 25); - fill(core.formatBigNumber(core.status.hero.exp), 42, 233); - fill(core.setTwoDigits(core.itemCount('yellowKey')), 11, 267, '#FFCCAA'); - fill(core.setTwoDigits(core.itemCount('blueKey')), 46, 267, '#AAAADD'); - fill(core.setTwoDigits(core.itemCount('redKey')), 81, 267, '#FF8888'); + 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); + ctx.textAlign = 'left'; + fill((core.status.thisMap || {}).title || "Loading", 0, 37, '#000000'); + //core.drawImage(ctx, core.statusBar.icons.hp, 6, 43, 25, 25); + ctx.textAlign = 'right'; + fill(core.formatBigNumber(core.getRealStatus('hp')), 108, 82, '#000000'); + //core.drawImage(ctx, core.statusBar.icons.atk, 6, 77, 25, 25); + fill(core.formatBigNumber(core.getRealStatus('atk')), 108, 82 + 35, '#000000'); + //core.drawImage(ctx, core.statusBar.icons.def, 6, 111, 25, 25); + fill(core.formatBigNumber(core.getRealStatus('def')), 108, 82 + 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.money), 108, 82 + 35 + 36 + 33, '#000000'); + //core.drawImage(ctx, core.statusBar.icons.exp, 6, 213, 25, 25); + fill(core.formatBigNumber(core.status.hero.exp), 108, 82 + 35 + 36 + 33 + 33, '#000000'); + fill(core.getFlag("juqing", 0), 108, 82 + 35 + 36 + 33 + 33 + 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); + if (flags.poison) fill("中毒", 5, 60, '#00CD00'); + if (flags.weak) fill("衰弱", 50, 60, '#FF1493'); } } else if (core.flags.extendToolbar && !core.domStyle.isVertical) { // 横屏且隐藏状态栏 if (!core.dymCanvas['status']) diff --git a/project/images/状态.png b/project/images/status.png similarity index 100% rename from project/images/状态.png rename to project/images/status.png diff --git a/project/images/状态2.png b/project/images/status2.png similarity index 100% rename from project/images/状态2.png rename to project/images/status2.png