From 23b5280cd6cc4bab1244e878aa975cf1d2990055 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 21 Sep 2019 02:24:30 +0200 Subject: [PATCH] Cross platform confirmed working --- Assets/Code/Viewer/ActViewer.cs | 2 +- Assets/Code/Viewer/LobbyController.cs | 70 +++ Assets/Code/Viewer/LobbyController.cs.meta | 31 ++ Assets/Code/Viewer/StartGameBtn.cs | 18 + Assets/Code/Viewer/StartGameBtn.cs.meta | 11 + Assets/Code/Viewer/ViewerMainController.cs | 91 ++++ .../Code/Viewer/ViewerMainController.cs.meta | 7 +- ....prefab => Player Lobby Controller.prefab} | 0 ...ta => Player Lobby Controller.prefab.meta} | 0 ...y Text.prefab => Player Lobby Text.prefab} | 0 ...fab.meta => Player Lobby Text.prefab.meta} | 0 Assets/Prefabs/Misc/Start Button.prefab | 222 ++++++++++ Assets/Prefabs/Misc/Start Button.prefab.meta | 7 + Assets/Prefabs/Misc/Viewer Camera.prefab | 85 ++++ Assets/Prefabs/Misc/Viewer Camera.prefab.meta | 7 + .../Misc/Viewer Lobby Controller.prefab | 65 +++ .../Misc/Viewer Lobby Controller.prefab.meta | 7 + Assets/Prefabs/Misc/Viewer Lobby Text.prefab | 79 ++++ .../Misc/Viewer Lobby Text.prefab.meta | 7 + Assets/Prefabs/Player Main Controller.prefab | 2 +- .../{Misc => }/Server Main Controller.prefab | 0 .../Server Main Controller.prefab.meta | 0 Assets/Prefabs/Viewer Main Controller.prefab | 94 ++++ .../Viewer Main Controller.prefab.meta | 7 + Assets/Scenes/Player.unity | 5 + Assets/Scenes/Server.unity | 188 ++++++++ Assets/Scenes/Viewer.unity | 418 ++++++++++++++---- ProjectSettings/EditorBuildSettings.asset | 5 +- ProjectSettings/GraphicsSettings.asset | 1 + 29 files changed, 1345 insertions(+), 84 deletions(-) create mode 100644 Assets/Code/Viewer/LobbyController.cs create mode 100644 Assets/Code/Viewer/LobbyController.cs.meta create mode 100644 Assets/Code/Viewer/StartGameBtn.cs create mode 100644 Assets/Code/Viewer/StartGameBtn.cs.meta rename Assets/Prefabs/Misc/{Lobby Controller.prefab => Player Lobby Controller.prefab} (100%) rename Assets/Prefabs/Misc/{Lobby Controller.prefab.meta => Player Lobby Controller.prefab.meta} (100%) rename Assets/Prefabs/Misc/{Lobby Text.prefab => Player Lobby Text.prefab} (100%) rename Assets/Prefabs/Misc/{Lobby Text.prefab.meta => Player Lobby Text.prefab.meta} (100%) create mode 100644 Assets/Prefabs/Misc/Start Button.prefab create mode 100644 Assets/Prefabs/Misc/Start Button.prefab.meta create mode 100644 Assets/Prefabs/Misc/Viewer Camera.prefab create mode 100644 Assets/Prefabs/Misc/Viewer Camera.prefab.meta create mode 100644 Assets/Prefabs/Misc/Viewer Lobby Controller.prefab create mode 100644 Assets/Prefabs/Misc/Viewer Lobby Controller.prefab.meta create mode 100644 Assets/Prefabs/Misc/Viewer Lobby Text.prefab create mode 100644 Assets/Prefabs/Misc/Viewer Lobby Text.prefab.meta rename Assets/Prefabs/{Misc => }/Server Main Controller.prefab (100%) rename Assets/Prefabs/{Misc => }/Server Main Controller.prefab.meta (100%) create mode 100644 Assets/Prefabs/Viewer Main Controller.prefab create mode 100644 Assets/Prefabs/Viewer Main Controller.prefab.meta diff --git a/Assets/Code/Viewer/ActViewer.cs b/Assets/Code/Viewer/ActViewer.cs index e4ad385..9ae3821 100644 --- a/Assets/Code/Viewer/ActViewer.cs +++ b/Assets/Code/Viewer/ActViewer.cs @@ -5,7 +5,7 @@ using UnityEngine.EventSystems; namespace BetterTee.Viewer { - public class ActController + public class ActViewer { [Header("Settings")] public ActSettings settings = null; diff --git a/Assets/Code/Viewer/LobbyController.cs b/Assets/Code/Viewer/LobbyController.cs new file mode 100644 index 0000000..c85aa8b --- /dev/null +++ b/Assets/Code/Viewer/LobbyController.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + + +namespace BetterTee.Viewer +{ + + public class LobbyController : MonoBehaviour + { + [Header("Objects")] + public Canvas canvas = null; + public EventSystem eventSystem = null; + public Action startGameAction = null; + public Text lobbyText = null; + public Text playersText = null; + public Text viewersText = null; + public Text playersList = null; + public Text viewersList = null; + public StartGameBtn startGameBtn = null; + + [Header("Prefabs")] + public GameObject lobbyTextPrefab; + public GameObject playersTextPrefab; + public GameObject viewersTextPrefab; + public GameObject playersListPrefab; + public GameObject viewersListPrefab; + public GameObject startGameBtnPrefab; + + protected void Start() { + canvas = GameObject.FindGameObjectWithTag("Canvas")?.GetComponent(); + eventSystem = GameObject.FindGameObjectWithTag("EventSystem")?.GetComponent(); + + lobbyText = Instantiate(lobbyTextPrefab, canvas.transform).GetComponent(); + playersText = Instantiate(playersTextPrefab, canvas.transform).GetComponent(); + viewersText = Instantiate(viewersTextPrefab, canvas.transform).GetComponent(); + playersList = Instantiate(playersListPrefab, canvas.transform).GetComponent(); + viewersList = Instantiate(viewersListPrefab, canvas.transform).GetComponent(); + startGameBtn = Instantiate(startGameBtnPrefab, canvas.transform).GetComponent(); + startGameBtn.lobbyController = this; + } + + public void OnLobbyStatusChange(ConnectedPlayerData[] players, ConnectedViewerData[] viewers) { + playersList.text = ""; + viewersList.text = ""; + + foreach(ConnectedPlayerData player in players) { + playersList.text += String.Format("[{0}] {1}\n", player.id, player.name); + } + + foreach(ConnectedViewerData viewer in viewers) { + viewersList.text += String.Format("[{0}] {1}\n", viewer.id, viewer.name); + } + } + + public void OnStartGameBtnPress() { + startGameAction(); + } + + protected void OnDestroy() { + Destroy(lobbyText.gameObject); + Destroy(playersText.gameObject); + Destroy(viewersText.gameObject); + Destroy(playersList.gameObject); + Destroy(viewersList.gameObject); + } + } +} diff --git a/Assets/Code/Viewer/LobbyController.cs.meta b/Assets/Code/Viewer/LobbyController.cs.meta new file mode 100644 index 0000000..a340be3 --- /dev/null +++ b/Assets/Code/Viewer/LobbyController.cs.meta @@ -0,0 +1,31 @@ +fileFormatVersion: 2 +guid: fdfe5faff2417844e90a58ebaee26d1a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - canvas: {instanceID: 0} + - eventSystem: {instanceID: 0} + - lobbyText: {instanceID: 0} + - playersText: {instanceID: 0} + - viewersText: {instanceID: 0} + - playersList: {instanceID: 0} + - viewersList: {instanceID: 0} + - startGameBtn: {instanceID: 0} + - lobbyTextPrefab: {fileID: 4296974857052366504, guid: c9dad4cb8a37b1a4ba7c2f8fc34776e9, + type: 3} + - playersTextPrefab: {fileID: 2701375965084900438, guid: 555a7eb2700e7ac4596020774a4450bb, + type: 3} + - viewersTextPrefab: {fileID: 5517075760296149523, guid: 17deacbc7a4a5fe458b491cfa6608d1f, + type: 3} + - playersListPrefab: {fileID: 8188877146660590661, guid: 84a62a0ae00165e418afb36de8439922, + type: 3} + - viewersListPrefab: {fileID: 7800282026214090873, guid: 03fa783d7d140f54cb9b3d03bbb1d9d8, + type: 3} + - startGameBtnPrefab: {fileID: 3739031463738071162, guid: 97b7444a26100194b8abf98ad84a633f, + type: 3} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Code/Viewer/StartGameBtn.cs b/Assets/Code/Viewer/StartGameBtn.cs new file mode 100644 index 0000000..b371958 --- /dev/null +++ b/Assets/Code/Viewer/StartGameBtn.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using UnityEngine.UI; +using UnityEngine.EventSystems; + + +namespace BetterTee.Viewer +{ + + public class StartGameBtn : MonoBehaviour + { + public LobbyController lobbyController; + + public void OnClick() { + lobbyController.OnStartGameBtnPress(); + } + } + +} \ No newline at end of file diff --git a/Assets/Code/Viewer/StartGameBtn.cs.meta b/Assets/Code/Viewer/StartGameBtn.cs.meta new file mode 100644 index 0000000..8fdea4f --- /dev/null +++ b/Assets/Code/Viewer/StartGameBtn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 064d7b2018fb8284a8bf839c2c4fd0b9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Code/Viewer/ViewerMainController.cs b/Assets/Code/Viewer/ViewerMainController.cs index 041c675..e113243 100644 --- a/Assets/Code/Viewer/ViewerMainController.cs +++ b/Assets/Code/Viewer/ViewerMainController.cs @@ -8,6 +8,97 @@ namespace BetterTee.Viewer public class ViewerMainController : MonoBehaviour { + [Header("WIP")] + public string address = "127.0.0.1"; + public string viewerName = "Unknown"; + public string gamePassword = "ASDF"; + + void Start() { + viewerName = Environment.MachineName; + ConnectToServer(address, viewerName); + } + + [Header("Objects")] + public ActViewer currentAct = null; + public LobbyController lobbyController = null; + + [Header("Prefabs")] + public GameObject lobbyControllerPrefab = null; + public GameObject drawingViewerPrefab = null; + public GameObject typingViewerPrefab = null; + + [Serializable] + public class InvalidActTypeException : Exception { + public readonly string actType; + + public InvalidActTypeException(string actType) { + this.actType = actType; + } + }; + + public void LoadAct(ActSettings settings) { + throw new InvalidActTypeException(settings.type); + } + + public void ConnectToServer(string address, string playerName) { + LogFilter.Debug = true; + Transport.activeTransport = GetComponent(); + NetworkClient.RegisterHandler(OnConnect); + NetworkClient.RegisterHandler(OnDisconnect); + NetworkClient.RegisterHandler(OnLobbyStatusChange); + NetworkClient.RegisterHandler(OnLobbyEnd); + NetworkClient.RegisterHandler(OnGameEnd); + NetworkClient.RegisterHandler(OnActInit); + NetworkClient.RegisterHandler(OnActStart); + NetworkClient.RegisterHandler(OnActEnd); + NetworkClient.Connect(address); + } + + public void StartGame() { + NetworkClient.Send(new NetMsg.Viewer.GameStart {}); + } + + #region Network Events + + protected void OnConnect(NetworkConnection connection, ConnectMessage message) { + Debug.Log("Sending ViewerLink message"); + connection.Send(new NetMsg.Viewer.ViewerLink { + viewerName = viewerName, + gamePassword = gamePassword + }); + + lobbyController = Instantiate(lobbyControllerPrefab, transform).GetComponent(); + lobbyController.startGameAction = StartGame; + } + + protected void OnDisconnect(NetworkConnection connection, DisconnectMessage message) { + Debug.LogWarning("Lost connection"); + } + + protected void OnLobbyStatusChange(NetworkConnection connection, NetMsg.Server.LobbyStatusChange message) { + lobbyController.OnLobbyStatusChange(message.players, message.viewers); + } + + protected void OnLobbyEnd(NetworkConnection connection, NetMsg.Server.LobbyEnd message) {} + + protected void OnGameEnd(NetworkConnection connection, NetMsg.Server.GameEnd message) {} + + protected void OnActInit(NetworkConnection connection, NetMsg.Server.ActInit message) { + LoadAct(message.settings); + //currentAct.ActInit(); + } + + protected void OnActStart(NetworkConnection connection, NetMsg.Server.ActStart message) { + //currentAct.ActStart(); + } + + protected void OnActEnd(NetworkConnection connection, NetMsg.Server.ActEnd message) { + //currentAct.ActEnd(); + //Destroy(currentAct); + } + + #endregion + } } \ No newline at end of file diff --git a/Assets/Code/Viewer/ViewerMainController.cs.meta b/Assets/Code/Viewer/ViewerMainController.cs.meta index eb32314..6c121f1 100644 --- a/Assets/Code/Viewer/ViewerMainController.cs.meta +++ b/Assets/Code/Viewer/ViewerMainController.cs.meta @@ -3,7 +3,12 @@ guid: 7de9e5b69cd5a9c4796053227593c096 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - lobbyController: {instanceID: 0} + - lobbyControllerPrefab: {fileID: 7830222156937957713, guid: a28b59fa0c0a2e24683c587d5638b099, + type: 3} + - drawingViewerPrefab: {instanceID: 0} + - typingViewerPrefab: {instanceID: 0} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/Prefabs/Misc/Lobby Controller.prefab b/Assets/Prefabs/Misc/Player Lobby Controller.prefab similarity index 100% rename from Assets/Prefabs/Misc/Lobby Controller.prefab rename to Assets/Prefabs/Misc/Player Lobby Controller.prefab diff --git a/Assets/Prefabs/Misc/Lobby Controller.prefab.meta b/Assets/Prefabs/Misc/Player Lobby Controller.prefab.meta similarity index 100% rename from Assets/Prefabs/Misc/Lobby Controller.prefab.meta rename to Assets/Prefabs/Misc/Player Lobby Controller.prefab.meta diff --git a/Assets/Prefabs/Misc/Lobby Text.prefab b/Assets/Prefabs/Misc/Player Lobby Text.prefab similarity index 100% rename from Assets/Prefabs/Misc/Lobby Text.prefab rename to Assets/Prefabs/Misc/Player Lobby Text.prefab diff --git a/Assets/Prefabs/Misc/Lobby Text.prefab.meta b/Assets/Prefabs/Misc/Player Lobby Text.prefab.meta similarity index 100% rename from Assets/Prefabs/Misc/Lobby Text.prefab.meta rename to Assets/Prefabs/Misc/Player Lobby Text.prefab.meta diff --git a/Assets/Prefabs/Misc/Start Button.prefab b/Assets/Prefabs/Misc/Start Button.prefab new file mode 100644 index 0000000..931d48e --- /dev/null +++ b/Assets/Prefabs/Misc/Start Button.prefab @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3738802717162588930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8157209055135050381} + - component: {fileID: 2125848621364196711} + - component: {fileID: 152315562129180734} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8157209055135050381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3738802717162588930} + 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: 800518150567200742} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2125848621364196711 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3738802717162588930} + m_CullTransparentMesh: 0 +--- !u!114 &152315562129180734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3738802717162588930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 8 + m_MaxSize: 80 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Start +--- !u!1 &3739031463738071162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 800518150567200742} + - component: {fileID: 7937598141472229571} + - component: {fileID: 3724447121527780808} + - component: {fileID: 2449453467759470303} + - component: {fileID: 3899701105600816867} + m_Layer: 5 + m_Name: Start Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &800518150567200742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3739031463738071162} + 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: + - {fileID: 8157209055135050381} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 430.9, y: 848} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7937598141472229571 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3739031463738071162} + m_CullTransparentMesh: 0 +--- !u!114 &3724447121527780808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3739031463738071162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2449453467759470303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3739031463738071162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3724447121527780808} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3899701105600816867} + m_MethodName: OnClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &3899701105600816867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3739031463738071162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 064d7b2018fb8284a8bf839c2c4fd0b9, type: 3} + m_Name: + m_EditorClassIdentifier: + lobbyController: {fileID: 0} diff --git a/Assets/Prefabs/Misc/Start Button.prefab.meta b/Assets/Prefabs/Misc/Start Button.prefab.meta new file mode 100644 index 0000000..3efe85e --- /dev/null +++ b/Assets/Prefabs/Misc/Start Button.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 97b7444a26100194b8abf98ad84a633f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Misc/Viewer Camera.prefab b/Assets/Prefabs/Misc/Viewer Camera.prefab new file mode 100644 index 0000000..0212c25 --- /dev/null +++ b/Assets/Prefabs/Misc/Viewer Camera.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1841744630836386782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1841744630836386787} + - component: {fileID: 1841744630836386780} + - component: {fileID: 1841744630836386781} + m_Layer: 0 + m_Name: Viewer Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1841744630836386787 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841744630836386782} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &1841744630836386780 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841744630836386782} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215688, g: 0.4745098, b: 0.22980398, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &1841744630836386781 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841744630836386782} + m_Enabled: 1 diff --git a/Assets/Prefabs/Misc/Viewer Camera.prefab.meta b/Assets/Prefabs/Misc/Viewer Camera.prefab.meta new file mode 100644 index 0000000..c54c883 --- /dev/null +++ b/Assets/Prefabs/Misc/Viewer Camera.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7969b23215d1fd84ba1b05c23f355db1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Misc/Viewer Lobby Controller.prefab b/Assets/Prefabs/Misc/Viewer Lobby Controller.prefab new file mode 100644 index 0000000..bcb36c3 --- /dev/null +++ b/Assets/Prefabs/Misc/Viewer Lobby Controller.prefab @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7830222156937957713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7830222156937957714} + - component: {fileID: 5558618277305773976} + m_Layer: 0 + m_Name: Viewer Lobby Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7830222156937957714 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7830222156937957713} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5558618277305773976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7830222156937957713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fdfe5faff2417844e90a58ebaee26d1a, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 0} + eventSystem: {fileID: 0} + lobbyText: {fileID: 0} + playersText: {fileID: 0} + viewersText: {fileID: 0} + playersList: {fileID: 0} + viewersList: {fileID: 0} + startGameBtn: {fileID: 0} + lobbyTextPrefab: {fileID: 4296974857052366504, guid: c9dad4cb8a37b1a4ba7c2f8fc34776e9, + type: 3} + playersTextPrefab: {fileID: 2701375965084900438, guid: 555a7eb2700e7ac4596020774a4450bb, + type: 3} + viewersTextPrefab: {fileID: 5517075760296149523, guid: 17deacbc7a4a5fe458b491cfa6608d1f, + type: 3} + playersListPrefab: {fileID: 8188877146660590661, guid: 84a62a0ae00165e418afb36de8439922, + type: 3} + viewersListPrefab: {fileID: 7800282026214090873, guid: 03fa783d7d140f54cb9b3d03bbb1d9d8, + type: 3} + startGameBtnPrefab: {fileID: 3739031463738071162, guid: 97b7444a26100194b8abf98ad84a633f, + type: 3} diff --git a/Assets/Prefabs/Misc/Viewer Lobby Controller.prefab.meta b/Assets/Prefabs/Misc/Viewer Lobby Controller.prefab.meta new file mode 100644 index 0000000..7f4eaa5 --- /dev/null +++ b/Assets/Prefabs/Misc/Viewer Lobby Controller.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a28b59fa0c0a2e24683c587d5638b099 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Misc/Viewer Lobby Text.prefab b/Assets/Prefabs/Misc/Viewer Lobby Text.prefab new file mode 100644 index 0000000..bbed1cb --- /dev/null +++ b/Assets/Prefabs/Misc/Viewer Lobby Text.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4296974857052366504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4296974857052366505} + - component: {fileID: 4296974857052366507} + - component: {fileID: 4296974857052366506} + m_Layer: 5 + m_Name: Viewer Lobby Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4296974857052366505 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4296974857052366504} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -98.549965, y: -12} + m_SizeDelta: {x: 858.9, y: 200} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4296974857052366507 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4296974857052366504} + m_CullTransparentMesh: 0 +--- !u!114 &4296974857052366506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4296974857052366504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 111 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Lobby diff --git a/Assets/Prefabs/Misc/Viewer Lobby Text.prefab.meta b/Assets/Prefabs/Misc/Viewer Lobby Text.prefab.meta new file mode 100644 index 0000000..183c4ab --- /dev/null +++ b/Assets/Prefabs/Misc/Viewer Lobby Text.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c9dad4cb8a37b1a4ba7c2f8fc34776e9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player Main Controller.prefab b/Assets/Prefabs/Player Main Controller.prefab index 8750a5e..99ec74e 100644 --- a/Assets/Prefabs/Player Main Controller.prefab +++ b/Assets/Prefabs/Player Main Controller.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: address: 127.0.0.1 playerName: Steffo - gamePassword: ASDF + gamePassword: currentAct: {fileID: 0} lobbyController: {fileID: 0} lobbyControllerPrefab: {fileID: 6155809969824259580, guid: b44ef03800892be43b5bb7033900174c, diff --git a/Assets/Prefabs/Misc/Server Main Controller.prefab b/Assets/Prefabs/Server Main Controller.prefab similarity index 100% rename from Assets/Prefabs/Misc/Server Main Controller.prefab rename to Assets/Prefabs/Server Main Controller.prefab diff --git a/Assets/Prefabs/Misc/Server Main Controller.prefab.meta b/Assets/Prefabs/Server Main Controller.prefab.meta similarity index 100% rename from Assets/Prefabs/Misc/Server Main Controller.prefab.meta rename to Assets/Prefabs/Server Main Controller.prefab.meta diff --git a/Assets/Prefabs/Viewer Main Controller.prefab b/Assets/Prefabs/Viewer Main Controller.prefab new file mode 100644 index 0000000..e32a898 --- /dev/null +++ b/Assets/Prefabs/Viewer Main Controller.prefab @@ -0,0 +1,94 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &773637803096473374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 773637803096473369} + - component: {fileID: 773637803096473368} + - component: {fileID: 773637803096473371} + m_Layer: 0 + m_Name: Viewer Main Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &773637803096473369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773637803096473374} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &773637803096473368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773637803096473374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7de9e5b69cd5a9c4796053227593c096, type: 3} + m_Name: + m_EditorClassIdentifier: + address: 127.0.0.1 + viewerName: Unknown + gamePassword: + lobbyController: {fileID: 0} + lobbyControllerPrefab: {fileID: 7830222156937957713, guid: a28b59fa0c0a2e24683c587d5638b099, + type: 3} + drawingViewerPrefab: {fileID: 0} + typingViewerPrefab: {fileID: 0} +--- !u!114 &773637803096473371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773637803096473374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7424c1070fad4ba2a7a96b02fbeb4bb, type: 3} + m_Name: + m_EditorClassIdentifier: + OnClientConnected: + m_PersistentCalls: + m_Calls: [] + OnClientDataReceived: + m_PersistentCalls: + m_Calls: [] + OnClientError: + m_PersistentCalls: + m_Calls: [] + OnClientDisconnected: + m_PersistentCalls: + m_Calls: [] + OnServerConnected: + m_PersistentCalls: + m_Calls: [] + OnServerDataReceived: + m_PersistentCalls: + m_Calls: [] + OnServerError: + m_PersistentCalls: + m_Calls: [] + OnServerDisconnected: + m_PersistentCalls: + m_Calls: [] + port: 7777 + NoDelay: 1 + serverMaxMessageSize: 16384 + clientMaxMessageSize: 16384 diff --git a/Assets/Prefabs/Viewer Main Controller.prefab.meta b/Assets/Prefabs/Viewer Main Controller.prefab.meta new file mode 100644 index 0000000..75312bd --- /dev/null +++ b/Assets/Prefabs/Viewer Main Controller.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8b3e072540bac1d42a09c1dd0fc76bca +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Player.unity b/Assets/Scenes/Player.unity index fe350de..d3a2c54 100644 --- a/Assets/Scenes/Player.unity +++ b/Assets/Scenes/Player.unity @@ -445,5 +445,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6762738775296509204, guid: 416e45cce018dc04195ffc5d403b4fd6, + type: 3} + propertyPath: address + value: 192.168.1.17 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 416e45cce018dc04195ffc5d403b4fd6, type: 3} diff --git a/Assets/Scenes/Server.unity b/Assets/Scenes/Server.unity index cce629c..3573110 100644 --- a/Assets/Scenes/Server.unity +++ b/Assets/Scenes/Server.unity @@ -121,6 +121,194 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &806615450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 19295868197739831, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_Name + value: Canvas + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 271969daef7419b4ebe43f38cec27106, type: 3} +--- !u!1001 &1620932269 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3025113431455174604, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_Name + value: Event System + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ee353e448c935064ebc2db8b1c2e8442, type: 3} --- !u!1001 &2877268335210782679 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Viewer.unity b/Assets/Scenes/Viewer.unity index 21cb1e4..bf8c70c 100644 --- a/Assets/Scenes/Viewer.unity +++ b/Assets/Scenes/Viewer.unity @@ -121,86 +121,344 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1600768605 -GameObject: +--- !u!1001 &1526568814 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1600768608} - - component: {fileID: 1600768607} - - component: {fileID: 1600768606} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1600768606 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600768605} - m_Enabled: 1 ---- !u!20 &1600768607 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600768605} - m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1600768608 -Transform: + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 19295868197739831, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_Name + value: Canvas + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19295868197739819, guid: 271969daef7419b4ebe43f38cec27106, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 271969daef7419b4ebe43f38cec27106, type: 3} +--- !u!1001 &1910533065 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1600768605} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3025113431455174604, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_Name + value: Event System + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3025113431455174593, guid: ee353e448c935064ebc2db8b1c2e8442, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ee353e448c935064ebc2db8b1c2e8442, type: 3} +--- !u!1001 &773637803984897349 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 773637803096473374, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_Name + value: Viewer Main Controller + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 773637803096473369, guid: 8b3e072540bac1d42a09c1dd0fc76bca, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8b3e072540bac1d42a09c1dd0fc76bca, type: 3} +--- !u!1001 &1841744629504250243 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1841744630836386782, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_Name + value: Viewer Camera + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386787, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386780, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_BackGroundColor.r + value: 0.06363475 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386780, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_BackGroundColor.g + value: 0.20754719 + objectReference: {fileID: 0} + - target: {fileID: 1841744630836386780, guid: 7969b23215d1fd84ba1b05c23f355db1, + type: 3} + propertyPath: m_BackGroundColor.b + value: 0.08362258 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7969b23215d1fd84ba1b05c23f355db1, type: 3} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 53efedc..cb6a709 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,10 +5,13 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Player.unity guid: 2cda990e2423bbf4892e6590ba056729 - enabled: 0 path: Assets/Scenes/Server.unity guid: 29c4d09f87832d24fbc08b364afc5b30 + - enabled: 0 + path: Assets/Scenes/Viewer.unity + guid: 73fa8e1d2e6de384a94ce9ff74269804 m_configObjects: {} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4654e13..71c9e0f 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}