Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ Transform:
- {fileID: 2256034313796960807}
- {fileID: 7559383771208540613}
- {fileID: 8481058004063830698}
- {fileID: 6866794867799222920}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5231826839060252271
Expand Down Expand Up @@ -378,3 +379,50 @@ MonoBehaviour:
m_PanelMaxSize: 1
m_DisplayYOffset: 1.8
m_Camera: {fileID: 0}
--- !u!1 &8792977535300992051
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6866794867799222920}
- component: {fileID: 2710521362083790645}
m_Layer: 0
m_Name: TextChatUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6866794867799222920
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8792977535300992051}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 9.600002, y: -5.4000006, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8617889547341104717}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2710521362083790645
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8792977535300992051}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 893a7d85794ab094798b16ae014c5d52, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UIDocument: {fileID: 436460152536684898}
m_Asset: {fileID: 9197481963319205126, guid: e47914746c33245118570e272f51690a, type: 3}
m_Messages: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4141237635811601714
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7448202836938688200}
- component: {fileID: 8855226785007094250}
m_Layer: 0
m_Name: VivoxManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7448202836938688200
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4141237635811601714}
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: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8855226785007094250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4141237635811601714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dde97419ba27cd44bae2dcde9387507b, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ParticipantPrefab: {fileID: 0}
m_ParticipantListParent: {fileID: 0}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ RenderSettings:
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
Expand Down Expand Up @@ -147,8 +148,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b5134217b751de44fb27f189c7ef29e2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AutoAuthenticateOnStart: 1
m_InitiateVivoxOnAuthentication: 1
--- !u!4 &340021862
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -223,6 +222,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
m_Name:
m_EditorClassIdentifier:
NetworkManagerExpanded: 0
NetworkConfig:
ProtocolVersion: 0
NetworkTransport: {fileID: 900326968}
Expand All @@ -246,8 +246,8 @@ MonoBehaviour:
SpawnTimeout: 10
EnableNetworkLogs: 1
NetworkTopology: 1
UseCMBService: 0
AutoSpawnPlayerPrefabClientSide: 1
UseCMBService: 1
AutoSpawnPlayerPrefabClientSide: 0
NetworkMessageMetrics: 1
NetworkProfilingMetrics: 1
OldPrefabList: []
Expand All @@ -268,9 +268,67 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1475976338
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4141237635811601714, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_Name
value: VivoxManager
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 340021862}
- {fileID: 900326970}
- {fileID: 1475976338}
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,63 @@ MonoBehaviour:
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!1001 &387878127
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4141237635811601714, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_Name
value: VivoxManager
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7448202836938688200, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53316d28950de8e4494bc48f320e09f6, type: 3}
--- !u!1001 &406782382
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -291126,3 +291183,4 @@ SceneRoots:
- {fileID: 735923504}
- {fileID: 8089728398451373915}
- {fileID: 2053309536}
- {fileID: 387878127}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ static class GameplayEventHandler
internal static event Action<string, string> OnStartButtonPressed;
internal static event Action OnReturnToMainMenuButtonPressed;
internal static event Action OnQuitGameButtonPressed;
internal static event Action<Task> OnConnectToSessionCompleted;
internal static event Action<Task, string> OnConnectToSessionCompleted;
internal static event Action OnExitedSession;
internal static event Action<string, string, bool> OnTextMessageReceived;
internal static event Action<string> OnSendTextMessage;
internal static event Action<bool> OnBlockPlayerControls;
internal static event Action<bool> OnChatIsReady;

internal static void NetworkObjectDespawned(NetworkObject networkObject)
{
Expand All @@ -41,9 +45,9 @@ internal static void QuitGamePressed()
OnQuitGameButtonPressed?.Invoke();
}

internal static void ConnectToSessionComplete(Task task)
internal static void ConnectToSessionComplete(Task task, string sessionName)
{
OnConnectToSessionCompleted?.Invoke(task);
OnConnectToSessionCompleted?.Invoke(task, sessionName);
}

internal static void ExitedSession()
Expand All @@ -60,5 +64,25 @@ internal static void LoadInGameScene()
{
SceneManager.LoadScene("HubScene_TownMarket");
}

internal static void ProcessTextMessageReceived(string senderName, string message, bool fromSelf)
{
OnTextMessageReceived?.Invoke(senderName, message, fromSelf);
}

internal static void SendTextMessage(string message)
{
OnSendTextMessage?.Invoke(message);
}

public static void BlockPlayerControls(bool disable)
{
OnBlockPlayerControls?.Invoke(disable);
}

public static void SetTextChatReady(bool enabled)
{
OnChatIsReady?.Invoke(enabled);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void OnDestroy()
GameplayEventHandler.OnConnectToSessionCompleted -= OnConnectToSessionCompleted;
}

void OnConnectToSessionCompleted(Task task)
void OnConnectToSessionCompleted(Task task, string sessionName)
{
if (task.IsCompletedSuccessfully)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using Unity.Collections;
using Unity.Multiplayer.Samples.SocialHub.GameManagement;
using Unity.Multiplayer.Samples.SocialHub.Gameplay;
using UnityEngine;
using Unity.Multiplayer.Samples.SocialHub.Input;
Expand Down Expand Up @@ -71,6 +72,8 @@ public override void OnNetworkSpawn()
Debug.LogError("CameraControl not found on the Main Camera or Main Camera is missing.");
}

GameplayEventHandler.OnBlockPlayerControls += OnBlockPlayerControls;

base.OnNetworkSpawn();
}

Expand All @@ -91,6 +94,7 @@ public override void OnNetworkDespawn()
cameraControl.SetTransform(null);
}

GameplayEventHandler.OnBlockPlayerControls -= OnBlockPlayerControls;
m_TopUIController?.RemovePlayer(gameObject);
}

Expand Down Expand Up @@ -122,6 +126,11 @@ void OnPlayerNameChanged(FixedString32Bytes previousValue, FixedString32Bytes ne
m_TopUIController.AddPlayer(gameObject, newValue.Value);
}

void OnBlockPlayerControls(bool blockInput)
{
m_PlayerInput.enabled = !blockInput;
}

public void NetworkUpdate(NetworkUpdateStage updateStage)
{
switch (updateStage)
Expand Down
Loading