diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity index 0089732c..7d2624a0 100644 --- a/Assets/Scenes/Main Scene.unity +++ b/Assets/Scenes/Main Scene.unity @@ -237,6 +237,10 @@ PrefabInstance: propertyPath: m_Name value: Straight_Manhole_Up 1 objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e4cc6038906227b41bbab3e2f4906158, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -465,6 +469,10 @@ PrefabInstance: propertyPath: m_Name value: Dead_End_Manhole_Down objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c7b8e72ff8d936143a810e1baa494428, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -785,6 +793,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Hallucinate.GameSetup.Maze.MazeRenderer visualProfile: {fileID: 11400000, guid: 15b745b0bb979b84ea937c679ee0f1ed, type: 2} + floorHeight: 3.5 --- !u!1001 &1580015189 PrefabInstance: m_ObjectHideFlags: 0 @@ -999,14 +1008,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3607adabe0c29c34591af73b414eb17a, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Hallucinate.GameSetup.Maze.MazeManager - floorCount: 2 + mazes: + - scale: 1 + - scale: 1 floorHeight: 1.5 connectionsPerFloor: 2 selectedAlgorithm: 0 width: 30 depth: 30 - rendererPrefab: {fileID: 1439162688} + debugMode: 1 + visualizationInterval: 0.05 + mazeRenderer: {fileID: 1439162688} mazeContainer: {fileID: 390662299} + straightManHoleLadder: {fileID: 919132149155446097, guid: bea94d2de5b89ea4cba759f4a73149d4, type: 3} + straightManHoleUp: {fileID: 919132149155446097, guid: df993452c905ccd4a8db16303509c4aa, type: 3} + deadendManHoleLadder: {fileID: 919132149155446097, guid: c7b8e72ff8d936143a810e1baa494428, type: 3} + deadendManHoleUp: {fileID: 919132149155446097, guid: 1e0fe08755c202644ab57e3ecb75ea61, type: 3} --- !u!1001 &3886963620680427248 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameSetup/Maze/MazeManager.cs b/Assets/Scripts/GameSetup/Maze/MazeManager.cs index 9a907a5d..454e667d 100644 --- a/Assets/Scripts/GameSetup/Maze/MazeManager.cs +++ b/Assets/Scripts/GameSetup/Maze/MazeManager.cs @@ -108,8 +108,8 @@ namespace Hallucinate.GameSetup.Maze int z = pos.y; // Set stair cells - currentFloor.SetCell(x, z, MazeCellType.StairUp); - nextFloor.SetCell(x, z, MazeCellType.StairDown); + currentFloor.SetCell(x, z, MazeCellType.StairsUp); + nextFloor.SetCell(x, z, MazeCellType.StairsDown); connectionsMade++; } diff --git a/Assets/Scripts/GameSetup/Maze/MazeRenderer.cs b/Assets/Scripts/GameSetup/Maze/MazeRenderer.cs index 577cbf85..509c36f6 100644 --- a/Assets/Scripts/GameSetup/Maze/MazeRenderer.cs +++ b/Assets/Scripts/GameSetup/Maze/MazeRenderer.cs @@ -238,8 +238,8 @@ namespace Hallucinate.GameSetup.Maze || type == MazeCellType.Start || type == MazeCellType.End || type == MazeCellType.Path - || type == MazeCellType.StairUp - || type == MazeCellType.StairDown; + || type == MazeCellType.StairsUp + || type == MazeCellType.StairsDown; } // ================================================================================= @@ -268,6 +268,7 @@ namespace Hallucinate.GameSetup.Maze if (target != null) { + // Scale target.localScale = finalScale; } } diff --git a/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs b/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs index 5ee78ac6..d1e4784e 100644 --- a/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs +++ b/Assets/Scripts/GameSetup/Maze/MazeVisualProfile.cs @@ -41,8 +41,8 @@ namespace Hallucinate.GameSetup.Maze MazeCellType.Path => pathPrefab, MazeCellType.Start => startPrefab, MazeCellType.End => endPrefab, - MazeCellType.StairUp => stairUpPrefab, - MazeCellType.StairDown => stairDownPrefab, + MazeCellType.StairsUp => stairUpPrefab, + MazeCellType.StairsDown => stairDownPrefab, _ => null }; } diff --git a/Assets/Settings/Project Setting/DefaultMazeProfile.asset b/Assets/Settings/Project Setting/DefaultMazeProfile.asset index ca851cb2..bcff1bf1 100644 --- a/Assets/Settings/Project Setting/DefaultMazeProfile.asset +++ b/Assets/Settings/Project Setting/DefaultMazeProfile.asset @@ -21,10 +21,8 @@ MonoBehaviour: pathPrefab: {fileID: 0} startPrefab: {fileID: 0} endPrefab: {fileID: 0} - stairsUp: {fileID: 919132149155446097, guid: 0d3d98145a7d95240aaa356b16f42c5d, type: 3} - wallpiece: {fileID: 4577348821146165120, guid: b69e6489df77a9b498c1c77003e0ee1f, type: 3} - floorpiece: {fileID: 4223043221652826205, guid: a9482a26b06970942a1b56c2d7575f2a, type: 3} - cellingpiece: {fileID: 2878949705306832448, guid: 5629501e49db88c4bb12289a632c8c7c, type: 3} + stairUpPrefab: {fileID: 931007308557375819, guid: 0ebe74534e32a164aa6bf410d377bf86, type: 3} + stairDownPrefab: {fileID: 919132149155446097, guid: 0d3d98145a7d95240aaa356b16f42c5d, type: 3} corridorStraight: {fileID: 919132149155446097, guid: 31c4154f4868c31419e8c1be5681fea1, type: 3} corridorCorner: {fileID: 919132149155446097, guid: 9a0138c4a172272478edaf689ad99cb3, type: 3} corridorTJunction: {fileID: 919132149155446097, guid: 7957821753825954a8aad1fa25d0c745, type: 3}