diff --git a/Assets/BlenderModels/Door.blend b/Assets/BlenderModels/Door.blend index 13ec3841..1fef359e 100644 Binary files a/Assets/BlenderModels/Door.blend and b/Assets/BlenderModels/Door.blend differ diff --git a/Assets/BlenderModels/Door.blend1 b/Assets/BlenderModels/Door.blend1 index 8e5ea125..c7c2fcc0 100644 Binary files a/Assets/BlenderModels/Door.blend1 and b/Assets/BlenderModels/Door.blend1 differ diff --git a/Assets/BlenderModels/FlatWall.blend b/Assets/BlenderModels/FlatWall.blend index bc60a42d..1bd71ea9 100644 Binary files a/Assets/BlenderModels/FlatWall.blend and b/Assets/BlenderModels/FlatWall.blend differ diff --git a/Assets/BlenderModels/FlatWall.blend1 b/Assets/BlenderModels/FlatWall.blend1 index 41edb634..0c867d39 100644 Binary files a/Assets/BlenderModels/FlatWall.blend1 and b/Assets/BlenderModels/FlatWall.blend1 differ diff --git a/Assets/Models/Interrior/Door.fbx b/Assets/Models/Interrior/Door.fbx index c23aa2a8..aeaf571d 100644 Binary files a/Assets/Models/Interrior/Door.fbx and b/Assets/Models/Interrior/Door.fbx differ diff --git a/Assets/Models/Interrior/FlatWall.fbx b/Assets/Models/Interrior/FlatWall.fbx index 3e538630..a5e00675 100644 Binary files a/Assets/Models/Interrior/FlatWall.fbx and b/Assets/Models/Interrior/FlatWall.fbx differ diff --git a/Assets/Scenes/School.unity b/Assets/Scenes/School.unity index 55b5499f..8fc227ff 100644 --- a/Assets/Scenes/School.unity +++ b/Assets/Scenes/School.unity @@ -3072,6 +3072,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 0c8bb8ae79767d54cb8f825f82322c06, + type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/Managers/CameraSystem.cs b/Assets/Scripts/Managers/CameraSystem.cs index bcb2c7a6..b8f0247b 100644 --- a/Assets/Scripts/Managers/CameraSystem.cs +++ b/Assets/Scripts/Managers/CameraSystem.cs @@ -42,6 +42,7 @@ public class CameraSystem : MonoBehaviour private float _zoomAmount = 3f; private float _targetFieldOfView = 60f; private CinemachineTransposer _cinemachineTransposer; + private Bounds _worldBounds; private void Awake() { @@ -56,6 +57,13 @@ public class CameraSystem : MonoBehaviour public void ResetToPlayerPosition() { + Renderer[] renderers = FindObjectsOfType(); + + _worldBounds = renderers[0].bounds; + + for (int i = 1; i < renderers.Length; ++i) + _worldBounds.Encapsulate(renderers[i].bounds); + transform.position = Player.Instance.transform.position; } @@ -84,9 +92,6 @@ public class CameraSystem : MonoBehaviour { EdgeScrollingMovement(); } - //HandleCameraZoom_MoveY(); - //HandleCameraZoom_FOV(); - //HandleCameraZoom_MoveForward(); } @@ -140,6 +145,7 @@ public class CameraSystem : MonoBehaviour private void HandleCameraMovement(Vector2 inputDir) { + Vector3 moveDir = transform.forward * inputDir.y + transform.right * inputDir.x; transform.position += moveDir * _moveSpeed * Time.deltaTime; } diff --git a/Packages/manifest.json b/Packages/manifest.json index 66beaddc..0a8c2cb3 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.formats.fbx": "5.1.0", "com.unity.ide.visualstudio": "2.0.22", "com.unity.inputsystem": "1.7.0", - "com.unity.render-pipelines.universal": "16.0.4", + "com.unity.render-pipelines.universal": "16.0.5", "com.unity.test-framework": "1.3.9", "com.unity.timeline": "1.8.6", "com.unity.ugui": "2.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 9c9a6353..af464f70 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -34,11 +34,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.11", + "version": "1.8.12", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -119,7 +120,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "16.0.4", + "version": "16.0.5", "depth": 1, "source": "builtin", "dependencies": { @@ -132,18 +133,18 @@ } }, "com.unity.render-pipelines.universal": { - "version": "16.0.4", + "version": "16.0.5", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "16.0.4", - "com.unity.shadergraph": "16.0.4" + "com.unity.render-pipelines.core": "16.0.5", + "com.unity.shadergraph": "16.0.5" } }, "com.unity.rendering.light-transport": { - "version": "1.0.0", + "version": "1.0.1", "depth": 2, "source": "builtin", "dependencies": { @@ -160,11 +161,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "16.0.4", + "version": "16.0.5", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "16.0.4", + "com.unity.render-pipelines.core": "16.0.5", "com.unity.searcher": "4.9.2" } }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5e4fa7fb..88b6f04b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2023.2.2f1 -m_EditorVersionWithRevision: 2023.2.2f1 (dfe9eb92cac5) +m_EditorVersion: 2023.2.13f1 +m_EditorVersionWithRevision: 2023.2.13f1 (70197a359f36)