diff --git a/package.json b/package.json index 426900c..6bbfa20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cultivation", - "version": "1.5.8", + "version": "1.6.0", "private": true, "dependencies": { "@tauri-apps/api": "^1.0.0-rc.5", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index fe2bf65..89a54f1 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -959,7 +959,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "cultivation" -version = "1.5.8" +version = "1.6.0" dependencies = [ "anime-launcher-sdk", "anyhow", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d03c75f..fea2ab3 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "cultivation" -version = "1.5.8" +version = "1.6.0" description = "A custom launcher for anime game." authors = ["KingRainbow44", "SpikeHD"] license = "" repository = "https://github.com/Grasscutters/Cultivation.git" default-run = "cultivation" edition = "2021" -rust-version = "1.58" +rust-version = "1.57" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src-tauri/patch/5version.dll b/src-tauri/patch/5version.dll index 4a93937..d38dade 100644 Binary files a/src-tauri/patch/5version.dll and b/src-tauri/patch/5version.dll differ diff --git a/src-tauri/patch/6version.dll b/src-tauri/patch/6version.dll new file mode 100644 index 0000000..7825922 Binary files /dev/null and b/src-tauri/patch/6version.dll differ diff --git a/src-tauri/src/patch.rs b/src-tauri/src/patch.rs index 8e03d81..bff8bb7 100644 --- a/src-tauri/src/patch.rs +++ b/src-tauri/src/patch.rs @@ -155,7 +155,12 @@ pub async fn patch_game(_newer_game: bool, version: String) -> bool { // For 5.0 and up use universal if i_ver > 49 { - patch_path = PathBuf::from(system_helpers::install_location()).join("patch/5version.dll"); + if i_ver < 59 { + patch_path = PathBuf::from(system_helpers::install_location()).join("patch/5version.dll"); + } else { + // 6.0 patch not checked/tested if works for old vers, so separate + patch_path = PathBuf::from(system_helpers::install_location()).join("patch/6version.dll"); + } let replaced50 = file_helpers::copy_file_with_new_name( patch_path.clone().to_str().unwrap().to_string(), get_game_rsa_path().await.unwrap(), diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 54efcd9..c2eb64e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "Cultivation", - "version": "1.5.8" + "version": "1.6.0" }, "tauri": { "allowlist": { @@ -72,7 +72,8 @@ "resizable": true, "title": "Cultivation", "width": 1280, - "decorations": false + "decorations": false, + "center": true } ] } diff --git a/src/ui/components/news/NewsSection.tsx b/src/ui/components/news/NewsSection.tsx index 21277ad..913b5cd 100644 --- a/src/ui/components/news/NewsSection.tsx +++ b/src/ui/components/news/NewsSection.tsx @@ -143,7 +143,7 @@ export default class NewsSection extends React.Component { Work in progress area! These numbers may be outdated, so please do not use them as reference. Latest - version: Grasscutter 1.7.4 - Cultivation 1.5.8 + version: Grasscutter 1.7.4 - Cultivation 1.6.0 )