Fix custom patching for vers >4.x

NotThorny · Aug 28, 2024 · 25a359b · 25a359b
1 parent c72aaa9
commit 25a359b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cultivation",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "private": true,
   "dependencies": {
     "@tauri-apps/api": "^1.0.0-rc.5",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cultivation"
-version = "1.4.4"
+version = "1.4.6"
 description = "A custom launcher for anime game."
 authors = ["KingRainbow44", "SpikeHD"]
 license = ""

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Cultivation",
-    "version": "1.4.4"
+    "version": "1.4.6"
   },
   "tauri": {
     "allowlist": {

diff --git a/src/ui/App.tsx b/src/ui/App.tsx
@@ -87,6 +87,7 @@ class App extends React.Component<Readonly<unknown>, IState> {
         // @ts-expect-error - TS doesn't like our custom event
         page: e.detail,
       })
+      this.forceUpdate
     })
   }
 

diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx
@@ -176,7 +176,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
 
         const versionString = gameVersion?.major.toString() + gameVersion?.minor.toString()
 
-        if (gameVersion?.major == 4 && gameVersion?.minor > 5) {
+        if ((gameVersion?.major == 4 && gameVersion?.minor > 5) || gameVersion?.major > 4) {
           newerGame = true
 
           const path = (await invoke('install_location')) as string

diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx
@@ -186,7 +186,7 @@ export default class Options extends React.Component<IProps, IState> {
     }
 
     // If setting any other game, automatically set to redirect more
-    if (!value.toLowerCase().includes('genshin' || 'yuanshen')) {
+    if (!value.toLowerCase().includes('genshin') || !value.toLowerCase().includes('yuanshen')) {
       if (!this.state.redirect_more) {
         this.toggleOption('redirect_more')
       }

diff --git 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<IProps, IState> {
           <tr>
             <td>
               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.4.4
+              version: Grasscutter 1.7.4 - Cultivation 1.4.6
             </td>
           </tr>
         )