From d4400325ff8431cde8dda51e268ad11c39907534 Mon Sep 17 00:00:00 2001 From: ShakeFlower Date: Fri, 28 Mar 2025 07:57:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=AD=98=E6=A1=A3?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E8=B7=B3=E8=BF=87=E5=89=A7=E6=83=85=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=BC=9A=E4=BA=92=E7=9B=B8=E5=B9=B2=E6=89=B0=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/functions.js | 13 +++++++ project/plugins.js | 91 ++++++++++++++++++++++++++++++-------------- 2 files changed, 76 insertions(+), 28 deletions(-) diff --git a/project/functions.js b/project/functions.js index 96118c28..ee1a29a7 100644 --- a/project/functions.js +++ b/project/functions.js @@ -53,6 +53,19 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = // 隐藏右下角的音乐按钮 core.dom.musicBtn.style.display = 'none'; + // 同步剧情跳过设置 + switch (core.getFlag('skip')) { + case 'text': + core.plugin.skipTextOn(); + break; + case 'perform': + core.plugin.skipPerformOn(); + break; + default: + core.plugin.skipPerformOff(); + break; + } + // 清空录像暂停点 core.setFlag('replayValve', null); }, diff --git a/project/plugins.js b/project/plugins.js index 8cc06456..cb7bcfe5 100644 --- a/project/plugins.js +++ b/project/plugins.js @@ -4031,10 +4031,14 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = } const perform = { - jumpBlock: core.maps.jumpBlock, jumpHero: core.maps.jumpHero, moveBlock: core.maps.moveBlock, - drawAnimate: core.maps.drawAnimate, drawHeroAnimate: core.maps.drawHeroAnimate, - vibrate: core.events.vibrate, _action_sleep: core.events._action_sleep, - __action_checkReplaying: core.events.__action_checkReplaying, + jumpBlock: maps.prototype.jumpBlock, + jumpHero: maps.prototype.jumpHero, + moveBlock: maps.prototype.moveBlock, + drawAnimate: maps.prototype.drawAnimate, + drawHeroAnimate: maps.prototype.drawHeroAnimate, + vibrate: events.prototype.vibrate, + _action_sleep: events.prototype._action_sleep, + __action_checkReplaying: events.prototype.__action_checkReplaying, }; function instantMove(fromX, fromY, aimX, aimY, keep, callback) { @@ -4046,67 +4050,98 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = if (callback) callback(); } + // 这里是为了方便读档来回切换的情况 function skipTextOn() { - events.prototype.__action_checkReplaying = function () { + core.events.__action_checkReplaying = function () { core.doAction(); return true; } + core.maps.jumpBlock = perform.jumpBlock; + core.maps.jumpHero = perform.jumpHero; + core.maps.moveBlock = perform.moveBlock; + core.maps.drawAnimate = perform.drawAnimate; + core.maps.drawHeroAnimate = perform.drawHeroAnimate; + core.events.vibrate = perform.vibrate; + core.events._action_sleep = perform._action_sleep; } function skipTextOff() { - events.prototype.__action_checkReplaying = perform.__action_checkReplaying; + core.maps.jumpBlock = perform.jumpBlock; + core.maps.jumpHero = perform.jumpHero; + core.maps.moveBlock = perform.moveBlock; + core.maps.drawAnimate = perform.drawAnimate; + core.maps.drawHeroAnimate = perform.drawHeroAnimate; + core.events.vibrate = perform.vibrate; + core.events._action_sleep = perform._action_sleep; + core.events.__action_checkReplaying = perform.__action_checkReplaying; } function skipPeformOn() { - maps.prototype.jumpBlock = function (sx, sy, ex, ey, time, keep, callback) { + core.maps.jumpBlock = function (sx, sy, ex, ey, time, keep, callback) { return instantMove(sx, sy, ex, ey, keep, callback); } - maps.prototype.jumpHero = function (ex, ey, time, callback) { + core.maps.jumpHero = function (ex, ey, time, callback) { core.setHeroLoc('x', ex); core.setHeroLoc('y', ey); core.clearMap('hero'); core.drawHero(); if (callback) callback(); } - - maps.prototype.moveBlock = function (x, y, steps, time, keep, callback) { + + core.maps.moveBlock = function (x, y, steps, time, keep, callback) { perform.moveBlock(x, y, steps, 1, keep, callback); } - - maps.prototype.drawAnimate = function (name, x, y, alignWindow, callback) { + + core.maps.drawAnimate = function (name, x, y, alignWindow, callback) { if (callback) callback(); return -1; } - - maps.prototype.drawHeroAnimate = function (name, callback) { + + core.maps.drawHeroAnimate = function (name, callback) { if (callback) callback(); return -1; } - - events.prototype.vibrate = function () { + + core.events.vibrate = function () { if (callback) callback(); return; } - - events.prototype._action_sleep = function (data, x, y, prefix) { + + core.events._action_sleep = function (data, x, y, prefix) { core.doAction(); } - - events.prototype.__action_checkReplaying = function () { + + core.events.__action_checkReplaying = function () { core.doAction(); return true; } } function skipPeformOff() { - maps.prototype.jumpBlock = perform.jumpBlock; - maps.prototype.jumpHero = perform.jumpHero; - maps.prototype.moveBlock = perform.moveBlock; - maps.prototype.drawAnimate = perform.drawAnimate; - maps.prototype.drawHeroAnimate = perform.drawHeroAnimate; - events.prototype.vibrate = perform.vibrate; - events.prototype._action_sleep = perform._action_sleep; - events.prototype.__action_checkReplaying = perform.__action_checkReplaying; + core.maps.jumpBlock = perform.jumpBlock; + core.maps.jumpHero = perform.jumpHero; + core.maps.moveBlock = perform.moveBlock; + core.maps.drawAnimate = perform.drawAnimate; + core.maps.drawHeroAnimate = perform.drawHeroAnimate; + core.events.vibrate = perform.vibrate; + core.events._action_sleep = perform._action_sleep; + core.events.__action_checkReplaying = perform.__action_checkReplaying; + } + + // 每次读档时执行下列函数，避免不同存档的设置相互干扰 + this.skipTextOn = function () { + skipTextOn(); + core.setFlag('skip', 'text'); + } + + this.skipPerformOn = function () { + skipPeformOn(); + core.setFlag('skip', 'perform'); + } + + this.skipPerformOff = function () { + skipPeformOff(); + core.setFlag('skip', null); } const settingMap = new Map([