[O] Move general game settings to general tab

pull/50/head
Clansty 2024-08-08 13:50:14 +08:00
parent 3b80b8d7f1
commit d0aecc76ed
No known key found for this signature in database
GPG Key ID: 3A6BE8BAF2EDE134
4 changed files with 17 additions and 7 deletions

View File

@ -0,0 +1,9 @@
<script>
import { fade } from "svelte/transition";
import { FADE_IN, FADE_OUT } from "../libs/config";
import GameSettingFields from "./GameSettingFields.svelte";
</script>
<div out:fade={FADE_OUT} in:fade={FADE_IN}>
<GameSettingFields game="general"/>
</div>

View File

@ -1,7 +1,6 @@
<script lang="ts">
import { slide, fade } from "svelte/transition";
import { FADE_IN, FADE_OUT } from "../libs/config";
import GameSettingFields from "./GameSettingFields.svelte";
import { t } from "../libs/i18n.js";
import Icon from "@iconify/svelte";
import StatusOverlays from "./StatusOverlays.svelte";
@ -73,7 +72,6 @@
</div>
</div>
{/each}
<GameSettingFields game="mai2"/>
<button class="exportButton" on:click={exportData}>
<Icon icon="bxs:file-export"/>
{t('settings.export')}

View File

@ -12,6 +12,7 @@
import UserBox from "../../components/UserBox.svelte";
import Mai2Settings from "../../components/Mai2Settings.svelte";
import WaccaSettings from "../../components/WaccaSettings.svelte";
import GeneralGameSettings from "../../components/GeneralGameSettings.svelte";
USER.ensureLoggedIn()
@ -19,7 +20,7 @@
let error: string;
let submitting = ""
let tab = 0
let tabs = [ 'profile' ]
let tabs = [ 'profile', 'game' ]
const profileFields = [
[ 'displayName', t('settings.profile.name') ],
@ -139,6 +140,8 @@
<Mai2Settings username={me.username} />
{:else if tabs[tab] === 'wacca'}
<WaccaSettings />
{:else if tabs[tab] === 'game'}
<GeneralGameSettings />
{/if}
<StatusOverlays {error} loading={!me || !!submitting} />

View File

@ -14,16 +14,16 @@ class AquaGameOptions(
@GeneratedValue(strategy = GenerationType.IDENTITY)
var id: Long = 0,
@SettingField("mai2")
@SettingField("general")
var unlockMusic: Boolean = false,
@SettingField("mai2")
@SettingField("general")
var unlockChara: Boolean = false,
@SettingField("mai2")
@SettingField("general")
var unlockCollectables: Boolean = false,
@SettingField("mai2")
@SettingField("general")
var unlockTickets: Boolean = false,
@SettingField("wacca")