diff --git a/DungeonShooting_Godot/src/framework/generate/GenerateDungeon.cs b/DungeonShooting_Godot/src/framework/generate/GenerateDungeon.cs
index e1fd172..5fa9c77 100644
--- a/DungeonShooting_Godot/src/framework/generate/GenerateDungeon.cs
+++ b/DungeonShooting_Godot/src/framework/generate/GenerateDungeon.cs
@@ -12,7 +12,7 @@
     private Grid<bool> _roomGrid = new Grid<bool>();
     private List<RoomInfo> _roomInfos = new List<RoomInfo>();
     private int _count = 0;
-    private int _maxCount = 3;
+    private int _maxCount = 30;
 
     public GenerateDungeon(TileMap tileMap)
     {
@@ -21,7 +21,7 @@
 
     public void Generate()
     {
-        GenerateRoom(null);
+        GenerateRoom(null, 0);
 
         foreach (var info in _roomInfos)
         {
@@ -37,22 +37,25 @@
         }
     }
 
-    public void GenerateRoom(RoomInfo prevRoomInfo)
+    private RoomInfo GenerateRoom(RoomInfo prevRoomInfo, int direction)
     {
-        if (_count >= _maxCount)
+        if (_count > _maxCount)
         {
-            return;
+            return null;
         }
-        
-        var pos = Vector2.Zero;
-        var size = new Vector2(Utils.RandRangeInt(5, 10), Utils.RandRangeInt(5, 10));
+        _count++;
+        var info = new RoomInfo();
+        info.Size = new Vector2(Utils.RandRangeInt(10, 30), Utils.RandRangeInt(10, 30));
+        info.Position = Vector2.Zero;
+        info.Direction = direction;
 
         if (prevRoomInfo != null) //表示这不是第一个房间, 就得判断当前位置下的房间是否被遮挡
         {
-            var dir = Utils.RandRangeInt(0, 3); //0上, 1右, 2下, 3左
-            var space = Utils.RandRangeInt(3, 10);
+            //房间间隔
+            var space = Utils.RandRangeInt(3, 4);
+            //中心偏移
             int offset;
-            if (dir == 0 || dir == 2)
+            if (direction == 0 || direction == 2)
             {
                 offset = Utils.RandRangeInt(-(int)prevRoomInfo.Size.y, (int)prevRoomInfo.Size.y);
             }
@@ -60,39 +63,70 @@
             {
                 offset = Utils.RandRangeInt(-(int)prevRoomInfo.Size.x, (int)prevRoomInfo.Size.x);
             }
-
-            if (dir == 0)
+            //计算房间位置
+            if (direction == 0) //上
             {
-                pos = new Vector2(prevRoomInfo.Position.x + offset,
-                    prevRoomInfo.Position.y - prevRoomInfo.Size.y - space);
+                info.Position = new Vector2(prevRoomInfo.Position.x + offset,
+                    prevRoomInfo.Position.y - info.Size.y - space);
             }
-            else if (dir == 1)
+            else if (direction == 1) //右
             {
-                pos = new Vector2(prevRoomInfo.Position.x + prevRoomInfo.Size.y + space, prevRoomInfo.Position.y + offset - space);
+                info.Position = new Vector2(prevRoomInfo.Position.x + prevRoomInfo.Size.y + space, prevRoomInfo.Position.y + offset);
             }
-            else if (dir == 2)
+            else if (direction == 2) //下
             {
-                pos = new Vector2(prevRoomInfo.Position.x + offset, prevRoomInfo.Position.y + space);
+                info.Position = new Vector2(prevRoomInfo.Position.x + offset, prevRoomInfo.Position.y + prevRoomInfo.Size.y + space);
             }
-            else if (dir == 3)
+            else if (direction == 3) //左
             {
-                pos = new Vector2(prevRoomInfo.Position.x - prevRoomInfo.Size.x - space,
-                    prevRoomInfo.Position.y + prevRoomInfo.Size.y + offset);
+                info.Position = new Vector2(prevRoomInfo.Position.x - info.Size.x - space,
+                    prevRoomInfo.Position.y + offset);
             }
-
-            if (_roomGrid.RectCollision(pos, size))
+            
+            //是否碰到其他房间
+            if (_roomGrid.RectCollision(info.Position - new Vector2(1, 1), info.Size + new Vector2(2, 2)))
             {
-                return;
+                return null;
             }
         }
-
-
-        _count++;
-        var info = new RoomInfo();
-        info.Size = size;
-        info.Position = pos;
+        
         _roomInfos.Add(info);
         _roomGrid.AddRect(info.Position, info.Size, true);
-        GenerateRoom(info);
+        
+        //下一个房间
+        //0上, 1右, 2下, 3左
+        var dirList = new List<int>(new []{ 0, 1, 2, 3 });
+        if (prevRoomInfo != null)
+        {
+            dirList.Remove(GetReverseDirection(direction));
+        }
+
+        while (dirList.Count > 0)
+        {
+            var randDir = Utils.RandChoose(dirList);
+            var generateRoom = GenerateRoom(info, randDir);
+            if (generateRoom == null)
+            {
+                break;
+            }
+
+            dirList.Remove(randDir);
+        }
+        
+        
+        return info;
+    }
+
+    private int GetReverseDirection(int direction)
+    {
+        switch (direction)
+        {
+            case 0: return 2;
+            case 1: return 3;
+            case 2: return 0;
+            case 3: return 1;
+        }
+
+        return 2;
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/framework/generate/RoomInfo.cs b/DungeonShooting_Godot/src/framework/generate/RoomInfo.cs
index 603ab08..c2106ef 100644
--- a/DungeonShooting_Godot/src/framework/generate/RoomInfo.cs
+++ b/DungeonShooting_Godot/src/framework/generate/RoomInfo.cs
@@ -18,4 +18,11 @@
     
     public object Doors;
 
+    /// <summary>
+    /// 房间生成时所处方向: 0上, 1右, 2下, 3左
+    /// </summary>
+    public int Direction;
+
+    //public RoomInfo Next;
+    //public RoomInfo Prev;
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/game/common/Utils.cs b/DungeonShooting_Godot/src/game/common/Utils.cs
index 8ee8ec3..b78bb23 100644
--- a/DungeonShooting_Godot/src/game/common/Utils.cs
+++ b/DungeonShooting_Godot/src/game/common/Utils.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Godot;
 
 /// <summary>
@@ -43,6 +44,16 @@
             return default;
         }
 
-        return list[list.Length - 1];
+        return list[RandRangeInt(0, list.Length - 1)];
+    }
+
+    public static T RandChoose<T>(List<T> list)
+    {
+        if (list.Count == 0)
+        {
+            return default;
+        }
+
+        return list[RandRangeInt(0, list.Count - 1)];
     }
 }
\ No newline at end of file
diff --git a/DungeonShooting_Godot/src/test/TestGenerateDungeon.cs b/DungeonShooting_Godot/src/test/TestGenerateDungeon.cs
index 1026f5f..8223b35 100644
--- a/DungeonShooting_Godot/src/test/TestGenerateDungeon.cs
+++ b/DungeonShooting_Godot/src/test/TestGenerateDungeon.cs
@@ -14,7 +14,7 @@
 
 	public override void _Ready()
 	{
-		//GD.Randomize();
+		GD.Randomize();
 		_tileMap = GetNode<TileMap>(TileMapPath);
 		_camera = GetNode<Camera2D>(Camera);