step 1 put pet color into pet menu

This commit is contained in:
2026-01-07 16:17:38 +08:00
parent ee2b9f270e
commit d821941fbd
3 changed files with 23 additions and 9 deletions

View File

@@ -9,7 +9,7 @@
import { invoke } from "@tauri-apps/api/core"; import { invoke } from "@tauri-apps/api/core";
import DesktopPet from "./DesktopPet.svelte"; import DesktopPet from "./components/DesktopPet.svelte";
let innerWidth = 0; let innerWidth = 0;
let innerHeight = 0; let innerHeight = 0;
@@ -95,8 +95,7 @@
targetX={position.mapped.x * innerWidth} targetX={position.mapped.x * innerWidth}
targetY={position.mapped.y * innerHeight} targetY={position.mapped.y * innerHeight}
name={getFriendName(userId)} name={getFriendName(userId)}
bodyColor={config?.colorScheme?.body} {config}
outlineColor={config?.colorScheme?.outline}
{isInteractive} {isInteractive}
/> />
{/if} {/if}

View File

@@ -4,14 +4,15 @@
import { usePetState } from "$lib/composables/usePetState"; import { usePetState } from "$lib/composables/usePetState";
import { getSpriteSheetUrl } from "$lib/utils/sprite-utils"; import { getSpriteSheetUrl } from "$lib/utils/sprite-utils";
import PetSprite from "$lib/components/PetSprite.svelte"; import PetSprite from "$lib/components/PetSprite.svelte";
import onekoGif from "../../assets/oneko/oneko.gif"; import onekoGif from "../../../assets/oneko/oneko.gif";
import PetMenu from "./PetMenu.svelte";
import type { DollConfigurationDto } from "../../../types/bindings/DollConfigurationDto";
export let id = ""; export let id = "";
export let targetX = 0; export let targetX = 0;
export let targetY = 0; export let targetY = 0;
export let name = ""; export let name = "";
export let bodyColor: string | undefined = undefined; export let config: DollConfigurationDto | undefined = undefined;
export let outlineColor: string | undefined = undefined;
export let isInteractive = false; export let isInteractive = false;
const { position, currentSprite, updatePosition, setPosition } = usePetState( const { position, currentSprite, updatePosition, setPosition } = usePetState(
@@ -26,7 +27,7 @@
let isPetMenuOpen = false; let isPetMenuOpen = false;
// Watch for color changes to regenerate sprite // Watch for color changes to regenerate sprite
$: updateSprite(bodyColor, outlineColor); $: updateSprite(config?.colorScheme.body, config?.colorScheme.outline);
$: (isInteractive, (isPetMenuOpen = false)); $: (isInteractive, (isPetMenuOpen = false));
@@ -86,11 +87,15 @@
> >
{#if isPetMenuOpen} {#if isPetMenuOpen}
<div <div
class="absolute -translate-y-44 w-30 h-40 bg-neutral-500 rounded-md" class="absolute -translate-y-44 w-30 h-40 *:size-full"
role="menu" role="menu"
tabindex="0" tabindex="0"
aria-label="Pet Menu" aria-label="Pet Menu"
></div> >
{#if config}
<PetMenu {config} />
{/if}
</div>
{/if} {/if}
<button <button
onclick={() => { onclick={() => {

View File

@@ -0,0 +1,10 @@
<script lang="ts">
import { type DollConfigurationDto } from "../../../types/bindings/DollConfigurationDto";
export let config: DollConfigurationDto;
</script>
<div class="bg-base-100 border border-base-200 card p-1">
<div class="flex flex-col gap-1">
<p class="text-xs">{config.colorScheme.body}</p>
</div>
</div>