From 94b4b7b8ed842567b0d2eddb0318540d8ece0571 Mon Sep 17 00:00:00 2001 From: barasakar Date: Fri, 12 Nov 2021 11:59:08 -0600 Subject: [PATCH 1/3] Disable the Create tab and other features on Komodo menu for desktop view (staged main and prefab as-is) --- .../RuntimeSession/FreeFlightController.cs | 13 +++++++++ .../Managers/EventSystemManager.cs | 4 --- .../RuntimeSession/Managers/UIManager.cs | 27 +++++++++++++++++++ .../RuntimeSession/ToggleMenuDisplayMode.cs | 4 ++- .../WebXRManagerEditorSimulator.cs | 4 +-- .../Settings/Open XR Package Settings.asset | 23 ++++++++++++++++ Komodo/Assets/XR.meta | 8 ++++++ Komodo/Assets/XR/Settings.meta | 8 ++++++ 8 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 Komodo/Assets/XR.meta create mode 100644 Komodo/Assets/XR/Settings.meta diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs index 0c583aa..ff12ff5 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs @@ -140,6 +140,8 @@ public void OnUpdate(float deltaTime) } SyncXRWithSpectator(); + + TeleportPlayerWithRightClick(); } private void onXRChange(WebXRState state, int viewsCount, Rect leftRect, Rect rightRect) @@ -441,5 +443,16 @@ public static float ClampAngle(float angle, float min, float max) return Mathf.Clamp(angle, min, max); } + /// + /// Enable teleportation with right click. + /// + public void TeleportPlayerWithRightClick() + { + if (Input.GetMouseButtonDown(1)) + { + + } + } + } } diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/EventSystemManager.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/EventSystemManager.cs index 59814ea..01ecb2e 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/EventSystemManager.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/EventSystemManager.cs @@ -98,7 +98,6 @@ public void SetToDesktop() //turn on and off appropriate eventsystem to handle appropriate input desktopStandaloneInput.gameObject.SetActive(true); xrStandaloneInput.gameObject.SetActive(false); - } [ContextMenu("Set to XR")] @@ -107,7 +106,6 @@ public void SetToXR() GetComponent().SetVRViewPort(); desktopStandaloneInput.gameObject.SetActive(false); xrStandaloneInput.gameObject.SetActive(true); - } @@ -205,8 +203,6 @@ public void RemoveInputSourceWithoutClick(TriggerEventInputSource inputSource) foreach (var canvas in canvasesToReceiveEvents) canvas.worldCamera = inputSource_LeftHand.eventCamera; - - //set linerenderer to use for line to UI interactions xrStandaloneInput.RegisterInputSource(inputSource_LeftHand); diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs index 91b4d2d..a72fb77 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs @@ -582,5 +582,32 @@ public bool IsReady () return false; } + + /// + /// This function will disable Create and Height Calibration Panels for Desktop view. + /// + public void DisableMenuFeaturesForDesktop() + { + + //KomodoMenu -> Tabs -> Create + GameObject createMenu = menu.transform.Find("Tabs").transform.Find("Create").gameObject; + + //KomodoMenu -> Panels -> SettingsMenu + GameObject SettingsMenu = menu.transform.Find("Panels").transform.Find("SettingsMenu").gameObject; + + //KomodoMenu -> Panels -> SettingsMenu -> HeightCalibration + GameObject heightCalibration = SettingsMenu.transform.Find("HeightCalibration").gameObject; + + //KomodoMenu -> Panels -> SettingsMenu -> NotCalibrating -> CalibrateHeightButton + GameObject calibrationButtons = SettingsMenu.transform.Find("NotCalibrating").transform.Find("CalibrateHeightButton").gameObject; + + //KomodoMenu -> Panels -> SettingsMenu -> NotCalibrating -> ManuallyAdjustHeight + GameObject manuallyAdjustHeight = SettingsMenu.transform.Find("NotCalibrating").transform.Find("ManuallyAdjustHeight").gameObject; + + createMenu.gameObject.SetActive(false); + heightCalibration.gameObject.SetActive(false); + calibrationButtons.gameObject.SetActive(false); + manuallyAdjustHeight.gameObject.SetActive(false); + } } } diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs index 535bb15..64e9f2f 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs @@ -51,7 +51,7 @@ public void SetVRViewPort() { UIManager.Instance.PlaceMenuOnCurrentHand(); UIManager.Instance.ConvertMenuToAlwaysExpanded(); - + return; } } @@ -69,6 +69,8 @@ public void SetDesktopViewport() UIManager.Instance.ConvertMenuToExpandable(false); + UIManager.Instance.DisableMenuFeaturesForDesktop(); + return; } } diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/WebXRManagerEditorSimulator.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/WebXRManagerEditorSimulator.cs index 7985a79..e951734 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/WebXRManagerEditorSimulator.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/WebXRManagerEditorSimulator.cs @@ -21,16 +21,14 @@ void Update () { bool isVRActive = XRSettings.isDeviceActive; //tells us whether the device is attached (not necessarily if it is being worn or used.) if (isVRActive && !previousIsVRActive) { - Debug.Log("VR Headset detected."); OnXRChange.Invoke(WebXRState.VR, 2, new Rect(), new Rect()); } if (!isVRActive && previousIsVRActive) { - Debug.Log("VR Headset no longer detected."); OnXRChange.Invoke(WebXRState.NORMAL, 1, new Rect(), new Rect()); } previousIsVRActive = isVRActive; } #endif -} +} \ No newline at end of file diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/XR/Settings/Open XR Package Settings.asset b/Komodo/Assets/Packages/KomodoCore/Runtime/XR/Settings/Open XR Package Settings.asset index 9f7a417..638a889 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/XR/Settings/Open XR Package Settings.asset +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/XR/Settings/Open XR Package Settings.asset @@ -139,6 +139,7 @@ MonoBehaviour: - {fileID: -1007786447557025201} - {fileID: 6996874771206359924} - {fileID: 8380146115642572116} + - {fileID: 7703375418623662417} m_renderMode: 1 m_depthSubmissionMode: 0 --- !u!114 &2910771567588298596 @@ -197,6 +198,28 @@ MonoBehaviour: priority: 0 required: 0 ignoreValidationErrors: 0 +--- !u!114 &7703375418623662417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} + m_Name: RuntimeDebuggerOpenXRFeature Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 + cacheSize: 1048576 + perThreadCacheSize: 51200 --- !u!114 &7731443339745850861 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Komodo/Assets/XR.meta b/Komodo/Assets/XR.meta new file mode 100644 index 0000000..880ec98 --- /dev/null +++ b/Komodo/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0214b469af0f8d478c3de289822b7e2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Komodo/Assets/XR/Settings.meta b/Komodo/Assets/XR/Settings.meta new file mode 100644 index 0000000..20c353f --- /dev/null +++ b/Komodo/Assets/XR/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3664116d4e7e504388e512ecb416855 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 624ba0fb9a5ec8afc541bfddb2251cddf3a898ad Mon Sep 17 00:00:00 2001 From: barasakar Date: Fri, 12 Nov 2021 12:00:15 -0600 Subject: [PATCH 2/3] Fixed a bug about menu anchor placement --- .../RuntimeSession/DrawTeleportIndicator.cs | 10 +++++++ .../DrawTeleportIndicator.cs.meta | 11 ++++++++ .../RuntimeSession/FreeFlightController.cs | 26 ++++++++++++------- .../RuntimeSession/Managers/UIManager.cs | 19 +++++++------- .../RuntimeSession/ToggleMenuDisplayMode.cs | 6 +++-- 5 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs create mode 100644 Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs.meta diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs new file mode 100644 index 0000000..9874be5 --- /dev/null +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Komodo.Utilities; + +public class DrawTeleportIndicator : MonoBehaviour +{ + + +} diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs.meta b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs.meta new file mode 100644 index 0000000..a9c94a7 --- /dev/null +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/DrawTeleportIndicator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 14a58e7f467c9084f9965cb35b93436c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs index ff12ff5..0b517db 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/FreeFlightController.cs @@ -139,9 +139,15 @@ public void OnUpdate(float deltaTime) HyperspeedPanPlayerFromInput(); } - SyncXRWithSpectator(); + // if (Input.GetMouseButtonDown(1)) { + // ShowTeleportIndicator(); + // } + + // if (Input.GetMouseButtonUp(1)) { + // hideTeleportIndicator(); + // } - TeleportPlayerWithRightClick(); + SyncXRWithSpectator(); } private void onXRChange(WebXRState state, int viewsCount, Rect leftRect, Rect rightRect) @@ -446,13 +452,15 @@ public static float ClampAngle(float angle, float min, float max) /// /// Enable teleportation with right click. /// - public void TeleportPlayerWithRightClick() - { - if (Input.GetMouseButtonDown(1)) - { - - } - } + // public void ShowTeleportIndicator() + // { + // gameObject.transform.Find("TeleportIndicator").gameObject.SetActive(true); + // } + + // public void hideTeleportIndicator() + // { + // gameObject.transform.Find("TeleportIndicator").gameObject.SetActive(true); + // } } } diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs index a72fb77..7b9a49b 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/UIManager.cs @@ -586,12 +586,8 @@ public bool IsReady () /// /// This function will disable Create and Height Calibration Panels for Desktop view. /// - public void DisableMenuFeaturesForDesktop() + public void EnableHightCalibrationButtons() { - - //KomodoMenu -> Tabs -> Create - GameObject createMenu = menu.transform.Find("Tabs").transform.Find("Create").gameObject; - //KomodoMenu -> Panels -> SettingsMenu GameObject SettingsMenu = menu.transform.Find("Panels").transform.Find("SettingsMenu").gameObject; @@ -604,10 +600,15 @@ public void DisableMenuFeaturesForDesktop() //KomodoMenu -> Panels -> SettingsMenu -> NotCalibrating -> ManuallyAdjustHeight GameObject manuallyAdjustHeight = SettingsMenu.transform.Find("NotCalibrating").transform.Find("ManuallyAdjustHeight").gameObject; - createMenu.gameObject.SetActive(false); - heightCalibration.gameObject.SetActive(false); - calibrationButtons.gameObject.SetActive(false); - manuallyAdjustHeight.gameObject.SetActive(false); + //createMenu.gameObject.SetActive(false); + heightCalibration.gameObject.SetActive(true); + calibrationButtons.gameObject.SetActive(true); + manuallyAdjustHeight.gameObject.SetActive(true); + } + + public void EnableCreateMenu() { + GameObject createMenu = menu.transform.Find("Tabs").transform.Find("Create").gameObject; + createMenu.gameObject.SetActive(true); } } } diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs index 64e9f2f..fe6a40b 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/ToggleMenuDisplayMode.cs @@ -51,6 +51,10 @@ public void SetVRViewPort() { UIManager.Instance.PlaceMenuOnCurrentHand(); UIManager.Instance.ConvertMenuToAlwaysExpanded(); + + UIManager.Instance.EnableCreateMenu(); + + UIManager.Instance.EnableHightCalibrationButtons(); return; } @@ -68,8 +72,6 @@ public void SetDesktopViewport() UIManager.Instance.menuCanvas.renderMode = RenderMode.ScreenSpaceOverlay; UIManager.Instance.ConvertMenuToExpandable(false); - - UIManager.Instance.DisableMenuFeaturesForDesktop(); return; } From 911c5b702db61f5c067d71ac9497fde0f46d6b3f Mon Sep 17 00:00:00 2001 From: Brandon Dang Date: Fri, 12 Nov 2021 13:31:47 -0600 Subject: [PATCH 3/3] re-turn off VR controls, fix OnDestroy bug, fix Settings panel color, fix socketIODisplay bug --- .../KomodoCoreAssets/Scenes/Main.unity | 435 ++++++++++++++++++ .../KomodoCore/Runtime/Prefabs/MenuUI.prefab | 66 +-- .../Runtime/Prefabs/PlayerSet.prefab | 19 +- .../Managers/NetworkUpdateHandler.cs | 10 +- Komodo/Packages/packages-lock.json | 2 +- 5 files changed, 476 insertions(+), 56 deletions(-) diff --git a/Komodo/Assets/Packages/KomodoCore/KomodoCoreAssets/Scenes/Main.unity b/Komodo/Assets/Packages/KomodoCore/KomodoCoreAssets/Scenes/Main.unity index e1c1aa7..e9d1cd4 100644 --- a/Komodo/Assets/Packages/KomodoCore/KomodoCoreAssets/Scenes/Main.unity +++ b/Komodo/Assets/Packages/KomodoCore/KomodoCoreAssets/Scenes/Main.unity @@ -3465,6 +3465,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 146268657187939159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 146268657187939159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 146268657187939159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 146268657187939159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 469097970807562543, guid: 0a1fe9a4692a92b429808dc7c4de1de1, type: 3} propertyPath: m_AnchorMax.y @@ -3495,6 +3515,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 601320268341031183, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 601320268341031183, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 601320268341031183, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 601320268341031183, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 601320268341031183, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 105 + objectReference: {fileID: 0} + - target: {fileID: 601320268341031183, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1019810391216920754, guid: 0a1fe9a4692a92b429808dc7c4de1de1, type: 3} propertyPath: m_AnchorMax.y @@ -3830,6 +3880,161 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2836976638233774833, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976638233774833, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976638233774833, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976638233774833, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976638233774833, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976639143132196, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976639143132196, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976639143132196, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976639143132196, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976639143132196, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2836976639143132196, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2994554221519044153, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2994554221519044153, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2994554221519044153, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2994554221519044153, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2995466039106973544, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2995466039106973544, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2995466039106973544, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2995466039106973544, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2995466039106973544, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2995466039106973544, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3758330276156789186, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3758330276156789186, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3758330276156789186, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3758330276156789186, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3758330276156789186, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3758330276156789186, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4609074005833973159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4609074005833973159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4609074005833973159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4609074005833973159, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4899851360655828573, guid: 0a1fe9a4692a92b429808dc7c4de1de1, type: 3} propertyPath: m_AnchorMax.y @@ -3860,6 +4065,121 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5464605466693063169, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5464605466693063169, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5464605466693063169, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5464605466693063169, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5464605466693063169, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5573069062318929640, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5573069062318929640, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5573069062318929640, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5573069062318929640, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5573069062318929640, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5573069062318929640, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5895907627220152936, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5895907627220152936, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5895907627220152936, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5895907627220152936, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5895907627220152936, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5895907627220152936, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6231765590358564694, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6231765590358564694, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6231765590358564694, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6231765590358564694, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6231765590358564694, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6231765590358564694, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6741963814757406207, guid: 0a1fe9a4692a92b429808dc7c4de1de1, type: 3} propertyPath: m_AnchorMax.y @@ -3890,6 +4210,121 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7360029440119842727, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7360029440119842727, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7360029440119842727, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7360029440119842727, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8450240680962613750, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8450240680962613750, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8450240680962613750, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8450240680962613750, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8586586948586574357, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8586586948586574357, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8586586948586574357, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8586586948586574357, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8935285792695981252, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8935285792695981252, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8935285792695981252, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8935285792695981252, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8935285792695981252, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966863333020665586, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966863333020665586, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966863333020665586, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966863333020665586, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966863333020665586, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8966863333020665586, guid: 0a1fe9a4692a92b429808dc7c4de1de1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a1fe9a4692a92b429808dc7c4de1de1, type: 3} --- !u!114 &6164736969038234897 stripped diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/MenuUI.prefab b/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/MenuUI.prefab index 83a8492..c0f55ab 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/MenuUI.prefab +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/MenuUI.prefab @@ -681,7 +681,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4091276155227089280 RectTransform: m_ObjectHideFlags: 0 @@ -1796,7 +1796,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8766869811656989108 RectTransform: m_ObjectHideFlags: 0 @@ -1816,7 +1816,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 105, y: -95} + m_AnchoredPosition: {x: 105, y: -60} m_SizeDelta: {x: 210, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1886875307629036608 @@ -2461,10 +2461,10 @@ RectTransform: m_Father: {fileID: 7700205268373815943} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 110, y: -140} - m_SizeDelta: {x: 210, y: 200} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1377807928677562121 MonoBehaviour: @@ -5592,10 +5592,10 @@ RectTransform: m_Father: {fileID: 7700205268373815943} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -5} - m_SizeDelta: {x: 210, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &1203963429663881877 CanvasRenderer: @@ -8297,10 +8297,10 @@ RectTransform: m_Father: {fileID: 2040148651102960158} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 105, y: -180} - m_SizeDelta: {x: 75, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7700205267672626262 CanvasRenderer: @@ -8480,7 +8480,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7700205267741768715 RectTransform: m_ObjectHideFlags: 0 @@ -8497,10 +8497,10 @@ RectTransform: m_Father: {fileID: 2438115558609078599} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 185, y: -35} + m_SizeDelta: {x: 45, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7700205267741768719 CanvasRenderer: @@ -8720,10 +8720,10 @@ RectTransform: m_Father: {fileID: 7700205267741768715} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 22.5, y: -5} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7700205267790156600 CanvasRenderer: @@ -9167,10 +9167,10 @@ RectTransform: m_Father: {fileID: 7700205267839848467} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -450} - m_SizeDelta: {x: 220, y: 245} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!222 &7700205268373815940 CanvasRenderer: @@ -9239,7 +9239,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9672,10 +9672,10 @@ RectTransform: m_Father: {fileID: 7700205267741768715} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 22.5, y: -55} + m_SizeDelta: {x: 55, y: 15} m_Pivot: {x: 0.5, y: 0} --- !u!222 &7700205268660593576 CanvasRenderer: diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/PlayerSet.prefab b/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/PlayerSet.prefab index 385b67c..746fe0f 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/PlayerSet.prefab +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Prefabs/PlayerSet.prefab @@ -1122,7 +1122,7 @@ MonoBehaviour: onUpFlick: m_PersistentCalls: m_Calls: [] - currentTransform: {fileID: 0} + hoveredObjectTransform: {fileID: 0} throwForce: 1.2 --- !u!114 &2310410839999614777 MonoBehaviour: @@ -1421,7 +1421,7 @@ MonoBehaviour: onUpFlick: m_PersistentCalls: m_Calls: [] - currentTransform: {fileID: 0} + hoveredObjectTransform: {fileID: 0} throwForce: 1.2 --- !u!114 &2310716809689014119 MonoBehaviour: @@ -7031,21 +7031,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6164443520166499296, guid: 3773d0422e0122743ad9688a0d03d9dd, - type: 3} - propertyPath: m_Color.b - value: 0.16078432 - objectReference: {fileID: 0} - - target: {fileID: 6164443520166499296, guid: 3773d0422e0122743ad9688a0d03d9dd, - type: 3} - propertyPath: m_Color.g - value: 0.16078432 - objectReference: {fileID: 0} - - target: {fileID: 6164443520166499296, guid: 3773d0422e0122743ad9688a0d03d9dd, - type: 3} - propertyPath: m_Color.r - value: 0.16078432 - objectReference: {fileID: 0} - target: {fileID: 6555541029743400969, guid: 3773d0422e0122743ad9688a0d03d9dd, type: 3} propertyPath: m_AnchorMax.y diff --git a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/NetworkUpdateHandler.cs b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/NetworkUpdateHandler.cs index 5819b06..22b3a10 100644 --- a/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/NetworkUpdateHandler.cs +++ b/Komodo/Assets/Packages/KomodoCore/Runtime/Scripts/RuntimeSession/Managers/NetworkUpdateHandler.cs @@ -247,10 +247,6 @@ public void Awake() Debug.LogWarning("No model data template was found for NetworkManager. Imported models may use editor template."); } - if (socketIODisplay == null) { - throw new System.Exception("You must assign a socketIODisplay in NetworkUpdateHandler."); - } - _CreateSocketSimulator(); _GetParams(); @@ -262,6 +258,10 @@ public void Awake() public void Start() { + if (socketIODisplay == null) { + throw new System.Exception("You must assign a socketIODisplay in NetworkUpdateHandler."); + } + GlobalMessageManager.Instance.Subscribe("sync", (data) => _DeserializeAndProcessSyncData(data)); GlobalMessageManager.Instance.Subscribe("interaction", (data) => _DeserializeAndProcessInteractionData(data)); @@ -472,7 +472,7 @@ public void ProcessMessage(string typeAndMessage) } } - public void OnApplicationQuit() + public void OnDestroy() { //deregister our update loops if (GameStateManager.IsAlive) diff --git a/Komodo/Packages/packages-lock.json b/Komodo/Packages/packages-lock.json index a16bae3..2394420 100644 --- a/Komodo/Packages/packages-lock.json +++ b/Komodo/Packages/packages-lock.json @@ -279,7 +279,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.8", + "version": "2.1.7", "depth": 1, "source": "registry", "dependencies": {