diff --git a/.gitmodules b/.gitmodules index 2ce17f3..1cfb4e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "Js/Translations"] path = Js/Translations url = https://git.poweris.moe/yttt-xdu/xdutranslations.git - branch = master + branch = . [submodule "CustomData"] path = CustomData url = https://git.poweris.moe/yttt-xdu/customdata.git diff --git a/CHANGELOG.md b/CHANGELOG.md index d5b8181..f696757 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,8 +43,4 @@ Fix MoveCamera macro ## V1.4.0 (2019-09-29) -Updated Pixi.js to v5 - -## V1.5.0 (2020-07-31) - -XDU Global support +Updated Pixi.js to v5 \ No newline at end of file diff --git a/Css/main.css b/Css/main.css index 779762e..2b293b9 100644 --- a/Css/main.css +++ b/Css/main.css @@ -84,8 +84,6 @@ body { margin: 0; height: 100%; } #text-container.rus { font-family: 'PTSans'; } -#text-container.cze { font-family: 'PTSans'; } - #text-container #fullscreen-button { position: absolute; top: 0.5rem; left: 0.5rem; font-size: 30px; line-height: 30px; opacity: 0.35; z-index: 11; } #text-container #title { position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); text-align: center; font-size: 20px; transition: opacity 0.3s; cursor: default; user-select: none; } diff --git a/Js/Main.js b/Js/Main.js index 7ba61db..9c491ee 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -10,8 +10,8 @@ const shaders = new Shaders(); const textFunc = new TextFunctions(); let audio = undefined; //Cant create a audio context without user input. const player = new Player(pixiApp, utage, textFunc, audio, shaders); -const languages = ["eng", "jpn", "rus", "cze", "enm", "kor", "zho"]; -const version = "YameteTomete XDUPlayer V1.5.0"; +const languages = ["eng", "jpn", "rus", "enm", "kor", "zho"]; +const version = "YameteTomete XDUPlayer V1.4.0"; let bodyLoaded = false; let utageLoaded = false; let languagesLoaded = false; @@ -285,10 +285,6 @@ function sceneDropDownChanged(event) { let name = scene.Name; let summary = scene.SummaryText; - let image = questSceneMstId; - if ("Image" in scene) { - image = scene.Image; - } let credits = ""; let tl_key = utage.sceneTranslations[cust][questSceneMstId]; @@ -311,8 +307,8 @@ function sceneDropDownChanged(event) { chapterSelect += `` } - let detailSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Detail/${image}.png`; - let iconSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Icon/${image}.png`; + let detailSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Detail/${questSceneMstId}.png`; + let iconSrc = `${utage.rootDirectory}${(scene.IsCustom ? "CustomData" : "XDUData")}/Asset/Image/Quest/Snap/Icon/${questSceneMstId}.png`; chapterSelect += ''; cont.innerHTML = `