Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c463dd76db |
+1
-2
@@ -122,8 +122,7 @@ impl Plugin for MenuPlugin {
|
|||||||
fn build(&self, app: &mut App) {
|
fn build(&self, app: &mut App) {
|
||||||
app.add_systems(
|
app.add_systems(
|
||||||
OnEnter(AppState::MainMenu),
|
OnEnter(AppState::MainMenu),
|
||||||
(build_menu::<MainMenu>, |mut commands: Commands| {
|
build_menu::<MainMenu>,
|
||||||
}),
|
|
||||||
)
|
)
|
||||||
.add_message::<character_select::PlayerSlotAssigned>()
|
.add_message::<character_select::PlayerSlotAssigned>()
|
||||||
.init_resource::<navigation::UINavigationActionState>()
|
.init_resource::<navigation::UINavigationActionState>()
|
||||||
|
|||||||
+6
-10
@@ -7,10 +7,14 @@ use strum::IntoEnumIterator;
|
|||||||
use strum_macros::EnumIter;
|
use strum_macros::EnumIter;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
AppState, game_settings::GameSettings, math::{int::FGi32, vec::FGVec2}, stage::{
|
AppState,
|
||||||
|
game_settings::GameSettings,
|
||||||
|
math::vec::FGVec2,
|
||||||
|
stage::{
|
||||||
StagePoly,
|
StagePoly,
|
||||||
line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
|
line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
|
||||||
}, texture_reference::TextureReference,
|
},
|
||||||
|
texture_reference::TextureReference,
|
||||||
};
|
};
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
|
|
||||||
@@ -83,14 +87,6 @@ pub struct StageManifest {
|
|||||||
pub icon: TextureReference,
|
pub icon: TextureReference,
|
||||||
pub camera: StageCameraProfile,
|
pub camera: StageCameraProfile,
|
||||||
pub polygons: Vec<StagePolyDefinition>,
|
pub polygons: Vec<StagePolyDefinition>,
|
||||||
#[reflect(ignore)]
|
|
||||||
pub blast_zone_left: FGi32,
|
|
||||||
#[reflect(ignore)]
|
|
||||||
pub blast_zone_right: FGi32,
|
|
||||||
#[reflect(ignore)]
|
|
||||||
pub blast_zone_top: FGi32,
|
|
||||||
#[reflect(ignore)]
|
|
||||||
pub blast_zone_bottom: FGi32,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Resource)]
|
#[derive(Resource)]
|
||||||
|
|||||||
Reference in New Issue
Block a user