From 7ce005d770520c52d292063565627c53529f396b Mon Sep 17 00:00:00 2001 From: oc Date: Sat, 30 Jun 2018 00:31:58 +0800 Subject: [PATCH] Autosize --- _server/blockly/MotaAction.g4 | 2 +- libs/control.js | 3 ++- libs/events.js | 14 ++++++++++++-- styles.css | 3 ++- 更新说明.txt | 15 ++++++++++++++- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index 99783b0b..470e7b10 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -338,7 +338,7 @@ return code; */; setValue_s - : '变量操作' ':' '名称' idString_e '值' expression Newline + : '变量设置' ':' '名称' idString_e '值' expression Newline /* setValue_s diff --git a/libs/control.js b/libs/control.js index b848ec69..2162ffd2 100644 --- a/libs/control.js +++ b/libs/control.js @@ -2225,6 +2225,7 @@ control.prototype.loadData = function (data, callback) { ////// 设置勇士属性 ////// control.prototype.setStatus = function (statusName, statusVal) { + if (statusName == 'exp') statusName = 'experience'; if (core.isset(core.status.hero.loc[statusName])) core.status.hero.loc[statusName] = statusVal; else @@ -2236,6 +2237,7 @@ control.prototype.getStatus = function (statusName) { // support status:x if (core.isset(core.status.hero.loc[statusName])) return core.status.hero.loc[statusName]; + if (statusName == 'exp') statusName = 'experience'; return core.status.hero[statusName]; } @@ -2446,7 +2448,6 @@ control.prototype.updateStatusBar = function () { core.statusBar.hard.innerHTML = core.status.hard; - // 回放 if (core.status.replay.replaying) { core.statusBar.image.book.src = core.status.replay.pausing?core.statusBar.icons.play.src:core.statusBar.icons.pause.src; diff --git a/libs/events.js b/libs/events.js index b82df54e..3e5d1470 100644 --- a/libs/events.js +++ b/libs/events.js @@ -1082,9 +1082,19 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback var floorName = core.status.maps[floorId].name; if (!core.isset(floorName) || floorName=="") floorName=" " core.statusBar.floor.innerHTML = floorName; - if (/^[+-]?\d+$/.test(floorName)) + if (/^[+-]?\d+$/.test(floorName)) { core.statusBar.floor.style.fontStyle = 'italic'; - else core.statusBar.floor.style.fontStyle = 'normal'; + core.statusBar.floor.style.fontSize = '1.1em'; + } + else { + core.statusBar.floor.style.fontStyle = 'normal'; + if (floorName.length<=5) + core.statusBar.floor.style.fontSize = '1.1em'; + else if (floorName.length==6) + core.statusBar.floor.style.fontSize = '0.9em'; + else + core.statusBar.floor.style.fontSize = '0.7em'; + } // 更改BGM if (core.isset(core.floors[floorId].bgm)) { diff --git a/styles.css b/styles.css index 2021c874..dceacbb9 100644 --- a/styles.css +++ b/styles.css @@ -191,10 +191,11 @@ #statusBar p { display: inline-block; vertical-align: middle; - width: 60%; + width: 70%; margin: 0; color: white; font: bold italic 1.1em Verdana; + white-space: nowrap; } #toolBar { position: absolute; diff --git a/更新说明.txt b/更新说明.txt index ef07cf76..8601bc08 100644 --- a/更新说明.txt +++ b/更新说明.txt @@ -1,4 +1,17 @@ -HTML5魔塔样板V2.3.1 +HTML5魔塔样板V2.3.2 + +启动服务的多开版本 √ +怪物数据导出器 +gif播放可随着分辨率自动放缩 √ +状态栏可随文字长度自动调整放缩 √ +也可以用status:exp来代替经验值的写法 √ +破炸在周围只有一个目标时无需转向面对它 √ +道具效果中,无需再将null改成""才能双击编辑了 √ +各个已知Bug的修复,部分细节优化 √ + +----------------------------------------------------------------------- + +HTML5魔塔样板V2.3.1 存档采用高比率压缩,单个大小是原来的1/10! 默认存档数改成100页500个