diff --git a/src-tauri/lang/chs.json b/src-tauri/lang/chs.json index b1ef5d3..7dca78e 100644 --- a/src-tauri/lang/chs.json +++ b/src-tauri/lang/chs.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "下载 Grasscutter 一体化", + "grasscutter_fullquest": "下载 Quest 一体化", "grasscutter_stable_data": "下载 Grasscutter 稳定版数据", "grasscutter_latest_data": "下载 Grasscutter 开发版数据", "grasscutter_stable_data_update": "更新 Grasscutter 稳定版数据", "grasscutter_latest_data_update": "更新 Grasscutter 开发版数据", - "grasscutter_stable": "下载 Grasscutter 稳定版", + "grasscutter_unstable": "下载 Grasscutter 稳定版", "grasscutter_latest": "下载 Grasscutter 开发版", - "grasscutter_stable_update": "更新 Grasscutter 稳定版", + "grasscutter_unstable_update": "更新 Grasscutter 稳定版", "grasscutter_latest_update": "更新 Grasscutter 开发版", "resources": "下载 Grasscutter 资源", "game": "下载游戏", diff --git a/src-tauri/lang/cht.json b/src-tauri/lang/cht.json index c30fe8f..b876b03 100644 --- a/src-tauri/lang/cht.json +++ b/src-tauri/lang/cht.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "下載Grasscutter多合一下載", + "grasscutter_fullquest": "下载 Quest 一体化", "grasscutter_stable_data": "下載Grasscutter穩定版數據（Data）", "grasscutter_latest_data": "下載Grasscutter開發板數據（Data）", "grasscutter_stable_data_update": "更新Grasscutter穩定版數據（Data）", "grasscutter_latest_data_update": "更新Grasscutter開發板數據（Data）", - "grasscutter_stable": "下載Grasscutter穩定版", + "grasscutter_unstable": "下載Grasscutter穩定版", "grasscutter_latest": "下載Grasscutter開發板", - "grasscutter_stable_update": "更新Grasscutter穩定版", + "grasscutter_unstable_update": "更新Grasscutter穩定版", "grasscutter_latest_update": "更新Grasscutter開發板", "resources": "下載Grasscutter資源（Resources）", "game": "下載遊戲", diff --git a/src-tauri/lang/de.json b/src-tauri/lang/de.json index c493215..79bf527 100644 --- a/src-tauri/lang/de.json +++ b/src-tauri/lang/de.json @@ -33,13 +33,14 @@ }, "downloads": { "grasscutter_fullbuild": "Alles in Einem Grasscutter Daten herunterladen", + "grasscutter_fullquest": "Alles in Einem Questing Daten herunterladen", "grasscutter_stable_data": "Stabile Grasscutter Daten herunterladen", "grasscutter_latest_data": "Aktuellste Grasscutter Daten herunterladen", "grasscutter_stable_data_update": "Stabile Grasscutter Daten aktualisieren", "grasscutter_latest_data_update": "Aktuellste Grasscutter Daten aktualisieren", - "grasscutter_stable": "Stabile Grasscutter Version herunterladen", + "grasscutter_unstable": "Stabile Grasscutter Version herunterladen", "grasscutter_latest": "Aktuellste Grasscutter Version herunterladen", - "grasscutter_stable_update": "Stabile Grasscutter Version aktualisieren", + "grasscutter_unstable_update": "Stabile Grasscutter Version aktualisieren", "grasscutter_latest_update": "Aktuellste Grasscutter Version aktualisieren", "resources": "Grasscutter Ressourcen herunterladen", "game": "Spiel herunterladen", diff --git a/src-tauri/lang/en.json b/src-tauri/lang/en.json index d0b13af..1e8d130 100644 --- a/src-tauri/lang/en.json +++ b/src-tauri/lang/en.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "Download Grasscutter All-in-One", + "grasscutter_fullquest": "Download Questing All-in-One", "grasscutter_stable_data": "Download Grasscutter Stable Data", "grasscutter_latest_data": "Download Grasscutter Latest Data", "grasscutter_stable_data_update": "Update Grasscutter Stable Data", "grasscutter_latest_data_update": "Update Grasscutter Latest Data", - "grasscutter_stable": "Download Grasscutter Stable", + "grasscutter_unstable": "Download Grasscutter Questing", "grasscutter_latest": "Download Grasscutter Latest", - "grasscutter_stable_update": "Update Grasscutter Stable", + "grasscutter_unstable_update": "Update Grasscutter Questing", "grasscutter_latest_update": "Update Grasscutter Latest", "resources": "Download Grasscutter Resources", "game": "Download Game", diff --git a/src-tauri/lang/es.json b/src-tauri/lang/es.json index e8ed0ea..ec6a340 100644 --- a/src-tauri/lang/es.json +++ b/src-tauri/lang/es.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "Descargar Datos todo en uno de Grasscutter", + "grasscutter_fullquest": "Descargar Datos todo en uno de Questing", "grasscutter_stable_data": "Descargar Datos Estables de Grasscutter", "grasscutter_latest_data": "Descargar Datos más Recientes de Grasscutter", "grasscutter_stable_data_update": "Actualizar Datos Estables de Grasscutter", "grasscutter_latest_data_update": "Actualizar Datos más Recientes de Grasscutter", - "grasscutter_stable": "Descargar Grasscutter Estable", + "grasscutter_unstable": "Descargar Grasscutter Estable", "grasscutter_latest": "Descargar Grasscutter más reciente", - "grasscutter_stable_update": "Actualizar Grasscutter Estable", + "grasscutter_unstable_update": "Actualizar Grasscutter Estable", "grasscutter_latest_update": "Actualizar Grasscutter más reciente", "resources": "Descargar Recursos de Grasscutter", "game": "Descarga el juego", diff --git a/src-tauri/lang/fr.json b/src-tauri/lang/fr.json index 4b74aec..4efcfc0 100644 --- a/src-tauri/lang/fr.json +++ b/src-tauri/lang/fr.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "Telecharger Grasscutter tout-en-un", + "grasscutter_fullquest": "Télécharger les Quêtes tout-en-un", "grasscutter_stable_data": "Telecharger les donnees de Grasscutter (version stable)", "grasscutter_latest_data": "Telecharger les donnees de Grasscutter (derniere version)", "grasscutter_stable_data_update": "Mettre a jour les donnees de Grasscutter (version stable)", "grasscutter_latest_data_update": "Mettre a jour les donnees de Grasscutter (derniere version)", - "grasscutter_stable": "Telecharger Grasscutter (version stable)", + "grasscutter_unstable": "Telecharger Grasscutter (version stable)", "grasscutter_latest": "Telecharger Grasscutter (derniere version)", - "grasscutter_stable_update": "Mettre a jour Grasscutter (version stable)", + "grasscutter_unstable_update": "Mettre a jour Grasscutter (version stable)", "grasscutter_latest_update": "Mettre a jour Grasscutter (derniere version)", "resources": "Telecharger les ressources logicielles de Grasscutter", "aio_header": "Telechargements tout-en-un:", diff --git a/src-tauri/lang/id.json b/src-tauri/lang/id.json index 6ccf330..5d39ca8 100644 --- a/src-tauri/lang/id.json +++ b/src-tauri/lang/id.json @@ -33,13 +33,14 @@ }, "downloads": { "grasscutter_fullbuild": "Sedang Mendownload Grasscutter Semua Dalam Satu", + "grasscutter_fullquest": "Unduh pencarian semua dalam satu", "grasscutter_stable_data": "Sedang Mendownload Grasscutter Versi Stabil", "grasscutter_latest_data": "Sedang Mendownload Grasscutter Data Terbaru", "grasscutter_stable_data_update": "Memperbaharui Grasscutter Data Stabil", "grasscutter_latest_data_update": "Memperbaharui Grasscutter Data Terbaru", - "grasscutter_stable": "Download Grasscutter Stabil Version ", + "grasscutter_unstable": "Download Grasscutter Stabil Version ", "grasscutter_latest": "Download Grasscutter Terbaru Version", - "grasscutter_stable_update": "Sedang MengUpdate Grasscutter Stabil", + "grasscutter_unstable_update": "Sedang MengUpdate Grasscutter Stabil", "grasscutter_latest_update": "Sedang MengUpdate Grasscutter Terbaru", "resources": "Mendownload Grasscutter Resources", "aio_header": "Unduhan Semua Dalam Satu:", diff --git a/src-tauri/lang/ko.json b/src-tauri/lang/ko.json index ed11c0f..9c59706 100644 --- a/src-tauri/lang/ko.json +++ b/src-tauri/lang/ko.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "올인원 Grasscutter 다운로드", + "grasscutter_fullquest": "퀘스트 올인원 다운로드", "grasscutter_stable_data": "안정적인 데이터 다운로드", "grasscutter_latest_data": "최신 데이터 다운로드", "grasscutter_stable_data_update": "안정적 데이터 업데이트", "grasscutter_latest_data_update": "최신 데이터 업데이트", - "grasscutter_stable": "안정 다운로드", + "grasscutter_unstable": "안정 다운로드", "grasscutter_latest": "최신 다운로드", - "grasscutter_stable_update": "안정 업데이트", + "grasscutter_unstable_update": "안정 업데이트", "grasscutter_latest_update": "최신 업데이트", "resources": "리소스 다운로드", "game": "게임 다운로드", diff --git a/src-tauri/lang/lv.json b/src-tauri/lang/lv.json index adeced0..78a6c9d 100644 --- a/src-tauri/lang/lv.json +++ b/src-tauri/lang/lv.json @@ -32,13 +32,14 @@ }, "downloads": { "grasscutter_fullbuild": "Lejupielādējiet Grasscutter viss vienā", + "grasscutter_fullquest": "Lejupielādēt questing viss vienā", "grasscutter_stable_data": "Lejupielādējiet Grasscutter stabilos datus", "grasscutter_latest_data": "Lejupielādējiet Grasscutter jaunākos datus", "grasscutter_stable_data_update": "Atjauniniet Grasscutter stabilos datus", "grasscutter_latest_data_update": "Atjauniniet Grasscutter jaunākos datus", - "grasscutter_stable": "Lejupielādēt Grasscutter stabilo", + "grasscutter_unstable": "Lejupielādēt Grasscutter stabilo", "grasscutter_latest": "Lejupielādēt Grasscutter jaunāko", - "grasscutter_stable_update": "Atjauniet Grasscutter stabilo", + "grasscutter_unstable_update": "Atjauniet Grasscutter stabilo", "grasscutter_latest_update": "Atjauniet Grasscutter jaunāko", "resources": "Lejupielādējiet Grasscutter resursi", "aio_header": "Lejupielādes viss vienā", diff --git a/src-tauri/lang/nl.json b/src-tauri/lang/nl.json index 3d3d80b..284784e 100644 --- a/src-tauri/lang/nl.json +++ b/src-tauri/lang/nl.json @@ -33,13 +33,14 @@ }, "downloads": { "grasscutter_fullbuild": "Grasscutter Alles-in-één Downloaden", + "grasscutter_fullquest": "Alles-in-één zoeken downloaden", "grasscutter_stable_data": "Download Stabiele Gegevens Van Grasscutter", "grasscutter_latest_data": "Download De Nieuwste Gegevens Van Grasscutter", "grasscutter_stable_data_update": "Stabiele gegevens Van Grasscutter bijwerken", "grasscutter_latest_data_update": "Nieuwste gegevens Van Grasscutter bijwerken", - "grasscutter_stable": "Download Stabiele Versie Van Grasscutter", + "grasscutter_unstable": "Download Stabiele Versie Van Grasscutter", "grasscutter_latest": "Download De Nieuwste Versie Van Grasscutter", - "grasscutter_stable_update": "Update Grasscutter Naar De Stabiele Versie", + "grasscutter_unstable_update": "Update Grasscutter Naar De Stabiele Versie", "grasscutter_latest_update": "Update Grasscutter Naar De Nieuwste Versie", "resources": "Download Grasscutter bronnen", "game": "Download Spel", diff --git a/src-tauri/lang/pt-br.json b/src-tauri/lang/pt-br.json index 79187b5..62b21fc 100644 --- a/src-tauri/lang/pt-br.json +++ b/src-tauri/lang/pt-br.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "Baixar o Grasscutter Tudo-em-Um", + "grasscutter_fullquest": "Baixar de missões em um só lugar", "grasscutter_stable_data": "Baixar os Dados do Grasscutter Estável", "grasscutter_latest_data": "Baixar os Dados do Grasscutter Mais Recente", "grasscutter_stable_data_update": "Atualizar os Dados do Grasscutter Estável", "grasscutter_latest_data_update": "Atualizar os Dados do Grasscutter Mais Recente", - "grasscutter_stable": "Baixar o Grasscutter Estável", + "grasscutter_unstable": "Baixar o Grasscutter Estável", "grasscutter_latest": "Baixar o Grasscutter Mais Recente", - "grasscutter_stable_update": "Atualizar o Grasscutter Estável", + "grasscutter_unstable_update": "Atualizar o Grasscutter Estável", "grasscutter_latest_update": "Atualizar o Grasscutter Mais Recente", "resources": "Baixar os Recursos do Grasscutter ", "game": "Baixar o Jogo", diff --git a/src-tauri/lang/ru.json b/src-tauri/lang/ru.json index 9171994..774cc35 100644 --- a/src-tauri/lang/ru.json +++ b/src-tauri/lang/ru.json @@ -33,13 +33,14 @@ }, "downloads": { "grasscutter_fullbuild": "Скачать все в одном Grasscutter", + "grasscutter_fullquest": "Скачать квесты все в одном", "grasscutter_stable_data": "Скачать стабильные данные Grasscutter", "grasscutter_latest_data": "Скачать последние данные Grasscutter", "grasscutter_stable_data_update": "Обновить стабильные данные Grasscutter", "grasscutter_latest_data_update": "Обновить последние данные Grasscutter", - "grasscutter_stable": "Скачать стабильную версию Grasscutter", + "grasscutter_unstable": "Скачать стабильную версию Grasscutter", "grasscutter_latest": "Скачать последнюю версию Grasscutter", - "grasscutter_stable_update": "Обновить стабильную версию Grasscutter", + "grasscutter_unstable_update": "Обновить стабильную версию Grasscutter", "grasscutter_latest_update": "Обновить последнюю версию Grasscutter", "resources": "Скачать ресурсы Grasscutter", "game": "Скачать Игру", diff --git a/src-tauri/lang/vi.json b/src-tauri/lang/vi.json index b208f7d..7ed7143 100644 --- a/src-tauri/lang/vi.json +++ b/src-tauri/lang/vi.json @@ -34,13 +34,14 @@ }, "downloads": { "grasscutter_fullbuild": "Tải Grasscutter tất cả trong một", + "grasscutter_fullquest": "Tải xuống truy vấn tất cả trong một", "grasscutter_stable_data": "Tải dữ liệu Grasscutter bản ổn định", "grasscutter_latest_data": "Tải dữ liệu Grasscutter bản mới nhất", "grasscutter_stable_data_update": "Cập nhật dữ liệu Grasscutter bản ổn định", "grasscutter_latest_data_update": "Cập nhật dữ liệu Grasscutter bản mới nhất", - "grasscutter_stable": "Tải Grasscutter bản ổn định", + "grasscutter_unstable": "Tải Grasscutter bản ổn định", "grasscutter_latest": "Tải Grasscutter bản mới nhất", - "grasscutter_stable_update": "Cập nhật Grasscutter bản ổn định", + "grasscutter_unstable_update": "Cập nhật Grasscutter bản ổn định", "grasscutter_latest_update": "Cập nhật Grasscutter bản mới nhất", "resources": "Tải tài nguyên Grasscutter", "game": "Tải game", diff --git a/src-tauri/src/unzip.rs b/src-tauri/src/unzip.rs index e574405..a2ae27f 100644 --- a/src-tauri/src/unzip.rs +++ b/src-tauri/src/unzip.rs @@ -107,12 +107,9 @@ pub fn unzip( .unwrap(); } - if zipfile.contains("GIMI") { + if zipfile.contains("GrasscutterQuests") { window - .emit( - "migoto_extracted", - destpath.to_string() + "3DMigoto Loader.exe", - ) + .emit("jar_extracted", destpath.to_string() + "grasscutter.jar") .unwrap(); } diff --git a/src/ui/App.css b/src/ui/App.css index b389969..36a1c5c 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -111,7 +111,7 @@ select:focus { padding: 0; backdrop-filter: blur(10px); - box-shadow: inset 0px 5px 12px -3px rgb(0,0,0,0.43); + box-shadow: inset 0px 5px 12px -3px rgb(0, 0, 0, 0.43); } @media (max-height: 580px) { @@ -124,4 +124,4 @@ select:focus { .BottomSection { height: 140px; } -} \ No newline at end of file +} diff --git a/src/ui/App.tsx b/src/ui/App.tsx index 5d4f349..3c46541 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -114,4 +114,4 @@ class App extends React.Component, IState> { } } -export default App \ No newline at end of file +export default App diff --git a/src/ui/Main.tsx b/src/ui/Main.tsx index 13c903d..13d1141 100644 --- a/src/ui/Main.tsx +++ b/src/ui/Main.tsx @@ -69,14 +69,6 @@ export class Main extends React.Component { setConfigOption('grasscutter_path', payload) }) - listen('migoto_extracted', ({ payload }: { payload: string }) => { - setConfigOption('migoto_path', payload) - - invoke('set_migoto_target', { - migotoPath: payload, - }) - }) - // Emitted for rsa replacing-purposes listen('game_closed', async () => { const wasPatched = await getConfigOption('patch_rsa') diff --git a/src/ui/components/RightBar.tsx b/src/ui/components/RightBar.tsx index a136039..456fde4 100644 --- a/src/ui/components/RightBar.tsx +++ b/src/ui/components/RightBar.tsx @@ -24,7 +24,6 @@ export default class RightBar extends React.Component {
this.openInBrowser(GITHUB)}>
- ) diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index b414c93..3fb6c8a 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -129,4 +129,4 @@ #officialPlay { width: 40%; } -} \ No newline at end of file +} diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx index c8b8b40..942a837 100644 --- a/src/ui/components/ServerLaunchSection.tsx +++ b/src/ui/components/ServerLaunchSection.tsx @@ -317,4 +317,4 @@ export default class ServerLaunchSection extends React.Component ) } -} \ No newline at end of file +} diff --git a/src/ui/components/menu/Downloads.tsx b/src/ui/components/menu/Downloads.tsx index d83ace4..bd08f8d 100644 --- a/src/ui/components/menu/Downloads.tsx +++ b/src/ui/components/menu/Downloads.tsx @@ -14,13 +14,14 @@ import { listen } from '@tauri-apps/api/event' import HelpButton from '../common/HelpButton' const FULL_BUILD_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterCulti.zip' // Change to link that can be updated without modifying here +const FULL_QUEST_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterQuests.zip' const STABLE_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archive/refs/heads/stable.zip' const DEV_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archive/refs/heads/development.zip' -const STABLE_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip' +const UNSTABLE_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/unstable/Grasscutter.zip' const DEV_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/development/Grasscutter.zip' -const RESOURCES_DOWNLOAD = 'https://gitlab.com/YuukiPS/GC-Resources/-/archive/3.5/GC-Resources-3.5.zip' // Use Yuuki res as grasscutter crepe res are broken +const RESOURCES_DOWNLOAD = 'https://gitlab.com/YuukiPS/GC-Resources/-/archive/3.6/GC-Resources-3.6.zip' // Use Yuuki res as grasscutter crepe res are broken const MIGOTO_DOWNLOAD = - 'https://github.com/SilentNightSound/GI-Model-Importer/releases/download/V6.0/3dmigoto-GIMI-for-playing-mods.zip' + 'https://github.com/SilentNightSound/GI-Model-Importer/releases/download/V7.0/3dmigoto-GIMI-for-playing-mods.zip' interface IProps { closeFn: () => void @@ -55,9 +56,10 @@ export default class Downloads extends React.Component { this.getGrasscutterFolder = this.getGrasscutterFolder.bind(this) this.downloadGrasscutterFullBuild = this.downloadGrasscutterFullBuild.bind(this) + this.downloadGrasscutterFullQuest = this.downloadGrasscutterFullQuest.bind(this) this.downloadGrasscutterStableRepo = this.downloadGrasscutterStableRepo.bind(this) this.downloadGrasscutterDevRepo = this.downloadGrasscutterDevRepo.bind(this) - this.downloadGrasscutterStable = this.downloadGrasscutterStable.bind(this) + this.downloadGrasscutterUnstable = this.downloadGrasscutterUnstable.bind(this) this.downloadGrasscutterLatest = this.downloadGrasscutterLatest.bind(this) this.downloadResources = this.downloadResources.bind(this) this.downloadMigoto = this.downloadMigoto.bind(this) @@ -141,6 +143,16 @@ export default class Downloads extends React.Component { this.toggleButtons() } + async downloadGrasscutterFullQuest() { + const folder = await this.getGrasscutterFolder() + this.props.downloadManager.addDownload(FULL_QUEST_DOWNLOAD, folder + '\\GrasscutterQuests.zip', async () => { + await unzip(folder + '\\GrasscutterQuests.zip', folder + '\\', true) + this.toggleButtons() + }) + + this.toggleButtons() + } + async downloadGrasscutterStableRepo() { const folder = await this.getGrasscutterFolder() this.props.downloadManager.addDownload(STABLE_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', async () => { @@ -161,16 +173,13 @@ export default class Downloads extends React.Component { this.toggleButtons() } - async downloadGrasscutterStable() { + async downloadGrasscutterUnstable() { const folder = await this.getGrasscutterFolder() - this.props.downloadManager.addDownload(STABLE_DOWNLOAD, folder + '\\grasscutter.zip', async () => { + this.props.downloadManager.addDownload(UNSTABLE_DOWNLOAD, folder + '\\grasscutter.zip', async () => { await unzip(folder + '\\grasscutter.zip', folder + '\\', true) this.toggleButtons }) - // Also add repo download - this.downloadGrasscutterStableRepo() - this.toggleButtons() } @@ -270,29 +279,46 @@ export default class Downloads extends React.Component { - - - - {/*
-
- - +
+
+ +
-
+
-
*/} +
+ + +
+
+
+ + +
+
+ + + +
+
{ this.setState({ migoto_path: value, }) - - // Set game exe in Migoto ini - invoke('set_migoto_target', { - migotoPath: value, - }) } setReshade(value: string) {