fix overlay

aratama · Jan 11, 2025 · b236ecd · b236ecd
1 parent 1b98e72
commit b236ecd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/src/hud/overlay.rs b/src/hud/overlay.rs
@@ -84,7 +84,6 @@ fn update_overlay(
         match overlay.next {
             Some(next) => {
                 next_state.set(next);
-                overlay.open = true;
             }
             _ => {}
         }

diff --git a/src/page/ending.rs b/src/page/ending.rs
@@ -8,7 +8,14 @@ use bevy_aseprite_ultra::prelude::AseUiAnimation;
 #[derive(Component)]
 pub struct EndingImage;
 
-fn setup(mut commands: Commands, assets: Res<GameAssets>, mut next_bgm: ResMut<NextBGM>) {
+fn setup(
+    mut commands: Commands,
+    assets: Res<GameAssets>,
+    mut next_bgm: ResMut<NextBGM>,
+    mut overlay: EventWriter<OverlayEvent>,
+) {
+    overlay.send(OverlayEvent::SetOpen(true));
+
     commands.spawn((StateScoped(GameState::Ending), Camera2d::default()));
 
     next_bgm.0 = Some(assets.ending_bgm.clone());

diff --git a/src/page/in_game.rs b/src/page/in_game.rs
@@ -8,6 +8,7 @@ use crate::entity::actor::ActorGroup;
 use crate::entity::dropped_item::spawn_dropped_item;
 use crate::entity::witch::spawn_witch;
 use crate::hud::life_bar::LifeBarResource;
+use crate::hud::overlay::OverlayEvent;
 use crate::inventory::InventoryItem;
 use crate::inventory_item::InventoryItemType;
 use crate::language::Dict;
@@ -108,7 +109,10 @@ pub fn setup_level(
     config: Res<GameConfig>,
     mut spawn: EventWriter<SpawnEntity>,
     mut next: ResMut<NextState<GameMenuState>>,
+    mut overlay: EventWriter<OverlayEvent>,
 ) {
+    overlay.send(OverlayEvent::SetOpen(true));
+
     let mut rng = StdRng::from_entropy();
 
     let level = current.next_level;

diff --git a/src/page/main_menu.rs b/src/page/main_menu.rs
@@ -47,7 +47,10 @@ fn setup(
     assets: Res<GameAssets>,
     mut next_bgm: ResMut<NextBGM>,
     mut current: ResMut<LevelSetup>,
+    mut overlay: EventWriter<OverlayEvent>,
 ) {
+    overlay.send(OverlayEvent::SetOpen(true));
+
     commands.spawn((Camera2d::default(), StateScoped(GameState::MainMenu)));
 
     *next_bgm = NextBGM(Some(assets.boubaku.clone()));

diff --git a/src/page/name_input.rs b/src/page/name_input.rs
@@ -58,7 +58,10 @@ fn setup(
     assets: Res<GameAssets>,
     shots: Res<ButtonShots>,
     config: Res<GameConfig>,
+    mut overlay: EventWriter<OverlayEvent>,
 ) {
+    overlay.send(OverlayEvent::SetOpen(true));
+
     commands.spawn((Camera2d::default(), StateScoped(GameState::NameInput)));
 
     commands