fix runtime errors

aratama · Nov 12, 2024 · 853e2e6 · 853e2e6
1 parent 90b18e6
commit 853e2e6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1,8 +1,8 @@
-<script integrity=sha384-DXfxbHnmRjXl3uhZSP4S1IWEe3DfX/sHDa2A7iHxmUB6Ag+87PaP8wV2AtDOwHfm src=./restart-audio-context-8127143435824044.js type=module></script><link href=assets/favicon.png rel=icon><link href=./index-56627a79e0752a1c.css integrity=sha384-m/ivHNojsD/VAvwMMce+fhrN8VxOZuZt5hms1JExuO36KLCDKKRGDtjLXSlnQq0B rel=stylesheet><script nonce="UmTgmf4N2ajiLtABHX0AXw==" type=module>import init, * as bindings from './magiacircle-d297b2967bb6d26.js';
-const wasm = await init('./magiacircle-d297b2967bb6d26_bg.wasm');
+<script integrity=sha384-DXfxbHnmRjXl3uhZSP4S1IWEe3DfX/sHDa2A7iHxmUB6Ag+87PaP8wV2AtDOwHfm src=./restart-audio-context-8127143435824044.js type=module></script><link href=assets/favicon.png rel=icon><link href=./index-56627a79e0752a1c.css integrity=sha384-m/ivHNojsD/VAvwMMce+fhrN8VxOZuZt5hms1JExuO36KLCDKKRGDtjLXSlnQq0B rel=stylesheet><script nonce="+w7SKDAS0RbXL3RGpM+naw==" type=module>import init, * as bindings from './magiacircle-efaff60e1194bb10.js';
+const wasm = await init('./magiacircle-efaff60e1194bb10_bg.wasm');
 
 
 window.wasmBindings = bindings;
 
 
-dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));</script><title>magiacircle 0.1</title><link crossorigin href=./magiacircle-d297b2967bb6d26.js integrity=sha384-9Q23cWEM6uviEQi1XtYUgQnLJqlUeI1O6w5SoOa7pf4p2Hza8rz3nA3MQjP7b0zv rel=modulepreload><link as=fetch crossorigin href=./magiacircle-d297b2967bb6d26_bg.wasm integrity=sha384-RO3JR5rPHCkXK7CY9D6LcNtlnMR6eRWBf0yeDZmp6GWyZXzdeVAWg7IsCvnhTB8V rel=preload type=application/wasm></head><body></body></html>
+dispatchEvent(new CustomEvent("TrunkApplicationStarted", {detail: {wasm}}));</script><title>magiacircle 0.1</title><link crossorigin href=./magiacircle-efaff60e1194bb10.js integrity=sha384-iZrEYBriwagISmiIhrcphvIAN0GD4e0NYIN1XdHjwI0Tsd2GI5H0gBa4kuNj6u1m rel=modulepreload><link as=fetch crossorigin href=./magiacircle-efaff60e1194bb10_bg.wasm integrity=sha384-NWoLqtLJpkKD+61DmvQS+1pxgW0kiNrS3+QBL1LSsB9odZkfrF8DeXnQAhofU5na rel=preload type=application/wasm></head><body></body></html>
diff --git a/docs/magiacircle-d297b2967bb6d26.js b/docs/magiacircle-d297b2967bb6d26.js
diff --git a/docs/magiacircle-efaff60e1194bb10.js b/docs/magiacircle-efaff60e1194bb10.js
diff --git a/docs/magiacircle-d297b2967bb6d26_bg.wasm → docs/magiacircle-efaff60e1194bb10_bg.wasm b/docs/magiacircle-d297b2967bb6d26_bg.wasm → docs/magiacircle-efaff60e1194bb10_bg.wasm
diff --git a/src/controller/player.rs b/src/controller/player.rs
@@ -39,12 +39,13 @@ fn move_player(
     menu: Res<State<GameMenuState>>,
     wand_editor_visible_query: Query<&Visibility, With<WandEditorRoot>>,
 ) {
-    let mut actor = player_query.single_mut();
-    let wand_editor_visible = wand_editor_visible_query.single();
-    if *menu == GameMenuState::Closed && *wand_editor_visible == Visibility::Hidden {
-        actor.move_direction = get_direction(keys, axes, &gamepads);
-    } else {
-        actor.move_direction = Vec2::ZERO;
+    if let Ok(mut actor) = player_query.get_single_mut() {
+        let wand_editor_visible = wand_editor_visible_query.single();
+        if *menu == GameMenuState::Closed && *wand_editor_visible == Visibility::Hidden {
+            actor.move_direction = get_direction(keys, axes, &gamepads);
+        } else {
+            actor.move_direction = Vec2::ZERO;
+        }
     }
 }
 
@@ -69,14 +70,15 @@ fn trigger_bullet(
     wand_editor_visible_query: Query<&Visibility, With<WandEditorRoot>>,
 ) {
     let wand_editor_visible = wand_editor_visible_query.single();
-    let mut player = player_query.single_mut();
-    if *menu == GameMenuState::Closed
-        && *wand_editor_visible == Visibility::Hidden
-        && get_fire_trigger(buttons, gamepad_buttons, &my_gamepad)
-    {
-        player.fire_state = ActorFireState::Fire;
-    } else {
-        player.fire_state = ActorFireState::Idle;
+    if let Ok(mut player) = player_query.get_single_mut() {
+        if *menu == GameMenuState::Closed
+            && *wand_editor_visible == Visibility::Hidden
+            && get_fire_trigger(buttons, gamepad_buttons, &my_gamepad)
+        {
+            player.fire_state = ActorFireState::Fire;
+        } else {
+            player.fire_state = ActorFireState::Idle;
+        }
     }
 }
 

diff --git a/src/ui/floating.rs b/src/ui/floating.rs
@@ -20,7 +20,7 @@ pub struct InventoryItemFloating(pub Option<InventoryItemFloatingContent>);
 pub fn spawn_inventory_floating(commands: &mut Commands, assets: &Res<GameAssets>) {
     commands.spawn((
         InventoryItemFloating(None),
-        StateScoped(GameState::MainMenu),
+        StateScoped(GameState::InGame),
         Interaction::default(),
         ImageBundle {
             style: Style {