diff --git a/DungeonShooting_Godot/src/game/room/RoomManager.cs b/DungeonShooting_Godot/src/game/room/RoomManager.cs
index 0302485..02a61d5 100644
--- a/DungeonShooting_Godot/src/game/room/RoomManager.cs
+++ b/DungeonShooting_Godot/src/game/room/RoomManager.cs
@@ -30,7 +30,7 @@
     /// <summary>
     /// 当前玩家所在的房间
     /// </summary>
-    public RoomInfo ActiveRoom => Player?.Affiliation.RoomInfo;
+    public RoomInfo ActiveRoom => Player?.Affiliation?.RoomInfo;
     
     /// <summary>
     /// 当前玩家所在的区域
@@ -268,7 +268,7 @@
     private void OnCheckEnemy()
     {
         var activeRoom = ActiveRoom;
-        if (activeRoom.IsSeclusion)
+        if (activeRoom != null && activeRoom.IsSeclusion)
         {
             if (activeRoom.IsCurrWaveOver()) //所有标记执行完成
             {