From 6a3ffd1d9c7f43cd911f838703cee3a06f9ad7fe Mon Sep 17 00:00:00 2001 From: Sylvain Renault <sylvain.renault@hhi.fraunhofer.de> Date: Fri, 29 Apr 2022 10:25:23 +0200 Subject: [PATCH] Little changes in scene. Renamed the server scriptables. --- .../Scenes/WorldStorageSample.unity | 44 +++++++++++++++++++ ...gs.asset => WorldStorageSettingsHHI.asset} | 5 ++- .../WorldStorageSettingsHHI.asset.meta | 8 ++++ .../WorldStorageSettingsHHI_Intern.asset | 18 ++++++++ ...WorldStorageSettingsHHI_Intern.asset.meta} | 0 Packages/unity-world-storage-package | 2 +- 6 files changed, 74 insertions(+), 3 deletions(-) rename Assets/ETSI.ARF/ARF World Storage API/Scriptables/{myWorldStorageSettings.asset => WorldStorageSettingsHHI.asset} (76%) create mode 100644 Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset.meta create mode 100644 Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI_Intern.asset rename Assets/ETSI.ARF/ARF World Storage API/Scriptables/{myWorldStorageSettings.asset.meta => WorldStorageSettingsHHI_Intern.asset.meta} (100%) diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity b/Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity index 2e05d63..cb0bbf5 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity +++ b/Assets/ETSI.ARF/ARF World Storage API/Scenes/WorldStorageSample.unity @@ -394,3 +394,47 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1056454763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1056454765} + - component: {fileID: 1056454764} + m_Layer: 0 + m_Name: ARFServer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1056454764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056454763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02da7adcc65f4694684d71e61d88070b, type: 3} + m_Name: + m_EditorClassIdentifier: + worldStorageServer: {fileID: 11400000, guid: b656b4f6c38b83148a06d0ccd523227c, type: 2} +--- !u!4 &1056454765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056454763} + 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: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scriptables/myWorldStorageSettings.asset b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset similarity index 76% rename from Assets/ETSI.ARF/ARF World Storage API/Scriptables/myWorldStorageSettings.asset rename to Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset index 58c245c..7117b62 100644 --- a/Assets/ETSI.ARF/ARF World Storage API/Scriptables/myWorldStorageSettings.asset +++ b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset @@ -10,8 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3} - m_Name: myWorldStorageSettings + m_Name: WorldStorageSettingsHHI m_EditorClassIdentifier: serverName: HHI Servers - basePath: https://localhosts + creatorUID: 9739c1d7-b86d-4894-9f4a-2e43ea6cfdf6 + basePath: https://ics1.hhi.fraunhofer.de port: 40311 diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset.meta new file mode 100644 index 0000000..77cd62f --- /dev/null +++ b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd253fbdf276d5e47bef25ba893dc7a4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI_Intern.asset b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI_Intern.asset new file mode 100644 index 0000000..898ef1f --- /dev/null +++ b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI_Intern.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: e4b7be4c33f68d0418c3b4e1a7053d91, type: 3} + m_Name: WorldStorageSettingsHHI_Intern + m_EditorClassIdentifier: + serverName: HHI Servers (intern test) + creatorUID: 2af3e69e-91d6-4021-99d1-188917df8ea8 + basePath: http://vm009254.fe.hhi.de/ + port: 40311 diff --git a/Assets/ETSI.ARF/ARF World Storage API/Scriptables/myWorldStorageSettings.asset.meta b/Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI_Intern.asset.meta similarity index 100% rename from Assets/ETSI.ARF/ARF World Storage API/Scriptables/myWorldStorageSettings.asset.meta rename to Assets/ETSI.ARF/ARF World Storage API/Scriptables/WorldStorageSettingsHHI_Intern.asset.meta diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package index 11be4dd..0fe54fb 160000 --- a/Packages/unity-world-storage-package +++ b/Packages/unity-world-storage-package @@ -1 +1 @@ -Subproject commit 11be4ddf097238232e569513fb17d319daccacc4 +Subproject commit 0fe54fb13060f8856ee7545408ef6c6329c832df -- GitLab