fixed conflict

This commit is contained in:
Nixon 2022-08-24 15:44:52 +08:00
commit 2b8e04e4d6
2 changed files with 49 additions and 2 deletions

View file

@ -13,6 +13,7 @@ pub fn setup_level(
commands: &mut Commands,
current_level: &mut ResMut<CurrentLevel>,
level_startup_event: &mut EventWriter<LevelStartupEvent>,
camera_query: &mut Query<&mut Transform, With<Camera>>,
level_id: LevelId,
) {
let level_entity = commands
@ -23,6 +24,8 @@ pub fn setup_level(
.id();
current_level.0 = Some(level_id);
camera_query.single_mut().translation = Default::default();
level_startup_event.send(LevelStartupEvent(level_entity));
}