Skip to content

feat: Dedicated Game Server Sample - upgrading project & related assets to Cinemachine v3.1.3 [MTT-11353] #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fernando-cortez merged 9 commits into from
Mar 25, 2025
Merged

feat: Dedicated Game Server Sample - upgrading project & related assets to Cinemachine v3.1.3 [MTT-11353] #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a16be0
upgrading project to 6000.0.36f1
fernando-cortez Jan 31, 2025
24b4ed6
added multiplayer services sdk, playmode scenarios, config as code, b…
fernando-cortez Feb 19, 2025
90c1459
multiplayer role usage in favour of defines
fernando-cortez Feb 24, 2025
2ff523b
stricter roles on some scenes, null-ref cleanups
fernando-cortez Feb 26, 2025
efbbd17
adding client matchmaking as its own state, stopping matchmaker reque…
fernando-cortez Mar 3, 2025
a9f0793
adding SQP to serverlisteningstate, matchmakerhandler added
fernando-cortez Mar 3, 2025
8d67983
defines guarding matchmaker code - for enabling IP editor workflow
fernando-cortez Mar 4, 2025
a4ac526
upgrading project & related assets to cinemachine v3.1.3
fernando-cortez Mar 4, 2025
c8ef06f
merge develop
fernando-cortez Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions Experimental/DedicatedGameServer/Assets/Scenes/GameScene01.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,16 @@ PrefabInstance:
propertyPath: m_GameObjectRolesMask
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
- target: {fileID: 4074790896732394817, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3}
propertyPath: m_GameObjectRolesMask
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4074790896732394817, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3}
propertyPath: m_ComponentsRolesMasks.Array.data[0].m_Object
value:
objectReference: {fileID: 0}
m_RemovedComponents: [{fileID: 2070925441746177913, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3},
{fileID: 3125594499909882602, guid: a1a802ecaf6775746bb2a929fb554ad8, type: 3}]
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
Expand Down Expand Up @@ -521,19 +530,19 @@ PrefabInstance:
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8188383779474413381, guid: 0dff047fe330e3947b10253ba41de7eb, type: 3}
propertyPath: 'm_Patrols.Array.data[0]'
propertyPath: m_Patrols.Array.data[0]
value:
objectReference: {fileID: 1611378409}
- target: {fileID: 8188383779474413381, guid: 0dff047fe330e3947b10253ba41de7eb, type: 3}
propertyPath: 'm_Patrols.Array.data[1]'
propertyPath: m_Patrols.Array.data[1]
value:
objectReference: {fileID: 1611378408}
- target: {fileID: 8188383779474413381, guid: 0dff047fe330e3947b10253ba41de7eb, type: 3}
propertyPath: 'm_Patrols.Array.data[2]'
propertyPath: m_Patrols.Array.data[2]
value:
objectReference: {fileID: 1611378407}
- target: {fileID: 8188383779474413381, guid: 0dff047fe330e3947b10253ba41de7eb, type: 3}
propertyPath: 'm_Patrols.Array.data[3]'
propertyPath: m_Patrols.Array.data[3]
value:
objectReference: {fileID: 1611378406}
m_RemovedComponents: []
Expand Down
4 changes: 2 additions & 2 deletions Experimental/DedicatedGameServer/Assets/Scenes/MetagameScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand Down
6 changes: 3 additions & 3 deletions ...edicatedGameServer/Assets/Scripts/Runtime/Game/Characters/Player/ClientPlayerCharacter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using Cinemachine;
using Unity.Cinemachine;
using StarterAssets;
using UnityEngine;
using UnityEngine.InputSystem;
Expand Down Expand Up @@ -71,8 +71,8 @@ void OnNetworkSpawn()
// position on owning clients
m_CharacterController.enabled = true;

var cinemachineVirtualCamera = FindFirstObjectByType<CinemachineVirtualCamera>();
cinemachineVirtualCamera.Follow = m_CameraFollow;
var cinemachineCamera = FindFirstObjectByType<CinemachineCamera>();
cinemachineCamera.Follow = m_CameraFollow;

GameApplication.Instance.Model.PlayerCharacter = this;
}
Expand Down
2 changes: 1 addition & 1 deletion ...dicatedGameServer/Assets/Scripts/Runtime/com.unity.sample.dedicated.server.runtime.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"Unity.Services.Core.Environments",
"Unity.Networking.Transport",
"com.unity.sample.dedicated-server.shared",
"Cinemachine",
"Unity.Cinemachine",
"Unity.Multiplayer.Samples.Utilities.ClientAuthority",
"Unity.InputSystem",
"StarterAssets",
Expand Down
Loading