diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx index 4a8cdaf..208d7f8 100644 --- a/src/ui/components/ServerLaunchSection.tsx +++ b/src/ui/components/ServerLaunchSection.tsx @@ -74,7 +74,7 @@ export default class ServerLaunchSection extends React.Component async playGame() { const config = await getConfig() - if (!config.game_path) return + if (!config.game_install_path) return // Connect to proxy if (config.toggle_grasscutter) { @@ -87,7 +87,7 @@ export default class ServerLaunchSection extends React.Component } // Launch the program - await invoke('run_program', { path: config.game_path }) + await invoke('run_program', { path: config.game_install_path }) } async launchServer() { diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx index 42ff2a4..e03a2d7 100644 --- a/src/ui/components/menu/Options.tsx +++ b/src/ui/components/menu/Options.tsx @@ -11,7 +11,7 @@ interface IProps { } interface IState { - game_path: string + game_install_path: string grasscutter_path: string grasscutter_with_game: boolean } @@ -21,7 +21,7 @@ export default class Options extends React.Component { super(props) this.state = { - game_path: '', + game_install_path: '', grasscutter_path: '', grasscutter_with_game: false } @@ -30,7 +30,7 @@ export default class Options extends React.Component { componentDidMount() { getConfig().then(config => { this.setState({ - game_path: config.game_path || '', + game_install_path: config.game_install_path || '', grasscutter_path: config.grasscutter_path || '', grasscutter_with_game: config.grasscutter_with_game || false }) @@ -40,7 +40,7 @@ export default class Options extends React.Component { } setGameExec(value: string) { - setConfigOption('game_path', value) + setConfigOption('game_install_path', value) } setGrasscutterJar(value: string) { @@ -59,7 +59,7 @@ export default class Options extends React.Component {
- +
diff --git a/src/utils/configuration.ts b/src/utils/configuration.ts index af34387..0750735 100644 --- a/src/utils/configuration.ts +++ b/src/utils/configuration.ts @@ -14,10 +14,26 @@ let defaultConfig: Configuration grasscutter_with_game: false, grasscutter_path: roamingAppData + '\\cultivation\\grasscutter.jar', close_action: 0, - startup_launch: false + startup_launch: false, + last_ip: '', + last_port: '', } })() +/** + * 'close_action': 0 = close, 1 = tray + */ +export interface Configuration { + toggle_grasscutter: boolean + game_install_path: string + grasscutter_with_game: boolean + grasscutter_path: string + close_action: number + startup_launch: boolean + last_ip: string + last_port: string +} + export async function setConfigOption(key: string, value: any): Promise { const config = await getConfig() @@ -91,15 +107,3 @@ async function writeConfigFile(raw: string) { contents: raw }) } - -/** - * 'close_action': 0 = close, 1 = tray - */ -export interface Configuration { - toggle_grasscutter: boolean - game_install_path: string - grasscutter_with_game: boolean - grasscutter_path: string - close_action: number - startup_launch: boolean -} \ No newline at end of file