diff --git a/Assets/Engine/Assets/Requirements/Place On Bottom Row.asset b/Assets/Engine/Assets/Requirements/Place On Bottom Or Top Row Alternating.asset similarity index 88% rename from Assets/Engine/Assets/Requirements/Place On Bottom Row.asset rename to Assets/Engine/Assets/Requirements/Place On Bottom Or Top Row Alternating.asset index 14842ae..836de4f 100644 --- a/Assets/Engine/Assets/Requirements/Place On Bottom Row.asset +++ b/Assets/Engine/Assets/Requirements/Place On Bottom Or Top Row Alternating.asset @@ -10,5 +10,5 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5aece1c1f67b46afaf249c4520a0478f, type: 3} - m_Name: Place On Bottom Row + m_Name: Place On Bottom Or Top Row Alternating m_EditorClassIdentifier: diff --git a/Assets/Engine/Assets/Requirements/Place On Bottom Row.asset.meta b/Assets/Engine/Assets/Requirements/Place On Bottom Or Top Row Alternating.asset.meta similarity index 100% rename from Assets/Engine/Assets/Requirements/Place On Bottom Row.asset.meta rename to Assets/Engine/Assets/Requirements/Place On Bottom Or Top Row Alternating.asset.meta diff --git a/Assets/Engine/Runtime/Engine.cs b/Assets/Engine/Runtime/Engine.cs index c459441..da8d2c7 100644 --- a/Assets/Engine/Runtime/Engine.cs +++ b/Assets/Engine/Runtime/Engine.cs @@ -72,14 +72,20 @@ namespace EscapeRoomEngine.Engine.Runtime public void GenerateRoom() { Logger.Log("Generating room...", LogType.RoomGeneration); + + var intro = NumberOfRooms == 0; // get the last entrance from the newest room or create a spawn passage with no entrance door for where the player will start - var entrance = NumberOfRooms > 0 ? _rooms.Last().exit : new Passage(new DoorModule(null, theme.spawnDoor)); + var entrance = intro ? new Passage(new DoorModule(null, theme.spawnDoor)) : _rooms.Last().exit; var room = new Room(entrance); _rooms.Add(room); - - if (_plannedPuzzles.Count > 0) + + if (intro) + { + GenerateIntroSpace(room, entrance); + } + else if (_plannedPuzzles.Count > 0) { GeneratePuzzleSpace(room, entrance); } @@ -92,7 +98,12 @@ namespace EscapeRoomEngine.Engine.Runtime var roomId = _rooms.Count - 1; room.InstantiateRoom(_playSpaceOrigin.transform, roomId * roomOffset, roomId.ToString()); - if (theme.environment) + if (intro) + { + Instantiate(theme.intro, room.roomObject.transform, false); + FindObjectOfType().Place(room.exit.fromOut.DoorState.transform); + } + else if (theme.environment) { Instantiate(theme.environment, room.roomObject.transform, false); } @@ -101,6 +112,20 @@ namespace EscapeRoomEngine.Engine.Runtime UpdateUI(); } + private void GenerateIntroSpace(Room room, Passage entrance) + { + Logger.Log($"Generating intro space...", LogType.RoomGeneration); + + var space = new IntroSpace(room, entrance); + var exitDoor = new DoorModule(space, theme.introExitDoor); + if (!space.AddModuleWithRequirements(exitDoor)) + { + throw new EngineException("Could not satisfy requirements for exit door."); + } + var exit = new Passage(exitDoor); + room.AddSpace(space, exit); + } + private void GeneratePuzzleSpace(Room room, Passage entrance) { var puzzlesAdded = 0; @@ -183,15 +208,11 @@ namespace EscapeRoomEngine.Engine.Runtime GameControl.Instance.PlannedPuzzles = _plannedPuzzles; } - /// - /// Hide or destroy the room two rooms ago. The actual previous room is kept for the player to be able to backtrack one room. - /// - /// public void HidePreviousRoom(bool destroy = true) { - if (NumberOfRooms > 2) + if (NumberOfRooms >= 2) { - var room = _rooms[NumberOfRooms - 3]; + var room = _rooms[NumberOfRooms - 2]; // lock the doors that might be used to return to the old room room.exit.toIn.DoorState.Lock(); diff --git a/Assets/Engine/Runtime/EngineTheme.cs b/Assets/Engine/Runtime/EngineTheme.cs index 4a48223..62fe1aa 100644 --- a/Assets/Engine/Runtime/EngineTheme.cs +++ b/Assets/Engine/Runtime/EngineTheme.cs @@ -15,6 +15,9 @@ namespace EscapeRoomEngine.Engine.Runtime { #region Theme + [BoxGroup("Theme")] + public Intro intro; + [BoxGroup("Theme")] [Required] [Tooltip("The tile that rooms are generated from.")] public SpaceTile spaceTile; @@ -33,6 +36,9 @@ namespace EscapeRoomEngine.Engine.Runtime [BoxGroup("Doors")] [Required] public DoorModuleDescription spawnDoor; + [BoxGroup("Doors")] [Required] + public DoorModuleDescription introExitDoor; + [BoxGroup("Doors")] [ValidateInput("IsNotEmpty", "At least one exit door type is required.")] [Tooltip("The types of exit doors this theme provides. Entrance doors are connected to the exit doors and don't need to be specified here.")] public List exitDoorTypes; diff --git a/Assets/Engine/Runtime/Intro.cs b/Assets/Engine/Runtime/Intro.cs new file mode 100644 index 0000000..32e9f05 --- /dev/null +++ b/Assets/Engine/Runtime/Intro.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +namespace EscapeRoomEngine.Engine.Runtime +{ + public class Intro : MonoBehaviour + { + public void Place(Transform placement) + { + var t = transform; + t.position = placement.position; + t.rotation = placement.rotation; + } + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Intro.cs.meta b/Assets/Engine/Runtime/Intro.cs.meta new file mode 100644 index 0000000..7f02520 --- /dev/null +++ b/Assets/Engine/Runtime/Intro.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c2e3fc71dc4142888bad2313cbf1bea9 +timeCreated: 1684011098 \ No newline at end of file diff --git a/Assets/Engine/Runtime/IntroSpace.cs b/Assets/Engine/Runtime/IntroSpace.cs new file mode 100644 index 0000000..70e68ab --- /dev/null +++ b/Assets/Engine/Runtime/IntroSpace.cs @@ -0,0 +1,19 @@ +using UnityEngine; + +namespace EscapeRoomEngine.Engine.Runtime +{ + public class IntroSpace : Space + { + internal IntroSpace(Room room, Passage entrance) : base(room, entrance) {} + + internal override void InstantiateSpace(Transform parent, string name) + { + spaceObject = new GameObject($"Space {name}"); + spaceObject.transform.SetParent(parent, false); + spaceObject.transform.localPosition = new Vector3(rrPlacement.position.x, 0, rrPlacement.position.z); + + // instantiate all modules inside this space + Modules.ForEach(module => module.InstantiateModule(spaceObject.transform)); + } + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/IntroSpace.cs.meta b/Assets/Engine/Runtime/IntroSpace.cs.meta new file mode 100644 index 0000000..cc461e9 --- /dev/null +++ b/Assets/Engine/Runtime/IntroSpace.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 84603b46fb8d4513945a113de3e6af72 +timeCreated: 1684066247 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomOrTopRowAlternating.cs b/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomOrTopRowAlternating.cs new file mode 100644 index 0000000..f9e6051 --- /dev/null +++ b/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomOrTopRowAlternating.cs @@ -0,0 +1,46 @@ +using System.Collections.Generic; +using EscapeRoomEngine.Engine.Runtime.Modules; +using EscapeRoomEngine.Engine.Runtime.Modules.State; +using EscapeRoomEngine.Engine.Runtime.Utilities; +using UnityEngine; + +namespace EscapeRoomEngine.Engine.Runtime.Requirements.Placement +{ + /// + /// This requirement guarantees that the back side of the module is placed on the bottom row of an even-numbered space or on the top row of an odd-numbered space. + /// + [CreateAssetMenu(menuName = "Requirements/Place On Bottom Or Top Row Alternating")] + public class PlaceOnBottomOrTopRowAlternating : PlacementRequirement + { + protected override List FilterCandidates(List candidates, Module module, Space space) + { + if (!module.description.HasType(ModuleType.DoorExit)) + { + throw new WrongTypeException(module.description.types[0], ModuleType.DoorExit); + } + + var number = FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None).Length; + + if (number / 2 % 2 == 0) + { + candidates.RemoveAll(candidate => + { + var (left, right) = candidate.BackCorners; + return !(left.z == 0 && right.z == 0); + }); + } + else + { + var sizeMinusOne = space.rrPlacement.size - Vector2Int.one; + + candidates.RemoveAll(candidate => + { + var (left, right) = candidate.BackCorners; + return !(left.z == sizeMinusOne.y && right.z == sizeMinusOne.y); + }); + } + + return candidates; + } + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomRow.cs.meta b/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomOrTopRowAlternating.cs.meta similarity index 100% rename from Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomRow.cs.meta rename to Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomOrTopRowAlternating.cs.meta diff --git a/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomRow.cs b/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomRow.cs deleted file mode 100644 index 493074d..0000000 --- a/Assets/Engine/Runtime/Requirements/Placement/PlaceOnBottomRow.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using EscapeRoomEngine.Engine.Runtime.Modules; -using UnityEngine; - -namespace EscapeRoomEngine.Engine.Runtime.Requirements.Placement -{ - /// - /// This requirement guarantees that the back side of the module is placed on the bottom row of the space. - /// - [CreateAssetMenu(menuName = "Requirements/Place On Bottom Row")] - public class PlaceOnBottomRow : PlacementRequirement - { - protected override List FilterCandidates(List candidates, Module module, Space space) - { - candidates.RemoveAll(candidate => - { - var (left, right) = candidate.BackCorners; - return !(left.z == 0 && right.z == 0); - }); - - return candidates; - } - } -} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Room.cs b/Assets/Engine/Runtime/Room.cs index 03ba870..d401f40 100644 --- a/Assets/Engine/Runtime/Room.cs +++ b/Assets/Engine/Runtime/Room.cs @@ -91,7 +91,11 @@ namespace EscapeRoomEngine.Engine.Runtime // start measurements on every puzzle as soon as the player enters the last room case DoorEventType.ExitedFrom when door.Equals(entrance.toIn) && Engine.Instance.CurrentRoom.Contains(this): puzzles.ForEach(puzzle => Measure.StartMeasuring((PuzzleModuleDescription)puzzle.description)); - // Engine.Instance.HidePreviousRoom(); + if (Engine.Instance.NumberOfRooms == 2) + { + // hide the intro room when exiting the first portal + Engine.Instance.HidePreviousRoom(false); + } break; } }; diff --git a/Assets/Engine/Runtime/Space.cs b/Assets/Engine/Runtime/Space.cs index 378ccd7..867b0f7 100644 --- a/Assets/Engine/Runtime/Space.cs +++ b/Assets/Engine/Runtime/Space.cs @@ -41,8 +41,10 @@ namespace EscapeRoomEngine.Engine.Runtime return modules; } } + + protected GameObject spaceObject; - private GameObject _spaceObject, _spaceTiles; + private GameObject _spaceTiles; private List _stagedModules = new(); internal Space(Room room, Passage entrance) @@ -97,15 +99,15 @@ namespace EscapeRoomEngine.Engine.Runtime return requirementsFulfilled; } - internal void InstantiateSpace(Transform parent, string name) + internal virtual void InstantiateSpace(Transform parent, string name) { - _spaceObject = new GameObject($"Space {name}"); - _spaceObject.transform.SetParent(parent, false); - _spaceObject.transform.localPosition = new Vector3(rrPlacement.position.x, 0, rrPlacement.position.z); + spaceObject = new GameObject($"Space {name}"); + spaceObject.transform.SetParent(parent, false); + spaceObject.transform.localPosition = new Vector3(rrPlacement.position.x, 0, rrPlacement.position.z); // build the space floor out of tiles _spaceTiles = new GameObject($"Space Geometry"); - _spaceTiles.transform.SetParent(_spaceObject.transform, false); + _spaceTiles.transform.SetParent(spaceObject.transform, false); _spaceTiles.isStatic = true; for (var z = 0; z < rrPlacement.size.y; z++) { @@ -131,7 +133,7 @@ namespace EscapeRoomEngine.Engine.Runtime } // instantiate all modules inside this space - Modules.ForEach(module => module.InstantiateModule(_spaceObject.transform)); + Modules.ForEach(module => module.InstantiateModule(spaceObject.transform)); } /// diff --git a/Assets/Engine/Runtime/UI/GameControl.cs b/Assets/Engine/Runtime/UI/GameControl.cs index 02a5d7c..4b64584 100644 --- a/Assets/Engine/Runtime/UI/GameControl.cs +++ b/Assets/Engine/Runtime/UI/GameControl.cs @@ -130,6 +130,7 @@ namespace EscapeRoomEngine.Engine.Runtime.UI public void StartGame() { gameState = GameState.Running; + PauseGame(); // the time is not running during the intro TimeElapsed = 0; @@ -174,6 +175,12 @@ namespace EscapeRoomEngine.Engine.Runtime.UI pauseButton.GetComponent().Paused = true; break; case GameState.Paused: + // check if the intro portal should be activated + if (Engine.Instance.NumberOfRooms == 1) + { + Engine.Instance.CurrentRoom.Unwrap().SkipRoom(); + } + gameState = GameState.Running; pauseButton.GetComponent().Paused = false; break; diff --git a/Assets/Engine/Runtime/Utilities/Exceptions.cs b/Assets/Engine/Runtime/Utilities/Exceptions.cs index c331e88..f0284a1 100644 --- a/Assets/Engine/Runtime/Utilities/Exceptions.cs +++ b/Assets/Engine/Runtime/Utilities/Exceptions.cs @@ -14,6 +14,8 @@ namespace EscapeRoomEngine.Engine.Runtime.Utilities public WrongTypeException(DoorType expected, DoorType found) : base($"Wrong door type ({found} instead of {expected})") {} + public WrongTypeException(ModuleType expected, ModuleType found) : base($"Wrong module type ({found} instead of {expected})") {} + public WrongTypeException(string message) : base(message) {} } diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index ca01b17..79e7fd4 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -5143,16 +5143,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6649846303971886392, guid: 1358b4ef564c4704682417dff526766a, + - target: {fileID: 6527336161650890507, guid: 1358b4ef564c4704682417dff526766a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} + propertyPath: target + value: + objectReference: {fileID: 1429679620} - target: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_Name value: Intro Room objectReference: {fileID: 0} + - target: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5277,84 +5282,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2343402481646314945} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3040824338403071535 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalPosition.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7243428590643213936, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: m_Name - value: Follow Sphere - objectReference: {fileID: 0} - - target: {fileID: 8024693052737180052, guid: 884a61055675a5a4c825fba3863c8011, - type: 3} - propertyPath: target - value: - objectReference: {fileID: 1429679620} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 884a61055675a5a4c825fba3863c8011, type: 3} --- !u!1001 &3750376657174321753 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Environments/Intro Room/Audio.meta b/Assets/Station46/Environments/Intro Room/Audio.meta new file mode 100644 index 0000000..a543514 --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8577966b449a834aa0ccc54d45991ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav b/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav new file mode 100644 index 0000000..ec7183f --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db905d66f1000f985ac3926c68ef9f67bb04407fdc57d6d244494658d1973159 +size 2142458 diff --git a/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav.meta b/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav.meta new file mode 100644 index 0000000..1af715f --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e9879de5b83a4547be8ec1c406fb0556 +timeCreated: 1684016482 \ No newline at end of file diff --git a/Assets/Station46/Environments/Intro Room/Intro Room.prefab b/Assets/Station46/Environments/Intro Room/Intro Room.prefab index e41ef3f..ede7aa1 100644 --- a/Assets/Station46/Environments/Intro Room/Intro Room.prefab +++ b/Assets/Station46/Environments/Intro Room/Intro Room.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &438046926007253352 +--- !u!1 &491373566855890109 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,116 +8,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7978791187095600470} - - component: {fileID: 3211590283418314086} - - component: {fileID: 6062584371800388374} + - component: {fileID: 6026454149042564578} m_Layer: 0 - m_Name: Light + m_Name: Crates m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7978791187095600470 +--- !u!4 &6026454149042564578 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438046926007253352} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.7199979, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} + m_GameObject: {fileID: 491373566855890109} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6763395286814762758} + m_Children: + - {fileID: 7900289997617325409} + - {fileID: 140208148204807910} + - {fileID: 8435716962614061171} + - {fileID: 3172948519936861847} + - {fileID: 510872806881451986} + - {fileID: 4532318373785402389} + - {fileID: 7506028674506195587} + m_Father: {fileID: 6179995914325846554} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &3211590283418314086 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438046926007253352} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 2 - m_Shape: 0 - m_Color: {r: 0.6666667, g: 0.7790526, b: 1, a: 1} - m_Intensity: 0.84 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!114 &6062584371800388374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438046926007253352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 --- !u!1 &654728245526444413 GameObject: m_ObjectHideFlags: 0 @@ -144,12 +64,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 654728245526444413} - m_LocalRotation: {x: 0.00000006055089, y: -0.74331725, z: 0.00000005449201, w: 0.6689392} - m_LocalPosition: {x: -1.0200005, y: 0, z: 1.44} + m_LocalRotation: {x: 0.00000006055089, y: -0.74331725, z: 0.000000054492002, w: 0.6689391} + m_LocalPosition: {x: -1.0200009, y: 0, z: 1.4400003} m_LocalScale: {x: 4.0734, y: 4.0734, z: 4.0734} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 6026454149042564578} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: -96.03, z: 0} --- !u!33 &6211584280998375235 @@ -224,6 +144,41 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!1 &868344894103724298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8838196028621859037} + m_Layer: 0 + m_Name: Door + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8838196028621859037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868344894103724298} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5090393049748501691} + - {fileID: 7909952575672624299} + - {fileID: 1046503769176445905} + - {fileID: 5468753889055463194} + m_Father: {fileID: 9187355934463472165} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963299231571417953 GameObject: m_ObjectHideFlags: 0 @@ -249,12 +204,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963299231571417953} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -2.03553, y: 1.075, z: 0.5} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -2.035531, y: 1.075, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 8838196028621859037} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3635343434538553825 @@ -332,12 +287,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1036984416693012313} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0.5, y: -1, z: 2} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -0.5000005, y: -1, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5171106975609694412 @@ -415,12 +370,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1280857105013253927} - m_LocalRotation: {x: 0.022757242, y: -0.9591734, z: -0.28146386, w: -0.015704917} - m_LocalPosition: {x: -1.2539997, y: 0.395, z: 2.283} - m_LocalScale: {x: 4.0734024, y: 4.073403, z: 4.0734005} + m_LocalRotation: {x: 0.022757245, y: -0.9591734, z: -0.2814639, w: -0.015704928} + m_LocalPosition: {x: -1.254, y: 0.395, z: 2.2830005} + m_LocalScale: {x: 4.0734034, y: 4.0734024, z: 4.0734005} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 6026454149042564578} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -32.729, y: -181.18, z: -2.372} --- !u!33 &6183862245188509522 @@ -563,12 +518,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2418315853416793572} - m_LocalRotation: {x: -0.021768773, y: -0.9548682, z: 0.1754304, w: 0.23869866} - m_LocalPosition: {x: -1, y: 2.27, z: 15.08} - m_LocalScale: {x: 4.073399, y: 4.0734015, z: 4.073402} + m_LocalRotation: {x: -0.021768777, y: -0.9548682, z: 0.1754304, w: 0.23869866} + m_LocalPosition: {x: -1, y: 2.27, z: 15.080004} + m_LocalScale: {x: 4.073399, y: 4.073401, z: 4.0734024} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 6026454149042564578} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 18.943, y: -150.657, z: 7.614} --- !u!33 &528498078204176277 @@ -646,12 +601,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2621729265903296069} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: -1, y: 0, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7389339059168867719 @@ -729,12 +684,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2635874338855826107} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4928690315723168089 @@ -813,12 +768,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2955338000373492501} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -2.03553, y: 0, z: 0.5} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -2.035531, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 8838196028621859037} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4707104685641711437 @@ -918,12 +873,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3180138509856142228} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -2.03553, y: 1.075, z: 0.5} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -2.035531, y: 1.075, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 8838196028621859037} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3246159979343334485 @@ -1001,12 +956,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3335047605088500141} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 1.5, y: -0.030890306, z: -0.564} - m_LocalScale: {x: 1.06892, y: 1.0689199, z: 1.0689199} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: 1.5, y: -0.030890306, z: -0.56400025} + m_LocalScale: {x: 1.06892, y: 1.0689197, z: 1.0689197} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8497693914545247281 @@ -1092,7 +1047,7 @@ Transform: m_Father: {fileID: 6179995914325846554} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4196976510501519328 +--- !u!1 &4578631716421063508 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1100,81 +1055,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7990951691149106575} - - component: {fileID: 5074251854986097052} - - component: {fileID: 88055480883570181} + - component: {fileID: 7106282615239758844} m_Layer: 0 - m_Name: Gap Barrier Tape Handle + m_Name: Origin m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7990951691149106575 +--- !u!4 &7106282615239758844 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4196976510501519328} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0.5, y: -1, z: -2} + m_GameObject: {fileID: 4578631716421063508} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Children: + - {fileID: 6179995914325846554} + - {fileID: 2222967524522708063} + m_Father: {fileID: 5968074272560806773} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5074251854986097052 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4196976510501519328} - m_Mesh: {fileID: 372213777288626601, guid: d8f5464495b32734f99c29fcc11b27af, type: 3} ---- !u!23 &88055480883570181 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4196976510501519328} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 30977fec3723d7048a1183ec232d83ad, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &5086645854982696311 GameObject: m_ObjectHideFlags: 0 @@ -1200,12 +1105,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5086645854982696311} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 1.5, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7197670774019613670 @@ -1258,6 +1163,112 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &5318024067084410396 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7506028674506195587} + - component: {fileID: 3705568407447142682} + - component: {fileID: 6265265682201830198} + - component: {fileID: 2754635049830083831} + m_Layer: 0 + m_Name: Crate (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &7506028674506195587 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318024067084410396} + m_LocalRotation: {x: -0.029492076, y: -0.8704926, z: 0.48847806, w: 0.052556843} + m_LocalPosition: {x: -0.951, y: 0.126, z: -0.974} + m_LocalScale: {x: 4.0734, y: 4.0734, z: 4.0734} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6026454149042564578} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 57.923, y: -166.906, z: 11.149} +--- !u!33 &3705568407447142682 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318024067084410396} + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!23 &6265265682201830198 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318024067084410396} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7c9a3086b8f1b894589bc3d384d9ce8b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &2754635049830083831 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5318024067084410396} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} --- !u!1 &5401021002273677137 GameObject: m_ObjectHideFlags: 0 @@ -1283,12 +1294,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5401021002273677137} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: 0.5, y: 0, z: 0.5} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: 0.49999976, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4383647569754341761 @@ -1358,7 +1369,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6534859180971967246 Transform: m_ObjectHideFlags: 0 @@ -1449,12 +1460,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6021259196794440572} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0.5, y: -1, z: 0} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -0.5000005, y: -1, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7296276865379691330 @@ -1507,256 +1518,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6091827906718863495 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3149377876258904151} - - component: {fileID: 426224988284700777} - - component: {fileID: 3346855505105582238} - m_Layer: 0 - m_Name: Gap Barrier Tape - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &3149377876258904151 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6091827906718863495} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -1, y: 0, z: -1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6179995914325846554} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &426224988284700777 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6091827906718863495} - m_Mesh: {fileID: -9028827042508438387, guid: d8f5464495b32734f99c29fcc11b27af, type: 3} ---- !u!23 &3346855505105582238 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6091827906718863495} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 30977fec3723d7048a1183ec232d83ad, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6649846303971886392 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6763395286814762758} - - component: {fileID: 1242256129272809267} - - component: {fileID: 7355193674158170372} - m_Layer: 0 - m_Name: Light Main - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &6763395286814762758 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6649846303971886392} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.75699997, y: 3.15, z: 0.492} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7978791187095600470} - m_Father: {fileID: 6179995914325846554} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1242256129272809267 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6649846303971886392} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7355193674158170372 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6649846303971886392} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 81aae5f0e867adf4fb272cbce67973db, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6675255512229369542 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8791844741385239867} - - component: {fileID: 7368348962076084598} - - component: {fileID: 5850435654193440614} - m_Layer: 0 - m_Name: Railing Center (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!4 &8791844741385239867 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675255512229369542} - m_LocalRotation: {x: -0.5000007, y: -0.49999925, z: -0.4999993, w: 0.5000007} - m_LocalPosition: {x: -1.073, y: 0, z: -0.92083204} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6179995914325846554} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -90} ---- !u!33 &7368348962076084598 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675255512229369542} - m_Mesh: {fileID: 1143095832551547609, guid: d8f5464495b32734f99c29fcc11b27af, type: 3} ---- !u!23 &5850435654193440614 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6675255512229369542} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 30977fec3723d7048a1183ec232d83ad, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6779139061471556033 GameObject: m_ObjectHideFlags: 0 @@ -1782,12 +1543,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6779139061471556033} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -2.03553, y: 0, z: 0.5} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -2.035531, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 8838196028621859037} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3411078111544404288 @@ -1865,13 +1626,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7364153897325251900} - m_LocalRotation: {x: -0.7071068, y: 0.0000000074505797, z: -0.0000000074505797, - w: 0.70710677} - m_LocalPosition: {x: 0, y: 0, z: -1.0208321} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: 0, y: 0, z: -1.020833} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &8693774811695207273 @@ -1924,6 +1684,154 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7488354663729501066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4532318373785402389} + - component: {fileID: 1076532818998685298} + - component: {fileID: 2820333873972544146} + - component: {fileID: 4053001653294062092} + m_Layer: 0 + m_Name: Crate (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &4532318373785402389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488354663729501066} + m_LocalRotation: {x: 0.000000030269145, y: -0.9622961, z: 0.00000007562802, w: 0.27200398} + m_LocalPosition: {x: -0.962, y: 0.713, z: 0.554} + m_LocalScale: {x: 4.0734, y: 4.0734, z: 4.0734} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6026454149042564578} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: -148.433, z: 0} +--- !u!33 &1076532818998685298 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488354663729501066} + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!23 &2820333873972544146 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488354663729501066} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7c9a3086b8f1b894589bc3d384d9ce8b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &4053001653294062092 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7488354663729501066} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!1 &7705543489310463323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9187355934463472165} + m_Layer: 0 + m_Name: Main + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9187355934463472165 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705543489310463323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2002295285278983461} + - {fileID: 7706750496315931814} + - {fileID: 7608486624270173770} + - {fileID: 3013004159603573420} + - {fileID: 7352249114132255201} + - {fileID: 3779518836869836604} + - {fileID: 4022385106095058040} + - {fileID: 5465360593463253517} + - {fileID: 3833206097671653406} + - {fileID: 4159316011861688973} + - {fileID: 8838196028621859037} + m_Father: {fileID: 6179995914325846554} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7819539682802675775 GameObject: m_ObjectHideFlags: 0 @@ -1949,12 +1857,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7819539682802675775} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1996492519676684882 @@ -2033,12 +1941,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7825879461707800657} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -0.5, y: -1, z: 2} + m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} + m_LocalPosition: {x: -0.5000005, y: -1, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 9187355934463472165} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4769435004194074984 @@ -2136,39 +2044,19 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7884981278512205473} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.5, y: 0, z: -0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4159316011861688973} - {fileID: 6534859180971967246} - - {fileID: 2002295285278983461} - - {fileID: 5090393049748501691} - - {fileID: 7706750496315931814} - - {fileID: 7608486624270173770} - - {fileID: 3013004159603573420} - - {fileID: 3833206097671653406} - - {fileID: 3149377876258904151} - - {fileID: 7990951691149106575} - - {fileID: 7352249114132255201} - - {fileID: 4022385106095058040} - - {fileID: 193363641229463923} - - {fileID: 8791844741385239867} - - {fileID: 5465360593463253517} - - {fileID: 3779518836869836604} - - {fileID: 7909952575672624299} - - {fileID: 1046503769176445905} - - {fileID: 5468753889055463194} - - {fileID: 7900289997617325409} - - {fileID: 140208148204807910} - - {fileID: 8435716962614061171} + - {fileID: 9187355934463472165} + - {fileID: 6026454149042564578} - {fileID: 3957837619321901491} - - {fileID: 6763395286814762758} - m_Father: {fileID: 5968074272560806773} + m_Father: {fileID: 7106282615239758844} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8025863208509243369 +--- !u!1 &8137769401290482906 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2176,46 +2064,92 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 193363641229463923} - - component: {fileID: 3919114698771688261} - - component: {fileID: 2134097623475383196} + - component: {fileID: 5968074272560806773} + - component: {fileID: 6790828229373266063} m_Layer: 0 - m_Name: Railing Center (1) + m_Name: Intro Room m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &193363641229463923 +--- !u!4 &5968074272560806773 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8025863208509243369} - m_LocalRotation: {x: -0.5000007, y: -0.49999925, z: -0.4999993, w: 0.5000007} - m_LocalPosition: {x: -0.10000038, y: 0, z: -0.92083204} + m_GameObject: {fileID: 8137769401290482906} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7106282615239758844} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6790828229373266063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8137769401290482906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2e3fc71dc4142888bad2313cbf1bea9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8141187399824475193 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3172948519936861847} + - component: {fileID: 529050676535656790} + - component: {fileID: 7163086849899017197} + - component: {fileID: 8388696531276501222} + m_Layer: 0 + m_Name: Crate (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &3172948519936861847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8141187399824475193} + m_LocalRotation: {x: 0.0000000148699595, y: -0.99693334, z: 0.000000080091795, w: 0.07825636} + m_LocalPosition: {x: -0.569, y: 0, z: 0.145} + m_LocalScale: {x: 4.0734, y: 4.0734, z: 4.0734} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6179995914325846554} + m_Father: {fileID: 6026454149042564578} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: -90} ---- !u!33 &3919114698771688261 + m_LocalEulerAnglesHint: {x: 0, y: -171.023, z: 0} +--- !u!33 &529050676535656790 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8025863208509243369} - m_Mesh: {fileID: 1143095832551547609, guid: d8f5464495b32734f99c29fcc11b27af, type: 3} ---- !u!23 &2134097623475383196 + m_GameObject: {fileID: 8141187399824475193} + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!23 &7163086849899017197 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8025863208509243369} + m_GameObject: {fileID: 8141187399824475193} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -2229,7 +2163,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 30977fec3723d7048a1183ec232d83ad, type: 2} + - {fileID: 2100000, guid: 7c9a3086b8f1b894589bc3d384d9ce8b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2251,38 +2185,28 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &8137769401290482906 -GameObject: +--- !u!64 &8388696531276501222 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5968074272560806773} - m_Layer: 0 - m_Name: Intro Room - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5968074272560806773 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8137769401290482906} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 10, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6179995914325846554} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 8141187399824475193} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} --- !u!1 &9009715001565140767 GameObject: m_ObjectHideFlags: 0 @@ -2347,6 +2271,112 @@ Transform: m_Father: {fileID: 3957837619321901491} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &9057714517563596827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 510872806881451986} + - component: {fileID: 1548331597947055086} + - component: {fileID: 4243323966387119595} + - component: {fileID: 2329345287280056845} + m_Layer: 0 + m_Name: Crate (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!4 &510872806881451986 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9057714517563596827} + m_LocalRotation: {x: 0.000000008624478, y: -0.9999997, z: 0.000000081002675, w: 0.0008371471} + m_LocalPosition: {x: -1.497, y: 0, z: 0.058} + m_LocalScale: {x: 4.0734, y: 4.0734, z: 4.0734} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6026454149042564578} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: -179.904, z: 0} +--- !u!33 &1548331597947055086 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9057714517563596827} + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!23 &4243323966387119595 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9057714517563596827} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7c9a3086b8f1b894589bc3d384d9ce8b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &2329345287280056845 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9057714517563596827} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} --- !u!1001 &72445934563422397 PrefabInstance: m_ObjectHideFlags: 0 @@ -5098,6 +5128,90 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4334890750227075741, guid: d8f5464495b32734f99c29fcc11b27af, type: 3} +--- !u!1001 &3875539306738255519 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7106282615239758844} + m_Modifications: + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7243428590643213936, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: m_Name + value: Follow Sphere + objectReference: {fileID: 0} + - target: {fileID: 8024693052737180052, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + propertyPath: target + value: + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 884a61055675a5a4c825fba3863c8011, type: 3} +--- !u!4 &2222967524522708063 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + m_PrefabInstance: {fileID: 3875539306738255519} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3939492657530922903 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab b/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab index 7173ef6..45a8d72 100644 --- a/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab +++ b/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab @@ -9587,6 +9587,7 @@ GameObject: - component: {fileID: 6265514306172551706} - component: {fileID: 5628022306974000633} - component: {fileID: 8024693052737180052} + - component: {fileID: 2877895139439227182} m_Layer: 0 m_Name: Intro Sphere m_TagString: Untagged @@ -14949,6 +14950,102 @@ MonoBehaviour: minDistance: 0.01 speed: 100 target: {fileID: 0} +--- !u!82 &2877895139439227182 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7243428590643213936} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: e9879de5b83a4547be8ec1c406fb0556, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &8694320155638376109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs b/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs index 98c70d5..37179b9 100644 --- a/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs +++ b/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using EscapeRoomEngine.VR.Runtime; +using UnityEngine; namespace Station46.Environments.Intro_Sphere.Scripts { @@ -11,9 +12,10 @@ namespace Station46.Environments.Intro_Sphere.Scripts private Rigidbody _rigidbody; - private void Start() + private void Awake() { _rigidbody = GetComponent(); + target = Player.Instance.sphereFollow; } private void FixedUpdate() diff --git a/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset b/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset index c7518bf..3ef85b8 100644 --- a/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset +++ b/Assets/Station46/Module Descriptions/D Station 46 Portal Exit.asset @@ -17,8 +17,8 @@ MonoBehaviour: type: 3} preconditionRequirements: [] placementRequirements: - - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} - - {fileID: 11400000, guid: 49248c593c97bff4f8889e5c4da6c1bb, type: 2} - {fileID: 11400000, guid: 1f1825b71bae09c438a1cb52603347d6, type: 2} + - {fileID: 11400000, guid: 49248c593c97bff4f8889e5c4da6c1bb, type: 2} + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} connectedDoorDescription: {fileID: 11400000, guid: 58d2a66244450b94d8a266569cb8d2fa, type: 2} diff --git a/Assets/Station46/Module Descriptions/D Station 46 Portal Intro Exit.asset b/Assets/Station46/Module Descriptions/D Station 46 Portal Intro Exit.asset new file mode 100644 index 0000000..8e11603 --- /dev/null +++ b/Assets/Station46/Module Descriptions/D Station 46 Portal Intro Exit.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5c1202346c34ebc9c3f701a98b50877, type: 3} + m_Name: D Station 46 Portal Intro Exit + m_EditorClassIdentifier: + types: 01000000 + modulePrefab: {fileID: 1047274803835009197, guid: 07cea580d9888d24c84d8d62747839ad, + type: 3} + preconditionRequirements: [] + placementRequirements: + - {fileID: 11400000, guid: 05866bd177db8074a9bb40dcd0d9bcfe, type: 2} + - {fileID: 11400000, guid: 49248c593c97bff4f8889e5c4da6c1bb, type: 2} + - {fileID: 11400000, guid: 43eb2a566a244964aa3a3319eaafe1a8, type: 2} + connectedDoorDescription: {fileID: 11400000, guid: 58d2a66244450b94d8a266569cb8d2fa, + type: 2} diff --git a/Assets/Station46/Module Descriptions/D Station 46 Portal Intro Exit.asset.meta b/Assets/Station46/Module Descriptions/D Station 46 Portal Intro Exit.asset.meta new file mode 100644 index 0000000..60b9d7e --- /dev/null +++ b/Assets/Station46/Module Descriptions/D Station 46 Portal Intro Exit.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0103271741231674884edcd62f8b89bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab b/Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab index b633d15..d28b2f1 100644 --- a/Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab +++ b/Assets/Station46/Modules/Portal/Station 46 Portal Entrance.prefab @@ -205,7 +205,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3937028285041533707} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -213,7 +213,7 @@ Transform: - {fileID: 6713443008366400661} m_Father: {fileID: 2246995198243242195} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &5635962022185625128 GameObject: m_ObjectHideFlags: 0 @@ -261,6 +261,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 emissionRenderer: {fileID: 4905517471767474057} --- !u!114 &3392592227672293041 MonoBehaviour: diff --git a/Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab b/Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab index d28a437..42eb607 100644 --- a/Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab +++ b/Assets/Station46/Modules/Portal/Station 46 Portal Exit.prefab @@ -83,6 +83,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 emissionRenderer: {fileID: 4937930574110528582} --- !u!114 &1047274803835009197 MonoBehaviour: @@ -124,7 +125,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3231959822301966204} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -132,7 +133,7 @@ Transform: - {fileID: 5709573715699328820} m_Father: {fileID: 9212560043793041154} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &3701970131638747585 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Player/Station 46 XR Origin.prefab b/Assets/Station46/Player/Station 46 XR Origin.prefab index fa44a1f..52dd0bd 100644 --- a/Assets/Station46/Player/Station 46 XR Origin.prefab +++ b/Assets/Station46/Player/Station 46 XR Origin.prefab @@ -47,7 +47,7 @@ PrefabInstance: - target: {fileID: 419816427646908934, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 419816427646908934, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} @@ -151,6 +151,11 @@ PrefabInstance: value: objectReference: {fileID: 3680365890358827431, guid: 7bb2b5aee7d244943b4f1bb2f6606ac2, type: 3} + - target: {fileID: 7423186386015115176, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: sphereFollow + value: + objectReference: {fileID: 5693385846897636622} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index a78e3b4..0f66f55 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} m_Name: Station 46 m_EditorClassIdentifier: - minRoomSize: {x: 2, y: 4} - playSpace: {x: 2, y: 4} + intro: {fileID: 6790828229373266063, guid: 1358b4ef564c4704682417dff526766a, type: 3} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, @@ -28,6 +27,7 @@ MonoBehaviour: hdr: {r: 0, g: 4.329412, b: 8, a: 1} ldr: {r: 0, g: 0.5401311, b: 1, a: 1} spawnDoor: {fileID: 11400000, guid: f862612dd70c369448b18bbd8094cb38, type: 2} + introExitDoor: {fileID: 11400000, guid: 0103271741231674884edcd62f8b89bc, type: 2} exitDoorTypes: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index a879ef0..730a022 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} m_Name: Test Theme m_EditorClassIdentifier: - minRoomSize: {x: 2, y: 4} - playSpace: {x: 2, y: 4} + intro: {fileID: 6790828229373266063, guid: 1358b4ef564c4704682417dff526766a, type: 3} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, @@ -28,8 +27,18 @@ MonoBehaviour: hdr: {r: 0, g: 4.329412, b: 8, a: 1} ldr: {r: 0, g: 0.5401311, b: 1, a: 1} spawnDoor: {fileID: 11400000, guid: f862612dd70c369448b18bbd8094cb38, type: 2} + introExitDoor: {fileID: 11400000, guid: 0103271741231674884edcd62f8b89bc, type: 2} exitDoorTypes: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: + - {fileID: 11400000, guid: ecc412010abd45a4aaa7d364b6c3789c, type: 2} + - {fileID: 11400000, guid: 8707242279bb6c541a12dc4491388c42, type: 2} + - {fileID: 11400000, guid: 15dcebb677f5df940839eaaa50274294, type: 2} + - {fileID: 11400000, guid: 3f79d37154e44ca47b54bb43bbe8d9aa, type: 2} - {fileID: 11400000, guid: ee5a44432e80cd64689be3ff34750339, type: 2} + - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2} + - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} + - {fileID: 11400000, guid: 010a967ecaf566041a0e12459806bd04, type: 2} + - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2} + - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2} diff --git a/Assets/VR/Runtime/Player.cs b/Assets/VR/Runtime/Player.cs index 8d84f99..bdecb26 100644 --- a/Assets/VR/Runtime/Player.cs +++ b/Assets/VR/Runtime/Player.cs @@ -19,6 +19,7 @@ namespace EscapeRoomEngine.VR.Runtime } [BoxGroup("Internal")] public new Camera camera; + [BoxGroup("Internal")] public Transform sphereFollow; [BoxGroup("Internal")] [SerializeField] private Transform leftEye, rightEye; [BoxGroup("Internal")] [SerializeField] private Collider leftHand, rightHand;