From 2a4e5662276fee26b5390fc04f9349bac3e85d31 Mon Sep 17 00:00:00 2001 From: Bui Date: Mon, 28 Jan 2019 11:43:18 +0000 Subject: [PATCH 1/4] Titlescreen: add disclaimer --- public/src/css/titlescreen.css | 19 ++++++++++++++++++- public/src/js/strings.js | 10 ++++++++++ public/src/js/titlescreen.js | 10 +++++++++- public/src/views/titlescreen.html | 4 ++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/public/src/css/titlescreen.css b/public/src/css/titlescreen.css index 3a4165c..58d60f4 100644 --- a/public/src/css/titlescreen.css +++ b/public/src/css/titlescreen.css @@ -27,7 +27,7 @@ } .click-to-continue{ position: absolute; - bottom: 10%; + bottom: 15%; color: #fff; font-size: 8vmin; text-align: center; @@ -84,3 +84,20 @@ #lang:hover #lang-id::before { -webkit-text-stroke: 0.25em #f00; } +#title-disclaimer { + text-align: center; + position: absolute; + bottom: 5%; + color: #fff; + z-index: 1; +} +#title-disclaimer span { + color: #fff; + font-size: 2vmin; + text-align: center; + display: block; +} +#title-disclaimer span:before { + left: initial; + filter: blur(0.1vmin); +} diff --git a/public/src/js/strings.js b/public/src/js/strings.js index f0cae57..c8be873 100644 --- a/public/src/js/strings.js +++ b/public/src/js/strings.js @@ -6,6 +6,8 @@ this.taikoWeb = "たいこウェブ" this.titleProceed = "クリックするかEnterを押す！" + this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "J-POP", "アニメ": "アニメ", @@ -104,6 +106,8 @@ function StringsEn(){ this.taikoWeb = "Taiko Web" this.titleProceed = "Click or Press Enter!" + this.titleDisclaimer = "This unofficial simulator is unaffiliated with BANDAI NAMCO." + this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "Pop", "アニメ": "Anime", @@ -202,6 +206,8 @@ function StringsCn(){ this.taikoWeb = "太鼓网页" this.titleProceed = "点击或按回车！" + this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "流行音乐", "アニメ": "卡通动画音乐", @@ -300,6 +306,8 @@ function StringsTw(){ this.taikoWeb = "太鼓網頁" this.titleProceed = "點擊或按確認！" + this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "流行音樂", "アニメ": "卡通動畫音樂", @@ -398,6 +406,8 @@ function StringsKo(){ this.taikoWeb = "태고 웹" this.titleProceed = "클릭하거나 Enter를 누릅니다!" + this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "POP", "アニメ": "애니메이션", diff --git a/public/src/js/titlescreen.js b/public/src/js/titlescreen.js index a5e7727..8be517f 100644 --- a/public/src/js/titlescreen.js +++ b/public/src/js/titlescreen.js @@ -6,7 +6,9 @@ class Titlescreen{ this.proceed = document.getElementById("title-proceed") this.langDropdown = document.getElementById("lang-dropdown") this.langId = document.getElementById("lang-id") - + this.disclaimerText = document.getElementById("title-disclaimer-text") + this.disclaimerCopyright = document.getElementById("title-disclaimer-copyright") + this.logo = new Logo() this.lang = this.getLang() this.setLang(allStrings[this.lang]) @@ -97,6 +99,12 @@ class Titlescreen{ this.proceed.setAttribute("alt", strings.titleProceed) this.langId.innerText = strings.id.toUpperCase() this.langId.setAttribute("alt", strings.id.toUpperCase()) + + this.disclaimerText.innerText = strings.titleDisclaimer + this.disclaimerText.setAttribute("alt", strings.titleDisclaimer) + this.disclaimerCopyright.innerText = strings.titleCopyright + this.disclaimerCopyright.setAttribute("alt", strings.titleCopyright) + loader.screen.style.fontFamily = strings.font loader.screen.style.fontWeight = strings.font === "Microsoft YaHei, sans-serif" ? "bold" : "" if(failedTests.length !== 0){ diff --git a/public/src/views/titlescreen.html b/public/src/views/titlescreen.html index 8578e10..a284c7a 100644 --- a/public/src/views/titlescreen.html +++ b/public/src/views/titlescreen.html @@ -1,6 +1,10 @@
+
+ + +
From 682ca6aaed9203424a152816c1c6fcf981a23dde Mon Sep 17 00:00:00 2001 From: Bui Date: Mon, 28 Jan 2019 11:50:22 +0000 Subject: [PATCH 2/4] Titlescreen: clean disclaimer --- public/src/js/titlescreen.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/src/js/titlescreen.js b/public/src/js/titlescreen.js index 8be517f..57238fc 100644 --- a/public/src/js/titlescreen.js +++ b/public/src/js/titlescreen.js @@ -138,6 +138,8 @@ class Titlescreen{ pageEvents.remove(this.langDropdown, "change") delete this.titleScreen delete this.proceed + delete this.titleDisclaimer + delete this.titleCopyright delete this.langDropdown } } From cdaf3d6a91d47bf926bc2a8c2a71b6795bcb9a80 Mon Sep 17 00:00:00 2001 From: Bui Date: Mon, 28 Jan 2019 12:06:21 +0000 Subject: [PATCH 3/4] Titlescreen: add disclaimer translations --- public/src/js/strings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/js/strings.js b/public/src/js/strings.js index c8be873..743a784 100644 --- a/public/src/js/strings.js +++ b/public/src/js/strings.js @@ -206,7 +206,7 @@ function StringsCn(){ this.taikoWeb = "太鼓网页" this.titleProceed = "点击或按回车！" - this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleDisclaimer = "這款非官方模擬器與BANDAI NAMCO無關。" this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "流行音乐", @@ -306,7 +306,7 @@ function StringsTw(){ this.taikoWeb = "太鼓網頁" this.titleProceed = "點擊或按確認！" - this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleDisclaimer = "这款非官方模拟器与BANDAI NAMCO无关。" this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "流行音樂", @@ -406,7 +406,7 @@ function StringsKo(){ this.taikoWeb = "태고 웹" this.titleProceed = "클릭하거나 Enter를 누릅니다!" - this.titleDisclaimer = "この非公式シミュレーターはバンダイナムコとは関係がありません。" + this.titleDisclaimer = "이 비공식 시뮬레이터는 반다이 남코와 관련이 없습니다." this.titleCopyright = "Taiko no Tatsujin ©&™ 2011 BANDAI NAMCO Entertainment Inc." this.categories = { "J-POP": "POP", From 29040f474dbf05e978a16bd64315b743ed18a062 Mon Sep 17 00:00:00 2001 From: Bui Date: Mon, 28 Jan 2019 15:33:03 +0000 Subject: [PATCH 4/4] Titlescreen: increase #lang z-index --- public/src/css/titlescreen.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/src/css/titlescreen.css b/public/src/css/titlescreen.css index 58d60f4..6a280a3 100644 --- a/public/src/css/titlescreen.css +++ b/public/src/css/titlescreen.css @@ -46,6 +46,7 @@ width: 7em; height: 4em; color: #000; + z-index: 5; } #lang:focus-within{ outline: #4d90fe auto 5px;