From f059732c0d707236503d9dc7b15ae37c025173f5 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Fri, 3 Jan 2025 18:37:24 -0500 Subject: [PATCH 1/9] upgrade to 6000.0.32f1 & multiplayer services v1.1.0 bump --- .../Sessions/MultiplayerServicesFacade.cs | 10 ++++----- ...niversalRenderPipelineGlobalSettings.asset | 4 ++-- Packages/manifest.json | 18 +++++++-------- Packages/packages-lock.json | 22 +++++++++---------- ProjectSettings/ProjectVersion.txt | 4 ++-- ProjectSettings/VirtualProjectsConfig.json | 2 +- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs b/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs index 63c8d3584..f909f58b8 100644 --- a/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs +++ b/Assets/Scripts/UnityServices/Sessions/MultiplayerServicesFacade.cs @@ -39,8 +39,6 @@ public class MultiplayerServicesFacade : IDisposable, IStartable bool m_IsTracking; - SessionEventConnectionState m_SessionEventConnectionState = SessionEventConnectionState.Unknown; - public void Start() { m_ServiceScope = m_ParentScope.CreateChild(builder => @@ -240,7 +238,7 @@ void SubscribeToJoinedSessionAsync() CurrentUnitySession.StateChanged += OnSessionStateChanged; CurrentUnitySession.Deleted += OnSessionDeleted; CurrentUnitySession.PlayerJoined += OnPlayerJoined; - CurrentUnitySession.PlayerLeft += OnPlayerLeft; + CurrentUnitySession.PlayerHasLeft += OnPlayerHasLeft; CurrentUnitySession.RemovedFromSession += OnRemovedFromSession; CurrentUnitySession.PlayerPropertiesChanged += OnPlayerPropertiesChanged; CurrentUnitySession.SessionPropertiesChanged += OnSessionPropertiesChanged; @@ -252,7 +250,7 @@ void UnsubscribeFromJoinedSessionAsync() CurrentUnitySession.StateChanged -= OnSessionStateChanged; CurrentUnitySession.Deleted -= OnSessionDeleted; CurrentUnitySession.PlayerJoined -= OnPlayerJoined; - CurrentUnitySession.PlayerLeft -= OnPlayerLeft; + CurrentUnitySession.PlayerHasLeft -= OnPlayerHasLeft; CurrentUnitySession.RemovedFromSession -= OnRemovedFromSession; CurrentUnitySession.PlayerPropertiesChanged -= OnPlayerPropertiesChanged; CurrentUnitySession.SessionPropertiesChanged -= OnSessionPropertiesChanged; @@ -312,9 +310,9 @@ void OnPlayerJoined(string playerId) Debug.Log($"Player joined: {playerId}"); } - void OnPlayerLeft(string playerId) + void OnPlayerHasLeft(string playerId) { - Debug.Log($"Player left: {playerId}"); + Debug.Log($"Player has left: {playerId}"); } void OnRemovedFromSession() diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 94ba50c99..02c97aa8e 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31d4833f59a46db0c3c4996a6a98853ec30a4d2990c66f3d5c87ac3cd4d66e31 -size 14324 +oid sha256:a1aaae34ac488350fcf9b7d9b51cff00d9574036c0115d6d444baafb8a361c7a +size 14424 diff --git a/Packages/manifest.json b/Packages/manifest.json index f7d2d8105..14badb55b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,27 +1,27 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.ai.navigation": "2.0.4", - "com.unity.cinemachine": "2.10.1", - "com.unity.collab-proxy": "2.5.2", + "com.unity.ai.navigation": "2.0.5", + "com.unity.cinemachine": "2.10.3", + "com.unity.collab-proxy": "2.6.0", "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.learn.iet-framework": "4.0.2", + "com.unity.learn.iet-framework": "4.0.3", "com.unity.learn.iet-framework.authoring": "1.2.2", "com.unity.memoryprofiler": "1.1.1", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.playmode": "1.3.1", + "com.unity.multiplayer.playmode": "1.3.2", "com.unity.multiplayer.tools": "2.2.1", "com.unity.netcode.gameobjects": "2.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.postprocessing": "3.4.0", "com.unity.render-pipelines.universal": "17.0.3", - "com.unity.services.authentication": "3.3.3", - "com.unity.services.multiplayer": "1.0.2", + "com.unity.services.authentication": "3.4.0", + "com.unity.services.multiplayer": "1.1.0", "com.unity.test-framework": "1.4.5", "com.unity.timeline": "1.8.7", - "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.9", - "com.unity.transport": "2.3.0", + "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10", + "com.unity.transport": "2.4.0", "com.unity.ugui": "2.0.0", "jp.hadashikick.vcontainer": "1.11.0", "com.unity.modules.accessibility": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index dee4f7402..0010cb48d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.ai.navigation": { - "version": "2.0.4", + "version": "2.0.5", "depth": 0, "source": "registry", "dependencies": { @@ -26,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.10.1", + "version": "2.10.3", "depth": 0, "source": "registry", "dependencies": { @@ -35,7 +35,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.5.2", + "version": "2.6.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -86,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "4.0.2", + "version": "4.0.3", "depth": 0, "source": "registry", "dependencies": { @@ -129,7 +129,7 @@ } }, "com.unity.multiplayer.playmode": { - "version": "1.3.1", + "version": "1.3.2", "depth": 0, "source": "registry", "dependencies": { @@ -260,19 +260,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "3.3.3", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.services.core": "1.13.0", + "com.unity.services.core": "1.14.0", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.13.0", + "version": "1.14.0", "depth": 1, "source": "registry", "dependencies": { @@ -300,7 +300,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.multiplayer": { - "version": "1.0.2", + "version": "1.1.0", "depth": 0, "source": "registry", "dependencies": { @@ -406,7 +406,7 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.macos-x86_64-linux-x86_64": { - "version": "2.0.9", + "version": "2.0.10", "depth": 0, "source": "registry", "dependencies": { @@ -416,7 +416,7 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.3.0", + "version": "2.4.0", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4f951fb4a..d1c9097a6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.25f1 -m_EditorVersionWithRevision: 6000.0.25f1 (4859ab7b5a49) +m_EditorVersion: 6000.0.32f1 +m_EditorVersionWithRevision: 6000.0.32f1 (b2e806cf271c) diff --git a/ProjectSettings/VirtualProjectsConfig.json b/ProjectSettings/VirtualProjectsConfig.json index b20c24ea6..1c43509ad 100644 --- a/ProjectSettings/VirtualProjectsConfig.json +++ b/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.3.1" + "version": "1.3.2" } \ No newline at end of file From a14b0ca227c404f6e07aec5b12feb3e50ca3813b Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Mon, 6 Jan 2025 18:40:11 -0500 Subject: [PATCH 2/9] packages upgraded to recommended versions, cinemachine freelook camera updated to cinemachinecamera --- Assets/Prefabs/GameCam/CMCameraPrefab.prefab | 860 ++++-------------- Assets/Scenes/BossRoom.unity | 4 +- Assets/Scenes/BossRoom/DungeonBossRoom.unity | 4 +- Assets/Scenes/BossRoom/DungeonEntrance.unity | 4 +- .../Scenes/BossRoom/DungeonTransition.unity | 4 +- Assets/Scenes/PostGame.unity | 4 +- Assets/Scenes/Startup.unity | 4 +- .../Scripts/CameraUtils/CameraController.cs | 32 +- .../Unity.BossRoom.CameraUtils.asmdef | 4 +- ...salRenderPipelineAsset_Mobile_Medium.asset | 4 +- ...ersalRenderPipelineAsset_Mobile_High.asset | 4 +- Packages/manifest.json | 14 +- Packages/packages-lock.json | 36 +- .../CustomColorSettings.asset | 3 + ProjectSettings/TimelineSettings.asset | 4 +- ProjectSettings/VirtualProjectsConfig.json | 2 +- 16 files changed, 271 insertions(+), 716 deletions(-) create mode 100644 ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset diff --git a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab index c8dcf3875..1f34fcc06 100644 --- a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab +++ b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab @@ -1,79 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1676734515771252290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1676734515771252668} - - component: {fileID: 1676734515771252291} - m_Layer: 0 - m_Name: MiddleRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1676734515771252668 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734515771252290} - m_LocalRotation: {x: 0.3943448, y: 0.31044647, z: -0.14352979, w: 0.85294455} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1676734516866984547} - m_Father: {fileID: 1676734517288307197} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734515771252291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734515771252290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - LensShift: {x: 0, y: 0} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1676734516866984547} --- !u!1 &1676734516302391371 GameObject: m_ObjectHideFlags: 0 @@ -98,12 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1676734516302391371} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.45, y: 0, z: 0.48} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2966953081568086693} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1676734516302391364 MonoBehaviour: @@ -117,284 +44,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5eb80d8e62d9d145bb50fb783c0f731, type: 3} m_Name: m_EditorClassIdentifier: - m_PositionMode: 0 - m_RotationMode: 0 - m_UpdateMethod: 2 - m_Targets: [] ---- !u!1 &1676734516695783277 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1676734516695783279} - - component: {fileID: 1676734516695783278} - m_Layer: 0 - m_Name: TopRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1676734516695783279 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516695783277} - m_LocalRotation: {x: 0.3985757, y: 0.3097298, z: -0.14506967, w: 0.8509757} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1676734517587239784} - m_Father: {fileID: 1676734517288307197} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734516695783278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516695783277} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - LensShift: {x: 0, y: 0} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1676734517587239784} ---- !u!1 &1676734516724634597 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1676734516724634599} - - component: {fileID: 1676734516724634598} - m_Layer: 0 - m_Name: BottomRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1676734516724634599 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516724634597} - m_LocalRotation: {x: 0.38943532, y: 0.31126636, z: -0.14174287, w: 0.85519725} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1676734517611811567} - m_Father: {fileID: 1676734517288307197} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734516724634598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516724634597} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - LensShift: {x: 0, y: 0} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1676734517611811567} ---- !u!1 &1676734516866984546 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1676734516866984547} - - component: {fileID: 1676734516866984542} - - component: {fileID: 1676734516866984541} - - component: {fileID: 1676734516866984540} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1676734516866984547 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516866984546} - 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_Children: [] - m_Father: {fileID: 1676734515771252668} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734516866984542 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516866984546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1676734516866984541 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516866984546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 4 - m_FollowOffset: {x: 0, y: 20, z: -15} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 40 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &1676734516866984540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734516866984546} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 1, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 + PositionMode: 0 + RotationMode: 0 + UpdateMethod: 0 + Targets: [] + m_LegacyTargets: [] --- !u!1 &1676734517288307075 GameObject: m_ObjectHideFlags: 0 @@ -404,10 +58,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1676734517288307197} - - component: {fileID: 1676734517288307196} + - component: {fileID: 114669375565425622} + - component: {fileID: 2134312450369994339} + - component: {fileID: 7526749824992581565} + - component: {fileID: 9199614428061556971} + - component: {fileID: 2979079838363680315} m_Layer: 0 m_Name: CMFreeLook - m_TagString: Untagged + m_TagString: CMCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -419,17 +77,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1676734517288307075} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.1918144, y: 20, z: -11.010667} + serializedVersion: 2 + m_LocalRotation: {x: 0.39434484, y: 0.3104464, z: -0.14352977, w: 0.85294455} + m_LocalPosition: {x: -9.641814, y: 20, z: -11.490666} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1676734516695783279} - - {fileID: 1676734515771252668} - - {fileID: 1676734516724634599} + m_ConstrainProportionsScale: 0 + m_Children: [] m_Father: {fileID: 2966953081568086693} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734517288307196 +--- !u!114 &114669375565425622 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -438,350 +94,221 @@ MonoBehaviour: m_GameObject: {fileID: 1676734517288307075} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} m_Name: m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 1676734516302391365} - m_Follow: {fileID: 1676734516302391365} - m_CommonLens: 1 - m_Lens: + Priority: + Enabled: 1 + m_Value: 10 + OutputChannel: 1 + StandbyUpdate: 2 + m_StreamingVersion: 20241001 + m_LegacyPriority: 0 + Target: + TrackingTarget: {fileID: 1676734516302391365} + LookAtTarget: {fileID: 1676734516302391365} + CustomLookAtTarget: 0 + Lens: FieldOfView: 40 OrthographicSize: 10 NearClipPlane: 0.1 FarClipPlane: 5000 Dutch: 0 - LensShift: {x: 0, y: 0} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_YAxis: - Value: 0.5 - m_SpeedMode: 1 - m_MaxSpeed: 5 - m_AccelTime: 2 - m_DecelTime: 2 - m_InputAxisName: Mouse ScrollWheel - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: 0 - m_MaxValue: 1 - m_Wrap: 0 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_YAxisRecentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 40 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 4 - m_SplineCurvature: 0.2 - m_Orbits: - - m_Height: 35 - m_Radius: 15 - - m_Height: 20 - m_Radius: 15 - - m_Height: 5 - m_Radius: 8 - m_LegacyHeadingBias: 3.4028235e+38 - m_Rigs: - - {fileID: 1676734516695783278} - - {fileID: 1676734515771252291} - - {fileID: 1676734516724634598} ---- !u!1 &1676734517587239791 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1676734517587239784} - - component: {fileID: 1676734517587239787} - - component: {fileID: 1676734517587239786} - - component: {fileID: 1676734517587239785} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1676734517587239784 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517587239791} - 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_Children: [] - m_Father: {fileID: 1676734516695783279} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734517587239787 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517587239791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1676734517587239786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517587239791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 4 - m_FollowOffset: {x: 0, y: 20, z: -15} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 40 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &1676734517587239785 + ModeOverride: 0 + PhysicalProperties: + GateFit: 2 + SensorSize: {x: 21.946, y: 16.002} + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 +--- !u!114 &2134312450369994339 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517587239791} + m_GameObject: {fileID: 1676734517288307075} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 3b5d7c088409d9a40b7b09aa707777f8, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 2, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!1 &1676734517611811566 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1676734517611811567} - - component: {fileID: 1676734517611811562} - - component: {fileID: 1676734517611811561} - - component: {fileID: 1676734517611811560} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1676734517611811567 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517611811566} - 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_Children: [] - m_Father: {fileID: 1676734516724634599} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1676734517611811562 + TargetOffset: {x: 0, y: 0, z: 0} + TrackerSettings: + BindingMode: 4 + PositionDamping: {x: 1, y: 1, z: 1} + AngularDampingMode: 0 + RotationDamping: {x: 0, y: 0, z: 0} + QuaternionDamping: 0 + OrbitStyle: 1 + Radius: 15 + Orbits: + Top: + Radius: 15 + Height: 35 + Center: + Radius: 15 + Height: 20 + Bottom: + Radius: 8 + Height: 5 + SplineCurvature: 0.2 + RecenteringTarget: 2 + HorizontalAxis: + Value: 40 + Center: 0 + Range: {x: -180, y: 180} + Wrap: 1 + Recentering: + Enabled: 0 + Wait: 1 + Time: 2 + Restrictions: 0 + VerticalAxis: + Value: 0.5 + Center: 0.5 + Range: {x: 0, y: 1} + Wrap: 0 + Recentering: + Enabled: 0 + Wait: 1 + Time: 2 + Restrictions: 0 + RadialAxis: + Value: 1 + Center: 1 + Range: {x: 1, y: 1} + Wrap: 0 + Recentering: + Enabled: 0 + Wait: 1 + Time: 2 + Restrictions: 0 +--- !u!114 &7526749824992581565 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517611811566} + m_GameObject: {fileID: 1676734517288307075} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1676734517611811561 + Composition: + ScreenPosition: {x: 0, y: 0.050000012} + DeadZone: + Enabled: 1 + Size: {x: 0, y: 0} + HardLimits: + Enabled: 1 + Size: {x: 0.8, y: 0.8} + Offset: {x: 0, y: 0} + CenterOnActivate: 1 + TargetOffset: {x: 0, y: 1, z: 0} + Damping: {x: 0, y: 0} + Lookahead: + Enabled: 0 + Time: 0 + Smoothing: 0 + IgnoreY: 0 +--- !u!114 &9199614428061556971 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517611811566} + m_GameObject: {fileID: 1676734517288307075} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Script: {fileID: 11500000, guid: a076c17fe76165e4f8ed21498b877bf9, type: 3} m_Name: m_EditorClassIdentifier: - m_BindingMode: 4 - m_FollowOffset: {x: 0, y: 20, z: -15} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 40 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &1676734517611811560 + Modifiers: + - rid: 5233093796304257304 + references: + version: 2 + RefIds: + - rid: 5233093796304257304 + type: {class: CinemachineFreeLookModifier/CompositionModifier, ns: Unity.Cinemachine, asm: Unity.Cinemachine} + data: + Composition: + Top: + ScreenPosition: {x: 0, y: 0} + DeadZone: + Enabled: 1 + Size: {x: 0, y: 0} + HardLimits: + Enabled: 1 + Size: {x: 0.8, y: 0.8} + Offset: {x: 0, y: 0} + Bottom: + ScreenPosition: {x: 0, y: 0.100000024} + DeadZone: + Enabled: 1 + Size: {x: 0, y: 0} + HardLimits: + Enabled: 1 + Size: {x: 0.8, y: 0.8} + Offset: {x: 0, y: 0} +--- !u!114 &2979079838363680315 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1676734517611811566} + m_GameObject: {fileID: 1676734517288307075} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Script: {fileID: 11500000, guid: 89875cdc57c54474a8a74efd9b2a3b5d, type: 3} m_Name: m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 + ScanRecursively: 1 + SuppressInputWhileBlending: 1 + IgnoreTimeScale: 0 + m_ControllerManager: + Controllers: + - Name: Look Orbit X + Owner: {fileID: 2134312450369994339} + Enabled: 1 + Input: + LegacyInput: + LegacyGain: 300 + CancelDeltaTime: 0 + InputValue: 0 + Driver: + AccelTime: 0.1 + DecelTime: 0.1 + - Name: Look Orbit Y + Owner: {fileID: 2134312450369994339} + Enabled: 1 + Input: + LegacyInput: Mouse ScrollWheel + LegacyGain: 5 + CancelDeltaTime: 0 + InputValue: 0 + Driver: + AccelTime: 2 + DecelTime: 2 + - Name: Orbit Scale + Owner: {fileID: 2134312450369994339} + Enabled: 1 + Input: + LegacyInput: Mouse ScrollWheel + LegacyGain: 200 + CancelDeltaTime: 0 + InputValue: 0 + Driver: + AccelTime: 0 + DecelTime: 0 --- !u!1 &2167489802469618434 GameObject: m_ObjectHideFlags: 0 @@ -805,12 +332,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2167489802469618434} + serializedVersion: 2 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: 1676734517288307197} - {fileID: 1676734516302391365} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index 43d9c7b23..134f7cae1 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8fd7364ea33eec42ccd63498e270396c9b2ab90b9bd4bd9128fd68841e899de -size 423109 +oid sha256:563f5ab263d3a1bc25ef209e45ac203c29d5f727a3c4204c8939adb1abebccdb +size 426863 diff --git a/Assets/Scenes/BossRoom/DungeonBossRoom.unity b/Assets/Scenes/BossRoom/DungeonBossRoom.unity index 7f190c77d..fe8d29767 100644 --- a/Assets/Scenes/BossRoom/DungeonBossRoom.unity +++ b/Assets/Scenes/BossRoom/DungeonBossRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0f0ddaaf10020f714dc598e2ffd877f0d57cb6e01a70b5bf5725aa95836ee06 -size 335325 +oid sha256:62fb49820dd395603c4ed3c6a3eed0497fafd4e799b58d630eb996c84e9e78e1 +size 340011 diff --git a/Assets/Scenes/BossRoom/DungeonEntrance.unity b/Assets/Scenes/BossRoom/DungeonEntrance.unity index 1dab8e20e..3428b1fbc 100644 --- a/Assets/Scenes/BossRoom/DungeonEntrance.unity +++ b/Assets/Scenes/BossRoom/DungeonEntrance.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c544a225b24708e42ffe92d2ab9282608236c7a1ba6d984ef64a88f90978557d -size 33086 +oid sha256:2e754825749cbdff6a94176d031686e9ba6918b5fd9b89937e30bc7120d90998 +size 35122 diff --git a/Assets/Scenes/BossRoom/DungeonTransition.unity b/Assets/Scenes/BossRoom/DungeonTransition.unity index f6baab5cd..ef71645a6 100644 --- a/Assets/Scenes/BossRoom/DungeonTransition.unity +++ b/Assets/Scenes/BossRoom/DungeonTransition.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd06bcd32ee6eddef987ad17d127ff54710fc0b83e8b65246741f31965c6f9eb -size 26310 +oid sha256:c9ddbb20b51266d5d0bca5e4ca52df58929a8af4a84f736c129e629f96291382 +size 28071 diff --git a/Assets/Scenes/PostGame.unity b/Assets/Scenes/PostGame.unity index 26deb420a..d51f9a415 100644 --- a/Assets/Scenes/PostGame.unity +++ b/Assets/Scenes/PostGame.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c1bbe694d33663c96391988b7b4e69027a71307724e12e85752bcd162542834 -size 34942 +oid sha256:9f6d043b0d737b156218d82153c0068bda1b8af7cf40d1acdf13adc7356e6ae8 +size 34859 diff --git a/Assets/Scenes/Startup.unity b/Assets/Scenes/Startup.unity index 3f2050f35..c5fc2f93a 100644 --- a/Assets/Scenes/Startup.unity +++ b/Assets/Scenes/Startup.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea9671f269c2d6dba887663ac41841dc02c4d22d34e302dfcc6cba4c458a3cf1 -size 60038 +oid sha256:051baee2f7626476a45adae7ef3ae46e1d2e63ecd142ccc36a7cd7859335e57e +size 60061 diff --git a/Assets/Scripts/CameraUtils/CameraController.cs b/Assets/Scripts/CameraUtils/CameraController.cs index d90b54750..6a5ab2122 100644 --- a/Assets/Scripts/CameraUtils/CameraController.cs +++ b/Assets/Scripts/CameraUtils/CameraController.cs @@ -1,4 +1,4 @@ -using Cinemachine; +using Unity.Cinemachine; using UnityEngine; using UnityEngine.Assertions; @@ -6,26 +6,36 @@ namespace Unity.BossRoom.CameraUtils { public class CameraController : MonoBehaviour { - private CinemachineFreeLook m_MainCamera; - + const string k_CMCameraTag = "CMCamera"; + void Start() { AttachCamera(); } - private void AttachCamera() + void AttachCamera() { - m_MainCamera = FindAnyObjectByType(); - Assert.IsNotNull(m_MainCamera, "CameraController.AttachCamera: Couldn't find gameplay freelook camera"); + var cinemachineCameraGameObject = GameObject.FindGameObjectWithTag(k_CMCameraTag); + Assert.IsNotNull(cinemachineCameraGameObject); + + var cinemachineCamera = cinemachineCameraGameObject.GetComponent(); + Assert.IsNotNull(cinemachineCamera, "CameraController.AttachCamera: Couldn't find gameplay CinemachineCamera"); - if (m_MainCamera) + if (cinemachineCamera != null) { // camera body / aim - m_MainCamera.Follow = transform; - m_MainCamera.LookAt = transform; + cinemachineCamera.Follow = transform; + cinemachineCamera.LookAt = transform; + } + + var cinemachineOrbitalFollow = cinemachineCameraGameObject.GetComponent(); + Assert.IsNotNull(cinemachineOrbitalFollow, "CameraController.AttachCamera: Couldn't find gameplay CinemachineOrbitalFollow"); + + if (cinemachineOrbitalFollow != null) + { // default rotation / zoom - m_MainCamera.m_Heading.m_Bias = 40f; - m_MainCamera.m_YAxis.Value = 0.5f; + cinemachineOrbitalFollow.HorizontalAxis.Value = 40f; + cinemachineOrbitalFollow.VerticalAxis.Value = 0.5f; } } } diff --git a/Assets/Scripts/CameraUtils/Unity.BossRoom.CameraUtils.asmdef b/Assets/Scripts/CameraUtils/Unity.BossRoom.CameraUtils.asmdef index ea57eaeb2..7ebc5de67 100644 --- a/Assets/Scripts/CameraUtils/Unity.BossRoom.CameraUtils.asmdef +++ b/Assets/Scripts/CameraUtils/Unity.BossRoom.CameraUtils.asmdef @@ -2,7 +2,7 @@ "name": "Unity.BossRoom.CameraUtils", "rootNamespace": "", "references": [ - "Cinemachine" + "Unity.Cinemachine" ], "includePlatforms": [], "excludePlatforms": [], @@ -13,4 +13,4 @@ "defineConstraints": [], "versionDefines": [], "noEngineReferences": false -} +} \ No newline at end of file diff --git a/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset b/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset index 52cf4af4e..dd1ac1297 100644 --- a/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset +++ b/Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec3b54e2206ca1aca321f2f0b9961bf14937f8e15821aa8342e45835b965db81 -size 3504 +oid sha256:61fd1498ae417613b1e4fc43d90f62a1a8eacb61953ed8defc91082077be5148 +size 4361 diff --git a/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset b/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset index ddd784b09..bbd68c344 100644 --- a/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset +++ b/Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78565188a9b121a758c685ad1b4da264123ab20dc15b2de49725c527140b8ae0 -size 3502 +oid sha256:95bc4e0a16a45168277872febc3470a47559b5388c278832a3df1e3573839f34 +size 4359 diff --git a/Packages/manifest.json b/Packages/manifest.json index 14badb55b..e7da95ec1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,18 +2,18 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "2.0.5", - "com.unity.cinemachine": "2.10.3", + "com.unity.cinemachine": "3.1.2", "com.unity.collab-proxy": "2.6.0", - "com.unity.ide.rider": "3.0.31", + "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", "com.unity.learn.iet-framework": "4.0.3", "com.unity.learn.iet-framework.authoring": "1.2.2", - "com.unity.memoryprofiler": "1.1.1", + "com.unity.memoryprofiler": "1.1.3", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.playmode": "1.3.2", - "com.unity.multiplayer.tools": "2.2.1", - "com.unity.netcode.gameobjects": "2.0.0", - "com.unity.performance.profile-analyzer": "1.2.2", + "com.unity.multiplayer.playmode": "1.3.3", + "com.unity.multiplayer.tools": "2.2.3", + "com.unity.netcode.gameobjects": "2.1.1", + "com.unity.performance.profile-analyzer": "1.2.3", "com.unity.postprocessing": "3.4.0", "com.unity.render-pipelines.universal": "17.0.3", "com.unity.services.authentication": "3.4.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0010cb48d..af933a82e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -26,11 +26,11 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.10.3", + "version": "3.1.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31" + "com.unity.splines": "2.0.0" }, "url": "https://packages.unity.com" }, @@ -68,7 +68,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -112,10 +112,14 @@ "url": "https://packages.unity.com" }, "com.unity.memoryprofiler": { - "version": "1.1.1", + "version": "1.1.3", "depth": 0, "source": "registry", "dependencies": { + "com.unity.burst": "1.8.0", + "com.unity.collections": "1.2.3", + "com.unity.mathematics": "1.2.1", + "com.unity.profiling.core": "1.0.0", "com.unity.editorcoroutines": "1.0.0" }, "url": "https://packages.unity.com" @@ -129,7 +133,7 @@ } }, "com.unity.multiplayer.playmode": { - "version": "1.3.2", + "version": "1.3.3", "depth": 0, "source": "registry", "dependencies": { @@ -148,13 +152,13 @@ } }, "com.unity.multiplayer.tools": { - "version": "2.2.1", + "version": "2.2.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.17", - "com.unity.collections": "2.4.0", - "com.unity.mathematics": "1.3.1", + "com.unity.burst": "1.8.18", + "com.unity.collections": "2.5.1", + "com.unity.mathematics": "1.3.2", "com.unity.profiling.core": "1.0.2", "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.modules.uielements": "1.0.0", @@ -163,7 +167,7 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "2.0.0", + "version": "2.1.1", "depth": 0, "source": "registry", "dependencies": { @@ -187,7 +191,7 @@ "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { - "version": "1.2.2", + "version": "1.2.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -356,6 +360,16 @@ "com.unity.searcher": "4.9.2" } }, + "com.unity.splines": { + "version": "2.7.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.settings-manager": "1.0.3" + }, + "url": "https://packages.unity.com" + }, "com.unity.sysroot": { "version": "2.0.10", "depth": 1, diff --git a/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset b/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset new file mode 100644 index 000000000..7e462f93b --- /dev/null +++ b/ProjectSettings/Packages/com.unity.multiplayer.tools/CustomColorSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c0c545e8f374c8c1e2f6f13a13060dc1de399d73fd6c0bb2a42f1bf8a6ccdb1 +size 423 diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset index c6c19d580..bec00b3aa 100644 --- a/ProjectSettings/TimelineSettings.asset +++ b/ProjectSettings/TimelineSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4333bb60f63529ab4ad88b65fe5dfaf7af05a7b4f2b9d64ad4e970ad17cc1514 -size 411 +oid sha256:1c63fbda5a79fb6a2ee33f5c664a234633dd0f9524e8669cb28dc82132047309 +size 436 diff --git a/ProjectSettings/VirtualProjectsConfig.json b/ProjectSettings/VirtualProjectsConfig.json index 1c43509ad..b77f3f11c 100644 --- a/ProjectSettings/VirtualProjectsConfig.json +++ b/ProjectSettings/VirtualProjectsConfig.json @@ -1,4 +1,4 @@ { "PlayerTags": [], - "version": "1.3.2" + "version": "1.3.3" } \ No newline at end of file From 15ade30bd28b504db6143fbee157074dae3c4e08 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 7 Jan 2025 13:45:08 -0500 Subject: [PATCH 3/9] changelog cleanup, changelog addition --- CHANGELOG.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1237536d2..4d5019688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,22 +8,23 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [Unreleased] ### Added -* Added a welcome dialog to guide users on their first time experience -* Added a Table of Contents with helpful resources, that can be accessed from the `Tutorials > Show Tutorials` menu -* Added the Multiplayer Play Mode package v1.3.1 to the project +* Added a welcome dialog to guide users on their first time experience (#888) + * Added a Table of Contents with helpful resources, that can be accessed from the `Tutorials > Show Tutorials` menu +* Added the Multiplayer Play Mode package v1.3.1 to the project (#890) ### Changed -* Upgraded Boss Room to Netcode for GameObjects v2.0.0 -* Upgraded editor version to 6000.0.25f1 +* Upgraded editor version to 6000.0.25f1 and upgraded Boss Room to Netcode for GameObjects v2.0.0 (#890) * Replaced Lobby and Relay standalone packages with the Multiplayer Services package v1.0.2 and the Sessions framework (#892) +* Upgraded editor version to 6000.0.32f1 and Multiplayer Services package to v1.1.0 (#894) + * Removed usage of ISession's deprecated PlayerLeft callback to the new PlayerHasLeft callback ### Cleanup -* Removed ParrelSync from the project +* Removed ParrelSync from the project (#890) ### Fixed * Fix a Healer ability doesn't work (#893) * Changed the way characters are oriented when using skills. - * Added the GetTotalDamage API to the IDamagble interface. This number is your maximum health minus your current health. + * Added the GetTotalDamage API to the IDamageable interface. This number is your maximum health minus your current health. * Changed the way MeleeAction selects a target when there are multiple targets to collide with. The target with the highest GetTotalDamage value (mentioned above) will be selected. From aee1bed76804d4d1904060df6f8cb681132aad88 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 7 Jan 2025 15:12:01 -0500 Subject: [PATCH 4/9] changelog addition --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d5019688..caccc26b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,11 @@ Additional documentation and release notes are available at [Multiplayer Documen * Replaced Lobby and Relay standalone packages with the Multiplayer Services package v1.0.2 and the Sessions framework (#892) * Upgraded editor version to 6000.0.32f1 and Multiplayer Services package to v1.1.0 (#894) * Removed usage of ISession's deprecated PlayerLeft callback to the new PlayerHasLeft callback +* Upgraded several packages to their recommended versions (#895) They include: + * com.unity.cinemachine from v2.10.3 to 3.1.2. Camera using deprecated CinemachineFreeLook component has been re-implemented with CinemachineCamera component + * com.unity.multiplayer.playmode from v1.3.2 to v1.3.3 + * com.unity.multiplayer.tools from v2.2.1 to v2.2.3 + * com.unity.netcode.gameobjects from v2.0.0 to v2.1.1 ### Cleanup * Removed ParrelSync from the project (#890) @@ -27,7 +32,6 @@ Additional documentation and release notes are available at [Multiplayer Documen * Added the GetTotalDamage API to the IDamageable interface. This number is your maximum health minus your current health. * Changed the way MeleeAction selects a target when there are multiple targets to collide with. The target with the highest GetTotalDamage value (mentioned above) will be selected. - ## [2.5.0] - 2024-04-18 ### Changed From fb8a82206cc5cdd747a788d30b8fab2506089199 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 7 Jan 2025 15:13:18 -0500 Subject: [PATCH 5/9] update to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caccc26b4..20ba92700 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * Upgraded editor version to 6000.0.32f1 and Multiplayer Services package to v1.1.0 (#894) * Removed usage of ISession's deprecated PlayerLeft callback to the new PlayerHasLeft callback * Upgraded several packages to their recommended versions (#895) They include: - * com.unity.cinemachine from v2.10.3 to 3.1.2. Camera using deprecated CinemachineFreeLook component has been re-implemented with CinemachineCamera component + * com.unity.cinemachine from v2.10.3 to v3.1.2. Camera using deprecated CinemachineFreeLook component has been re-implemented with CinemachineCamera component * com.unity.multiplayer.playmode from v1.3.2 to v1.3.3 * com.unity.multiplayer.tools from v2.2.1 to v2.2.3 * com.unity.netcode.gameobjects from v2.0.0 to v2.1.1 From 57cfd9e58a458fcfb66590c0e0d0baf87bbde461 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 7 Jan 2025 16:14:06 -0500 Subject: [PATCH 6/9] upgrading readme version badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1dd002be2..7dad572d0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### Made with and Including Utilities for Netcode for GameObjects
-[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0.25f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.25) +[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0.32f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.32) [![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-2.0.0-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1) [![LatestRelease](https://img.shields.io/badge/Latest%20Github%20Release:-v2.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/releases/tag/v2.5.0)

From 9f561d16bfcdc3c52c04ec5f44f79840fc8a2647 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 7 Jan 2025 16:18:23 -0500 Subject: [PATCH 7/9] updating reamde netcode version badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7dad572d0..1cbd530f3 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
[![UnityVersion](https://img.shields.io/badge/Unity%20Version:-6000.0.32f1%20LTS-57b9d3.svg?logo=unity&color=2196F3)](https://unity.com/releases/editor/whats-new/6000.0.32) -[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-2.0.0-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F1.8.1) +[![NetcodeVersion](https://img.shields.io/badge/Netcode%20Version:-2.1.1-57b9d3.svg?logo=unity&color=2196F3)](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/releases/tag/ngo%2F2.1.1) [![LatestRelease](https://img.shields.io/badge/Latest%20Github%20Release:-v2.5.0-57b9d3.svg?logo=github&color=brightgreen)](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/releases/tag/v2.5.0)

From 5096d5154363473a6cbb898bfe9c3f85a0703ed3 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 14 Jan 2025 12:31:07 -0500 Subject: [PATCH 8/9] camera zoom scroll inverted, readjusted gain --- Assets/Prefabs/GameCam/CMCameraPrefab.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab index 1f34fcc06..f67f8dd0c 100644 --- a/Assets/Prefabs/GameCam/CMCameraPrefab.prefab +++ b/Assets/Prefabs/GameCam/CMCameraPrefab.prefab @@ -292,7 +292,7 @@ MonoBehaviour: Enabled: 1 Input: LegacyInput: Mouse ScrollWheel - LegacyGain: 5 + LegacyGain: -50 CancelDeltaTime: 0 InputValue: 0 Driver: From 02664be59832874f40c3741fd13c23024042d334 Mon Sep 17 00:00:00 2001 From: Fernando Cortez Date: Tue, 14 Jan 2025 16:34:28 -0500 Subject: [PATCH 9/9] whitespace fixes --- Assets/Scripts/CameraUtils/CameraController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/CameraUtils/CameraController.cs b/Assets/Scripts/CameraUtils/CameraController.cs index 6a5ab2122..45eface2a 100644 --- a/Assets/Scripts/CameraUtils/CameraController.cs +++ b/Assets/Scripts/CameraUtils/CameraController.cs @@ -7,7 +7,7 @@ namespace Unity.BossRoom.CameraUtils public class CameraController : MonoBehaviour { const string k_CMCameraTag = "CMCamera"; - + void Start() { AttachCamera(); @@ -17,7 +17,7 @@ void AttachCamera() { var cinemachineCameraGameObject = GameObject.FindGameObjectWithTag(k_CMCameraTag); Assert.IsNotNull(cinemachineCameraGameObject); - + var cinemachineCamera = cinemachineCameraGameObject.GetComponent(); Assert.IsNotNull(cinemachineCamera, "CameraController.AttachCamera: Couldn't find gameplay CinemachineCamera"); @@ -27,10 +27,10 @@ void AttachCamera() cinemachineCamera.Follow = transform; cinemachineCamera.LookAt = transform; } - + var cinemachineOrbitalFollow = cinemachineCameraGameObject.GetComponent(); Assert.IsNotNull(cinemachineOrbitalFollow, "CameraController.AttachCamera: Couldn't find gameplay CinemachineOrbitalFollow"); - + if (cinemachineOrbitalFollow != null) { // default rotation / zoom