From 0aff9f9062ba7b254ab9295c8c05c71885fddedf Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Fri, 30 Jul 2021 19:49:36 +0800 Subject: [PATCH] =?UTF-8?q?register=E7=B3=BB=E5=88=97=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _docs/script.md | 2 +- libs/actions.js | 38 ++++++++++++++++++++------------------ project/plugins.js | 8 ++++---- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/_docs/script.md b/_docs/script.md index d1352a63..fe42f408 100644 --- a/_docs/script.md +++ b/_docs/script.md @@ -269,7 +269,7 @@ core.registerAction('keyDown', 'my_shop', function (keycode) { // 获得当前“显示选择项”的各个选项 var choices = core.status.event.data.current.choices; // 获得当前选项第一项在屏幕上的y坐标 - var topIndex = core.actions.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = core.actions._getChoicesTopIndex(choices.length); // 检查按键的键值，是否是空格或者回车 if (keycode == 13 || keycode == 32) { // 如果是，则视为直接点击屏幕上的选项 diff --git a/libs/actions.js b/libs/actions.js index 21890828..4c1f2270 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -499,7 +499,7 @@ actions.prototype._sys_onmove_choices = function (x, y) { switch (core.status.event.id) { case 'action': - if (core.status.event.data.tyoe == 'choices') { + if (core.status.event.data.type == 'choices') { this._onMoveChoices(x, y); return true; } @@ -884,9 +884,13 @@ actions.prototype._sys_onStatusBarClick = function (px, py, vertical) { /////////////////// 在某个界面时的按键点击效果 /////////////////// +actions.prototype._getChoicesTopIndex = function (length) { + return this.HSIZE - parseInt((length - 1) / 2) + (core.status.event.ui.offset || 0); +} + // 数字键快速选择选项 actions.prototype._selectChoices = function (length, keycode, callback) { - var topIndex = this.HSIZE - parseInt((length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(length); if (keycode == 13 || keycode == 32 || keycode == 67) { callback.apply(this, [this.HSIZE, topIndex + core.status.event.selection]); } @@ -917,9 +921,7 @@ actions.prototype._keyDownChoices = function (keycode) { actions.prototype._onMoveChoices = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); - + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; if (selection == core.status.event.selection) return; @@ -1059,7 +1061,7 @@ actions.prototype._clickAction = function (x, y, px, py) { var choices = data.choices; if (choices.length == 0) return; if (x >= this.CHOICES_LEFT && x <= this.CHOICES_RIGHT) { - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var choice = choices[y - topIndex]; if (choice.need != null && choice.need != '' && !core.calValue(choice.need)) { @@ -2098,7 +2100,7 @@ actions.prototype._keyUpSL = function (keycode) { ////// 系统设置界面时的点击操作 ////// actions.prototype._clickSwitchs = function (x, y) { var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); var selection = y - topIndex; if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; if (selection >= 0 && selection < choices.length) { @@ -2137,7 +2139,7 @@ actions.prototype._keyUpSwitchs = function (keycode) { actions.prototype._clickSwitchs_sounds = function (x, y) { var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); var selection = y - topIndex; if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) { if (selection != 2) return; @@ -2211,7 +2213,7 @@ actions.prototype._keyUpSwitchs_sounds = function (keycode) { actions.prototype._clickSwitchs_display = function (x, y) { var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); var selection = y - topIndex; if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) { if (selection != 0) return; @@ -2330,7 +2332,7 @@ actions.prototype._keyUpSwitchs_display = function (keycode) { actions.prototype._clickSwitchs_action = function (x, y) { var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); var selection = y - topIndex; if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) { if (selection != 0 && selection != 1) return; @@ -2424,7 +2426,7 @@ actions.prototype._keyUpSwitchs_action = function (keycode) { actions.prototype._clickSettings = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; core.status.event.selection = selection; @@ -2484,7 +2486,7 @@ actions.prototype._clickNotes = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; core.status.event.selection = selection; @@ -2621,7 +2623,7 @@ actions.prototype._keyUpNotes = function (keycode) { actions.prototype._clickSyncSave = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; core.status.event.selection = selection; @@ -2691,7 +2693,7 @@ actions.prototype._clickSyncSelect = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; core.status.event.selection = selection; @@ -2731,7 +2733,7 @@ actions.prototype._clickLocalSaveSelect = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; @@ -2773,7 +2775,7 @@ actions.prototype._clickStorageRemove = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; @@ -2866,7 +2868,7 @@ actions.prototype._clickReplay = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; @@ -2938,7 +2940,7 @@ actions.prototype._clickGameInfo = function (x, y) { if (x < this.CHOICES_LEFT || x > this.CHOICES_RIGHT) return; var choices = core.status.event.ui.choices; - var topIndex = this.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = this._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { var selection = y - topIndex; diff --git a/project/plugins.js b/project/plugins.js index 3b3f5f6e..d08e6592 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -233,7 +233,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (core.status.event.data.type != 'choices') return false; var data = core.status.event.data.current; var choices = data.choices; - var topIndex = core.actions.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = core.actions._getChoicesTopIndex(choices.length); if (keycode == 88 || keycode == 27) { // X, ESC core.actions._clickAction(core.actions.HSIZE, topIndex + choices.length - 1); return true; @@ -248,7 +248,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (core.status.event.data.type != 'choices') return false; var data = core.status.event.data.current; var choices = data.choices; - var topIndex = core.actions.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = core.actions._getChoicesTopIndex(choices.length); if (keycode == 13 || keycode == 32) { // Space, Enter core.actions._clickAction(core.actions.HSIZE, topIndex + core.status.event.selection); return true; @@ -262,7 +262,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (core.status.event.data.type != 'choices') return false; var data = core.status.event.data.current; var choices = data.choices; - var topIndex = core.actions.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = core.actions._getChoicesTopIndex(choices.length); if (x >= core.actions.CHOICES_LEFT && x <= core.actions.CHOICES_RIGHT && y >= topIndex && y < topIndex + choices.length) { core.actions._clickAction(x, y); return true; @@ -1270,7 +1270,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (x < core.actions.CHOICES_LEFT || x > core.actions.CHOICES_RIGHT) return false; var choices = core.status.event.ui.choices; - var topIndex = core.actions.HSIZE - parseInt((choices.length - 1) / 2) + (core.status.event.ui.offset || 0); + var topIndex = core.actions._getChoicesTopIndex(choices.length); if (y >= topIndex && y < topIndex + choices.length) { _selectCategory(y - topIndex); }