From acf993150b979640e0f6223bceac2fac6dcf4b6f Mon Sep 17 00:00:00 2001 From: unamed <1319491857@qq.com> Date: Wed, 2 Feb 2022 10:32:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=87=AA=E5=8A=A8=E6=94=BE?= =?UTF-8?q?=E7=BC=A9=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _codelab/_sidebar.md | 2 +- libs/actions.js | 5 +++++ libs/ui.js | 1 + main.js | 21 ++++++++++++--------- 启动服务.exe | Bin 59904 -> 59904 bytes 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/_codelab/_sidebar.md b/_codelab/_sidebar.md index 590fcf44..4ea36a71 100644 --- a/_codelab/_sidebar.md +++ b/_codelab/_sidebar.md @@ -1,4 +1,4 @@ - [第一章:伤害计算函数](L1) - [第二章:特殊属性定义,表格配置](L2) -- [第二章:怪物真实属性](L3) +- [第三章:怪物真实属性](L3) diff --git a/libs/actions.js b/libs/actions.js index 206daa57..be0eb731 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -2301,6 +2301,11 @@ actions.prototype._clickSwitchs_display = function (x, y) { core.playSound('确定'); return this._clickSwitchs_display_extraDamageType(); case 7: + core.playSound('确定'); + core.setLocalStorage('autoScale', core.getLocalStorage('autoScale') ? false : true); + core.ui._drawSwitchs_display(); + break; + case 8: core.status.event.selection = 1; core.playSound('取消'); core.ui._drawSwitchs(); diff --git a/libs/ui.js b/libs/ui.js index 50a3e48d..80bec762 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -1953,6 +1953,7 @@ ui.prototype._drawSwitchs_display = function () { "临界显伤: " + (core.flags.displayCritical ? "[ON]" : "[OFF]"), "领域显伤: " + (core.flags.displayExtraDamage ? "[ON]" : "[OFF]"), "领域模式: " + (core.flags.extraDamageType == 2 ? "[最简]" : core.flags.extraDamageType == 1 ? "[半透明]" : "[完整]"), + "自动放缩: " + (core.getLocalStorage('autoScale') ? "[ON]" : "[OFF]"), "返回上一级", ]; this.drawChoices(null, choices); diff --git a/main.js b/main.js index 7b20dc22..f64060c3 100644 --- a/main.js +++ b/main.js @@ -238,16 +238,19 @@ main.prototype.init = function (mode, callback) { main.core.init(coreData, callback); main.core.resize(); // 自动放缩最大化 - try { - if (main.core) { - var index = main.core.domStyle.availableScale.indexOf(core.domStyle.scale); - main.core.control.setDisplayScale(main.core.domStyle.availableScale.length - 1 - index); - if (!main.core.isPlaying() && main.core.flags.enableHDCanvas) { - main.core.domStyle.ratio = Math.max(window.devicePixelRatio || 1, main.core.domStyle.scale); - main.core.resize(); + if (core.getLocalStorage('autoScale') === void 0) core.setLocalStorage('autoScale', true); + if (core.getLocalStorage('autoScale') && !core.domStyle.isVertical) { + try { + if (main.core) { + var index = main.core.domStyle.availableScale.indexOf(core.domStyle.scale); + main.core.control.setDisplayScale(main.core.domStyle.availableScale.length - 1 - index); + if (!main.core.isPlaying() && main.core.flags.enableHDCanvas) { + main.core.domStyle.ratio = Math.max(window.devicePixelRatio || 1, main.core.domStyle.scale); + main.core.resize(); + } } - } - } catch (e) { console.error(e) }; + } catch (e) { console.error(e) }; + } }); }); }); diff --git a/启动服务.exe b/启动服务.exe index 03dcc7ad06a5a6de0641dec733a774fdf66da966..6fc2c67b85a15f265f50994837eb6a53a6998edb 100644 GIT binary patch delta 1090 zcmZWpSxggA6n%GqX)P@<6sXq962Vm402VOB2BgqJnRXOZKoDgSmADm0jccIM57z|b zsvl~MOX7!duSR2H=a>zAf)0E=Pp{E@NXw4P3`-74vm3>8`JUF`nhfyYUj2ir*{JU<|d+V&k}i zzqYx_Bb2V>2<72NS4d-jnfG$(d0@uMAupBB1Jo~)|Ct6 z=yw&;wD(Fg%stbW^sz#$bt_ZJ+i<8VH`);1av)6JU5}%l zG`NWQZWDM>axWx9dfb^w|MKH4cWUN;jGTNg!mcHe_{lBhMH$aqn7}V!OrIaep3uw9 zW=vpFib?%FY^}aPoKw}A(1Dp^Ha8HFv__nh7^LI5a8>C@-M4%95n<4q7rtt`sF)G@R<)J_-n^RLmxYZU z2-j?snqe59N_{X7>z1}d@s)>5{mJ?kwvPE&2V2j!ur}7t@&eBX&%`D5wiKT1*?g+% tcERVPTRRxj zFz!Gh*4Ss`p5kO!fk%r)T~!oT5W>C^)`+nsA_UM^VuLn3LU9K^Eh&U9j9D(i6|7!v zgF!q@@nd{K@yJPs2p`ewu)zc#q?pG?jv|%#nl`Rr z`3jbzS?U4Cn5s34j`A;Tbj_tU`&{*L##$B>l4S?Jbh%(98r>O&=sI(4q)5gZcRq|` zyL$;ud);lJ_`TZ!mvKQ^1zf`&Wm#|+Ptf`TdujcS&&#q};_664Bh8Sa6LgkYYEuIV z(3xApO6JVK2||JbuMNT8Fq}67CklxQygme5b{Eo~EB`hOzK z58Y_>7(qnIvzQDymmjZsQZxT!9=vml6{y$140U0DMcl#bMWSLJ>p9IIRuzH01N%m{s}T5|z!T1W58!bT5< zYqm-2VFd3>osfgIRemTsf1|2BN!Z9XvsTv3wy*$eV*dW2r>A3+8G9SJr+V=0hxcM$ s_GrUI!iE0eut!5b2fXzzEvdTa)E!m8S3dCYroZRSt&aW=?~L((0BOWD$N&HU