From e9a7b785fb87475e4c6d1eb4c8cb48026ae8daec Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Sun, 10 Jul 2022 00:49:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=97=A5=E6=9C=AC=E8=AA=9E=E8=A8=B3?= =?UTF-8?q?=E3=81=AE=E6=94=B9=E5=96=84=E3=81=8COFF=E3=81=AE=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AB=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=B9=E6=AC=84?= =?UTF-8?q?=E3=82=84=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= =?UTF-8?q?=E5=B1=A5=E6=AD=B4=E3=81=8C=E5=A3=8A=E3=82=8C=E3=82=8B=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/main.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/common/main.js b/src/common/main.js index 66a69d5..85120fe 100644 --- a/src/common/main.js +++ b/src/common/main.js @@ -34,8 +34,6 @@ const betterJapanese = { isRegisteredHook: false, init: function() { - this.load() - this.fallbackTimer = setTimeout(() => { this.checkUpdate() this.initialized = true @@ -52,6 +50,8 @@ const betterJapanese = { }, initAfterLoad: async function() { + betterJapanese.load() + // メニューに独自ボタンを実装 // この方法で実装しないとCCSEなどのメニュー独自実装Modと競合してしまう let origin = eval('Game.UpdateMenu.toString()').split('\n') @@ -114,12 +114,6 @@ const betterJapanese = { return negative ? '-' + output : output + decimal } - // 背景の名前を翻訳 - for (let i = 1; i < Game.AllBGs.length; i++) { - Game.AllBGs[i].enName = Game.AllBGs[i].name - Game.AllBGs[i].name = loc(Game.AllBGs[i].enName) - } - // カスタムCSSを適用 let customStyle = document.createElement('style') customStyle.innerHTML = ` @@ -188,6 +182,17 @@ const betterJapanese = { document.head.appendChild(customStyle) + // 設定の「日本語訳の改善」がOFFになっている場合はここから下は実行しない (ニュース欄やアップデート履歴が壊れる) + if (!betterJapanese.config.replaceJP) return + + console.log(betterJapanese.config.replaceJP) + + // 背景の名前を翻訳 + for (let i = 1; i < Game.AllBGs.length; i++) { + Game.AllBGs[i].enName = Game.AllBGs[i].name + Game.AllBGs[i].name = loc(Game.AllBGs[i].enName) + } + // 在庫市場のquoteを実装 while (!Game.Objects['Bank'].hasOwnProperty('minigame')) await new Promise(resolve => setTimeout(resolve, 1000)) if (typeof(betterJapanese.origins.goodTooltip) === 'undefined') { From 5eb263e81bc4db998f3880f1539b2e9f4655ce89 Mon Sep 17 00:00:00 2001 From: yukineko <27853966+hideki0403@users.noreply.github.com> Date: Sun, 10 Jul 2022 00:50:43 +0900 Subject: [PATCH 2/2] release: v1.4.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a25c5f..b83e380 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "better-japanese", - "version": "1.4.2", + "version": "1.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "better-japanese", - "version": "1.4.2", + "version": "1.4.3", "license": "ISC", "devDependencies": { "chalk": "^4.1.2", diff --git a/package.json b/package.json index 2f53849..a4b049d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "better-japanese", - "version": "1.4.2", + "version": "1.4.3", "description": "", "main": "index.js", "scripts": {