diff --git a/CHANGELOG.md b/CHANGELOG.md index 83a366a2d..d78f95e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # Changelog - VR Builder -**v4.4.0 (2024/10/31 - Current)** +**v5.0.0 (2024/11/11 - Current)** + +*[Changed]* +- VR Builder now supports Unity 6 out of the box. Unity 2022 and previous versions are not officially supported by VR Builder 5. +- Since Unity 6 uses URP by default, we now consider URP as our default render pipeline as well, and updated our content accordingly. +- The default interaction component is now based on XRI 3. This entails a completely new rig (based on the XRI default rig) and some updated interactions. +- The default raycast and interaction layers for teleportation are now named "Teleport" instead of "XR Teleport" and set to layer 31 if possible. +- Teleportation anchors now have two more options: Add Snap Volume and Add Interaction Affordance, respectively auto configuring the anchor so that the teleportation ray snaps to it and so that it provides affordance when hovered. +- Changed and tidied up namespaces. This can result in API breaks on custom content, but it should be a simple case of pointing to the new namespace. +- Merged Text-to-Speech and Basic Interaction assemblies in the Core assembly, in order to simplify the architecture. Custom content that referenced these assemblies now needs to reference the Core assembly. +- Removed obsolete code. + +*[Known issues]* +- There is no automated upgrade path from VR Builder 4 processes. It's technically still possible by manually editing the JSONs, but we recommend not upgrading a project in progress. + +**v4.4.0 (2024/10/31)** *[Added]* - The `Object in Collider` condition now supports multiple object references and lets the user specify a number of objects that needs to be in the collider. diff --git a/Demo/Editor/DemoSceneLoader.cs b/Demo/Editor/DemoSceneLoader.cs index 9cdf6aab0..a9f1f3ebb 100644 --- a/Demo/Editor/DemoSceneLoader.cs +++ b/Demo/Editor/DemoSceneLoader.cs @@ -4,15 +4,15 @@ using UnityEditor.SceneManagement; using UnityEngine; -namespace VRBuilder.Editor.DemoScene +namespace VRBuilder.Demo.Editor { /// /// Menu item for loading the demo scene after checking the process file is in the StreamingAssets folder. /// public static class DemoSceneLoader { - private const string demoSceneAssetsPath = "Assets/MindPort/VR Builder/Core/Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity"; - private const string demoScenePackagesPath = "Packages/co.mindport.vrbuilder.core/Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity"; + private const string demoSceneAssetsPath = "Assets/MindPort/VR Builder/Core/Demo/Scenes/VR Builder Demo - Core Features.unity"; + private const string demoScenePackagesPath = "Packages/co.mindport.vrbuilder.core/Demo/Scenes/VR Builder Demo - Core Features.unity"; private const string demoProcessAssetsPath = "Assets/MindPort/VR Builder/Core/Demo/StreamingAssets/Processes/Demo - Core Features/Demo - Core Features.json"; private const string demoProcessPackagesPath = "Packages/co.mindport.vrbuilder.core/Demo/StreamingAssets/Processes/Demo - Core Features/Demo - Core Features.json"; @@ -44,13 +44,13 @@ public static void LoadDemoScene() EditorSceneManager.OpenScene(demoScenePath); #if VR_BUILDER && VR_BUILDER_XR_INTERACTION - foreach (GameObject configuratorGameObject in GameObject.FindObjectsOfType(true). + foreach (GameObject configuratorGameObject in GameObject.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None). Where(go => go.GetComponent() != null)) { VRBuilder.Core.Setup.ILayerConfigurator configurator = configuratorGameObject.GetComponent(); if (configurator.LayerSet == VRBuilder.Core.Setup.LayerSet.Teleportation) { - configurator.ConfigureLayers("XR Teleport", "XR Teleport"); + configurator.ConfigureLayers("Teleport", "Teleport"); EditorUtility.SetDirty(configuratorGameObject); } } diff --git a/Demo/Editor/VRBuilder.Editor.DemoScene.asmdef b/Demo/Editor/VRBuilder.Editor.Demo.asmdef similarity index 92% rename from Demo/Editor/VRBuilder.Editor.DemoScene.asmdef rename to Demo/Editor/VRBuilder.Editor.Demo.asmdef index 41819fa8f..7cd41d084 100644 --- a/Demo/Editor/VRBuilder.Editor.DemoScene.asmdef +++ b/Demo/Editor/VRBuilder.Editor.Demo.asmdef @@ -1,5 +1,5 @@ { - "name": "VRBuilder.Editor.DemoScene", + "name": "VRBuilder.Core.Editor.Demo", "rootNamespace": "", "references": [ "VRBuilder.Core" diff --git a/Demo/Editor/VRBuilder.Editor.DemoScene.asmdef.meta b/Demo/Editor/VRBuilder.Editor.Demo.asmdef.meta similarity index 100% rename from Demo/Editor/VRBuilder.Editor.DemoScene.asmdef.meta rename to Demo/Editor/VRBuilder.Editor.Demo.asmdef.meta diff --git a/Demo/Resources/SnapZones/SnapZoneHighlightMaterial.mat b/Demo/Resources/SnapZones/SnapZoneHighlightMaterial.mat index 27b71a937..7933cea9c 100644 --- a/Demo/Resources/SnapZones/SnapZoneHighlightMaterial.mat +++ b/Demo/Resources/SnapZones/SnapZoneHighlightMaterial.mat @@ -1,25 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8657389808637378058 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SnapZoneHighlightMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,11 +81,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,12 +121,21 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.4, g: 0.5882353, b: 1, a: 0.19607843} + - _BaseColor: {r: 0.39999998, g: 0.5882353, b: 1, a: 0.19607843} + - _Color: {r: 0.39999995, g: 0.5882353, b: 1, a: 0.19607843} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Resources/SnapZones/SnapZoneInvalidMaterial.mat b/Demo/Resources/SnapZones/SnapZoneInvalidMaterial.mat index 57b09af8e..18c670f84 100644 --- a/Demo/Resources/SnapZones/SnapZoneInvalidMaterial.mat +++ b/Demo/Resources/SnapZones/SnapZoneInvalidMaterial.mat @@ -2,24 +2,36 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SnapZoneInvalidMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,11 +68,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,12 +108,34 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.9529412, g: 0.3019608, b: 0.078431375, a: 0.49411765} + - _BaseColor: {r: 0.9529411, g: 0.30196077, b: 0.078431346, a: 0.49411765} + - _Color: {r: 0.9529411, g: 0.30196074, b: 0.078431316, a: 0.49411765} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7897435329882493311 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Resources/SnapZones/SnapZoneValidationMaterial.mat b/Demo/Resources/SnapZones/SnapZoneValidationMaterial.mat index 7bab60899..ea7fb9782 100644 --- a/Demo/Resources/SnapZones/SnapZoneValidationMaterial.mat +++ b/Demo/Resources/SnapZones/SnapZoneValidationMaterial.mat @@ -1,25 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1001170586789147378 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SnapZoneValidationMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,11 +81,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,12 +121,21 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 0.49411765} + - _BaseColor: {r: 0.47058815, g: 0.945098, b: 0.78431374, a: 0.49411765} + - _Color: {r: 0.4705881, g: 0.945098, b: 0.78431374, a: 0.49411765} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/Light.mat b/Demo/Runtime/StaticAssets/Materials/Light.mat deleted file mode 100644 index 90435035c..000000000 --- a/Demo/Runtime/StaticAssets/Materials/Light.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Light - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 3.9999995, g: 3.9999995, b: 3.9999995, a: 1} - m_BuildTextureStacks: [] diff --git a/Demo/Runtime/StaticAssets/Materials/Shield.mat b/Demo/Runtime/StaticAssets/Materials/Shield.mat deleted file mode 100644 index 60939f272..000000000 --- a/Demo/Runtime/StaticAssets/Materials/Shield.mat +++ /dev/null @@ -1,79 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Shield - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0.754 - - _GlossyReflections: 1 - - _Metallic: 0.474 - - _Mode: 3 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 0.90588236, g: 0.2509804, b: 1, a: 0.49411765} - - _EmissionColor: {r: 0.4056604, g: 0, b: 0.35430175, a: 1} - m_BuildTextureStacks: [] diff --git a/Demo/Runtime/StaticAssets/Materials/Station.mat b/Demo/Runtime/StaticAssets/Materials/Station.mat deleted file mode 100644 index ef3c6dc22..000000000 --- a/Demo/Runtime/StaticAssets/Materials/Station.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Station - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.836 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.4, g: 0.4, b: 0.4, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Demo/Runtime/StaticAssets/Materials/StationEmissive.mat b/Demo/Runtime/StaticAssets/Materials/StationEmissive.mat deleted file mode 100644 index 1ec2d6ffa..000000000 --- a/Demo/Runtime/StaticAssets/Materials/StationEmissive.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: StationEmissive - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION - m_LightmapFlags: 2 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0.2883008, g: 0.75678957, b: 1.7207954, a: 1} - m_BuildTextureStacks: [] diff --git a/Demo/Runtime/Scripts/TouchPanel.cs b/Demo/Runtime/TouchPanel.cs similarity index 100% rename from Demo/Runtime/Scripts/TouchPanel.cs rename to Demo/Runtime/TouchPanel.cs diff --git a/Demo/Runtime/Scripts/TouchPanel.cs.meta b/Demo/Runtime/TouchPanel.cs.meta similarity index 100% rename from Demo/Runtime/Scripts/TouchPanel.cs.meta rename to Demo/Runtime/TouchPanel.cs.meta diff --git a/Demo/Runtime/Scripts/VRBuilder.DemoScene.asmdef b/Demo/Runtime/VRBuilder.Demo.asmdef similarity index 93% rename from Demo/Runtime/Scripts/VRBuilder.DemoScene.asmdef rename to Demo/Runtime/VRBuilder.Demo.asmdef index 6c8f15824..de3732eb6 100644 --- a/Demo/Runtime/Scripts/VRBuilder.DemoScene.asmdef +++ b/Demo/Runtime/VRBuilder.Demo.asmdef @@ -1,5 +1,5 @@ { - "name": "VRBuilder.DemoScene", + "name": "VRBuilder.Demo", "rootNamespace": "", "references": [ "VRBuilder.XRInteraction", diff --git a/Demo/Runtime/Scripts/VRBuilder.DemoScene.asmdef.meta b/Demo/Runtime/VRBuilder.Demo.asmdef.meta similarity index 100% rename from Demo/Runtime/Scripts/VRBuilder.DemoScene.asmdef.meta rename to Demo/Runtime/VRBuilder.Demo.asmdef.meta diff --git a/Demo/Runtime/Scenes.meta b/Demo/Scenes.meta similarity index 100% rename from Demo/Runtime/Scenes.meta rename to Demo/Scenes.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers.meta b/Demo/Scenes/VR Builder Demo - Core Features.meta similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers.meta rename to Demo/Scenes/VR Builder Demo - Core Features.meta index 784235c1d..32230e8c5 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers.meta +++ b/Demo/Scenes/VR Builder Demo - Core Features.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0331d5149944f2344b7a9967f55cb64b +guid: 5081f362a368eb746a905d5963df5387 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity b/Demo/Scenes/VR Builder Demo - Core Features.unity similarity index 80% rename from Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity rename to Demo/Scenes/VR Builder Demo - Core Features.unity index 09c58c460..1ee56e14b 100644 --- a/Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity +++ b/Demo/Scenes/VR Builder Demo - Core Features.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.67614806, g: 0.71346116, b: 0.735849, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.023824753, g: 0.0029160744, b: 0.05423471, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: a26af9fe9239e964a993ded0adc97b3c, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 1e23c1a9601859c4bae4058bed458a3b, type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 43798e48bac48fb40a8f662065824ac1, type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,13 +113,13 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &25957661 +--- !u!1 &3120979 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,30 +127,327 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 25957662} - m_Layer: 0 - m_Name: Thumb_Palm_Left + - component: {fileID: 3120982} + - component: {fileID: 3120981} + - component: {fileID: 3120980} + m_Layer: 2 + m_Name: VRB_XR_Setup m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &25957662 +--- !u!114 &3120980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb84184823a056249bfba5107e766ec3, type: 3} + m_Name: + m_EditorClassIdentifier: + layerSet: 2 + interactors: + - {fileID: 2112048200} + - {fileID: 1895599009} +--- !u!114 &3120981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f391ac734d94ea34697b6cde3269f11a, type: 3} + m_Name: + m_EditorClassIdentifier: + head: {fileID: 1180278388} + leftHand: {fileID: 1071573184} + rightHand: {fileID: 487972874} + rigBase: {fileID: 2146169580} +--- !u!4 &3120982 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 25957661} - m_LocalRotation: {x: -0.7044048, y: 0.08700629, z: 0.3122117, w: 0.6314806} - m_LocalPosition: {x: -0.042795867, y: -0.014722028, z: 0.029782485} + m_GameObject: {fileID: 3120979} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.8578976, z: -0, w: 0.51382077} + m_LocalPosition: {x: 0.682, y: 0, z: 7.207} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1074416408} - m_Father: {fileID: 105739408} - m_RootOrder: 4 + - {fileID: 2146169580} + - {fileID: 496564292} + - {fileID: 1333177534} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: -118.163, z: 0} +--- !u!1 &10366436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 10366437} + - component: {fileID: 10366440} + - component: {fileID: 10366439} + - component: {fileID: 10366438} + m_Layer: 2 + m_Name: Grab Move + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &10366437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10366436} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 928609389} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &10366438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10366436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 760ff70c1c91bdd45907d0ff0cdcaf7f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_EnableFreeXMovement: 1 + m_EnableFreeYMovement: 0 + m_EnableFreeZMovement: 1 + m_UseGravity: 1 + m_GravityApplicationMode: 0 + m_LeftGrabMoveProvider: {fileID: 10366440} + m_RightGrabMoveProvider: {fileID: 10366439} + m_OverrideSharedSettingsOnInit: 1 + m_MoveFactor: 1 + m_RequireTwoHandsForTranslation: 0 + m_EnableRotation: 1 + m_EnableScaling: 0 + m_MinimumScale: 0.2 + m_MaximumScale: 5 +--- !u!114 &10366439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10366436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b94c4c83dec6a94fbaebf543478259e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_EnableFreeXMovement: 1 + m_EnableFreeYMovement: 0 + m_EnableFreeZMovement: 1 + m_UseGravity: 1 + m_GravityApplicationMode: 0 + m_ControllerTransform: {fileID: 487972874} + m_EnableMoveWhileSelecting: 0 + m_MoveFactor: 1 + m_GrabMoveInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Grab Move + m_Type: 1 + m_ExpectedControlType: + m_Id: 67220c99-f046-4e98-aa6f-d84114cad173 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Grab Move Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: ed114d26-3fbf-41fc-80fa-9675240038c5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 15759602096507913, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: 15759602096507913, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_GrabMoveAction: + m_UseReference: 1 + m_Action: + m_Name: Grab Move + m_Type: 0 + m_ExpectedControlType: + m_Id: de56d195-bf90-4347-9982-6bf8ffa3420c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} +--- !u!114 &10366440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 10366436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b94c4c83dec6a94fbaebf543478259e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_EnableFreeXMovement: 1 + m_EnableFreeYMovement: 0 + m_EnableFreeZMovement: 1 + m_UseGravity: 1 + m_GravityApplicationMode: 0 + m_ControllerTransform: {fileID: 1071573184} + m_EnableMoveWhileSelecting: 0 + m_MoveFactor: 1 + m_GrabMoveInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Grab Move + m_Type: 1 + m_ExpectedControlType: + m_Id: 2e9a23ce-d949-4c67-9b12-7a9a35510733 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Grab Move Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 3680a95b-119c-4eba-b8fe-7e0a362e460b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -3742484312079769484, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: -3742484312079769484, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_GrabMoveAction: + m_UseReference: 1 + m_Action: + m_Name: Grab Move + m_Type: 0 + m_ExpectedControlType: + m_Id: 3d33edcf-0043-45cb-95a7-008204badf83 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} +--- !u!1 &11185209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 11185210} + - component: {fileID: 11185212} + - component: {fileID: 11185211} + m_Layer: 31 + m_Name: Snap Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &11185210 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11185209} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 815556419} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &11185211 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11185209} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.25, y: 0.6, z: 1.25} + m_Center: {x: 0, y: 0.3, z: 0} +--- !u!114 &11185212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11185209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87996e81a5026dc429bfd6a9271548b6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractableObject: {fileID: 815556422} + m_SnapCollider: {fileID: 11185211} + m_DisableSnapColliderWhenSelected: 0 + m_SnapToCollider: {fileID: 0} --- !u!1 &33704421 GameObject: m_ObjectHideFlags: 0 @@ -178,6 +471,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33704421} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 1.5, y: 0, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -189,13 +483,94 @@ Transform: - {fileID: 861048855} - {fileID: 518602151} m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &36610240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 36610241} + - component: {fileID: 36610242} + m_Layer: 31 + m_Name: Interaction Affordance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &36610241 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36610240} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.00000005960466, y: 0, z: -0.000000059604638} + m_LocalScale: {x: 0.99999976, y: 1, z: 0.99999976} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2014095924} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &36610242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36610240} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49e0a5b5ff5540f5b14dd29d46faec22, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractableSource: {fileID: 2014095928} + m_IgnoreHoverEvents: 0 + m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} --- !u!1001 &53683353 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 248065651} m_Modifications: - target: {fileID: -8679921383154817045, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} @@ -255,18 +630,31 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 1862d8e21d2bba649b255c6a7eb4eb61, type: 2} - target: {fileID: -7511558181221131132, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: a2e88723e4cd77a4690d0637321940aa, type: 2} - target: {fileID: 919132149155446097, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} propertyPath: m_Name value: MagicCube objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} + insertIndex: -1 + addedObject: {fileID: 53683356} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} + insertIndex: -1 + addedObject: {fileID: 53683357} m_SourcePrefab: {fileID: 100100000, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} --- !u!4 &53683354 stripped Transform: @@ -286,9 +674,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53683355} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.39999995, y: 0.39999995, z: 0.39999995} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &53683357 @@ -305,9 +701,8 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: df8a710cc656294c8257c8ace06c735d - uniqueName: Cube - tags: [] ---- !u!1 &54233950 + guids: [] +--- !u!1 &102893242 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -315,141 +710,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 54233951} - - component: {fileID: 54233953} - - component: {fileID: 54233952} + - component: {fileID: 102893252} + - component: {fileID: 102893251} + - component: {fileID: 102893250} + - component: {fileID: 102893243} + - component: {fileID: 102893248} + - component: {fileID: 102893247} + - component: {fileID: 102893246} + - component: {fileID: 102893245} + - component: {fileID: 102893244} + - component: {fileID: 102893249} + - component: {fileID: 102893253} m_Layer: 0 - m_Name: RightHand + m_Name: Sliced Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &54233951 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54233950} - m_LocalRotation: {x: -0.27542365, y: 0.27542365, z: 0.65126175, w: 0.65126175} - m_LocalPosition: {x: 0.0358, y: 0.0577, z: -0.1296} - m_LocalScale: {x: 0.95, y: 0.95, z: 0.95} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1909973946} - - {fileID: 918098385} - - {fileID: 2040506300} - m_Father: {fileID: 820468471} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -45.848, y: 0, z: 90} ---- !u!114 &54233952 + m_IsActive: 0 +--- !u!114 &102893243 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54233950} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e241df096dff11c478f43d1b202d33af, type: 3} - m_Name: - m_EditorClassIdentifier: - selectFloat: Select - activateFloat: Activate - UIStateBool: UIEnabled - teleportStateBool: TeleportEnabled - baseController: {fileID: 0} - teleportController: {fileID: 0} - uiController: {fileID: 0} - controllerManager: {fileID: 0} ---- !u!95 &54233953 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54233950} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 3cc1bfa741063664e8b13a63afcd062f, type: 3} - m_Controller: {fileID: 9100000, guid: 6f17d5d554bc9b742b9bf585b813330c, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &65634328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 65634329} - m_Layer: 0 - m_Name: CameraOffset - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &65634329 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 65634328} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2008584333} - - {fileID: 1773926310} - - {fileID: 697578261} - m_Father: {fileID: 361400739} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &102893242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 102893252} - - component: {fileID: 102893251} - - component: {fileID: 102893250} - - component: {fileID: 102893243} - - component: {fileID: 102893248} - - component: {fileID: 102893247} - - component: {fileID: 102893246} - - component: {fileID: 102893245} - - component: {fileID: 102893244} - - component: {fileID: 102893249} - m_Layer: 0 - m_Name: Sliced Cube (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &102893243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 102893242} + m_GameObject: {fileID: 102893242} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} @@ -457,8 +742,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: 780883f2693fe44e98bca9b93f030cb7 - uniqueName: Sliced Cube (2) - tags: [] + guids: [] --- !u!114 &102893244 MonoBehaviour: m_ObjectHideFlags: 0 @@ -531,9 +815,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -592,39 +873,12 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_AttachTransform: {fileID: 0} m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 + m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 + m_SnapToColliderVolume: 0 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 m_MovementType: 1 @@ -665,10 +919,10 @@ MonoBehaviour: m_ThrowAngularVelocityScale: 1 m_ForceGravityOnDetach: 0 m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 isTouchable: 1 isGrabbable: 1 isUsable: 0 @@ -679,10 +933,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 102893242} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 1 m_Interpolate: 0 @@ -696,9 +961,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 102893242} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.40000013, y: 0.39999995, z: 0.20000006} m_Center: {x: 0, y: 0, z: -0.10000027} --- !u!23 &102893250 @@ -718,6 +991,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -759,15 +1035,37 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 102893242} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.01, y: 1.2, z: 0.75} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1756511964} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!1 &105739407 +--- !u!114 &102893253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 102893242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 0} + m_PokeCollider: {fileID: 102893249} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!1 &122397524 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -775,35 +1073,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 105739408} + - component: {fileID: 122397525} m_Layer: 0 - m_Name: BigHandLeft + m_Name: Left Controller Stabilized Attach m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &105739408 +--- !u!4 &122397525 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 105739407} + m_GameObject: {fileID: 122397524} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1906445694} - - {fileID: 1784977341} - - {fileID: 1675801262} - - {fileID: 1142522481} - - {fileID: 25957662} - m_Father: {fileID: 1015737782} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 629046874} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &134998303 +--- !u!1 &149866824 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -811,81 +1104,131 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 134998304} - - component: {fileID: 134998306} - - component: {fileID: 134998305} - m_Layer: 8 - m_Name: Cylinder + - component: {fileID: 149866826} + - component: {fileID: 149866825} + - component: {fileID: 149866827} + m_Layer: 0 + m_Name: Right Poke Interactor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &134998304 -Transform: +--- !u!114 &149866825 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 134998303} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.1} - m_LocalScale: {x: 1, y: 0.1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1222594156} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &134998305 -MeshRenderer: + m_GameObject: {fileID: 149866824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0924bcaa9eb50df458a783ae0e2b59f5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 1 + m_Handedness: 2 + m_AttachTransform: {fileID: 1951035652} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_PokeDepth: 0.1 + m_PokeWidth: 0.0075 + m_PokeSelectWidth: 0.015 + m_PokeHoverRadius: 0.015 + m_PokeInteractionOffset: 0.005 + m_PhysicsLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_PhysicsTriggerInteraction: 1 + m_RequirePokeFilter: 1 + m_EnableUIInteraction: 1 + m_DebugVisualizationsEnabled: 0 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &149866826 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 134998303} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a16db0f18ace882458e325d3243cb6da, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &134998306 -MeshFilter: + m_GameObject: {fileID: 149866824} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1951035652} + - {fileID: 2029649882} + m_Father: {fileID: 487972874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &149866827 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 134998303} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 149866824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd0b9921bce4eeb49bd05815b1135ac2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractorSourceObject: {fileID: 149866825} + m_HapticImpulsePlayer: {fileID: 487972871} + m_PlaySelectEntered: 1 + m_SelectEnteredData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectExited: 0 + m_SelectExitedData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectCanceled: 0 + m_SelectCanceledData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverEntered: 1 + m_HoverEnteredData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverExited: 0 + m_HoverExitedData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverCanceled: 0 + m_HoverCanceledData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_AllowHoverHapticsWhileSelecting: 0 --- !u!1 &185363457 GameObject: m_ObjectHideFlags: 0 @@ -914,13 +1257,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185363457} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 248065651} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &185363459 MonoBehaviour: @@ -948,8 +1291,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: 8531ddd739de15498651d945a022a74e - uniqueName: Slicing highlight - tags: [] + guids: [] --- !u!65 &185363461 BoxCollider: m_ObjectHideFlags: 0 @@ -958,9 +1300,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185363457} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 2, y: 1, z: 1.5} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &185363462 @@ -980,6 +1330,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1013,38 +1366,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185363457} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &189572712 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 189572713} - m_Layer: 0 - m_Name: Index_0_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &189572713 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 189572712} - m_LocalRotation: {x: 0.039005104, y: -0.077951096, z: -0.09432525, w: 0.9917182} - m_LocalPosition: {x: -0.059387933, y: -0.00000024288892, z: 0.0000000011920929} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1352490008} - m_Father: {fileID: 1906445694} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &221845636 GameObject: m_ObjectHideFlags: 0 @@ -1073,6 +1394,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221845636} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.4, z: 1.8} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1080,7 +1402,6 @@ Transform: m_Children: - {fileID: 1745294527} m_Father: {fileID: 33704422} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!114 &221845638 MonoBehaviour: @@ -1095,11 +1416,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_Handedness: 0 m_AttachTransform: {fileID: 1745294527} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -1119,18 +1438,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] m_ShowInteractableHoverMeshes: 1 m_InteractableHoverMeshMaterial: {fileID: 0} m_InteractableCantHoverMeshMaterial: {fileID: 0} @@ -1156,9 +1463,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221845636} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.4, y: 0.4, z: 0.2} m_Center: {x: 0, y: 0, z: -0.1} --- !u!114 &221845640 @@ -1210,9 +1525,8 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: fe37ce7994e9bd4e91415ae124ae8aea - uniqueName: Sliced Cube (1)_SnapZone - tags: [] ---- !u!1 &232339299 + guids: [] +--- !u!1 &230423073 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1220,33 +1534,207 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 232339300} - - component: {fileID: 232339303} - - component: {fileID: 232339304} - - component: {fileID: 232339302} - - component: {fileID: 232339301} - m_Layer: 8 - m_Name: Teleportation Spot + - component: {fileID: 230423074} + - component: {fileID: 230423077} + - component: {fileID: 230423076} + - component: {fileID: 230423075} + m_Layer: 0 + m_Name: Poke m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &232339300 +--- !u!4 &230423074 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 232339299} + m_GameObject: {fileID: 230423073} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1765347203} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &230423075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230423073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 230423077} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: d0eab193f3deddf459ada93a8c8366ef, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 230423076} + m_ColorPropertyName: _BaseColor +--- !u!114 &230423076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230423073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer: {fileID: 1669315464} + m_MaterialIndex: 0 +--- !u!114 &230423077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 230423073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c83f12c537584f51b92c01f10d7090c0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractorSource: {fileID: 1861251858} + m_IgnoreHoverEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 1 + m_IgnoreUGUIHover: 0 + m_IgnoreUGUISelect: 0 + m_IgnoreXRInteractionEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!1 &232339299 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 232339300} + - component: {fileID: 232339303} + - component: {fileID: 232339304} + - component: {fileID: 232339302} + - component: {fileID: 232339301} + m_Layer: 31 + m_Name: Teleportation Spot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &232339300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 232339299} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1268751234} + - {fileID: 2016722928} + - {fileID: 903701278} + - {fileID: 1060792103} m_Father: {fileID: 1756511964} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &232339301 MonoBehaviour: @@ -1275,9 +1763,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 232339299} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.01, z: 1} m_Center: {x: 0, y: 0.02, z: 0} --- !u!114 &232339303 @@ -1294,11 +1790,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: - m_Bits: 2 + m_Bits: 2147483648 m_DistanceCalculationMode: 1 m_SelectMode: 1 m_FocusMode: 1 @@ -1355,43 +1848,16 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_TeleportationProvider: {fileID: 0} m_MatchOrientation: 2 m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 + m_TeleportTrigger: 0 m_FilterSelectionByHitNormal: 0 m_UpNormalToleranceDegrees: 30 m_Teleporting: m_PersistentCalls: m_Calls: [] - m_TeleportAnchorTransform: {fileID: 1268751234} + m_TeleportAnchorTransform: {fileID: 2016722928} --- !u!114 &232339304 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1406,8 +1872,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: bb9fcf7f489136429f6cc417d678a54c - uniqueName: Teleportation Spot_1 - tags: [] + guids: [] --- !u!1 &242342981 GameObject: m_ObjectHideFlags: 0 @@ -1434,13 +1899,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242342981} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 503181885} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &242342983 MeshRenderer: @@ -1459,10 +1924,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2018913513} + - {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1505,6 +1973,90 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parent: {fileID: 503181886} +--- !u!1 &246867873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 246867874} + - component: {fileID: 246867875} + m_Layer: 2 + m_Name: Move + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &246867874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246867873} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 928609389} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &246867875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 246867873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4b724061ba0dd1144bd85f70904124d0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_MoveSpeed: 2.5 + m_EnableStrafe: 1 + m_EnableFly: 0 + m_UseGravity: 1 + m_ForwardSource: {fileID: 1180278388} + m_LeftHandMoveInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Left Hand Move + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: a0889756-f4c0-4539-9bac-9066c586d8a2 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 6972639530819350904, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RightHandMoveInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Right Hand Move + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: c2221eec-40e7-408b-8ad6-fffc2b2e7ac1 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -8198699208435500284, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_HeadTransform: {fileID: 1180278388} + m_LeftControllerTransform: {fileID: 1071573184} + m_RightControllerTransform: {fileID: 487972874} + m_LeftHandMovementDirection: 0 + m_RightHandMovementDirection: 0 --- !u!1 &248065650 GameObject: m_ObjectHideFlags: 0 @@ -1520,6 +2072,7 @@ GameObject: - component: {fileID: 248065655} - component: {fileID: 248065654} - component: {fileID: 248065653} + - component: {fileID: 248065659} m_Layer: 0 m_Name: Magic Cube m_TagString: Untagged @@ -1534,6 +2087,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 248065650} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -3, y: 1.2, z: 5.25} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1543,7 +2097,6 @@ Transform: - {fileID: 53683354} - {fileID: 561255720} m_Father: {fileID: 0} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &248065653 MonoBehaviour: @@ -1617,9 +2170,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -1678,39 +2228,12 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_AttachTransform: {fileID: 0} m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 + m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 + m_SnapToColliderVolume: 0 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 m_MovementType: 1 @@ -1751,10 +2274,10 @@ MonoBehaviour: m_ThrowAngularVelocityScale: 1 m_ForceGravityOnDetach: 0 m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 isTouchable: 1 isGrabbable: 1 isUsable: 0 @@ -1765,10 +2288,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 248065650} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 1 m_Interpolate: 0 @@ -1788,9 +2322,30 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: a81db1d2faa3e34da620e6951c2b6be7 - uniqueName: Magic Cube - tags: [] ---- !u!1 &283625089 + guids: [] +--- !u!114 &248065659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 248065650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 248065656} + m_PokeCollider: {fileID: 0} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!1 &250989852 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1798,35 +2353,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 283625090} - m_Layer: 0 - m_Name: Thumb_1_Left + - component: {fileID: 250989853} + m_Layer: 31 + m_Name: Anchor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &283625090 +--- !u!4 &250989853 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 283625089} - m_LocalRotation: {x: 0.0000025456518, y: 0.0000026570444, z: 0.10506754, w: 0.9944651} - m_LocalPosition: {x: -0.03307885, y: 0.000000052452087, z: -0.00000030398368} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 250989852} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.00000005960466, y: 0.00999999, z: -0.000000059604638} + m_LocalScale: {x: 0.99999976, y: 1, z: 0.99999976} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1889204434} - m_Father: {fileID: 1074416408} - m_RootOrder: 0 + - {fileID: 2041203274} + m_Father: {fileID: 2014095924} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &286338418 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: -8679921383154817045, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} @@ -1874,15 +2430,19 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -7511558181221131132, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 703eca7600ef1d1409b7cf527745a33e, type: 2} - target: {fileID: -7511558181221131132, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} - propertyPath: m_Materials.Array.data[2] + propertyPath: 'm_Materials.Array.data[2]' value: objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - target: {fileID: -3133498875991405556, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} @@ -1890,11 +2450,15 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} - target: {fileID: -2859109400176981367, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -2859109400176981367, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -2859109400176981367, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - target: {fileID: 919132149155446097, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} @@ -1906,46 +2470,136 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1abcf478131f05645a9e8efbebd736db, type: 3} ---- !u!1001 &308985786 -PrefabInstance: +--- !u!1 &308734738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 308734739} + - component: {fileID: 308734741} + - component: {fileID: 308734740} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &308734739 +Transform: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308734738} serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalRotation.w + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.012954317, z: -0.02} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 936988544} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &308734740 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308734738} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &308734741 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 308734738} + m_Mesh: {fileID: -8653722315008560443, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1001 &308985786 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_LocalRotation.x + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99999946 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0010357928 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} propertyPath: m_LocalRotation.y value: -0 @@ -1956,7 +2610,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 0.119 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -1967,33 +2621,41 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 16598d12187e7ef49aaf6d2ec4136e05, type: 2} - target: {fileID: -7511558181221131132, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 20cfa7770468940429489de589ef1302, type: 2} - target: {fileID: -7511558181221131132, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_Materials.Array.data[2] + propertyPath: 'm_Materials.Array.data[2]' value: objectReference: {fileID: 2100000, guid: 07bc3b943f33eb048941deac15d39ea6, type: 2} - target: {fileID: -6485130812926156181, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3993f871ec52cf74da0409f8ba5f6a4a, type: 2} - target: {fileID: -6485130812926156181, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 8feb2afc57281374ea664a04bad2dac0, type: 2} - target: {fileID: -5961788602603777882, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: c04323bebf6070b4ab0e9df97c3f28e7, type: 2} - target: {fileID: 919132149155446097, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} propertyPath: m_Name value: Platform objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} propertyPath: m_StaticEditorFlags value: 4294967295 @@ -2003,8 +2665,11 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2432b9d584ff8c44c88073c39743e60b, type: 3} ---- !u!1 &326836475 +--- !u!1 &323365438 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2012,34 +2677,90 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 326836476} + - component: {fileID: 323365439} + - component: {fileID: 323365441} + - component: {fileID: 323365440} m_Layer: 0 - m_Name: Ring_Tip_Left + m_Name: Bumper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &326836476 +--- !u!4 &323365439 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326836475} - m_LocalRotation: {x: 0.000000011175867, y: -0.000000022351747, z: -0.00000020395967, w: 1} - m_LocalPosition: {x: -0.020554436, y: 0.000000114440915, z: -0.00000007867813} + m_GameObject: {fileID: 323365438} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000013985816, y: -0.1305262, z: 0.000000018412676, w: 0.9914449} + m_LocalPosition: {x: -0.0125, y: -0.028556997, z: 0.027326612} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 933831182} - m_RootOrder: 0 + m_Father: {fileID: 936988544} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &323365440 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323365438} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &323365441 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323365438} + m_Mesh: {fileID: -4189514412694937182, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} --- !u!1001 &343040741 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 813701130} m_Modifications: - target: {fileID: -8679921383154817045, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} @@ -2087,15 +2808,19 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -7511558181221131132, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - target: {fileID: -505929436113270756, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: d586649e59c967444a1607a4aed46c01, type: 2} - target: {fileID: 919132149155446097, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} @@ -2107,43 +2832,24 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 5355397255215566438, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: abb9f2a27e7f7184b881acce31145657, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} + insertIndex: -1 + addedObject: {fileID: 1831340544} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} + insertIndex: -1 + addedObject: {fileID: 450456541} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} + insertIndex: -1 + addedObject: {fileID: 2121825125} m_SourcePrefab: {fileID: 100100000, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} ---- !u!1 &361187390 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 361187391} - m_Layer: 0 - m_Name: Middle_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &361187391 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361187390} - m_LocalRotation: {x: -0.00000002980233, y: -0.00000005308539, z: -0.000000042258765, w: 1} - m_LocalPosition: {x: -0.022676239, y: 0.00000029563904, z: -0.000000077486035} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1714243700} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &361400738 +--- !u!1 &389396067 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2151,269 +2857,445 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 361400739} - - component: {fileID: 361400748} - - component: {fileID: 361400747} - - component: {fileID: 361400746} - - component: {fileID: 361400745} - - component: {fileID: 361400744} - - component: {fileID: 361400743} - - component: {fileID: 361400742} - - component: {fileID: 361400741} - - component: {fileID: 361400740} + - component: {fileID: 389396071} + - component: {fileID: 389396068} + - component: {fileID: 389396070} + - component: {fileID: 389396069} m_Layer: 0 - m_Name: XR Rig + m_Name: Gaze Interactor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &361400739 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 65634329} - m_Father: {fileID: 1634918261} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &361400740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 58a9a7b4435e36f4fbc7000edd687974, type: 3} - m_Name: - m_EditorClassIdentifier: - moveScheme: 0 - turnStyle: 0 - moveForwardSource: 0 - actionAssets: - - {fileID: -944628639613478452, guid: de2411ef647d9f24d981120efb63e621, type: 3} - actionMaps: [] - actions: [] - baseControlScheme: Generic XR Controller - noncontinuousControlScheme: Noncontinuous Move - continuousControlScheme: Continuous Move - continuousMoveProvider: {fileID: 361400743} - continuousTurnProvider: {fileID: 361400744} - snapTurnProvider: {fileID: 361400747} - headForwardSource: {fileID: 2008584333} - leftHandForwardSource: {fileID: 440165965} - rightHandForwardSource: {fileID: 1729154661} ---- !u!114 &361400741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af6bf904e410ee8479f9093d8830d1f8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LocomotionProvider: {fileID: 361400747} - m_MinHeight: 0 - m_MaxHeight: Infinity ---- !u!143 &361400742 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 1.36144 - m_Radius: 0.1 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &361400743 + m_IsActive: 0 +--- !u!114 &389396068 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} + m_GameObject: {fileID: 389396067} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f, type: 3} + m_Script: {fileID: 11500000, guid: c416f1a5c494e224fb5564fd1362b50d, type: 3} m_Name: m_EditorClassIdentifier: - m_System: {fileID: 361400746} - m_MoveSpeed: 1 - m_EnableStrafe: 1 - m_EnableFly: 0 - m_UseGravity: 1 - m_GravityApplicationMode: 0 - m_ForwardSource: {fileID: 2008584333} - m_LeftHandMoveAction: - m_UseReference: 1 - m_Action: - m_Name: Left Hand Move - m_Type: 0 + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 1 + m_Handedness: 0 + m_AttachTransform: {fileID: 1806910830} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_SelectInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 m_ExpectedControlType: - m_Id: 6da12c60-ad99-45b3-a0b1-a4ee1d30ddcc + m_Id: 26dcb486-2cd5-4bf0-83a4-8252a6419ca1 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 6972639530819350904, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RightHandMoveAction: - m_UseReference: 1 - m_Action: - m_Name: Right Hand Move + m_InputActionValue: + m_Name: Select Value m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d589f510-c88e-41dc-89ee-4accd74ded87 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 m_ExpectedControlType: - m_Id: 77f364a5-e031-452a-af50-144d41955e70 + m_Id: 1b75ac5e-63d2-4c5c-9b86-0fe382e6b137 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -8198699208435500284, guid: de2411ef647d9f24d981120efb63e621, type: 3} ---- !u!114 &361400744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927, type: 3} - m_Name: - m_EditorClassIdentifier: - m_System: {fileID: 361400746} - m_TurnSpeed: 60 - m_LeftHandTurnAction: - m_UseReference: 1 - m_Action: - m_Name: Left Hand Turn + m_InputActionValue: + m_Name: Activate Value m_Type: 0 + m_ExpectedControlType: Axis + m_Id: fde38f1d-c7ff-4233-b8ba-2548488943d7 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_SelectActionTrigger: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 0 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 0 + m_LineType: 0 + m_BlendVisualLinePoints: 1 + m_MaxRaycastDistance: 30 + m_RayOriginTransform: {fileID: 1272102072} + m_ReferenceFrame: {fileID: 0} + m_Velocity: 16 + m_Acceleration: 9.8 + m_AdditionalGroundHeight: 0.1 + m_AdditionalFlightTime: 0.5 + m_EndPointDistance: 30 + m_EndPointHeight: -10 + m_ControlPointDistance: 10 + m_ControlPointHeight: 5 + m_SampleFrequency: 20 + m_HitDetectionType: 0 + m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 + m_RaycastMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 0 + m_HitClosestOnly: 0 + m_HoverToSelect: 1 + m_HoverTimeToSelect: 1 + m_AutoDeselect: 1 + m_TimeToAutoDeselect: 0.25 + m_EnableUIInteraction: 1 + m_BlockInteractionsWithScreenSpaceUI: 0 + m_BlockUIOnInteractableSelection: 1 + m_ManipulateAttachTransform: 0 + m_UseForceGrab: 0 + m_RotateSpeed: 180 + m_TranslateSpeed: 1 + m_RotateReferenceFrame: {fileID: 0} + m_RotateMode: 0 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_EnableARRaycasting: 0 + m_OccludeARHitsWith3DObjects: 0 + m_OccludeARHitsWith2DObjects: 0 + m_ScaleMode: 0 + m_UIPressInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 m_ExpectedControlType: - m_Id: d065cb11-e9f6-4747-a3d4-1c032fc345a0 + m_Id: 8e16e22c-3195-4e76-b0d2-9ec60d8bfc8e m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 1010738217276881514, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RightHandTurnAction: - m_UseReference: 1 - m_Action: - m_Name: Right Hand Turn + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: f2af0d9f-965a-4778-accc-36828a6e40b8 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 83ec219e-cbbd-4b69-9013-f330cea06247 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TranslateManipulationInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Translate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 78fd2d8b-06b9-4583-8d46-a896cee22152 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RotateManipulationInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Rotate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 2941b9e4-5f6c-48d5-9338-136ff3a60e62 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_DirectionalManipulationInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Directional Manipulation m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 4decd4bd-22c4-4e97-af9b-f22d09a3ea8e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleToggleInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: Scale Toggle + m_Type: 1 m_ExpectedControlType: - m_Id: e043a43a-0352-4ee2-ab81-9dafdfb41dc2 + m_Id: 4e7a5ca5-86e4-4d9d-9678-01fb7083e39b m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -6493913391331992944, guid: de2411ef647d9f24d981120efb63e621, type: 3} ---- !u!114 &361400745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01f69dc1cb084aa42b2f2f8cd87bc770, type: 3} - m_Name: - m_EditorClassIdentifier: - m_System: {fileID: 361400746} - m_DelayTime: 0 ---- !u!114 &361400746 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03a5df2202a8b96488c744be3bd0c33e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Timeout: 10 - m_XROrigin: {fileID: 361400748} ---- !u!114 &361400747 + m_InputActionValue: + m_Name: Scale Toggle Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 0c82215d-82dc-4f94-a5a2-cd3a7186171a + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ScaleOverTimeInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Over Time + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: ec6d1bcc-90c1-4e80-98a9-7de37426ef90 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleDistanceDeltaInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Distance Delta + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 7e170bb1-3339-4b96-bbd9-61c01cb414db + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 + m_GazeAssistanceCalculation: 1 + m_GazeAssistanceColliderFixedSize: 1 + m_GazeAssistanceColliderScale: 1 + m_GazeAssistanceSnapVolume: {fileID: 0} + m_GazeAssistanceDistanceScaling: 0 + m_ClampGazeAssistanceDistanceScaling: 0 + m_GazeAssistanceDistanceScalingClampValue: 0 +--- !u!114 &389396069 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} + m_GameObject: {fileID: 389396067} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12, type: 3} + m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} m_Name: m_EditorClassIdentifier: - m_System: {fileID: 361400746} - m_TurnAmount: 45 - m_DebounceTime: 0.5 - m_EnableTurnLeftRight: 1 - m_EnableTurnAround: 1 - m_DelayTime: 0 - m_LeftHandSnapTurnAction: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: m_UseReference: 1 m_Action: - m_Name: Left Hand Snap Turn + m_Name: Position m_Type: 0 - m_ExpectedControlType: - m_Id: bcae984e-e222-4aec-9899-6a2de88a7166 + m_ExpectedControlType: Vector3 + m_Id: e0974d43-a211-4251-882f-3f0b4749db16 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 1010738217276881514, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RightHandSnapTurnAction: + m_Reference: {fileID: 3220680263695665919, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_RotationInput: m_UseReference: 1 m_Action: - m_Name: Right Hand Snap Turn + m_Name: Rotation m_Type: 0 - m_ExpectedControlType: - m_Id: ef35997d-2cb6-4340-9edd-1239db5332f0 + m_ExpectedControlType: Quaternion + m_Id: 0a88b07c-2048-460b-b52d-880dd98ceb35 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -5930349909990434036, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_TrackingStateInput: + m_UseReference: 1 + m_Action: + m_Name: Tracking State + m_Type: 0 + m_ExpectedControlType: Integer + m_Id: ca2485cb-f4d4-4bef-84e6-b085e080175c m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -6493913391331992944, guid: de2411ef647d9f24d981120efb63e621, type: 3} ---- !u!114 &361400748 + m_Reference: {fileID: 2069149553511882089, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_PositionAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: b902054d-edbb-440a-a455-68558ef17b58 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_RotationAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 629180f1-a17a-4e47-a583-481808df540f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 +--- !u!114 &389396070 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 361400738} + m_GameObject: {fileID: 389396067} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} + m_Script: {fileID: 11500000, guid: b19db2de414f1e347bab5bf4426be20d, type: 3} m_Name: m_EditorClassIdentifier: - m_Camera: {fileID: 2008584329} - m_OriginBaseGameObject: {fileID: 361400738} - m_CameraFloorOffsetObject: {fileID: 65634328} - m_RequestedTrackingOriginMode: 0 - m_CameraYOffset: 1.36144 ---- !u!1 &362215159 + m_FallbackIfEyeTrackingUnavailable: 1 +--- !u!4 &389396071 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389396067} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 886140063} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &422863735 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2421,202 +3303,268 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 362215160} - - component: {fileID: 362215162} - - component: {fileID: 362215161} - m_Layer: 0 - m_Name: EventSystem + - component: {fileID: 422863736} + - component: {fileID: 422863737} + m_Layer: 31 + m_Name: Interaction Affordance m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &362215160 +--- !u!4 &422863736 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362215159} + m_GameObject: {fileID: 422863735} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1634918261} - m_RootOrder: 3 + m_Father: {fileID: 815556419} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &362215161 +--- !u!114 &422863737 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362215159} + m_GameObject: {fileID: 422863735} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3} + m_Script: {fileID: 11500000, guid: 49e0a5b5ff5540f5b14dd29d46faec22, type: 3} m_Name: m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_ClickSpeed: 0.3 - m_MoveDeadzone: 0.6 - m_RepeatDelay: 0.5 - m_RepeatRate: 0.1 - m_TrackedDeviceDragThresholdMultiplier: 2 - m_TrackedScrollDeltaMultiplier: 5 - m_ActiveInputMode: 0 - m_MaxTrackedDeviceRaycastDistance: 1000 - m_EnableXRInput: 1 - m_EnableMouseInput: 1 - m_EnableTouchInput: 1 - m_PointAction: {fileID: 0} - m_LeftClickAction: {fileID: 0} - m_MiddleClickAction: {fileID: 0} - m_RightClickAction: {fileID: 0} - m_ScrollWheelAction: {fileID: 0} - m_NavigateAction: {fileID: 0} - m_SubmitAction: {fileID: 0} - m_CancelAction: {fileID: 0} - m_EnableBuiltinActionsAsFallback: 1 - m_EnableGamepadInput: 1 - m_EnableJoystickInput: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel ---- !u!114 &362215162 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362215159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!1 &375530499 -GameObject: + m_TransitionDuration: 0.125 + m_InteractableSource: {fileID: 815556422} + m_IgnoreHoverEvents: 0 + m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!4 &450456541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + m_PrefabInstance: {fileID: 1785665711} + m_PrefabAsset: {fileID: 0} +--- !u!1 &487972869 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 375530500} - - component: {fileID: 375530502} - - component: {fileID: 375530501} - m_Layer: 8 - m_Name: Plane + - component: {fileID: 487972874} + - component: {fileID: 487972873} + - component: {fileID: 487972872} + - component: {fileID: 487972871} + - component: {fileID: 487972870} + m_Layer: 0 + m_Name: Right Controller m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &375530500 -Transform: +--- !u!114 &487972870 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375530499} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 655638806} - m_Father: {fileID: 1883760419} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!23 &375530501 -MeshRenderer: + m_GameObject: {fileID: 487972869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: + m_UseReference: 1 + m_Action: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: Vector3 + m_Id: c21ad7d3-c46f-48ad-99da-097df39312cc + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -3326005586356538449, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_RotationInput: + m_UseReference: 1 + m_Action: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: Quaternion + m_Id: 69f091ba-e646-4189-9296-d68870a4d922 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 5101698808175986029, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_TrackingStateInput: + m_UseReference: 1 + m_Action: + m_Name: Tracking State + m_Type: 0 + m_ExpectedControlType: Integer + m_Id: 05873c58-6d6f-4aea-8e06-78c4544c58dc + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -1277054153949319361, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_PositionAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: e0c62bbd-29f9-48af-967b-21babef9a6a4 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_RotationAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 303ef588-e0d6-494e-9ceb-2d2edc0eb8e5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 +--- !u!114 &487972871 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375530499} + m_GameObject: {fileID: 487972869} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5984489a6c8753743953c8d64d3265fb, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &375530502 -MeshFilter: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b734f2bd29eeddd4d85afb0c266228c3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HapticOutput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Haptic + m_Type: 2 + m_ExpectedControlType: + m_Id: b71b5bb4-1b09-415f-a4df-1476771fcae6 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -8222252007134549311, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_AmplitudeMultiplier: 1 +--- !u!114 &487972872 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 375530499} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &388840134 -GameObject: + m_GameObject: {fileID: 487972869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4a50d88b55b45648927679791f472de, type: 3} + m_Name: + m_EditorClassIdentifier: + m_GroupName: Right + m_InteractionManager: {fileID: 0} + m_StartingGroupMembers: + - {fileID: 149866825} + - {fileID: 1285588752} + m_StartingInteractionOverridesMap: + - groupMember: {fileID: 149866825} + overrideGroupMembers: + - {fileID: 1285588752} +--- !u!114 &487972873 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 388840135} - m_Layer: 0 - m_Name: Ring_Palm_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &388840135 + m_GameObject: {fileID: 487972869} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b9a90fa34d4455469b76611722eae2a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RayInteractor: {fileID: 0} + m_NearFarInteractor: {fileID: 1285588752} + m_TeleportInteractor: {fileID: 1895599009} + m_TeleportMode: {fileID: -8061240218431744966, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_TeleportModeCancel: {fileID: 2307464322626738743, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_Turn: {fileID: -6493913391331992944, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_SnapTurn: {fileID: -8525429354371678379, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_Move: {fileID: -8198699208435500284, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_UIScroll: {fileID: -6756787485274679044, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_SmoothMotionEnabled: 0 + m_SmoothTurnEnabled: 0 + m_NearFarEnableTeleportDuringNearInteraction: 1 + m_UIScrollingEnabled: 1 + m_RayInteractorChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &487972874 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 388840134} - m_LocalRotation: {x: 0.99804187, y: -0.04426889, z: 0.04315787, w: 0.009497783} - m_LocalPosition: {x: -0.05238823, y: 0.0045133065, z: -0.011750946} + m_GameObject: {fileID: 487972869} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 695049119} - m_Father: {fileID: 1909973946} - m_RootOrder: 3 + - {fileID: 149866826} + - {fileID: 1285588754} + - {fileID: 1895599010} + - {fileID: 1802169368} + m_Father: {fileID: 886140063} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &391997630 +--- !u!1 &496564291 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2624,31 +3572,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 391997631} + - component: {fileID: 496564292} + - component: {fileID: 496564293} m_Layer: 0 - m_Name: Thumb_Palm_Left + m_Name: XR Interaction Manager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &391997631 +--- !u!4 &496564292 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 391997630} - m_LocalRotation: {x: -0.7044048, y: 0.08700629, z: 0.3122117, w: 0.6314806} - m_LocalPosition: {x: -0.042795867, y: -0.014722028, z: 0.029782485} + m_GameObject: {fileID: 496564291} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.028, y: 0, z: -5.929} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 595536807} - m_Father: {fileID: 1909973946} - m_RootOrder: 4 + m_Children: [] + m_Father: {fileID: 3120982} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &440165964 +--- !u!114 &496564293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 496564291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] +--- !u!1 &503181884 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2656,65 +3618,52 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 440165965} - - component: {fileID: 440165968} - - component: {fileID: 440165967} - - component: {fileID: 440165966} + - component: {fileID: 503181885} + - component: {fileID: 503181886} + - component: {fileID: 503181890} + - component: {fileID: 503181889} + - component: {fileID: 503181888} + - component: {fileID: 503181887} m_Layer: 0 - m_Name: Left Base Controller + m_Name: Magic Cube_SnapZone m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &440165965 +--- !u!4 &503181885 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440165964} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 503181884} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.2, z: 0.7500001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 506692965} - m_Father: {fileID: 1773926310} - m_RootOrder: 0 + - {fileID: 242342982} + m_Father: {fileID: 1756511964} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &440165966 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440165964} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.05 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &440165967 +--- !u!114 &503181886 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440165964} + m_GameObject: {fileID: 503181884} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7231d59cedbff745ae8517a2b954506, type: 3} + m_Script: {fileID: 11500000, guid: dc6efdd45e6a00744aaf4c68264d6d7c, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 2089871579} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 1 + m_InteractionManager: {fileID: 0} m_InteractionLayers: m_Bits: 1 - m_AttachTransform: {fileID: 1199504349} + m_Handedness: 0 + m_AttachTransform: {fileID: 242342982} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 m_StartingSelectedInteractable: {fileID: 0} @@ -2733,287 +3682,94 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 0 - m_TargetPriorityMode: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_AllowHoverAudioWhileSelecting: 1 - m_PlayHapticsOnSelectEntered: 1 - m_HapticSelectEnterIntensity: 0.5 - m_HapticSelectEnterDuration: 0.25 - m_PlayHapticsOnSelectExited: 1 - m_HapticSelectExitIntensity: 0.5 - m_HapticSelectExitDuration: 0.125 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 1 - m_HapticHoverEnterIntensity: 0.25 - m_HapticHoverEnterDuration: 0.25 - m_PlayHapticsOnHoverExited: 1 - m_HapticHoverExitIntensity: 0.25 - m_HapticHoverExitDuration: 0.125 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_AllowHoverHapticsWhileSelecting: 1 - m_ImproveAccuracyWithSphereCollider: 0 - m_PhysicsLayerMask: + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 0} + m_InteractableCantHoverMeshMaterial: {fileID: 0} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} + shownHighlightObject: {fileID: 919132149155446097, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} + ShowHighlightInEditor: 1 + highlightMeshMaterial: {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} + validationMaterial: {fileID: 2100000, guid: c6c888b079480654fbf337e7fe50b405, type: 2} + invalidMaterial: {fileID: 2100000, guid: 69e2b61a70de44f48909a564a7cf9c62, type: 2} + previewMesh: {fileID: 2119201252} +--- !u!65 &503181887 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503181884} + m_Material: {fileID: 0} + m_IncludeLayers: serializedVersion: 2 - m_Bits: 1 - m_PhysicsTriggerInteraction: 1 - precisionGrab: 1 ---- !u!114 &440165968 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.4, y: 0.4, z: 0.4} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &503181888 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440165964} + m_GameObject: {fileID: 503181884} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} + m_Script: {fileID: 11500000, guid: 557aaed036734781b129d67ec56c9366, type: 3} m_Name: m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 1 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 506692965} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: Grab - m_ModelDeSelectTransition: Grab - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: - m_Id: 8b170a9b-132e-486d-947e-6a244d4362ea - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -2024308242397127297, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotationAction: - m_UseReference: 1 - m_Action: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 080819c2-8547-4beb-8522-e6356be16fb1 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 8248158260566104461, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_IsTrackedAction: - m_UseReference: 0 - m_Action: - m_Name: Is Tracked - m_Type: 1 - m_ExpectedControlType: - m_Id: 5fcab0d7-7f85-486b-9ce8-587f91fd6010 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: bff3ff54-e432-4205-8a89-770a756a58f8 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: Select - m_Type: 0 - m_ExpectedControlType: - m_Id: 8e000d1c-13a4-4cc0-ad37-f2e125874399 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6131295136447488360, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: f93fa1a2-101a-4938-b3bf-d4156f43e4e4 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7039868187661461836, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: Activate - m_Type: 0 - m_ExpectedControlType: - m_Id: 3995f9f4-6aa7-409a-80d2-5f7ea1464fde - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5982496924579745919, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateActionValue: - m_UseReference: 1 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 0dee0d87-a49c-4317-9281-019ed020b1ce - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5393738492722007444, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: UI Press - m_Type: 0 - m_ExpectedControlType: - m_Id: db89d01c-df6f-4954-b868-103dd5bdb514 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6395602842196007441, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: c4f9d43a-7eb7-410a-a5ee-80994233e6e4 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIScrollAction: - m_UseReference: 0 - m_Action: - m_Name: UI Scroll - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: db273f91-ae55-4768-8558-7bb7cdc5d02b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 1 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 3e09b626-c80d-40ec-9592-eb3fe89c2038 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8785819595477538065, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Rotate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 3dca8766-e652-4e78-8406-420aa73ba338 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7363382999065477798, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 556e96de-15e0-4c21-af61-26549b7aff58 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Translate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: e873605e-6a95-4389-8fbe-39069340ba92 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 7779212132400271959, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ScaleToggleAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Toggle - m_Type: 1 - m_ExpectedControlType: - m_Id: 54622687-cf88-41cc-8b5a-2cfd522daf3a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ScaleDeltaAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Delta - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 4e22ab00-2340-424c-80a9-858890f88c2d - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 ---- !u!1 &481569935 + acceptedProcessSceneObjects: + - {fileID: 248065658} +--- !u!114 &503181889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503181884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb7be990fff0a2142a874601356b26df, type: 3} + m_Name: + m_EditorClassIdentifier: + lockOnParentObjectLock: 1 + objectAttached: + m_PersistentCalls: + m_Calls: [] + objectDetached: + m_PersistentCalls: + m_Calls: [] + lockOnUnsnap: 1 +--- !u!114 &503181890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503181884} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 49823b067d495c47aac98eb841ddc61e + guids: [] +--- !u!1 &518602150 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3021,841 +3777,517 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 481569936} - m_Layer: 0 - m_Name: AttachTransform + - component: {fileID: 518602151} + - component: {fileID: 518602152} + - component: {fileID: 518602154} + - component: {fileID: 518602153} + m_Layer: 31 + m_Name: Teleportation area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &481569936 + m_IsActive: 0 +--- !u!4 &518602151 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 481569935} - m_LocalRotation: {x: 0.36650118, y: 0, z: 0, w: 0.9304176} - m_LocalPosition: {x: -0.0447, y: -0.0476, z: 0.0131} + m_GameObject: {fileID: 518602150} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.5, y: 0, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 514757337} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 43, y: 0, z: 0} ---- !u!1 &496138946 -GameObject: + m_Father: {fileID: 33704422} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &518602152 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 496138948} - - component: {fileID: 496138951} - - component: {fileID: 496138947} - - component: {fileID: 496138950} - - component: {fileID: 496138949} - m_Layer: 0 - m_Name: Right Teleport Controller - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &496138947 + m_GameObject: {fileID: 518602150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: b83ed1c9b1876e46820d20bbcae66652 + guids: [] +--- !u!114 &518602153 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496138946} - m_Enabled: 0 + m_GameObject: {fileID: 518602150} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3} + m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 2089871579} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 256 + m_InteractionManager: {fileID: 0} + m_Colliders: [] m_InteractionLayers: - m_Bits: 2 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 0 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} + m_Bits: 2147483648 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 1 + m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] m_HoverEntered: m_PersistentCalls: m_Calls: [] m_HoverExited: m_PersistentCalls: m_Calls: [] - m_SelectEntered: + m_FirstSelectEntered: m_PersistentCalls: m_Calls: [] - m_SelectExited: + m_LastSelectExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: + m_SelectEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_SelectExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_SelectActionTrigger: 0 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 1 - m_TargetPriorityMode: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_AllowHoverAudioWhileSelecting: 1 - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_AllowHoverHapticsWhileSelecting: 1 - m_LineType: 1 - m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 30 - m_RayOriginTransform: {fileID: 1982479364} - m_ReferenceFrame: {fileID: 0} - m_Velocity: 10 - m_Acceleration: 9.8 - m_AdditionalGroundHeight: 0.1 - m_AdditionalFlightTime: 0.5 - m_EndPointDistance: 30 - m_EndPointHeight: -10 - m_ControlPointDistance: 10 - m_ControlPointHeight: 5 - m_SampleFrequency: 20 - m_HitDetectionType: 0 - m_SphereCastRadius: 0 - m_ConeCastAngle: 6 - m_RaycastMask: - serializedVersion: 2 - m_Bits: 256 - m_RaycastTriggerInteraction: 1 - m_RaycastSnapVolumeInteraction: 1 - m_HitClosestOnly: 0 - m_HoverToSelect: 1 - m_HoverTimeToSelect: 0 - m_AutoDeselect: 0 - m_TimeToAutoDeselect: 3 - m_EnableUIInteraction: 1 - m_BlockUIOnInteractableSelection: 1 - m_AllowAnchorControl: 1 - m_UseForceGrab: 1 - m_RotateSpeed: 180 - m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 - m_UIHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_UIHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_EnableARRaycasting: 0 - m_OccludeARHitsWith3DObjects: 0 - m_OccludeARHitsWith2DObjects: 0 - m_ScaleMode: 0 ---- !u!4 &496138948 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496138946} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1982479364} - m_Father: {fileID: 697578261} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &496138949 -MonoBehaviour: + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_TeleportationProvider: {fileID: 0} + m_MatchOrientation: 0 + m_MatchDirectionalInput: 0 + m_TeleportTrigger: 0 + m_FilterSelectionByHitNormal: 0 + m_UpNormalToleranceDegrees: 30 + m_Teleporting: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &518602154 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496138946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LineWidth: 0.02 - m_OverrideInteractorLineLength: 1 - m_LineLength: 10 - m_AutoAdjustLineLength: 0 - m_MinLineLength: 0.5 - m_UseDistanceToHitAsMaxLineLength: 1 - m_LineRetractionDelay: 0.5 - m_LineLengthChangeSpeed: 12 - m_WidthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_SetLineColorGradient: 1 - m_ValidColorGradient: - serializedVersion: 2 - key0: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 0} - key1: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key2: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_InvalidColorGradient: + m_GameObject: {fileID: 518602150} + m_Material: {fileID: 0} + m_IncludeLayers: serializedVersion: 2 - key0: {r: 1, g: 0.39215687, b: 0.18431373, a: 0} - key1: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key2: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_BlockedColorGradient: + m_Bits: 0 + m_ExcludeLayers: serializedVersion: 2 - key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_TreatSelectionAsValidState: 0 - m_SmoothMovement: 0 - m_FollowTightness: 10 - m_SnapThresholdDistance: 10 - m_Reticle: {fileID: 0} - m_BlockedReticle: {fileID: 0} - m_StopLineAtFirstRaycastHit: 1 - m_StopLineAtSelection: 0 - m_SnapEndpointIfAvailable: 1 - m_LineBendRatio: 0.5 - m_OverrideInteractorLineOrigin: 1 - m_LineOriginTransform: {fileID: 0} - m_LineOriginOffset: 0 ---- !u!120 &496138950 -LineRenderer: + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8378139086155444565, guid: 3d993d7375e6eec4d971b7d72f65da14, type: 3} +--- !u!43 &524671518 +Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496138946} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 0} - m_Parameters: + m_Name: + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 960 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 205 + localAABB: + m_Center: {x: -0.000000029802322, y: 0.000000029802322, z: 0.000000007450581} + m_Extent: {x: 0.2, y: 0.2, z: 0.19999999} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020001000300020001000400030002000300050004000600030004000700060003000800050003000600080005000800090007000a00060007000b000a0006000c00080006000a000c0008000d00090008000c000d0009000d000e000b000f000a000b0010000f000a0011000c000f0011000a000c0012000d00110012000c00100013000f001000140013000f00150011000f00130015001400160013001400170016000d0018000e00120018000d0011001900120015001900110013001a001500130016001a0017001b00160017001c001b001c001d001b0016001b001e0016001e001a001d001f001b001b001f001e001d0020001f0015001a0021001500210019001900220012001200220018001a001e0023001a0023002100200024001f002000250024001f0026001e001e00260023001f0024002600250027002400250028002700240027002900240029002600260029002a0026002a00230023002a002b00210023002b0021002b002c0021002c00190019002c0022002c002b002d002b002e002d0022002c002f002c002d002f002e0030002d002e003100300022002f0032001800220032002f002d0033002d0030003300310034003000310035003400350036003400350037003600340036003800300034003900340038003900300039003300390038003a0039003a003b00330039003b003b003a003c002f0033003d003d0033003b0032002f003d003d003b003e003e003b003c0032003d003f003f003d003e00400032003f001800320040000e00180040000e00400041000e004100420040003f0043004000430041003f003e0044003f00440043003e003c0045003e004500440041004600420042004600470041004300480041004800460043004400490043004900480046004a00470047004a004b0048004c00460046004c004a004a004d004b004b004d004e004a004f004d004c004f004a004c0050004f00480051004c00510050004c0048004900510051005200500044005300490044004500530049005400510051005400520049005300540053004500550054005300560053005500560052005400570054005600570045005800550045003c0058003c005900580059005a00580059005b005a00550058005c0058005a005c00560055005d0055005c005d005b005e005a005b005f005e005a0060005c005a005e0060005f0061005e005f00620061005e00610063005e00630060006000630064005c00600065006000640065005d005c00650065006400660056005d0067005700560067005d006500680068006500660067005d006800570067006900670068006a0067006a006900680066006b0068006b006a00570069006c00520057006c006d0052006c006d006c006e006f006d006e006c00690070006e006c00700069006a0071006900710070006f006e00720073006f0072006e007000740072006e007400730072007500760073007500750072007700720074007700770074007800740070007900740079007800700071007900780079007a006a007b0071006a006b007b0071007c00790079007c007a0071007b007c007b006b007d007c007b007e007b007d007e007a007c007f007c007e007f006b0080007d006b00660080006600810080008100820080008100830082007d00800084008000820084007e007d0085007d008400850083008600820083008700860082008800840082008600880087008900860087008a008900860089008b0086008b00880088008b008c00840088008d0088008c008d00850084008d008d008c008e007e0085008f007f007e008f0085008d00900090008d008e008f00850090007f008f0091008f00900092008f009200910090008e0093009000930092007f00910094007a007f00940095007a009400950094009600970095009600940091009800960094009800910092009900910099009800970096009a009b0097009a00960098009c009a0096009c009b009a009d009e009b009d009d009a009f009a009c009f009f009c00a0009c009800a1009c00a100a00098009900a100a000a100a2009200a300990092009300a3009900a400a100a100a400a2009900a300a400a3009300a500a400a300a600a300a500a600a200a400a700a400a600a7009300a800a50093008e00a8008e00a900a800a900aa00a800a900ab00aa00a500a800ac00a800aa00ac00a600a500ad00a500ac00ad00ab00ae00aa00ab00af00ae00aa00b000ac00aa00ae00b000af00b100ae00af00b200b100ae00b100b300ae00b300b000b000b300b400ac00b000b500b000b400b500ad00ac00b500b500b400b600b700b500b600ad00b500b700b700b600b800b900ad00b700a600ad00b900a700a600b900b700b800ba00b900b700ba00ba00b800bb00a700b900bc00b900ba00bc00ba00bb00bd00bc00ba00bd00bd00bb00be00a700bc00bf00a200a700bf00c000a200bf00bc00bd00c100bf00bc00c100bd00be00c200c100bd00c200c200be00c300c400c200c300c000bf00c500c500bf00c100c600c000c500c700c200c400c700c100c200c500c100c700c800c700c400c600c500c900c900c500c700c900c700c800ca00c600c900cb00c900c800ca00c900cb00cc00ca00cb00 + m_VertexData: serializedVersion: 3 - widthMultiplier: 0.02 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 4 - numCapVertices: 4 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &496138951 + m_VertexCount: 205 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 9840 + _typelessdata: 4d14cbb2cbcc4cbe7d3fd83200000000000080bf00000000587873bf000000000d389ebe000080bfc32e3a3e00000000134d7e3c6f3c46be10ab433da2b6ab3d936576bfb91e843e0d2974bf7c301cbeba9e84be000080bff3e8223e753d213d267226bd6f3c46be77dbf13cbdc660be936576bff74e233e52816cbf1e301c3e80bdb3be000080bf9274513e753d213dc76ce2bcd82d37be1d36ae3ddb8112bed7e862bf5472e13e587873bf0000000013389ebe000080bfc22e3a3e753da13d6115053dc9362ebe53cccc3d0e5b263e73c459bf73ffff3ed65b74bfb71887bede190ebe000080bf23a30b3e753da13d5436aebdc6362ebe6b247d3df3c3d9be6dc459bfe8369e3e0e925abf9a18873ebfc8e5be000080bf61ba683e753da13ddcfb2cbc183214bebcf00c3e4f5a86bd643e3bbf75c32d3fe0b378bf0829debd5ad857be000080bff2e8223e2edcf13d30ba3e3df1a806be8cc0123e1b026a3e0c522cbf9e0d343f8a5274bf085298bed8d4cf3c000080bfa6bae83d30dcf13d043294bd0c3214be1ec1f03d061ab1be593e3bbfb172163fd4eb68bf132ade3d9d0fcdbe000080bf9274513e30dcf13d9dabf9bdeba806bee164b53daf2919bf01522cbf7d8ede3e90d741bfdd51983e91dd14bf000080bf1900803e30dcf13d413ec23b2bbecdbd25fc303e44aa133c416401bf93e15c3fa2967cbfab2714be457898bd000080bf22a30b3e743d213ebd6a623d662eb7bd86362e3ee5828d3ef2f9e4be24c4593fe97f75bfd0c53ebe28c55a3e000080bf062fba3d753d213e9d5757bd9457d7bd82af253ebf9686bea29606bf761b4f3f587873bf0000000017389ebe000080bfc22e3a3e743d213e0fe2d9bd25becdbd5e9d0b3e07b303bf356401bfce56313f9f8c57bfd427143e1c0d05bf000080bf63ba683e753d213edf3114be5d2eb7bd4f56d73d573e39bfc0f9e4be0196063fe27816bf00000000e41b4fbf000080bf01a38b3e753d213ee24dfe3c47be4dbda5ab433ee426143e0db96fbe641d763f2d307dbf18e282bd6f79083e000080bfa5bae83dc18c493e9d96b23d65be4dbd57fc303e0765e53e54b96fbec3e15c3f3dd463bfce4accbc2d25e93e000080bf44a38b3dc28c493ef36ce2bcc16c62bdabc6423e8eb81dbeaa6f89be916e733f3a047cbfcbb526bd4b0c2fbe000080bff2e8223ec08c493ef92db7bdcb6c62bd79362e3ee25fdebeb26f89beca1d5c3f8c9b65bff9b4263d2575e1be000080bf9274513ec18c493e93257d3d330b18b4c1c6423e2a319e3ea722913ca66e733f707873bf0000000087379e3e000080bfe42eba3d0edc713ec6c1f03d0a11a632c9af253e2679163f00000000b21b4f3f3d074fbf268be33c496a163f000080bf052f3a3d0edc713e4d14cbb2c4c05332cccc4c3e00000000000000000000803fb6e67fbf828ee3bc00000000000080bf22a30b3e0ddc713ef42db73da16c623d7c362e3ee45fde3ea46f893eca1d5c3f8a9b65bfe8b3263d3475e13e000080bf22a38b3dad158d3ee4ba0c3e61be4d3d859d0b3ecea02e3f1ab96f3eec56313f6fbe3abf19fb1b3ee7b52a3f000080bf052fba3cad158d3ee9ba0cbe5dbe4dbd859d0b3ec9a02ebf25b96fbef056313f33c738bfc5e2823d816c30bf000080bf1900803ec28c493ea2257dbdb6f88732c1c6423e2b319ebefc2391bca56e733f6e7873bf0000000087379ebe000080bfc22e3a3e0edc713eeb6ce23c9e6c623dafc6423e9fb81d3e9b6f893e916e733f3c047cbf1fb426bd400c2f3e000080bf84bae83dad158d3e07e2d93d2abecd3d5f9d0b3e04b3033f3664013fd056313fa28c57bff527143e150d053f000080bfc22e3a3d533da13edb31143e5e2eb73d4f56d73d593e393fb6f9e43e0396063fc9ba2bbfca838d3e4d2d303f000080bf00000000533da13e97abf93defa8063ee164b53db429193ffe512c3f758ede3e9dd741bf4152983e64dd143f000080bf052fba3c0265b53e8f57573d9957d73d84af253ec696863e9e96063f771b4f3f567873bf000000001f389e3e000080bfc22eba3d533da13edb31943d2232143e0bc1f03deb19b13e663e3b3faa72163fe1eb68bf8f2ade3d620fcd3e000080bf23a38b3d0265b53e4d36ae3dca362e3e6b247d3df5c3d93e6fc4593fe1369e3e27925abfec18873e2fc8e53e000080bf052f3a3db08cc93efc4dfebc4fbe4d3da5ab433ef32614be06b96f3e641d763f2d307dbf12e282bd7e7908be000080bff3e8223ead158d3ecec1f0bd0a11a632c7af253e247916bf00000000b31b4f3f3f074fbf5c8ae33c476a16bf000080bf62ba683e0edc713ea63ec2bb2fbecd3d25fc303e32aa13bc3d64013f96e15c3fa0967cbfbc2714be5778983d000080bf12a30b3e533da13e186ce23ce52d373e0036ae3da381123ee1e8623f3672e13e587873bf0000000017389e3e000080bfe42eba3db08cc93e1972263d733c463e77dbf13cc4c6603e9365763ffc4e233e5b816cbf3d301c3e4cbdb33e000080bf44a38b3d5fb4dd3e01fb2c3c2332143eb7f00c3e0a5a863d673e3b3f72c32d3fd7b378bf312adebdc9d8573e000080bf84bae83d0265b53e454d7ebc733c463e13ab433da6b6abbd9365763faf1e843e042974bf97301cbef79e843e000080bfa6bae83d5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f00000000587873bf0000000011389e3e000080bf062fba3d0edcf13e6d1505bdcb362e3e53cccc3d135b26be75c4593f71ffff3ec25b74bffe1887bee61a0e3e000080bf23a30b3eb08cc93e3dba3ebdf4a8063e8cc0123e27026abe03522c3fa60d343f7f5274bf465298bec3d1cfbc000080bff3e8223e0265b53ecb6a62bd672eb73d86362e3ee4828dbef0f9e43e24c4593f877873bf00000000e8369ebe000080bfc32e3a3e533da13ea596b2bd6abe4d3d57fc303e1065e5be4fb96f3ec1e15c3f73e360bf8fe1823d056ff2be000080bf9274513ead158d3e183cc6bd2abecd3da0c0123efdecffbe3564013fc50d343fc52541bfb526143e85e223bf000080bf62ba683e533da13e3dba3ebdf4a8063e8cc0123e27026abe03522c3fa60d343fe57a49bfc451983e4f5a0abf000080bf9274513e0265b53e516209be7d6c623df8f00c3e27fc2ebf866f893ebac32d3ff32932bf41af263df78837bf000080bf1900803ead158d3e4d2db7bd1a32143e9c56d73d4f71e7be603e3b3f10b5023f2d7d29bf1d28de3d72d63dbf000080bf1800803e0265b53e6d1505bdcb362e3e53cccc3d135b26be75c4593f71ffff3e93cf30bf8118873e925e2cbf000080bf62ba683eb08cc93ee2af25be39c2c3b486c1f03d7f134fbf3d20913cf272163ffc7816bf00000000d11b4fbf000080bf00a38b3e0edc713ef4f00cbe7357d73d7ecccc3d332d30bf8796063fc4ffff3e3a7916bf00000000a51b4fbf000080bf01a38b3e533da13e873194bddc2d373e6556573dd4c6bfbed7e8623f7b558b3e887916bf000000006d1b4fbf000080bf00a38b3eb08cc93e454d7ebc733c463e13ab433da6b6abbd9365763faf1e843e738e1ebfb02f1c3e6a2845bf000080bf1900803e5fb4dd3e5dbd4dbd673c463e7d3fd83294eb8abe8865763f00000000fd830abf33311cbee9b753bf000080bfe845973e5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f00000000a07916bf00000000591b4fbf000080bf01a38b3e0edcf13ec756d7bda7362e3e7d3fd8323a9606bf4fc4593f00000000de98dabe991987be866b5dbf000080bfd0e8a23eb08cc93ebbb302be0432143ea156573ded1120bf4b3e3b3f9d558b3e832c00bffe2cdebddada5bbf000080bfe845973e0265b53e0d4e1abeb8a8063e7d3fd832dd513dbfcd512c3f0000000040a58abedb5298bef55e6abf000080bfb98bae3e0265b53efe322abed8bdcd3d38ab433dc9c852bf0e64013ff71e843ea55bc0bef72814be2a566abf000080bfd1e8a23e533da13eb42d37bef52db73d7d3fd8321bf964bf7cf9e43e000000000000000000000000000080bf000080bfa12eba3e533da13e5d7f30be216c623d6436ae3d61555bbf596f893ec172e13e3cfeeebee8b526bdc52862bf000080bfe845973ead158d3ec1ea43bedebd4d3dafdbf13cc18375bfb9b86f3e834f233ee82837be80e282bdf3567bbf000080bfb98bae3ead158d3ed4c642bed9c05332ae247d3d7c7873bf0000000031379e3e93279ebe0f8be3bc716073bf000080bfd0e8a23e0ddc713e5b4530be25be4dbdfe64b53db49f5ebfddb86fbeb48ede3e5260ddbef7e082bdcb4066bf000080bfe845973ec18c493e6d7226be07becdbddedb713d865b51bf256401bfece68c3e71b76fbe562714be791d76bf000080bfd0e8a23e743d213e9dabf9bdeba806bee164b53daf2919bf01522cbf7d8ede3ede5aa3bea75198be7d5b66bf000080bfe845973e30dcf13d45fd41be706c62bdd815053dbbb373bf916f89befee5163ee40711bed9b426bd82347dbf000080bfb88bae3ec08c493ecfcc4cbeb3f887327d3fd832b6f57fbf1c2491bc000000000000000000000000000080bf000080bfa02eba3e0edc713ec1ea43bedebd4d3d94dbf1bcc38375bfabb86f3e744f23bef928373eb4e3823def567bbf000080bf88d1c53ead158d3e2b6209be013214bee215053de3722abf4c3e3bbf02e6163ef545ccbd8429debd82347dbf000080bfb88bae3e2edcf13d5436aebdc6362ebe6b247d3df3c3d9be6dc459bfe8369e3ebde626be7b1887be7a6073bf000080bfd0e8a23e753da13d74362ebe6657d7bd7d3fd8321bc459bf8c9606bf000000000000000000000000000080bf000080bfa02eba3e743d213e45fd41be706c62bdcc1505bdbbb373bf916f89be02e616beee07113e8fb4263d82347dbf000080bf88d1c53ec18c493e7c2db7bdcf2d37be79813934a90cedbed1e862bf000000000000000000000000000080bf000080bfa02eba3e743da13d267226bd6f3c46be77dbf13cbdc660be936576bff74e233e8c2d46bd0c301cbe86b37cbf000080bfb98bae3e753d213d246209be093214bea21505bddc722abf533e3bbfe2e516be1446cc3d1229de3d82347dbf000080bf88d1c53e2edcf13d267226bd6f3c46be5ddbf1bcd7c660be8f6576bf194f23beb32d463d2e301c3e84b37cbf000080bf89d1c53e753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf000000000000000000000000000080bf000080bfa12eba3e000000005436aebdc6362ebe59247dbde6c3d9be72c459bfe8369ebe8de6263e8618873e7a6073bf000080bf7074d13e753da13d9dabf9bdeba806bed864b5bdaf2919bf04522cbf768edebeaa5aa33ece51983e815b66bf000080bf5817dd3e30dcf13d6d7226be07becdbdcedb71bd835b51bf2d6401bfe7e68cbe5bb76f3e6827143e791d76bf000080bf7174d13e753d213edf3114be5d2eb7bd4756d7bd5a3e39bfc0f9e4befe9506bfdc78163f00000000e91b4fbf000080bf41bae83e753d213ed4c642bef910a6329c247dbd7c7873bf000000002f379ebe8e279e3e6391e33c6f6073bf000080bf7074d13e0edc713e5b4530be25be4dbdf564b5bdb19f5ebfdab86fbec38edebe5560dd3eb9e1823dca4066bf000080bf5917dd3ec28c493e5d7f30be816c623d3936aebd64555bbf7b6f893e9e72e1be35feee3ec6b8263dc52862bf000080bf5817dd3ead158d3eebaf25beb3f887326ac1f0bd85134fbfeb22913ce87216bff678163f00000000d71b4fbf000080bf40bae83e0edc713ee7ba0cbe5cbe4dbd839d0bbed5a02ebf01b96fbee95631bf2cc7383f34e382bd886c30bf000080bf285df43ec18c493efe322abed8bdcd3d2aab43bdc5c852bf1764013fe81e84beb05bc03e3d29143e27566abf000080bf7074d13e533da13e0d4e1abeb8a8063e7d3fd832dd513dbfcd512c3f0000000041a58a3edc52983ef45e6abf000080bf89d1c53e0265b53ebbb302be0432143e935657bdec1120bf4b3e3b3fa1558bbe852c003ff42cde3ddada5bbf000080bf5817dd3e0265b53ec756d7bda7362e3e7d3fd8323a9606bf4fc4593f00000000e098da3e9b19873e856b5dbf000080bf7074d13eb08cc93ef4f00cbe7357d73d75ccccbd2f2d30bf9196063fbdffffbe3679163f00000000a81b4fbf000080bf40bae83e533da13e536209bec16c623deef00cbe29fc2ebf996f893eb4c32dbfe329323f55b226bd058937bf000080bf285df43ead158d3e873194bddc2d373e535657bdd4c6bfbed7e8623f80558bbe8a79163f000000006a1b4fbf000080bf40bae83eb08cc93e5dbd4dbd673c463e7d3fd83294eb8abe8865763f00000000fd830a3f34311c3ee9b753bf000080bf5817dd3e5fb4dd3e4b2db7bd1932143e9556d7bd4f71e7be613e3b3f0fb502bf2d7d293f2428debd72d63dbf000080bf285df43e0265b53e454d7ebc733c463e06ab43bdaab6abbd9365763fb11e84be738e1e3fb32f1cbe6a2845bf000080bf295df43e5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f00000000a079163f00000000591b4fbf000080bf41bae83e0edcf13e6d1505bdcb362e3e4accccbd185b26be76c4593f6affffbe90cf303f7c1887be945e2cbf000080bf0800003fb08cc93e3dba3ebdf4a8063e8ac012be2e026abe07522c3fa30d34bfe37a493fbe5198be535a0abf000080bf7cd1053f0265b53e183cc6bd2abecd3d9ec012bef9ecffbe3964013fc30d34bfbf25413fdc2614be87e223bf000080bf0800003f533da13ecb6a62bd672eb73d84362ebee4828dbee9f9e43e25c459bf8778733f00000000e8369ebe000080bff0a20b3f533da13ecec1f0bdb8c05332c6af25be2b7916bf00000000af1b4fbf39074f3f1a90e3bc4e6a16bf000080bf0800003f0ddc713ea596b2bd6abe4d3d54fc30be1065e5be49b96f3ec1e15cbf6ee3603f53e282bd0e6ff2be000080bf7cd1053fad158d3ef82db7bdcb6c62bd79362ebee85fdebead6f89bec91d5cbf8a9b653f4eb526bd2b75e1be000080bf7cd1053fc08c493ea2257dbdb0f88732bec642be2a319ebe252391bca66e73bf6e78733f0000000087379ebe000080bff0a20b3f0edc713efc4dfebc4fbe4d3da1ab43be0a2714be05b96f3e621d76bf2b307d3f4fe2823d917908be000080bf6474113fad158d3e0fe2d9bd25becdbd5d9d0bbe08b303bf3d6401bfc65631bf9c8c573fe12714be1e0d05bf000080bf0800003f743d213e9dabf9bdeba806bed864b5bdaf2919bf04522cbf768edebe92d7413ff35198be87dd14bf000080bf285df43e30dcf13ddc3194bd153214be1dc1f0bde619b1be663e3bbfab7216bfd6eb683f6829debda60fcdbe000080bf7cd1053f2edcf13d5436aebdc6362ebe59247dbde6c3d9be72c459bfe8369ebe10925a3f911887beb9c8e5be000080bf0800003f753da13d9d5757bd9457d7bd82af25bec69686bea29606bf751b4fbf5478733f0000000025389ebe000080bff0a20b3f743d213ef36ce2bcc16c62bdabc642be7cb81dbea46f89be936e73bf3a047c3f7ab5263d320c2fbe000080bf6474113fc18c493efd6be2bcd72d37be2736aebd9d8112bed7e862bf5d72e1be5878733f0000000015389ebe000080bff0a20b3f753da13d267226bd6f3c46be5ddbf1bcd7c660be8f6576bf194f23be50816c3f28301cbe89bdb3be000080bf7cd1053f753d213dcefa2cbc0c3214bec7f00cbed05986bd5e3e3bbf7cc32dbfe0b3783f8729de3d37d857be000080bf6474113f30dcf13d134d7e3c6f3c46be06ab43bd9fb6ab3d936576bfb61e84be0f29743f77301c3eb49e84be000080bf6474113f753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf000000005878733f000000000f389ebe000080bff0a20b3f000000006115053dc9362ebe47ccccbd395b263e75c459bf6cffffbed95b743fb318873e81190ebe000080bfd845173f753da13d30ba3e3df1a806be8ac012be5a026a3e0f522cbf960d34bf8e52743feb51983e56d9cf3c000080bf4c171d3f30dcf13d413ec23b2bbecdbd24fc30bef7ab133c396401bf99e15cbfa4967c3f9327143edb7798bd000080bfd845173f753d213ebd6a623d662eb7bd84362ebee4828d3eebf9e4be24c459bf8978733f00000000e5369e3e000080bfc0e8223f753d213e4d14cbb20411a632cbcc4cbe0000000000000000000080bfb6e67f3f8a8fe33c00000000000080bfd845173f0edc713ee24dfe3c47be4dbda1ab43bef826143e14b96fbe621d76bf2d307d3f52e2823d7d79083e000080bf4c171d3fc28c493e9d6ce23caf6c623dadc642be75b81d3ea36f893e936e73bf3c047c3ff1b4263d230c2f3e000080bf4c171d3fad158d3e6b257d3dc44eb1b3c2c642be23319e3ee122913ca66e73bf7078733f000000007f379e3e000080bfc0e8223f0edc713e9d96b23d65be4dbd54fc30be0365e53e42b96fbec4e15cbf75e3603f0be282bdff6ef23e000080bf34ba283fc18c493ea63ec2bb2fbecd3d24fc30bef2aa13bc3d64013f96e15cbfa0967c3fc927143e4978983d000080bfd845173f533da13e3dba3ebdf4a8063e8ac012be2e026abe07522c3fa30d34bf7f52743f4652983eded1cfbc000080bf6474113f0265b53e01fb2c3c2332143eb5f00cbefd59863d6a3e3b3f6fc32dbfd7b3783f342ade3dc8d8573e000080bf4c171d3f0265b53e6d1505bdcb362e3e4accccbd185b26be76c4593f6affffbec25b743f0019873ee61a0e3e000080bfd845173fb08cc93e8f57573d9957d73d82af25bec496863ea096063f771b4fbf5678733f000000001e389e3e000080bfc0e8223f533da13ee22db73db86c623d7d362ebed85fde3ea46f893ecf1d5cbf8f9b653f3eb426bd2275e13e000080bf34ba283fad158d3e156ce23ce52d373ef735aebda281123ee2e8623f3472e1be5878733f0000000017389e3e000080bfc0e8223fb08cc93e454d7ebc733c463e06ab43bdaab6abbd9365763fb11e84be0429743f99301c3ef59e843e000080bf4c171d3f5fb4dd3edb31943d2232143e07c1f0bded19b13e683e3b3fa77216bfe0eb683f852adebd690fcd3e000080bf34ba283f0265b53e1972263d733c463e5ddbf1bcc6c6603e9365763ffe4e23be5b816c3f3e301cbe4cbdb33e000080bf34ba283f5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f000000005878733f0000000011389e3e000080bfc0e8223f0edcf13e4d36ae3dca362e3e59247dbdf5c3d93e6fc4593fe1369ebe26925a3fe91887be36c8e53e000080bfa88b2e3fb08cc93e97abf93defa8063ed864b5bdb429193ffe512c3f738edebe9cd7413f3b5298be69dd143f000080bf1c5d343f0265b53e07e2d93d2abecd3d5c9d0bbe07b3033f3764013fcc5631bf9f8c573ffe2714be170d053f000080bfa88b2e3f533da13edb31143e5e2eb73d4756d7bd593e393fbdf9e43efe9506bfe078163f00000000e51b4f3f000080bf902e3a3f533da13ec6c1f03db8c05332c6af25be2379163f00000000b51b4fbf3f074f3f3f8ee3bc466a163f000080bfa88b2e3f0ddc713ee5ba0c3e65be4d3d839d0bbecda02e3f20b96f3eeb5631bf2fc7383f19e382bd836c303f000080bf1c5d343fad158d3e3a62093eb36c62bd02f10cbe17fc2e3f9d6f89bec4c32dbff229323fd2b226bdf488373f000080bf1c5d343fc08c493edcaf253eaaf887328ac1f0bd80134f3f442391bcef7216bffb78163f00000000d11b4f3f000080bf902e3a3f0edc713e5745303e2abe4d3df564b5bdb49f5e3fc3b86f3ec18edebe5460dd3ea6e1823dca40663f000080bf0400403fad158d3e103cc63d25becdbd9ec012bef1ecff3e416401bfc10d34bfc325413fbc2614be86e2233f000080bfa88b2e3f743d213e30ba3e3df1a806be8ac012be5a026a3e0f522cbf960d34bff07a493f835198be525a0a3f000080bf34ba283f30dcf13d6b2db73d143214be7956d7bd6271e73e643e3bbf02b502bf2e7d293f6627debd74d63d3f000080bf1c5d343f2edcf13d6115053dc9362ebe47ccccbd395b263e75c459bf6cffffbea9cf303f531887be825e2c3f000080bfa88b2e3f753da13df1f00c3e6f57d7bd75ccccbd312d303f8f9606bfc3ffffbe3679163f00000000a81b4f3f000080bf902e3a3f743d213e4b7f303e816c62bd6e36aebd5a555b3f716f89becd72e1be5dfeee3e16b8263dba28623f000080bf0400403fc18c493e9831943dd42d37be3d5657bde8c6bf3ed4e862bf7c558bbe8479163f000000006f1b4f3f000080bf902e3a3f753da13d134d7e3c6f3c46be06ab43bd9fb6ab3d936576bfb61e84be7b8e1e3fb52f1cbe6228453f000080bf1c5d343f753d213dc7b3023ef93114be4c5657bdf911203f473e3bbf7f558bbe6c2c003f172dde3de7da5b3f000080bf0400403f30dcf13d4fbd4d3d653c46be7d3fd83299eb8a3e886576bf00000000f0830a3f2e311c3ef1b7533f000080bf0400403f753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf00000000a079163f00000000591b4f3f000080bf902e3a3f00000000be56d73da4362ebe7d3fd8323696063f50c459bf00000000ba98da3e7b19873e946b5d3f000080bf78d1453f753da13d0a4e1a3eb4a806be7d3fd832dd513d3fcd512cbf0000000029a58a3ec052983efc5e6a3f000080bfeca24b3f30dcf13dfb322a3ed3bdcdbd2bab43bdcdc8523f0a6401bfee1e84bea45bc03e1f29143e29566a3f000080bf78d1453f753d213eb02d373ef42db7bd7d3fd8321bf9643f81f9e4be0000000000000000000000000000803f000080bf6074513f753d213ed0c6423ef910a6329c247dbd7a78733f000000003e379ebe9c279e3ec792e33c6d60733f000080bf78d1453f0edc713ebdea433ed9bd4dbd94dbf1bcc183753fa3b86fbea54f23be2c29373eb7e3823ded567b3f000080bfeca24b3fc28c493e41fd413e6f6c623dd01505bdbdb3733f8e6f893ef4e516beca07113ec0b5263d82347d3f000080bfeca24b3fad158d3ecbcc4c3ee1d11634f303d133b6f57f3f3e25913c0000000000000000000000000000803f000080bf6074513f0edc713ebdea433ed9bd4dbdafdbf13cc183753fadb86fbe9a4f233e1c2937be8de382bded567b3f000080bfd445573fc18c493e6a72263e0bbecd3dcedb71bd855b513f2c64013fe2e68cbe3db76f3e7f27143e7a1d763f000080bf78d1453f533da13e97abf93defa8063ed864b5bdb429193ffe512c3f738edebe885aa33eeb51983e825b663f000080bf0400403f0265b53e1a62093e0f32143eb01505bddc722a3f533e3b3fd8e516be2e45cc3dce29de3d84347d3f000080bfeca24b3f0265b53e4d36ae3dca362e3e59247dbdf5c3d93e6fc4593fe1369ebec1e5263eb218873e7c60733f000080bf78d1453fb08cc93e70362e3e6b57d73d7d3fd83219c4593f9096063f0000000000000000000000000000803f000080bf6074513f533da13e3cfd413e936c623dea15053db9b3733f996f893e05e6163ee90711be21b526bd82347d3f000080bfd445573fad158d3e582db73ddb2d373e7d3fd8329f0ced3ed3e8623f0000000000000000000000000000803f000080bf6074513fb08cc93e1972263d733c463e5ddbf1bcc6c6603e9365763ffe4e23be372c463d2a301c3e86b37c3f000080bfeca24b3f5fb4dd3e1a62093e0f32143ebc15053ddc722a3f553e3b3fd5e5163e2745ccbdc629debd84347d3f000080bfd445573f0265b53e1972263d733c463e77dbf13cc4c6603e9365763ffc4e233e322c46bd26301cbe86b37c3f000080bfd445573f5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f0000000000000000000000000000803f000080bf6074513f0edcf13e4d36ae3dca362e3e6b247d3df5c3d93e6fc4593fe1369e3ec2e526beb21887be7c60733f000080bf48175d3fb08cc93e97abf93defa8063ee164b53db429193ffe512c3f758ede3e8a5aa3beeb5198be825b663f000080bfbce8623f0265b53e6a72263e0bbecd3ddedb713d835b513f2e64013fe4e68c3e31b76fbe982714be7a1d763f000080bf48175d3f533da13edb31143e5e2eb73d4f56d73d593e393fb6f9e43e0396063f4ec2ffbe25c53ebe4995583f000080bf30ba683f533da13e5745303e2abe4d3dfe64b53db29f5e3fbdb86f3ec68ede3e5160ddbe26e282bdca40663f000080bfbce8623fad158d3ee4ba0c3e61be4d3d859d0b3ecea02e3f1ab96f3eec56313f164535bfab46ccbcdca7343f000080bfa48b6e3fad158d3ed0c6423ed9c05332ae247d3d7a78733f000000003d379e3e9c279ebe8293e3bc6b60733f000080bf48175d3f0ddc713edcaf253ebbf887328ec1f03d7d134f3fd12291bcf172163ffc7816bf00000000d01b4f3f000080bf30ba683f0edc713ec6c1f03d0a11a632c9af253e2679163f00000000b21b4f3f3c074fbf388fe33c496a163f000080bf185d743f0edc713e4d7f303e816c62bd7836ae3d5a555b3f716f89becd72e13e5ffeeebe69b826bdba28623f000080bfbce8623fc08c493e3b62093eb36c62bd04f10c3e15fc2e3f9c6f89bec7c32d3ff62932bf81b2263df188373f000080bfa48b6e3fc18c493e9d96b23d65be4dbd57fc303e0765e53e54b96fbec3e15c3feb0f5cbfd5fa1b3e39b4f93e000080bf8c2e7a3fc28c493efb322a3ed3bdcdbd38ab433dcbc8523f0b6401bfe71e843e995bc0be112914be2c566a3f000080bf48175d3f743d213e0a4e1a3eb4a806be7d3fd832dd513d3fcd512cbf000000000ba58abea25298be065f6a3f000080bfd445573f30dcf13df1f00c3e6f57d7bd7dcccc3d312d303f8d9606bfc4ffff3e377916bf00000000a81b4f3f000080bf30ba683f743d213e103cc63d25becdbda0c0123ef1ecff3e396401bfc70d343fcc2541bf9e26143e7de2233f000080bf185d743f753d213ebd6a623d662eb7bd86362e3ee5828d3ef2f9e4be24c4593f379f5cbf49838d3e10c4d93e000080bf0000803f753d213e30ba3e3df1a806be8cc0123e1b026a3e0c522cbf9e0d343f0f7b49bf5a51983e305a0a3f000080bf8c2e7a3f30dcf13dc5b3023ef63114be8b56573df611203f483e3bbf8d558b3e5d2c00bf3f2cdebdf3da5b3f000080bfbce8623f2edcf13dbe56d73da4362ebe7d3fd8323696063f50c459bf000000006498dabe471987beb26b5d3f000080bf48175d3f753da13d692db73d063214bea756d73d6471e73e573e3bbf13b5023f437d29bf2c27de3d61d63d3f000080bfa48b6e3f30dcf13d6115053dc9362ebe53cccc3d0e5b263e73c459bf73ffff3ed9cf30bf2c18873e5c5e2c3f000080bf185d743f753da13d9b31943dcd2d37beaf56573df4c6bf3ecce862bf9c558b3e847916bf000000006f1b4f3f000080bf30ba683f753da13d4fbd4d3d653c46be7d3fd83299eb8a3e886576bf00000000e0830abf1a311cbefeb7533f000080bfbce8623f753d213d134d7e3c6f3c46be10ab433da2b6ab3d936576bfb91e843e8c8e1ebfa12f1c3e5528453f000080bfa48b6e3f753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf00000000a07916bf00000000591b4f3f000080bf30ba683f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: -0.000000029802322, y: 0.000000029802322, z: 0.000000007450581} + m_Extent: {x: 0.2, y: 0.2, z: 0.19999999} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1.8829471 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &535679136 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535679137} + - component: {fileID: 535679138} + m_Layer: 0 + m_Name: TransformerEnabled + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &535679137 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535679136} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1507460097} + m_Father: {fileID: 1192304054} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &535679138 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 496138946} + m_GameObject: {fileID: 535679136} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 0 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 820468471} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -3326005586356538449, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotationAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 5101698808175986029, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_IsTrackedAction: - m_UseReference: 0 - m_Action: - m_Name: Is Tracked - m_Type: 1 - m_ExpectedControlType: - m_Id: fcd2b3a9-43ac-48cf-a7ef-54b9ad619657 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: cc4e2ef5-ea43-46d3-b5d9-bb0fd6cf288f - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8270564778575511633, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 056d5a5d-5859-40a6-9c77-a8c50f2557c3 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 4766120400929042988, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 83097790271614945, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateActionValue: - m_UseReference: 1 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 0c708103-b771-4cf9-a58f-f4cd7216526c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -3285721481334498719, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 3279264004350380116, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 820dd6dd-cf7f-42f3-bfef-c218ea683709 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIScrollAction: - m_UseReference: 0 - m_Action: - m_Name: UI Scroll - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 6e0e5c0a-f766-4ba1-ac09-ccb5e05c9f7d - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 1 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 9ad5ff42-2240-49bb-89c4-c981d3c023eb - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8222252007134549311, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5913262927076077117, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: f900ec0d-eadb-4813-baa4-f9f0709793fe - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 875253871413052681, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ScaleToggleAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Toggle - m_Type: 1 - m_ExpectedControlType: - m_Id: 9b17f14a-5c0c-47d4-bbf7-e6b9fceff015 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ScaleDeltaAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Delta - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 2b918fe0-516b-4793-b6b1-98f6a5f40457 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 ---- !u!1 &503181884 + serializedGuid: + serializedGuid: 0b02258065237248bdd586d9a5633b28 + guids: [] +--- !u!1 &551482092 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 503181885} - - component: {fileID: 503181886} - - component: {fileID: 503181890} - - component: {fileID: 503181889} - - component: {fileID: 503181888} - - component: {fileID: 503181887} - m_Layer: 0 - m_Name: Magic Cube_SnapZone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &503181885 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6246853691175774326, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + m_PrefabInstance: {fileID: 1978455790} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503181884} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.2, z: 0.7500001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 242342982} - m_Father: {fileID: 1756511964} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &503181886 +--- !u!114 &551482098 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503181884} + m_GameObject: {fileID: 551482092} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc6efdd45e6a00744aaf4c68264d6d7c, type: 3} + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 1 - m_AttachTransform: {fileID: 242342982} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 0} - m_InteractableCantHoverMeshMaterial: {fileID: 0} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} - shownHighlightObject: {fileID: 919132149155446097, guid: 1ed1d5cc1197f8144a46c56a59341db7, type: 3} - ShowHighlightInEditor: 1 - highlightMeshMaterial: {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} - validationMaterial: {fileID: 2100000, guid: c6c888b079480654fbf337e7fe50b405, type: 2} - invalidMaterial: {fileID: 2100000, guid: 69e2b61a70de44f48909a564a7cf9c62, type: 2} - previewMesh: {fileID: 2119201252} ---- !u!65 &503181887 -BoxCollider: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1001 &561255719 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503181884} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.4, y: 0.4, z: 0.4} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &503181888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503181884} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 557aaed036734781b129d67ec56c9366, type: 3} - m_Name: - m_EditorClassIdentifier: - acceptedProcessSceneObjects: - - {fileID: 248065658} ---- !u!114 &503181889 -MonoBehaviour: + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 248065651} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 1862d8e21d2bba649b255c6a7eb4eb61, type: 2} + - target: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_Name + value: MagicSphere + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + insertIndex: -1 + addedObject: {fileID: 561255722} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + insertIndex: -1 + addedObject: {fileID: 561255723} + m_SourcePrefab: {fileID: 100100000, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} +--- !u!4 &561255720 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + m_PrefabInstance: {fileID: 561255719} + m_PrefabAsset: {fileID: 0} +--- !u!1 &561255721 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + m_PrefabInstance: {fileID: 561255719} + m_PrefabAsset: {fileID: 0} +--- !u!135 &561255722 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503181884} + m_GameObject: {fileID: 561255721} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb7be990fff0a2142a874601356b26df, type: 3} - m_Name: - m_EditorClassIdentifier: - lockOnParentObjectLock: 1 - objectAttached: - m_PersistentCalls: - m_Calls: [] - objectDetached: - m_PersistentCalls: - m_Calls: [] - lockOnUnsnap: 1 ---- !u!114 &503181890 + serializedVersion: 3 + m_Radius: 0.2 + m_Center: {x: -0.000000029802322, y: 0.000000029802322, z: 0.000000007450581} +--- !u!114 &561255723 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503181884} + m_GameObject: {fileID: 561255721} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: m_EditorClassIdentifier: serializedGuid: - serializedGuid: 49823b067d495c47aac98eb841ddc61e - uniqueName: Magic Cube_SnapZone_1 - tags: [] ---- !u!1 &506692964 + serializedGuid: d67820fd904d9f46873f098e03179ac0 + guids: [] +--- !u!1 &576643108 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3863,31 +4295,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 506692965} + - component: {fileID: 576643109} + - component: {fileID: 576643110} m_Layer: 0 - m_Name: ModelPt + m_Name: Collider (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &506692965 +--- !u!4 &576643109 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506692964} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 576643108} + serializedVersion: 2 + m_LocalRotation: {x: -0.27059805, y: -0.27059805, z: 0.6532815, w: 0.6532815} + m_LocalPosition: {x: -0.1617, y: 0, z: 0.17999974} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1015737782} - m_Father: {fileID: 440165965} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &512971541 + m_Children: [] + m_Father: {fileID: 660021081} + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 90} +--- !u!136 &576643110 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576643108} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.02 + m_Height: 0.2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &578148353 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3895,674 +4350,259 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 512971542} + - component: {fileID: 578148354} + - component: {fileID: 578148355} m_Layer: 0 - m_Name: Index_2_Left + m_Name: Collider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &512971542 +--- !u!4 &578148354 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 512971541} - m_LocalRotation: {x: 0.006532279, y: 0.0032989993, z: -0.17059992, w: 0.98531324} - m_LocalPosition: {x: -0.023907261, y: -0.00000026226044, z: 0.00000022888183} + m_GameObject: {fileID: 578148353} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1421788325} - m_Father: {fileID: 1352490008} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 1011416140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &514757336 -GameObject: +--- !u!135 &578148355 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 514757337} - - component: {fileID: 514757341} - - component: {fileID: 514757340} - - component: {fileID: 514757339} - - component: {fileID: 514757338} - m_Layer: 0 - m_Name: Left UI Controller - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &514757337 -Transform: + m_GameObject: {fileID: 578148353} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.7 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &586564669 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 813701130} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_Name + value: Podium Teleportation Area + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_Layer + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: -7511558181221131132, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + insertIndex: -1 + addedObject: {fileID: 586564674} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + insertIndex: -1 + addedObject: {fileID: 586564672} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + insertIndex: -1 + addedObject: {fileID: 586564675} + m_SourcePrefab: {fileID: 100100000, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} +--- !u!4 &586564670 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + m_PrefabInstance: {fileID: 586564669} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514757336} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 481569936} - m_Father: {fileID: 1773926310} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &514757338 +--- !u!1 &586564671 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} + m_PrefabInstance: {fileID: 586564669} + m_PrefabAsset: {fileID: 0} +--- !u!114 &586564672 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514757336} + m_GameObject: {fileID: 586564671} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: m_EditorClassIdentifier: - m_LineWidth: 0.02 - m_OverrideInteractorLineLength: 1 - m_LineLength: 10 - m_AutoAdjustLineLength: 0 - m_MinLineLength: 0.5 - m_UseDistanceToHitAsMaxLineLength: 1 - m_LineRetractionDelay: 0.5 - m_LineLengthChangeSpeed: 12 - m_WidthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_SetLineColorGradient: 1 - m_ValidColorGradient: - serializedVersion: 2 - key0: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 0} - key1: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key2: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key3: {r: 0, g: 0, b: 0, a: 1} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_InvalidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0.39215687, b: 0.18431373, a: 0} - key1: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key2: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_BlockedColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_TreatSelectionAsValidState: 0 - m_SmoothMovement: 0 - m_FollowTightness: 10 - m_SnapThresholdDistance: 10 - m_Reticle: {fileID: 0} - m_BlockedReticle: {fileID: 0} - m_StopLineAtFirstRaycastHit: 1 - m_StopLineAtSelection: 0 - m_SnapEndpointIfAvailable: 1 - m_LineBendRatio: 0.5 - m_OverrideInteractorLineOrigin: 1 - m_LineOriginTransform: {fileID: 0} - m_LineOriginOffset: 0 ---- !u!120 &514757339 -LineRenderer: + serializedGuid: + serializedGuid: b1b2d19d99f7c74a9759a753b5c92766 + guids: [] +--- !u!64 &586564674 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514757336} + m_GameObject: {fileID: 586564671} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Positions: [] - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.02 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 1, a: 1} - key1: {r: 0, g: 0, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 4 - numCapVertices: 4 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &514757340 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -3071651571934779511, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} +--- !u!114 &586564675 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514757336} - m_Enabled: 0 + m_GameObject: {fileID: 586564671} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 203357f2f04686b4c860a9361fd12c36, type: 3} + m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 32 + m_Colliders: [] m_InteractionLayers: - m_Bits: 32 - m_AttachTransform: {fileID: 481569936} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} + m_Bits: 2147483648 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 1 + m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] m_HoverEntered: m_PersistentCalls: m_Calls: [] m_HoverExited: m_PersistentCalls: m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] m_SelectEntered: m_PersistentCalls: m_Calls: [] m_SelectExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 0 - m_TargetPriorityMode: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_AllowHoverAudioWhileSelecting: 1 - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_AllowHoverHapticsWhileSelecting: 1 - m_LineType: 0 - m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 30 - m_RayOriginTransform: {fileID: 0} - m_ReferenceFrame: {fileID: 0} - m_Velocity: 16 - m_Acceleration: 9.8 - m_AdditionalGroundHeight: 0.1 - m_AdditionalFlightTime: 0.5 - m_EndPointDistance: 30 - m_EndPointHeight: -10 - m_ControlPointDistance: 10 - m_ControlPointHeight: 5 - m_SampleFrequency: 20 - m_HitDetectionType: 0 - m_SphereCastRadius: 0 - m_ConeCastAngle: 6 - m_RaycastMask: - serializedVersion: 2 - m_Bits: 32 - m_RaycastTriggerInteraction: 1 - m_RaycastSnapVolumeInteraction: 1 - m_HitClosestOnly: 0 - m_HoverToSelect: 0 - m_HoverTimeToSelect: 0.5 - m_AutoDeselect: 0 - m_TimeToAutoDeselect: 3 - m_EnableUIInteraction: 1 - m_BlockUIOnInteractableSelection: 1 - m_AllowAnchorControl: 1 - m_UseForceGrab: 1 - m_RotateSpeed: 180 - m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 - m_UIHoverEntered: + m_Activated: m_PersistentCalls: m_Calls: [] - m_UIHoverExited: + m_Deactivated: m_PersistentCalls: m_Calls: [] - m_EnableARRaycasting: 0 - m_OccludeARHitsWith3DObjects: 0 - m_OccludeARHitsWith2DObjects: 0 - m_ScaleMode: 0 ---- !u!114 &514757341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514757336} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 0 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 506692965} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: - m_Id: ee2b90af-cb76-4d31-80a6-06fad8ac806a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -2024308242397127297, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotationAction: - m_UseReference: 1 - m_Action: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 4c57fe61-e6e1-4df3-bff3-6c688f6f9e9a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 8248158260566104461, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_IsTrackedAction: - m_UseReference: 0 - m_Action: - m_Name: Is Tracked - m_Type: 1 - m_ExpectedControlType: - m_Id: ddf8704b-2999-4398-9c0c-f544b97511bc - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: 513b54c8-e5e6-4655-86fb-ffc0e6581287 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: Select - m_Type: 0 - m_ExpectedControlType: - m_Id: 869302d5-d3c7-4c1b-a962-a7e033b42a15 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6131295136447488360, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 74881b2d-69d1-415a-ba95-f39c2790be4c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7039868187661461836, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: Activate - m_Type: 0 - m_ExpectedControlType: - m_Id: 4aec5842-effb-4789-a584-e3222db901f4 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5982496924579745919, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateActionValue: - m_UseReference: 1 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 89e16be1-e73a-49a3-b8bd-bdd0bbceb5bb - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5393738492722007444, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: UI Press - m_Type: 0 - m_ExpectedControlType: - m_Id: e65a640e-2a41-422f-82dd-ebfb73c6c378 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6395602842196007441, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 826f3058-ef37-41e9-ba84-4afcd5732d73 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIScrollAction: - m_UseReference: 0 - m_Action: - m_Name: UI Scroll - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 81d76e5d-99e0-4c7d-b7aa-4b9b356a9678 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 1 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 80072ca0-f27a-4040-8ae9-a0fa7a761bbc - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8785819595477538065, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Rotate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 13f6cacf-e639-4a90-864c-abb89495ad0c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7363382999065477798, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: b3c94e4f-767d-44c1-8640-f2e1c8cd8399 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Translate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 6713f8f9-89a2-46da-aad5-ae077ac477ee - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 7779212132400271959, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ScaleToggleAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Toggle - m_Type: 1 - m_ExpectedControlType: - m_Id: 286d9bd4-26e9-420c-8388-e665eff6186f - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ScaleDeltaAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Delta - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 9b9023bf-9a71-4cf5-93ac-5f72bdfeb34b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 ---- !u!1 &518602150 + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_TeleportationProvider: {fileID: 0} + m_MatchOrientation: 0 + m_MatchDirectionalInput: 0 + m_TeleportTrigger: 0 + m_FilterSelectionByHitNormal: 0 + m_UpNormalToleranceDegrees: 30 + m_Teleporting: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &587381658 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4570,71 +4610,117 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 518602151} - - component: {fileID: 518602152} - - component: {fileID: 518602154} - - component: {fileID: 518602153} - m_Layer: 8 - m_Name: Teleportation area + - component: {fileID: 587381659} + - component: {fileID: 587381667} + - component: {fileID: 587381666} + - component: {fileID: 587381668} + - component: {fileID: 587381664} + - component: {fileID: 587381663} + - component: {fileID: 587381662} + - component: {fileID: 587381661} + - component: {fileID: 587381660} + - component: {fileID: 587381665} + - component: {fileID: 587381669} + m_Layer: 0 + m_Name: Sliced Cube (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!4 &518602151 +--- !u!4 &587381659 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 518602150} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.5, y: 0, z: 1.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 33704422} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &518602152 + m_GameObject: {fileID: 587381658} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0.01, y: 1.2, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1756511964} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &587381660 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 518602150} + m_GameObject: {fileID: 587381658} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: 10f84f2b8a43cb84abcf29d7e444d45d, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: b83ed1c9b1876e46820d20bbcae66652 - uniqueName: Teleportation area - tags: [] ---- !u!114 &518602153 + lockOnParentObjectLock: 1 + attachedToSnapZone: + m_PersistentCalls: + m_Calls: [] + detachedFromSnapZone: + m_PersistentCalls: + m_Calls: [] + lockObjectOnSnap: 0 +--- !u!114 &587381661 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 518602150} + m_GameObject: {fileID: 587381658} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} + m_Script: {fileID: 11500000, guid: 428efa2c1665b6745bfa9c1ec2026c93, type: 3} + m_Name: + m_EditorClassIdentifier: + lockOnParentObjectLock: 1 + grabStarted: + m_PersistentCalls: + m_Calls: [] + grabEnded: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &587381662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 573907d717ac4934eb429f2f5978a132, type: 3} + m_Name: + m_EditorClassIdentifier: + lockOnParentObjectLock: 1 + touchStarted: + m_PersistentCalls: + m_Calls: [] + touchEnded: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &587381663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1bcb89c5e4474247b7923fe1388ad1a, type: 3} m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: - m_Bits: 2 + m_Bits: 1 m_DistanceCalculationMode: 1 - m_SelectMode: 1 + m_SelectMode: 0 m_FocusMode: 1 - m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} + m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 m_OverrideGazeTimeToSelect: 0 @@ -4687,221 +4773,840 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_TeleportationProvider: {fileID: 0} - m_MatchOrientation: 0 - m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 - m_FilterSelectionByHitNormal: 0 - m_UpNormalToleranceDegrees: 30 - m_Teleporting: - m_PersistentCalls: - m_Calls: [] ---- !u!64 &518602154 -MeshCollider: + m_AttachTransform: {fileID: 0} + m_SecondaryAttachTransform: {fileID: 0} + m_UseDynamicAttach: 1 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 0 + m_ReinitializeDynamicAttachEverySingleGrab: 1 + m_AttachEaseInTime: 0.15 + m_MovementType: 1 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 0 + m_SmoothPositionAmount: 5 + m_TightenPosition: 0.5 + m_TrackRotation: 1 + m_SmoothRotation: 0 + m_SmoothRotationAmount: 5 + m_TightenRotation: 0.5 + m_TrackScale: 1 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 + m_ThrowOnDetach: 1 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_StartingSingleGrabTransformers: [] + m_StartingMultipleGrabTransformers: [] + m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 + isTouchable: 1 + isGrabbable: 1 + isUsable: 0 +--- !u!54 &587381664 +Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 518602150} + m_GameObject: {fileID: 587381658} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &587381665 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8378139086155444565, guid: 3d993d7375e6eec4d971b7d72f65da14, type: 3} ---- !u!43 &524671518 -Mesh: + serializedVersion: 3 + m_Size: {x: 0.40000013, y: 0.39999995, z: 0.20000006} + m_Center: {x: 0.00000047683716, y: 0, z: -0.10000003} +--- !u!23 &587381666 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1862d8e21d2bba649b255c6a7eb4eb61, type: 2} + - {fileID: 2100000, guid: a2e88723e4cd77a4690d0637321940aa, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &587381667 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} + m_Mesh: {fileID: 8989072162018436745, guid: 3cd7c532cc585b54795fadfe1b32fc53, type: 3} +--- !u!114 &587381668 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 960 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 205 - localAABB: - m_Center: {x: -0.000000029802322, y: 0.000000029802322, z: 0.000000007450581} - m_Extent: {x: 0.2, y: 0.2, z: 0.19999999} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020001000300020001000400030002000300050004000600030004000700060003000800050003000600080005000800090007000a00060007000b000a0006000c00080006000a000c0008000d00090008000c000d0009000d000e000b000f000a000b0010000f000a0011000c000f0011000a000c0012000d00110012000c00100013000f001000140013000f00150011000f00130015001400160013001400170016000d0018000e00120018000d0011001900120015001900110013001a001500130016001a0017001b00160017001c001b001c001d001b0016001b001e0016001e001a001d001f001b001b001f001e001d0020001f0015001a0021001500210019001900220012001200220018001a001e0023001a0023002100200024001f002000250024001f0026001e001e00260023001f0024002600250027002400250028002700240027002900240029002600260029002a0026002a00230023002a002b00210023002b0021002b002c0021002c00190019002c0022002c002b002d002b002e002d0022002c002f002c002d002f002e0030002d002e003100300022002f0032001800220032002f002d0033002d0030003300310034003000310035003400350036003400350037003600340036003800300034003900340038003900300039003300390038003a0039003a003b00330039003b003b003a003c002f0033003d003d0033003b0032002f003d003d003b003e003e003b003c0032003d003f003f003d003e00400032003f001800320040000e00180040000e00400041000e004100420040003f0043004000430041003f003e0044003f00440043003e003c0045003e004500440041004600420042004600470041004300480041004800460043004400490043004900480046004a00470047004a004b0048004c00460046004c004a004a004d004b004b004d004e004a004f004d004c004f004a004c0050004f00480051004c00510050004c0048004900510051005200500044005300490044004500530049005400510051005400520049005300540053004500550054005300560053005500560052005400570054005600570045005800550045003c0058003c005900580059005a00580059005b005a00550058005c0058005a005c00560055005d0055005c005d005b005e005a005b005f005e005a0060005c005a005e0060005f0061005e005f00620061005e00610063005e00630060006000630064005c00600065006000640065005d005c00650065006400660056005d0067005700560067005d006500680068006500660067005d006800570067006900670068006a0067006a006900680066006b0068006b006a00570069006c00520057006c006d0052006c006d006c006e006f006d006e006c00690070006e006c00700069006a0071006900710070006f006e00720073006f0072006e007000740072006e007400730072007500760073007500750072007700720074007700770074007800740070007900740079007800700071007900780079007a006a007b0071006a006b007b0071007c00790079007c007a0071007b007c007b006b007d007c007b007e007b007d007e007a007c007f007c007e007f006b0080007d006b00660080006600810080008100820080008100830082007d00800084008000820084007e007d0085007d008400850083008600820083008700860082008800840082008600880087008900860087008a008900860089008b0086008b00880088008b008c00840088008d0088008c008d00850084008d008d008c008e007e0085008f007f007e008f0085008d00900090008d008e008f00850090007f008f0091008f00900092008f009200910090008e0093009000930092007f00910094007a007f00940095007a009400950094009600970095009600940091009800960094009800910092009900910099009800970096009a009b0097009a00960098009c009a0096009c009b009a009d009e009b009d009d009a009f009a009c009f009f009c00a0009c009800a1009c00a100a00098009900a100a000a100a2009200a300990092009300a3009900a400a100a100a400a2009900a300a400a3009300a500a400a300a600a300a500a600a200a400a700a400a600a7009300a800a50093008e00a8008e00a900a800a900aa00a800a900ab00aa00a500a800ac00a800aa00ac00a600a500ad00a500ac00ad00ab00ae00aa00ab00af00ae00aa00b000ac00aa00ae00b000af00b100ae00af00b200b100ae00b100b300ae00b300b000b000b300b400ac00b000b500b000b400b500ad00ac00b500b500b400b600b700b500b600ad00b500b700b700b600b800b900ad00b700a600ad00b900a700a600b900b700b800ba00b900b700ba00ba00b800bb00a700b900bc00b900ba00bc00ba00bb00bd00bc00ba00bd00bd00bb00be00a700bc00bf00a200a700bf00c000a200bf00bc00bd00c100bf00bc00c100bd00be00c200c100bd00c200c200be00c300c400c200c300c000bf00c500c500bf00c100c600c000c500c700c200c400c700c100c200c500c100c700c800c700c400c600c500c900c900c500c700c900c700c800ca00c600c900cb00c900c800ca00c900cb00cc00ca00cb00 - m_VertexData: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 4bd5dfda1461c546b1ceff6d13ef92cb + guids: [] +--- !u!114 &587381669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 587381658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 0} + m_PokeCollider: {fileID: 587381665} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!1 &597715542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 597715543} + - component: {fileID: 597715544} + - component: {fileID: 597715548} + - component: {fileID: 597715547} + - component: {fileID: 597715546} + - component: {fileID: 597715545} + m_Layer: 0 + m_Name: Magic Cube_SnapZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &597715543 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597715542} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.2, z: 0.75} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1106929324} + m_Father: {fileID: 1527860102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &597715544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597715542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc6efdd45e6a00744aaf4c68264d6d7c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 1 + m_Handedness: 0 + m_AttachTransform: {fileID: 1106929324} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 0} + m_InteractableCantHoverMeshMaterial: {fileID: 0} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} + shownHighlightObject: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} + ShowHighlightInEditor: 1 + highlightMeshMaterial: {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} + validationMaterial: {fileID: 2100000, guid: c6c888b079480654fbf337e7fe50b405, type: 2} + invalidMaterial: {fileID: 2100000, guid: 69e2b61a70de44f48909a564a7cf9c62, type: 2} + previewMesh: {fileID: 0} +--- !u!65 &597715545 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597715542} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.4, y: 0.4, z: 0.4} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &597715546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597715542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 557aaed036734781b129d67ec56c9366, type: 3} + m_Name: + m_EditorClassIdentifier: + acceptedProcessSceneObjects: + - {fileID: 248065658} +--- !u!114 &597715547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597715542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb7be990fff0a2142a874601356b26df, type: 3} + m_Name: + m_EditorClassIdentifier: + lockOnParentObjectLock: 1 + objectAttached: + m_PersistentCalls: + m_Calls: [] + objectDetached: + m_PersistentCalls: + m_Calls: [] + lockOnUnsnap: 1 +--- !u!114 &597715548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597715542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 41ac9fab4fee234e819d2b79f916d92a + guids: [] +--- !u!1 &629046873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629046874} + - component: {fileID: 629046875} + m_Layer: 0 + m_Name: Left Controller Teleport Stabilized Origin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &629046874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629046873} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 122397525} + m_Father: {fileID: 886140063} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &629046875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629046873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64d299502104b064388841ec2adf6def, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Target: {fileID: 1011416140} + m_AimTargetObject: {fileID: 2112048200} + m_UseLocalSpace: 0 + m_AngleStabilization: 20 + m_PositionStabilization: 0.25 +--- !u!1 &629305521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629305522} + - component: {fileID: 629305524} + - component: {fileID: 629305523} + m_Layer: 0 + m_Name: Bumper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &629305522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629305521} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000013985816, y: -0.1305262, z: 0.000000018412676, w: 0.9914449} + m_LocalPosition: {x: -0.012636564, y: -0.028556997, z: 0.027326612} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1129813367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &629305523 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629305521} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &629305524 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629305521} + m_Mesh: {fileID: -4189514412694937182, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1001 &632093759 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1527860102} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalPosition.x + value: -0.75 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} + - target: {fileID: -7511558181221131132, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} + - target: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_Name + value: Pedestal + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + insertIndex: -1 + addedObject: {fileID: 1637849900} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + insertIndex: -1 + addedObject: {fileID: 632093762} + m_SourcePrefab: {fileID: 100100000, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} +--- !u!4 &632093760 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + m_PrefabInstance: {fileID: 632093759} + m_PrefabAsset: {fileID: 0} +--- !u!1 &632093761 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} + m_PrefabInstance: {fileID: 632093759} + m_PrefabAsset: {fileID: 0} +--- !u!65 &632093762 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 632093761} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.5000001, y: 1, z: 0.5000001} + m_Center: {x: -0.00000023841858, y: 0.5, z: 0} +--- !u!1 &643048780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 643048781} + - component: {fileID: 643048782} + m_Layer: 0 + m_Name: Collider (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &643048781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643048780} + serializedVersion: 2 + m_LocalRotation: {x: 0.27059805, y: 0.27059805, z: 0.6532815, w: 0.6532815} + m_LocalPosition: {x: -0.182, y: 0, z: -0.163} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 660021081} + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 90} +--- !u!136 &643048782 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643048780} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.02 + m_Height: 0.2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &660021079 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: serializedVersion: 3 - m_VertexCount: 205 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 9840 - _typelessdata: 4d14cbb2cbcc4cbe7d3fd83200000000000080bf00000000587873bf000000000d389ebe000080bfc32e3a3e00000000134d7e3c6f3c46be10ab433da2b6ab3d936576bfb91e843e0d2974bf7c301cbeba9e84be000080bff3e8223e753d213d267226bd6f3c46be77dbf13cbdc660be936576bff74e233e52816cbf1e301c3e80bdb3be000080bf9274513e753d213dc76ce2bcd82d37be1d36ae3ddb8112bed7e862bf5472e13e587873bf0000000013389ebe000080bfc22e3a3e753da13d6115053dc9362ebe53cccc3d0e5b263e73c459bf73ffff3ed65b74bfb71887bede190ebe000080bf23a30b3e753da13d5436aebdc6362ebe6b247d3df3c3d9be6dc459bfe8369e3e0e925abf9a18873ebfc8e5be000080bf61ba683e753da13ddcfb2cbc183214bebcf00c3e4f5a86bd643e3bbf75c32d3fe0b378bf0829debd5ad857be000080bff2e8223e2edcf13d30ba3e3df1a806be8cc0123e1b026a3e0c522cbf9e0d343f8a5274bf085298bed8d4cf3c000080bfa6bae83d30dcf13d043294bd0c3214be1ec1f03d061ab1be593e3bbfb172163fd4eb68bf132ade3d9d0fcdbe000080bf9274513e30dcf13d9dabf9bdeba806bee164b53daf2919bf01522cbf7d8ede3e90d741bfdd51983e91dd14bf000080bf1900803e30dcf13d413ec23b2bbecdbd25fc303e44aa133c416401bf93e15c3fa2967cbfab2714be457898bd000080bf22a30b3e743d213ebd6a623d662eb7bd86362e3ee5828d3ef2f9e4be24c4593fe97f75bfd0c53ebe28c55a3e000080bf062fba3d753d213e9d5757bd9457d7bd82af253ebf9686bea29606bf761b4f3f587873bf0000000017389ebe000080bfc22e3a3e743d213e0fe2d9bd25becdbd5e9d0b3e07b303bf356401bfce56313f9f8c57bfd427143e1c0d05bf000080bf63ba683e753d213edf3114be5d2eb7bd4f56d73d573e39bfc0f9e4be0196063fe27816bf00000000e41b4fbf000080bf01a38b3e753d213ee24dfe3c47be4dbda5ab433ee426143e0db96fbe641d763f2d307dbf18e282bd6f79083e000080bfa5bae83dc18c493e9d96b23d65be4dbd57fc303e0765e53e54b96fbec3e15c3f3dd463bfce4accbc2d25e93e000080bf44a38b3dc28c493ef36ce2bcc16c62bdabc6423e8eb81dbeaa6f89be916e733f3a047cbfcbb526bd4b0c2fbe000080bff2e8223ec08c493ef92db7bdcb6c62bd79362e3ee25fdebeb26f89beca1d5c3f8c9b65bff9b4263d2575e1be000080bf9274513ec18c493e93257d3d330b18b4c1c6423e2a319e3ea722913ca66e733f707873bf0000000087379e3e000080bfe42eba3d0edc713ec6c1f03d0a11a632c9af253e2679163f00000000b21b4f3f3d074fbf268be33c496a163f000080bf052f3a3d0edc713e4d14cbb2c4c05332cccc4c3e00000000000000000000803fb6e67fbf828ee3bc00000000000080bf22a30b3e0ddc713ef42db73da16c623d7c362e3ee45fde3ea46f893eca1d5c3f8a9b65bfe8b3263d3475e13e000080bf22a38b3dad158d3ee4ba0c3e61be4d3d859d0b3ecea02e3f1ab96f3eec56313f6fbe3abf19fb1b3ee7b52a3f000080bf052fba3cad158d3ee9ba0cbe5dbe4dbd859d0b3ec9a02ebf25b96fbef056313f33c738bfc5e2823d816c30bf000080bf1900803ec28c493ea2257dbdb6f88732c1c6423e2b319ebefc2391bca56e733f6e7873bf0000000087379ebe000080bfc22e3a3e0edc713eeb6ce23c9e6c623dafc6423e9fb81d3e9b6f893e916e733f3c047cbf1fb426bd400c2f3e000080bf84bae83dad158d3e07e2d93d2abecd3d5f9d0b3e04b3033f3664013fd056313fa28c57bff527143e150d053f000080bfc22e3a3d533da13edb31143e5e2eb73d4f56d73d593e393fb6f9e43e0396063fc9ba2bbfca838d3e4d2d303f000080bf00000000533da13e97abf93defa8063ee164b53db429193ffe512c3f758ede3e9dd741bf4152983e64dd143f000080bf052fba3c0265b53e8f57573d9957d73d84af253ec696863e9e96063f771b4f3f567873bf000000001f389e3e000080bfc22eba3d533da13edb31943d2232143e0bc1f03deb19b13e663e3b3faa72163fe1eb68bf8f2ade3d620fcd3e000080bf23a38b3d0265b53e4d36ae3dca362e3e6b247d3df5c3d93e6fc4593fe1369e3e27925abfec18873e2fc8e53e000080bf052f3a3db08cc93efc4dfebc4fbe4d3da5ab433ef32614be06b96f3e641d763f2d307dbf12e282bd7e7908be000080bff3e8223ead158d3ecec1f0bd0a11a632c7af253e247916bf00000000b31b4f3f3f074fbf5c8ae33c476a16bf000080bf62ba683e0edc713ea63ec2bb2fbecd3d25fc303e32aa13bc3d64013f96e15c3fa0967cbfbc2714be5778983d000080bf12a30b3e533da13e186ce23ce52d373e0036ae3da381123ee1e8623f3672e13e587873bf0000000017389e3e000080bfe42eba3db08cc93e1972263d733c463e77dbf13cc4c6603e9365763ffc4e233e5b816cbf3d301c3e4cbdb33e000080bf44a38b3d5fb4dd3e01fb2c3c2332143eb7f00c3e0a5a863d673e3b3f72c32d3fd7b378bf312adebdc9d8573e000080bf84bae83d0265b53e454d7ebc733c463e13ab433da6b6abbd9365763faf1e843e042974bf97301cbef79e843e000080bfa6bae83d5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f00000000587873bf0000000011389e3e000080bf062fba3d0edcf13e6d1505bdcb362e3e53cccc3d135b26be75c4593f71ffff3ec25b74bffe1887bee61a0e3e000080bf23a30b3eb08cc93e3dba3ebdf4a8063e8cc0123e27026abe03522c3fa60d343f7f5274bf465298bec3d1cfbc000080bff3e8223e0265b53ecb6a62bd672eb73d86362e3ee4828dbef0f9e43e24c4593f877873bf00000000e8369ebe000080bfc32e3a3e533da13ea596b2bd6abe4d3d57fc303e1065e5be4fb96f3ec1e15c3f73e360bf8fe1823d056ff2be000080bf9274513ead158d3e183cc6bd2abecd3da0c0123efdecffbe3564013fc50d343fc52541bfb526143e85e223bf000080bf62ba683e533da13e3dba3ebdf4a8063e8cc0123e27026abe03522c3fa60d343fe57a49bfc451983e4f5a0abf000080bf9274513e0265b53e516209be7d6c623df8f00c3e27fc2ebf866f893ebac32d3ff32932bf41af263df78837bf000080bf1900803ead158d3e4d2db7bd1a32143e9c56d73d4f71e7be603e3b3f10b5023f2d7d29bf1d28de3d72d63dbf000080bf1800803e0265b53e6d1505bdcb362e3e53cccc3d135b26be75c4593f71ffff3e93cf30bf8118873e925e2cbf000080bf62ba683eb08cc93ee2af25be39c2c3b486c1f03d7f134fbf3d20913cf272163ffc7816bf00000000d11b4fbf000080bf00a38b3e0edc713ef4f00cbe7357d73d7ecccc3d332d30bf8796063fc4ffff3e3a7916bf00000000a51b4fbf000080bf01a38b3e533da13e873194bddc2d373e6556573dd4c6bfbed7e8623f7b558b3e887916bf000000006d1b4fbf000080bf00a38b3eb08cc93e454d7ebc733c463e13ab433da6b6abbd9365763faf1e843e738e1ebfb02f1c3e6a2845bf000080bf1900803e5fb4dd3e5dbd4dbd673c463e7d3fd83294eb8abe8865763f00000000fd830abf33311cbee9b753bf000080bfe845973e5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f00000000a07916bf00000000591b4fbf000080bf01a38b3e0edcf13ec756d7bda7362e3e7d3fd8323a9606bf4fc4593f00000000de98dabe991987be866b5dbf000080bfd0e8a23eb08cc93ebbb302be0432143ea156573ded1120bf4b3e3b3f9d558b3e832c00bffe2cdebddada5bbf000080bfe845973e0265b53e0d4e1abeb8a8063e7d3fd832dd513dbfcd512c3f0000000040a58abedb5298bef55e6abf000080bfb98bae3e0265b53efe322abed8bdcd3d38ab433dc9c852bf0e64013ff71e843ea55bc0bef72814be2a566abf000080bfd1e8a23e533da13eb42d37bef52db73d7d3fd8321bf964bf7cf9e43e000000000000000000000000000080bf000080bfa12eba3e533da13e5d7f30be216c623d6436ae3d61555bbf596f893ec172e13e3cfeeebee8b526bdc52862bf000080bfe845973ead158d3ec1ea43bedebd4d3dafdbf13cc18375bfb9b86f3e834f233ee82837be80e282bdf3567bbf000080bfb98bae3ead158d3ed4c642bed9c05332ae247d3d7c7873bf0000000031379e3e93279ebe0f8be3bc716073bf000080bfd0e8a23e0ddc713e5b4530be25be4dbdfe64b53db49f5ebfddb86fbeb48ede3e5260ddbef7e082bdcb4066bf000080bfe845973ec18c493e6d7226be07becdbddedb713d865b51bf256401bfece68c3e71b76fbe562714be791d76bf000080bfd0e8a23e743d213e9dabf9bdeba806bee164b53daf2919bf01522cbf7d8ede3ede5aa3bea75198be7d5b66bf000080bfe845973e30dcf13d45fd41be706c62bdd815053dbbb373bf916f89befee5163ee40711bed9b426bd82347dbf000080bfb88bae3ec08c493ecfcc4cbeb3f887327d3fd832b6f57fbf1c2491bc000000000000000000000000000080bf000080bfa02eba3e0edc713ec1ea43bedebd4d3d94dbf1bcc38375bfabb86f3e744f23bef928373eb4e3823def567bbf000080bf88d1c53ead158d3e2b6209be013214bee215053de3722abf4c3e3bbf02e6163ef545ccbd8429debd82347dbf000080bfb88bae3e2edcf13d5436aebdc6362ebe6b247d3df3c3d9be6dc459bfe8369e3ebde626be7b1887be7a6073bf000080bfd0e8a23e753da13d74362ebe6657d7bd7d3fd8321bc459bf8c9606bf000000000000000000000000000080bf000080bfa02eba3e743d213e45fd41be706c62bdcc1505bdbbb373bf916f89be02e616beee07113e8fb4263d82347dbf000080bf88d1c53ec18c493e7c2db7bdcf2d37be79813934a90cedbed1e862bf000000000000000000000000000080bf000080bfa02eba3e743da13d267226bd6f3c46be77dbf13cbdc660be936576bff74e233e8c2d46bd0c301cbe86b37cbf000080bfb98bae3e753d213d246209be093214bea21505bddc722abf533e3bbfe2e516be1446cc3d1229de3d82347dbf000080bf88d1c53e2edcf13d267226bd6f3c46be5ddbf1bcd7c660be8f6576bf194f23beb32d463d2e301c3e84b37cbf000080bf89d1c53e753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf000000000000000000000000000080bf000080bfa12eba3e000000005436aebdc6362ebe59247dbde6c3d9be72c459bfe8369ebe8de6263e8618873e7a6073bf000080bf7074d13e753da13d9dabf9bdeba806bed864b5bdaf2919bf04522cbf768edebeaa5aa33ece51983e815b66bf000080bf5817dd3e30dcf13d6d7226be07becdbdcedb71bd835b51bf2d6401bfe7e68cbe5bb76f3e6827143e791d76bf000080bf7174d13e753d213edf3114be5d2eb7bd4756d7bd5a3e39bfc0f9e4befe9506bfdc78163f00000000e91b4fbf000080bf41bae83e753d213ed4c642bef910a6329c247dbd7c7873bf000000002f379ebe8e279e3e6391e33c6f6073bf000080bf7074d13e0edc713e5b4530be25be4dbdf564b5bdb19f5ebfdab86fbec38edebe5560dd3eb9e1823dca4066bf000080bf5917dd3ec28c493e5d7f30be816c623d3936aebd64555bbf7b6f893e9e72e1be35feee3ec6b8263dc52862bf000080bf5817dd3ead158d3eebaf25beb3f887326ac1f0bd85134fbfeb22913ce87216bff678163f00000000d71b4fbf000080bf40bae83e0edc713ee7ba0cbe5cbe4dbd839d0bbed5a02ebf01b96fbee95631bf2cc7383f34e382bd886c30bf000080bf285df43ec18c493efe322abed8bdcd3d2aab43bdc5c852bf1764013fe81e84beb05bc03e3d29143e27566abf000080bf7074d13e533da13e0d4e1abeb8a8063e7d3fd832dd513dbfcd512c3f0000000041a58a3edc52983ef45e6abf000080bf89d1c53e0265b53ebbb302be0432143e935657bdec1120bf4b3e3b3fa1558bbe852c003ff42cde3ddada5bbf000080bf5817dd3e0265b53ec756d7bda7362e3e7d3fd8323a9606bf4fc4593f00000000e098da3e9b19873e856b5dbf000080bf7074d13eb08cc93ef4f00cbe7357d73d75ccccbd2f2d30bf9196063fbdffffbe3679163f00000000a81b4fbf000080bf40bae83e533da13e536209bec16c623deef00cbe29fc2ebf996f893eb4c32dbfe329323f55b226bd058937bf000080bf285df43ead158d3e873194bddc2d373e535657bdd4c6bfbed7e8623f80558bbe8a79163f000000006a1b4fbf000080bf40bae83eb08cc93e5dbd4dbd673c463e7d3fd83294eb8abe8865763f00000000fd830a3f34311c3ee9b753bf000080bf5817dd3e5fb4dd3e4b2db7bd1932143e9556d7bd4f71e7be613e3b3f0fb502bf2d7d293f2428debd72d63dbf000080bf285df43e0265b53e454d7ebc733c463e06ab43bdaab6abbd9365763fb11e84be738e1e3fb32f1cbe6a2845bf000080bf295df43e5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f00000000a079163f00000000591b4fbf000080bf41bae83e0edcf13e6d1505bdcb362e3e4accccbd185b26be76c4593f6affffbe90cf303f7c1887be945e2cbf000080bf0800003fb08cc93e3dba3ebdf4a8063e8ac012be2e026abe07522c3fa30d34bfe37a493fbe5198be535a0abf000080bf7cd1053f0265b53e183cc6bd2abecd3d9ec012bef9ecffbe3964013fc30d34bfbf25413fdc2614be87e223bf000080bf0800003f533da13ecb6a62bd672eb73d84362ebee4828dbee9f9e43e25c459bf8778733f00000000e8369ebe000080bff0a20b3f533da13ecec1f0bdb8c05332c6af25be2b7916bf00000000af1b4fbf39074f3f1a90e3bc4e6a16bf000080bf0800003f0ddc713ea596b2bd6abe4d3d54fc30be1065e5be49b96f3ec1e15cbf6ee3603f53e282bd0e6ff2be000080bf7cd1053fad158d3ef82db7bdcb6c62bd79362ebee85fdebead6f89bec91d5cbf8a9b653f4eb526bd2b75e1be000080bf7cd1053fc08c493ea2257dbdb0f88732bec642be2a319ebe252391bca66e73bf6e78733f0000000087379ebe000080bff0a20b3f0edc713efc4dfebc4fbe4d3da1ab43be0a2714be05b96f3e621d76bf2b307d3f4fe2823d917908be000080bf6474113fad158d3e0fe2d9bd25becdbd5d9d0bbe08b303bf3d6401bfc65631bf9c8c573fe12714be1e0d05bf000080bf0800003f743d213e9dabf9bdeba806bed864b5bdaf2919bf04522cbf768edebe92d7413ff35198be87dd14bf000080bf285df43e30dcf13ddc3194bd153214be1dc1f0bde619b1be663e3bbfab7216bfd6eb683f6829debda60fcdbe000080bf7cd1053f2edcf13d5436aebdc6362ebe59247dbde6c3d9be72c459bfe8369ebe10925a3f911887beb9c8e5be000080bf0800003f753da13d9d5757bd9457d7bd82af25bec69686bea29606bf751b4fbf5478733f0000000025389ebe000080bff0a20b3f743d213ef36ce2bcc16c62bdabc642be7cb81dbea46f89be936e73bf3a047c3f7ab5263d320c2fbe000080bf6474113fc18c493efd6be2bcd72d37be2736aebd9d8112bed7e862bf5d72e1be5878733f0000000015389ebe000080bff0a20b3f753da13d267226bd6f3c46be5ddbf1bcd7c660be8f6576bf194f23be50816c3f28301cbe89bdb3be000080bf7cd1053f753d213dcefa2cbc0c3214bec7f00cbed05986bd5e3e3bbf7cc32dbfe0b3783f8729de3d37d857be000080bf6474113f30dcf13d134d7e3c6f3c46be06ab43bd9fb6ab3d936576bfb61e84be0f29743f77301c3eb49e84be000080bf6474113f753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf000000005878733f000000000f389ebe000080bff0a20b3f000000006115053dc9362ebe47ccccbd395b263e75c459bf6cffffbed95b743fb318873e81190ebe000080bfd845173f753da13d30ba3e3df1a806be8ac012be5a026a3e0f522cbf960d34bf8e52743feb51983e56d9cf3c000080bf4c171d3f30dcf13d413ec23b2bbecdbd24fc30bef7ab133c396401bf99e15cbfa4967c3f9327143edb7798bd000080bfd845173f753d213ebd6a623d662eb7bd84362ebee4828d3eebf9e4be24c459bf8978733f00000000e5369e3e000080bfc0e8223f753d213e4d14cbb20411a632cbcc4cbe0000000000000000000080bfb6e67f3f8a8fe33c00000000000080bfd845173f0edc713ee24dfe3c47be4dbda1ab43bef826143e14b96fbe621d76bf2d307d3f52e2823d7d79083e000080bf4c171d3fc28c493e9d6ce23caf6c623dadc642be75b81d3ea36f893e936e73bf3c047c3ff1b4263d230c2f3e000080bf4c171d3fad158d3e6b257d3dc44eb1b3c2c642be23319e3ee122913ca66e73bf7078733f000000007f379e3e000080bfc0e8223f0edc713e9d96b23d65be4dbd54fc30be0365e53e42b96fbec4e15cbf75e3603f0be282bdff6ef23e000080bf34ba283fc18c493ea63ec2bb2fbecd3d24fc30bef2aa13bc3d64013f96e15cbfa0967c3fc927143e4978983d000080bfd845173f533da13e3dba3ebdf4a8063e8ac012be2e026abe07522c3fa30d34bf7f52743f4652983eded1cfbc000080bf6474113f0265b53e01fb2c3c2332143eb5f00cbefd59863d6a3e3b3f6fc32dbfd7b3783f342ade3dc8d8573e000080bf4c171d3f0265b53e6d1505bdcb362e3e4accccbd185b26be76c4593f6affffbec25b743f0019873ee61a0e3e000080bfd845173fb08cc93e8f57573d9957d73d82af25bec496863ea096063f771b4fbf5678733f000000001e389e3e000080bfc0e8223f533da13ee22db73db86c623d7d362ebed85fde3ea46f893ecf1d5cbf8f9b653f3eb426bd2275e13e000080bf34ba283fad158d3e156ce23ce52d373ef735aebda281123ee2e8623f3472e1be5878733f0000000017389e3e000080bfc0e8223fb08cc93e454d7ebc733c463e06ab43bdaab6abbd9365763fb11e84be0429743f99301c3ef59e843e000080bf4c171d3f5fb4dd3edb31943d2232143e07c1f0bded19b13e683e3b3fa77216bfe0eb683f852adebd690fcd3e000080bf34ba283f0265b53e1972263d733c463e5ddbf1bcc6c6603e9365763ffe4e23be5b816c3f3e301cbe4cbdb33e000080bf34ba283f5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f000000005878733f0000000011389e3e000080bfc0e8223f0edcf13e4d36ae3dca362e3e59247dbdf5c3d93e6fc4593fe1369ebe26925a3fe91887be36c8e53e000080bfa88b2e3fb08cc93e97abf93defa8063ed864b5bdb429193ffe512c3f738edebe9cd7413f3b5298be69dd143f000080bf1c5d343f0265b53e07e2d93d2abecd3d5c9d0bbe07b3033f3764013fcc5631bf9f8c573ffe2714be170d053f000080bfa88b2e3f533da13edb31143e5e2eb73d4756d7bd593e393fbdf9e43efe9506bfe078163f00000000e51b4f3f000080bf902e3a3f533da13ec6c1f03db8c05332c6af25be2379163f00000000b51b4fbf3f074f3f3f8ee3bc466a163f000080bfa88b2e3f0ddc713ee5ba0c3e65be4d3d839d0bbecda02e3f20b96f3eeb5631bf2fc7383f19e382bd836c303f000080bf1c5d343fad158d3e3a62093eb36c62bd02f10cbe17fc2e3f9d6f89bec4c32dbff229323fd2b226bdf488373f000080bf1c5d343fc08c493edcaf253eaaf887328ac1f0bd80134f3f442391bcef7216bffb78163f00000000d11b4f3f000080bf902e3a3f0edc713e5745303e2abe4d3df564b5bdb49f5e3fc3b86f3ec18edebe5460dd3ea6e1823dca40663f000080bf0400403fad158d3e103cc63d25becdbd9ec012bef1ecff3e416401bfc10d34bfc325413fbc2614be86e2233f000080bfa88b2e3f743d213e30ba3e3df1a806be8ac012be5a026a3e0f522cbf960d34bff07a493f835198be525a0a3f000080bf34ba283f30dcf13d6b2db73d143214be7956d7bd6271e73e643e3bbf02b502bf2e7d293f6627debd74d63d3f000080bf1c5d343f2edcf13d6115053dc9362ebe47ccccbd395b263e75c459bf6cffffbea9cf303f531887be825e2c3f000080bfa88b2e3f753da13df1f00c3e6f57d7bd75ccccbd312d303f8f9606bfc3ffffbe3679163f00000000a81b4f3f000080bf902e3a3f743d213e4b7f303e816c62bd6e36aebd5a555b3f716f89becd72e1be5dfeee3e16b8263dba28623f000080bf0400403fc18c493e9831943dd42d37be3d5657bde8c6bf3ed4e862bf7c558bbe8479163f000000006f1b4f3f000080bf902e3a3f753da13d134d7e3c6f3c46be06ab43bd9fb6ab3d936576bfb61e84be7b8e1e3fb52f1cbe6228453f000080bf1c5d343f753d213dc7b3023ef93114be4c5657bdf911203f473e3bbf7f558bbe6c2c003f172dde3de7da5b3f000080bf0400403f30dcf13d4fbd4d3d653c46be7d3fd83299eb8a3e886576bf00000000f0830a3f2e311c3ef1b7533f000080bf0400403f753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf00000000a079163f00000000591b4f3f000080bf902e3a3f00000000be56d73da4362ebe7d3fd8323696063f50c459bf00000000ba98da3e7b19873e946b5d3f000080bf78d1453f753da13d0a4e1a3eb4a806be7d3fd832dd513d3fcd512cbf0000000029a58a3ec052983efc5e6a3f000080bfeca24b3f30dcf13dfb322a3ed3bdcdbd2bab43bdcdc8523f0a6401bfee1e84bea45bc03e1f29143e29566a3f000080bf78d1453f753d213eb02d373ef42db7bd7d3fd8321bf9643f81f9e4be0000000000000000000000000000803f000080bf6074513f753d213ed0c6423ef910a6329c247dbd7a78733f000000003e379ebe9c279e3ec792e33c6d60733f000080bf78d1453f0edc713ebdea433ed9bd4dbd94dbf1bcc183753fa3b86fbea54f23be2c29373eb7e3823ded567b3f000080bfeca24b3fc28c493e41fd413e6f6c623dd01505bdbdb3733f8e6f893ef4e516beca07113ec0b5263d82347d3f000080bfeca24b3fad158d3ecbcc4c3ee1d11634f303d133b6f57f3f3e25913c0000000000000000000000000000803f000080bf6074513f0edc713ebdea433ed9bd4dbdafdbf13cc183753fadb86fbe9a4f233e1c2937be8de382bded567b3f000080bfd445573fc18c493e6a72263e0bbecd3dcedb71bd855b513f2c64013fe2e68cbe3db76f3e7f27143e7a1d763f000080bf78d1453f533da13e97abf93defa8063ed864b5bdb429193ffe512c3f738edebe885aa33eeb51983e825b663f000080bf0400403f0265b53e1a62093e0f32143eb01505bddc722a3f533e3b3fd8e516be2e45cc3dce29de3d84347d3f000080bfeca24b3f0265b53e4d36ae3dca362e3e59247dbdf5c3d93e6fc4593fe1369ebec1e5263eb218873e7c60733f000080bf78d1453fb08cc93e70362e3e6b57d73d7d3fd83219c4593f9096063f0000000000000000000000000000803f000080bf6074513f533da13e3cfd413e936c623dea15053db9b3733f996f893e05e6163ee90711be21b526bd82347d3f000080bfd445573fad158d3e582db73ddb2d373e7d3fd8329f0ced3ed3e8623f0000000000000000000000000000803f000080bf6074513fb08cc93e1972263d733c463e5ddbf1bcc6c6603e9365763ffe4e23be372c463d2a301c3e86b37c3f000080bfeca24b3f5fb4dd3e1a62093e0f32143ebc15053ddc722a3f553e3b3fd5e5163e2745ccbdc629debd84347d3f000080bfd445573f0265b53e1972263d733c463e77dbf13cc4c6603e9365763ffc4e233e322c46bd26301cbe86b37c3f000080bfd445573f5fb4dd3e4d14cbb2cfcc4c3e7d3fd832000000000000803f0000000000000000000000000000803f000080bf6074513f0edcf13e4d36ae3dca362e3e6b247d3df5c3d93e6fc4593fe1369e3ec2e526beb21887be7c60733f000080bf48175d3fb08cc93e97abf93defa8063ee164b53db429193ffe512c3f758ede3e8a5aa3beeb5198be825b663f000080bfbce8623f0265b53e6a72263e0bbecd3ddedb713d835b513f2e64013fe4e68c3e31b76fbe982714be7a1d763f000080bf48175d3f533da13edb31143e5e2eb73d4f56d73d593e393fb6f9e43e0396063f4ec2ffbe25c53ebe4995583f000080bf30ba683f533da13e5745303e2abe4d3dfe64b53db29f5e3fbdb86f3ec68ede3e5160ddbe26e282bdca40663f000080bfbce8623fad158d3ee4ba0c3e61be4d3d859d0b3ecea02e3f1ab96f3eec56313f164535bfab46ccbcdca7343f000080bfa48b6e3fad158d3ed0c6423ed9c05332ae247d3d7a78733f000000003d379e3e9c279ebe8293e3bc6b60733f000080bf48175d3f0ddc713edcaf253ebbf887328ec1f03d7d134f3fd12291bcf172163ffc7816bf00000000d01b4f3f000080bf30ba683f0edc713ec6c1f03d0a11a632c9af253e2679163f00000000b21b4f3f3c074fbf388fe33c496a163f000080bf185d743f0edc713e4d7f303e816c62bd7836ae3d5a555b3f716f89becd72e13e5ffeeebe69b826bdba28623f000080bfbce8623fc08c493e3b62093eb36c62bd04f10c3e15fc2e3f9c6f89bec7c32d3ff62932bf81b2263df188373f000080bfa48b6e3fc18c493e9d96b23d65be4dbd57fc303e0765e53e54b96fbec3e15c3feb0f5cbfd5fa1b3e39b4f93e000080bf8c2e7a3fc28c493efb322a3ed3bdcdbd38ab433dcbc8523f0b6401bfe71e843e995bc0be112914be2c566a3f000080bf48175d3f743d213e0a4e1a3eb4a806be7d3fd832dd513d3fcd512cbf000000000ba58abea25298be065f6a3f000080bfd445573f30dcf13df1f00c3e6f57d7bd7dcccc3d312d303f8d9606bfc4ffff3e377916bf00000000a81b4f3f000080bf30ba683f743d213e103cc63d25becdbda0c0123ef1ecff3e396401bfc70d343fcc2541bf9e26143e7de2233f000080bf185d743f753d213ebd6a623d662eb7bd86362e3ee5828d3ef2f9e4be24c4593f379f5cbf49838d3e10c4d93e000080bf0000803f753d213e30ba3e3df1a806be8cc0123e1b026a3e0c522cbf9e0d343f0f7b49bf5a51983e305a0a3f000080bf8c2e7a3f30dcf13dc5b3023ef63114be8b56573df611203f483e3bbf8d558b3e5d2c00bf3f2cdebdf3da5b3f000080bfbce8623f2edcf13dbe56d73da4362ebe7d3fd8323696063f50c459bf000000006498dabe471987beb26b5d3f000080bf48175d3f753da13d692db73d063214bea756d73d6471e73e573e3bbf13b5023f437d29bf2c27de3d61d63d3f000080bfa48b6e3f30dcf13d6115053dc9362ebe53cccc3d0e5b263e73c459bf73ffff3ed9cf30bf2c18873e5c5e2c3f000080bf185d743f753da13d9b31943dcd2d37beaf56573df4c6bf3ecce862bf9c558b3e847916bf000000006f1b4f3f000080bf30ba683f753da13d4fbd4d3d653c46be7d3fd83299eb8a3e886576bf00000000e0830abf1a311cbefeb7533f000080bfbce8623f753d213d134d7e3c6f3c46be10ab433da2b6ab3d936576bfb91e843e8c8e1ebfa12f1c3e5528453f000080bfa48b6e3f753d213d4d14cbb2cbcc4cbe7d3fd83200000000000080bf00000000a07916bf00000000591b4f3f000080bf30ba683f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: -0.000000029802322, y: 0.000000029802322, z: 0.000000007450581} - m_Extent: {x: 0.2, y: 0.2, z: 0.19999999} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1.8829471 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: + m_TransformParent: {fileID: 1743725476} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} + - target: {fileID: -7511558181221131132, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} + - target: {fileID: -4818106957885473086, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} + - target: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_Name + value: Target + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 2191750151954457832, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} + - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: 16598d12187e7ef49aaf6d2ec4136e05, type: 2} + - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: 'm_Materials.Array.data[2]' + value: + objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} + - target: {fileID: 3396913584297481876, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 844459427} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1769588068} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1359767051} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 576643109} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1816767294} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 2140681947} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1423653693} + - targetCorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 643048781} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 2008175316} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 2008175317} + - targetCorrespondingSourceObject: {fileID: 2191750151954457832, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 660021083} + - targetCorrespondingSourceObject: {fileID: 3396913584297481876, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + insertIndex: -1 + addedObject: {fileID: 1969415634} + m_SourcePrefab: {fileID: 100100000, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} +--- !u!4 &660021080 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + m_PrefabInstance: {fileID: 660021079} + m_PrefabAsset: {fileID: 0} +--- !u!4 &660021081 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + m_PrefabInstance: {fileID: 660021079} + m_PrefabAsset: {fileID: 0} +--- !u!1 &660021082 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2191750151954457832, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + m_PrefabInstance: {fileID: 660021079} + m_PrefabAsset: {fileID: 0} +--- !u!65 &660021083 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 660021082} + m_Material: {fileID: 0} + m_IncludeLayers: serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!1 &535679136 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.7976047, y: 1.1504669, z: 0.08324993} + m_Center: {x: 0, y: 3.5952096, z: 0.01631552} +--- !u!1 &695895225 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4909,232 +5614,299 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 535679137} - - component: {fileID: 535679138} + - component: {fileID: 695895226} + - component: {fileID: 695895227} m_Layer: 0 - m_Name: TransformerEnabled + m_Name: Left Controller Visual m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &535679137 + m_IsActive: 1 +--- !u!4 &695895226 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 535679136} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 695895225} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1507460097} - m_Father: {fileID: 1192304054} - m_RootOrder: 3 + - {fileID: 1129813367} + m_Father: {fileID: 1071573184} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &535679138 +--- !u!114 &695895227 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 535679136} + m_GameObject: {fileID: 695895225} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: 099767effc44a8e478d295d0c4d98289, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 0b02258065237248bdd586d9a5633b28 - uniqueName: TransformerEnabled - tags: [] ---- !u!21 &539108941 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Standard - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 3 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 0.4, g: 0.5882353, b: 1, a: 0.19607843} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] ---- !u!1001 &561255719 -PrefabInstance: + m_ThumbstickTransform: {fileID: 1687628410} + m_StickRotationRange: {x: 30, y: 30} + m_StickInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Thumbstick + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 499d6586-a749-4626-8410-e23d3a945a6e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -60998027439631388, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TriggerTransform: {fileID: 1725178572} + m_TriggerXAxisRotationRange: {x: 0, y: -15} + m_TriggerInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Trigger + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 9501238c-1324-4ba4-8e59-8c14278ef44d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -4289430672226363583, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 + m_GripTransform: {fileID: 629305522} + m_GripRightRange: {x: -0.0125, y: -0.011} + m_GripInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Grip + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 8d37d0f0-8996-4ad8-bc49-be5eec2ad875 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 6558622148059887818, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 +--- !u!1 &701476932 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 248065651} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 1862d8e21d2bba649b255c6a7eb4eb61, type: 2} - - target: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_Name - value: MagicSphere - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} ---- !u!4 &561255720 stripped + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 701476933} + - component: {fileID: 701476935} + - component: {fileID: 701476934} + m_Layer: 0 + m_Name: Button_Home + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &701476933 Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - m_PrefabInstance: {fileID: 561255719} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1 &561255721 stripped + m_GameObject: {fileID: 701476932} + serializedVersion: 2 + m_LocalRotation: {x: 0.18379451, y: -0.00000008593347, z: 0.000000016067828, w: 0.9829647} + m_LocalPosition: {x: 0.0000000071757764, y: -0.0032368493, z: 0.024549427} + m_LocalScale: {x: 1.01935, y: 1.01935, z: 1.01935} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1129813367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &701476934 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701476932} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &701476935 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 701476932} + m_Mesh: {fileID: -8429650256770907399, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &705507993 GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - m_PrefabInstance: {fileID: 561255719} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!135 &561255722 -SphereCollider: + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + - component: {fileID: 705507996} + m_Layer: 0 + m_Name: Sun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 561255721} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Center: {x: -0.000000029802322, y: 0.000000029802322, z: 0.000000007450581} ---- !u!114 &561255723 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 0.85882354, g: 0.858539, b: 0.84705883, a: 1} + m_Intensity: 0.65 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + serializedVersion: 2 + m_LocalRotation: {x: 0.8864501, y: 0.40046445, z: 0.13547534, w: 0.18836364} + m_LocalPosition: {x: 0, y: 5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 13.029, y: 156.335, z: 128.636} +--- !u!114 &705507996 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 561255721} + m_GameObject: {fileID: 705507993} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: d67820fd904d9f46873f098e03179ac0 - uniqueName: Sphere - tags: [] ---- !u!1 &576643108 + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &729381798 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5142,262 +5914,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 576643109} - - component: {fileID: 576643110} - m_Layer: 0 - m_Name: Collider (2) + - component: {fileID: 729381799} + - component: {fileID: 729381801} + - component: {fileID: 729381800} + m_Layer: 8 + m_Name: Cylinder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &576643109 +--- !u!4 &729381799 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576643108} - m_LocalRotation: {x: -0.27059805, y: -0.27059805, z: 0.6532815, w: 0.6532815} - m_LocalPosition: {x: -0.1617, y: 0, z: 0.17999974} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 729381798} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -0.1} + m_LocalScale: {x: 1, y: 0.1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 660021081} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: -45, z: 90} ---- !u!136 &576643110 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576643108} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.02 - m_Height: 0.2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &586564669 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 813701130} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_Name - value: Podium Teleportation Area - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_Layer - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: -7511558181221131132, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} ---- !u!4 &586564670 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - m_PrefabInstance: {fileID: 586564669} - m_PrefabAsset: {fileID: 0} ---- !u!1 &586564671 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} - m_PrefabInstance: {fileID: 586564669} - m_PrefabAsset: {fileID: 0} ---- !u!114 &586564672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 586564671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} - m_Name: - m_EditorClassIdentifier: - serializedGuid: - serializedGuid: b1b2d19d99f7c74a9759a753b5c92766 - uniqueName: Podium Teleportation Area - tags: [] ---- !u!64 &586564674 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 586564671} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -3071651571934779511, guid: 67cd907787fe7884e9ee9dfbe4e68f5a, type: 3} ---- !u!114 &586564675 -MonoBehaviour: + m_Father: {fileID: 1987015394} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &729381800 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 586564671} + m_GameObject: {fileID: 729381798} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 2 - m_DistanceCalculationMode: 1 - m_SelectMode: 1 - m_FocusMode: 1 - m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_TeleportationProvider: {fileID: 0} - m_MatchOrientation: 0 - m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 - m_FilterSelectionByHitNormal: 0 - m_UpNormalToleranceDegrees: 30 - m_Teleporting: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &587381658 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a16db0f18ace882458e325d3243cb6da, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &729381801 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 729381798} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &732697977 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5405,287 +6000,345 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 587381659} - - component: {fileID: 587381667} - - component: {fileID: 587381666} - - component: {fileID: 587381668} - - component: {fileID: 587381664} - - component: {fileID: 587381663} - - component: {fileID: 587381662} - - component: {fileID: 587381661} - - component: {fileID: 587381660} - - component: {fileID: 587381665} + - component: {fileID: 732697978} + - component: {fileID: 732697981} + - component: {fileID: 732697980} + - component: {fileID: 732697979} m_Layer: 0 - m_Name: Sliced Cube (1) + m_Name: NearFar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &587381659 + m_IsActive: 1 +--- !u!4 &732697978 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.01, y: 1.2, z: 0.75} + m_GameObject: {fileID: 732697977} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1756511964} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!114 &587381660 + m_Father: {fileID: 1765347203} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &732697979 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 732697977} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 10f84f2b8a43cb84abcf29d7e444d45d, type: 3} + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} m_Name: m_EditorClassIdentifier: - lockOnParentObjectLock: 1 - attachedToSnapZone: - m_PersistentCalls: - m_Calls: [] - detachedFromSnapZone: - m_PersistentCalls: - m_Calls: [] - lockObjectOnSnap: 0 ---- !u!114 &587381661 + m_AffordanceStateProvider: {fileID: 732697981} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: d0eab193f3deddf459ada93a8c8366ef, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 732697980} + m_ColorPropertyName: _BaseColor +--- !u!114 &732697980 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 732697977} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 428efa2c1665b6745bfa9c1ec2026c93, type: 3} + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} m_Name: m_EditorClassIdentifier: - lockOnParentObjectLock: 1 - grabStarted: - m_PersistentCalls: - m_Calls: [] - grabEnded: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &587381662 + m_Renderer: {fileID: 1669315464} + m_MaterialIndex: 0 +--- !u!114 &732697981 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 732697977} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 573907d717ac4934eb429f2f5978a132, type: 3} + m_Script: {fileID: 11500000, guid: c83f12c537584f51b92c01f10d7090c0, type: 3} m_Name: m_EditorClassIdentifier: - lockOnParentObjectLock: 1 - touchStarted: - m_PersistentCalls: - m_Calls: [] - touchEnded: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &587381663 -MonoBehaviour: + m_TransitionDuration: 0.125 + m_InteractorSource: {fileID: 1861251858} + m_IgnoreHoverEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 1 + m_IgnoreUGUIHover: 0 + m_IgnoreUGUISelect: 0 + m_IgnoreXRInteractionEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!1 &770514937 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d1bcb89c5e4474247b7923fe1388ad1a, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 1 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_FocusMode: 1 - m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_AttachTransform: {fileID: 0} - m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 - m_MatchAttachPosition: 1 - m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 - m_ReinitializeDynamicAttachEverySingleGrab: 1 - m_AttachEaseInTime: 0.15 - m_MovementType: 1 - m_VelocityDamping: 1 - m_VelocityScale: 1 - m_AngularVelocityDamping: 1 - m_AngularVelocityScale: 1 - m_TrackPosition: 1 - m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 - m_TrackScale: 1 - m_SmoothScale: 0 - m_SmoothScaleAmount: 8 - m_TightenScale: 0.1 - m_ThrowOnDetach: 1 - m_ThrowSmoothingDuration: 0.25 - m_ThrowSmoothingCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ThrowVelocityScale: 1.5 - m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 - m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 - m_StartingSingleGrabTransformers: [] - m_StartingMultipleGrabTransformers: [] - m_AddDefaultGrabTransformers: 1 - isTouchable: 1 - isGrabbable: 1 - isUsable: 0 ---- !u!54 &587381664 -Rigidbody: + serializedVersion: 6 + m_Component: + - component: {fileID: 770514938} + m_Layer: 8 + m_Name: Anchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &770514938 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 770514937} serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &587381665 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.01, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1987015394} + m_Father: {fileID: 815556419} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &773172689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 773172690} + m_Layer: 0 + m_Name: Right Controller Stabilized Attach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &773172690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 773172689} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1240689138} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &789831089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 789831090} + - component: {fileID: 789831092} + - component: {fileID: 789831091} + m_Layer: 31 + m_Name: Snap Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &789831090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789831089} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.00000005960466, y: 0, z: -0.000000059604638} + m_LocalScale: {x: 0.99999976, y: 1, z: 0.99999976} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2014095924} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &789831091 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 789831089} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.25, y: 0.6, z: 1.25} + m_Center: {x: 0, y: 0.3, z: 0} +--- !u!114 &789831092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789831089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87996e81a5026dc429bfd6a9271548b6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractableObject: {fileID: 2014095928} + m_SnapCollider: {fileID: 789831091} + m_DisableSnapColliderWhenSelected: 0 + m_SnapToCollider: {fileID: 0} +--- !u!1 &790520235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 790520236} + - component: {fileID: 790520239} + - component: {fileID: 790520238} + - component: {fileID: 790520237} + m_Layer: 0 + m_Name: SnapPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &790520236 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 790520235} serializedVersion: 2 - m_Size: {x: 0.40000013, y: 0.39999995, z: 0.20000006} - m_Center: {x: 0.00000047683716, y: 0, z: -0.10000003} ---- !u!23 &587381666 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1525491574} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &790520237 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 790520235} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -5696,11 +6349,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1862d8e21d2bba649b255c6a7eb4eb61, type: 2} - - {fileID: 2100000, guid: a2e88723e4cd77a4690d0637321940aa, type: 2} + - {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5722,63 +6377,28 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &587381667 +--- !u!33 &790520238 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} - m_Mesh: {fileID: 8989072162018436745, guid: 3cd7c532cc585b54795fadfe1b32fc53, type: 3} ---- !u!114 &587381668 + m_GameObject: {fileID: 790520235} + m_Mesh: {fileID: 862649805} +--- !u!114 &790520239 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587381658} + m_GameObject: {fileID: 790520235} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: 88ea78c93b844cc1b7f98cca70e8679c, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 4bd5dfda1461c546b1ceff6d13ef92cb - uniqueName: Sliced Cube (1) - tags: [] ---- !u!1 &595536806 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 595536807} - m_Layer: 0 - m_Name: Thumb_0_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &595536807 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595536806} - m_LocalRotation: {x: -0.017132446, y: 0.023738552, z: -0.011670226, w: 0.9995033} - m_LocalPosition: {x: -0.027674861, y: -0.00000018596648, z: 0.00000015173107} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1494241464} - m_Father: {fileID: 391997631} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &597715542 + parent: {fileID: 1525491575} +--- !u!1 &808029740 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5786,165 +6406,171 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 597715543} - - component: {fileID: 597715544} - - component: {fileID: 597715548} - - component: {fileID: 597715547} - - component: {fileID: 597715546} - - component: {fileID: 597715545} + - component: {fileID: 808029741} + - component: {fileID: 808029744} + - component: {fileID: 808029743} + - component: {fileID: 808029742} m_Layer: 0 - m_Name: Magic Cube_SnapZone + m_Name: Poke m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &597715543 +--- !u!4 &808029741 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597715542} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.2, z: 0.75} + m_GameObject: {fileID: 808029740} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1106929324} - m_Father: {fileID: 1527860102} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 2029649882} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &597715544 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597715542} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc6efdd45e6a00744aaf4c68264d6d7c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 1 - m_AttachTransform: {fileID: 1106929324} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 0} - m_InteractableCantHoverMeshMaterial: {fileID: 0} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} - shownHighlightObject: {fileID: 919132149155446097, guid: 60134579c9ddef44284c0dad35e2444d, type: 3} - ShowHighlightInEditor: 1 - highlightMeshMaterial: {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} - validationMaterial: {fileID: 2100000, guid: c6c888b079480654fbf337e7fe50b405, type: 2} - invalidMaterial: {fileID: 2100000, guid: 69e2b61a70de44f48909a564a7cf9c62, type: 2} - previewMesh: {fileID: 524671518} ---- !u!65 &597715545 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597715542} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.4, y: 0.4, z: 0.4} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &597715546 +--- !u!114 &808029742 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597715542} + m_GameObject: {fileID: 808029740} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 557aaed036734781b129d67ec56c9366, type: 3} + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} m_Name: m_EditorClassIdentifier: - acceptedProcessSceneObjects: - - {fileID: 248065658} ---- !u!114 &597715547 + m_AffordanceStateProvider: {fileID: 808029744} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: d0eab193f3deddf459ada93a8c8366ef, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 808029743} + m_ColorPropertyName: _BaseColor +--- !u!114 &808029743 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597715542} + m_GameObject: {fileID: 808029740} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb7be990fff0a2142a874601356b26df, type: 3} + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} m_Name: m_EditorClassIdentifier: - lockOnParentObjectLock: 1 - objectAttached: - m_PersistentCalls: - m_Calls: [] - objectDetached: - m_PersistentCalls: - m_Calls: [] - lockOnUnsnap: 1 ---- !u!114 &597715548 + m_Renderer: {fileID: 1153135961} + m_MaterialIndex: 0 +--- !u!114 &808029744 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597715542} + m_GameObject: {fileID: 808029740} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: c83f12c537584f51b92c01f10d7090c0, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 41ac9fab4fee234e819d2b79f916d92a - uniqueName: Magic Cube_SnapZone - tags: [] ---- !u!1 &626500154 + m_TransitionDuration: 0.125 + m_InteractorSource: {fileID: 149866825} + m_IgnoreHoverEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 1 + m_IgnoreUGUIHover: 0 + m_IgnoreUGUISelect: 0 + m_IgnoreXRInteractionEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!1 &813701129 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5952,31 +6578,34 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 626500155} + - component: {fileID: 813701130} m_Layer: 0 - m_Name: Middle_2_Left + m_Name: Station Unlock Chest m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &626500155 +--- !u!4 &813701130 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 626500154} - m_LocalRotation: {x: 0.007229151, y: 0.004674483, z: -0.10485168, w: 0.9944506} - m_LocalPosition: {x: -0.02966484, y: -0.00000024318695, z: 0.000000114440915} + m_GameObject: {fileID: 813701129} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 1.5, y: 0, z: -2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1177651917} - m_Father: {fileID: 1078070624} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &628411315 + - {fileID: 2014095924} + - {fileID: 1241623310} + - {fileID: 2121825122} + - {fileID: 586564670} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!1 &815556418 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5984,123 +6613,174 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 628411316} - m_Layer: 0 - m_Name: Index_Palm_Left + - component: {fileID: 815556419} + - component: {fileID: 815556422} + - component: {fileID: 815556423} + - component: {fileID: 815556421} + - component: {fileID: 815556420} + m_Layer: 31 + m_Name: Teleportation Spot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &628411316 +--- !u!4 &815556419 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 628411315} - m_LocalRotation: {x: 0.9956038, y: -0.056100972, z: -0.070293866, w: -0.026165245} - m_LocalPosition: {x: -0.05402496, y: 0.0060563944, z: 0.02002304} + m_GameObject: {fileID: 815556418} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1338586625} - m_Father: {fileID: 1909973946} - m_RootOrder: 0 + - {fileID: 770514938} + - {fileID: 11185210} + - {fileID: 422863736} + m_Father: {fileID: 1527860102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &632093759 -PrefabInstance: +--- !u!114 &815556420 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1527860102} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalPosition.x - value: -0.75 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - - target: {fileID: -7511558181221131132, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - - target: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_Name - value: Pedestal - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - propertyPath: m_StaticEditorFlags - value: 4294967295 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} ---- !u!4 &632093760 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - m_PrefabInstance: {fileID: 632093759} - m_PrefabAsset: {fileID: 0} ---- !u!1 &632093761 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e3168d03ba46dbe4eb56c62a2fcb9351, type: 3} - m_PrefabInstance: {fileID: 632093759} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!65 &632093762 + m_GameObject: {fileID: 815556418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 584ad12357614f4fbb5460fdf72e8cc6, type: 3} + m_Name: + m_EditorClassIdentifier: + lockOnParentObjectLock: 1 + teleportEnded: + m_PersistentCalls: + m_Calls: [] + initialized: + m_PersistentCalls: + m_Calls: [] +--- !u!65 &815556421 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 632093761} + m_GameObject: {fileID: 815556418} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.01, z: 1} + m_Center: {x: 0, y: 0.02, z: 0} +--- !u!114 &815556422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815556418} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0193c710a3042c6479b28370a44e0b0f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 2147483648 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 1 + m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_TeleportationProvider: {fileID: 0} + m_MatchOrientation: 2 + m_MatchDirectionalInput: 0 + m_TeleportTrigger: 0 + m_FilterSelectionByHitNormal: 0 + m_UpNormalToleranceDegrees: 30 + m_Teleporting: + m_PersistentCalls: + m_Calls: [] + m_TeleportAnchorTransform: {fileID: 770514938} +--- !u!114 &815556423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 815556418} m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.5000001, y: 1, z: 0.5000001} - m_Center: {x: -0.00000023841858, y: 0.5, z: 0} ---- !u!1 &643048780 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 8a8ba7249720634e83596d2c8de50700 + guids: [] +--- !u!1 &844459426 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6108,45 +6788,81 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 643048781} - - component: {fileID: 643048782} + - component: {fileID: 844459427} + - component: {fileID: 844459430} + - component: {fileID: 844459429} + - component: {fileID: 844459428} m_Layer: 0 - m_Name: Collider (6) + m_Name: TargetCollider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &643048781 +--- !u!4 &844459427 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 643048780} - m_LocalRotation: {x: 0.27059805, y: 0.27059805, z: 0.6532815, w: 0.6532815} - m_LocalPosition: {x: -0.182, y: 0, z: -0.163} + m_GameObject: {fileID: 844459426} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0.36999983} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 660021081} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 45, z: 90} ---- !u!136 &643048782 -CapsuleCollider: + m_Father: {fileID: 660021080} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &844459428 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 643048780} + m_GameObject: {fileID: 844459426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94f0bf7ce367d3942a1f56ec8dd56e41, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &844459429 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844459426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 70c21327b894cc4682eeaaad4a2ccbf0 + guids: [] +--- !u!65 &844459430 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 844459426} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - m_Radius: 0.02 - m_Height: 0.2 - m_Direction: 1 + serializedVersion: 3 + m_Size: {x: 0.35, y: 0.1, z: 0.35} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &655638805 +--- !u!1 &845665496 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6154,41 +6870,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 655638806} - - component: {fileID: 655638808} - - component: {fileID: 655638807} - m_Layer: 8 - m_Name: Cylinder + - component: {fileID: 845665497} + - component: {fileID: 845665499} + - component: {fileID: 845665498} + m_Layer: 0 + m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &655638806 +--- !u!4 &845665497 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 655638805} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.1} - m_LocalScale: {x: 1, y: 0.1, z: 1} + m_GameObject: {fileID: 845665496} + serializedVersion: 2 + m_LocalRotation: {x: 0.90965253, y: -0, z: -0, w: 0.41536996} + m_LocalPosition: {x: 0, y: -0.07550034, z: -0.040600345} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 375530500} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &655638807 + m_Children: + - {fileID: 1633703687} + m_Father: {fileID: 1969388070} + m_LocalEulerAnglesHint: {x: 130.91501, y: 0, z: 0} +--- !u!23 &845665498 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 655638805} + m_GameObject: {fileID: 845665496} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -6196,10 +6913,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a16db0f18ace882458e325d3243cb6da, type: 2} + - {fileID: 2100000, guid: dca6b5fc8485ffd4c88bf8ae060949bc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6221,167 +6941,15 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &655638808 +--- !u!33 &845665499 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 655638805} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &660021079 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1743725476} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - - target: {fileID: -7511558181221131132, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - - target: {fileID: -4818106957885473086, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - - target: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Name - value: Target - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_StaticEditorFlags - value: 4294967295 - objectReference: {fileID: 0} - - target: {fileID: 2191750151954457832, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_StaticEditorFlags - value: 4294967295 - objectReference: {fileID: 0} - - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 16598d12187e7ef49aaf6d2ec4136e05, type: 2} - - target: {fileID: 2229032678205019293, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_Materials.Array.data[2] - value: - objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - - target: {fileID: 3396913584297481876, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - propertyPath: m_StaticEditorFlags - value: 4294967295 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} ---- !u!4 &660021080 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - m_PrefabInstance: {fileID: 660021079} - m_PrefabAsset: {fileID: 0} ---- !u!4 &660021081 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 393777075064552474, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - m_PrefabInstance: {fileID: 660021079} - m_PrefabAsset: {fileID: 0} ---- !u!1 &660021082 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2191750151954457832, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - m_PrefabInstance: {fileID: 660021079} - m_PrefabAsset: {fileID: 0} ---- !u!65 &660021083 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 660021082} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.7976047, y: 1.1504669, z: 0.08324993} - m_Center: {x: 0, y: 3.5952096, z: 0.01631552} ---- !u!1 &668594701 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 668594702} - m_Layer: 0 - m_Name: Thumb_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &668594702 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 668594701} - m_LocalRotation: {x: 0.0000000018626451, y: 0.000000005587936, z: -0.000000014901163, w: 1} - m_LocalPosition: {x: -0.029552078, y: 0.0000000667572, z: -0.00000015109777} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1494241464} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &676405891 + m_GameObject: {fileID: 845665496} + m_Mesh: {fileID: 5083779560280695074, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &853416177 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6389,94 +6957,151 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 676405892} - m_Layer: 0 - m_Name: AttachTransform + - component: {fileID: 853416178} + - component: {fileID: 853416181} + - component: {fileID: 853416179} + - component: {fileID: 853416180} + m_Layer: 31 + m_Name: Stair 1 Teleportation Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &676405892 + m_IsActive: 0 +--- !u!4 &853416178 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 676405891} - m_LocalRotation: {x: 0.36650118, y: 0, z: 0, w: 0.9304176} - m_LocalPosition: {x: 0.0447, y: -0.0476, z: 0.0131} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1336895285} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 43, y: 0, z: 0} ---- !u!1 &679583487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 679583488} - m_Layer: 0 - m_Name: Little_1_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &679583488 -Transform: + m_GameObject: {fileID: 853416177} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.4, z: 1.8} + m_LocalScale: {x: 0.04, y: 1, z: 0.04} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 33704422} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &853416179 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 679583487} - m_LocalRotation: {x: 0.0012706812, y: -0.0023152584, z: -0.06524572, w: 0.99786574} - m_LocalPosition: {x: -0.033131722, y: 0.00000038266182, z: -0.00000061273573} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1418001335} - m_Father: {fileID: 1466462400} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &695049118 -GameObject: + m_GameObject: {fileID: 853416177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: dab4a007ae520c47af9117adf3fb3c6f + guids: [] +--- !u!114 &853416180 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 695049119} - m_Layer: 0 - m_Name: Ring_0_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &695049119 -Transform: + m_GameObject: {fileID: 853416177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 2147483648 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 1 + m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_TeleportationProvider: {fileID: 0} + m_MatchOrientation: 0 + m_MatchDirectionalInput: 0 + m_TeleportTrigger: 0 + m_FilterSelectionByHitNormal: 0 + m_UpNormalToleranceDegrees: 30 + m_Teleporting: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &853416181 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695049118} - m_LocalRotation: {x: 0.0037497291, y: 0.028980805, z: -0.08957866, w: 0.995551} - m_LocalPosition: {x: -0.060953286, y: -0.00000024797393, z: 0.00000015258789} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2146657147} - m_Father: {fileID: 388840135} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &697578260 + m_GameObject: {fileID: 853416177} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &860339258 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6484,393 +7109,409 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 697578261} - - component: {fileID: 697578262} - m_Layer: 0 - m_Name: RightHand + - component: {fileID: 860339259} + - component: {fileID: 860339261} + - component: {fileID: 860339260} + m_Layer: 2 + m_Name: Climb Teleport m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &697578261 +--- !u!4 &860339259 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 697578260} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 860339258} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1729154661} - - {fileID: 496138948} - - {fileID: 1336895285} - m_Father: {fileID: 65634329} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 1178045155} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &697578262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 697578260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41cc12ba1114e4f46929730a9389cb74, type: 3} - m_Name: - m_EditorClassIdentifier: - baseController: {fileID: 1729154660} - teleportController: {fileID: 496138946} - uiController: {fileID: 1336895284} - teleportModeActivate: {fileID: -8061240218431744966, guid: de2411ef647d9f24d981120efb63e621, type: 3} - teleportModeCancel: {fileID: 2307464322626738743, guid: de2411ef647d9f24d981120efb63e621, type: 3} - uiModeActivate: {fileID: -4794670585942407507, guid: de2411ef647d9f24d981120efb63e621, type: 3} - turn: {fileID: -6493913391331992944, guid: de2411ef647d9f24d981120efb63e621, type: 3} - move: {fileID: -8198699208435500284, guid: de2411ef647d9f24d981120efb63e621, type: 3} - translateAnchor: {fileID: 875253871413052681, guid: de2411ef647d9f24d981120efb63e621, type: 3} - rotateAnchor: {fileID: -5913262927076077117, guid: de2411ef647d9f24d981120efb63e621, type: 3} - selectState: - enabled: 0 - m_ID: 1 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] - teleportState: - enabled: 0 - m_ID: 2 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] - interactState: - enabled: 0 - m_ID: 3 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] - uiState: - enabled: 0 - m_ID: 4 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &705507993 -GameObject: +--- !u!114 &860339260 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 705507995} - - component: {fileID: 705507994} - m_Layer: 0 - m_Name: Sun - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &705507994 -Light: + m_GameObject: {fileID: 860339258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 403f8ba1dc82bb842b2dd5de318ed2ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ClimbTeleportInteractor: {fileID: 860339261} + m_PointerPrefab: {fileID: 5212361887338514247, guid: bb7ea2e5c009e7c46afed352eb1941aa, type: 3} + m_PointerDistance: 0.3 +--- !u!114 &860339261 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 705507993} + m_GameObject: {fileID: 860339258} m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 0.85882354, g: 0.858539, b: 0.84705883, a: 1} - m_Intensity: 0.8 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3c5f6c9defa4ae9ad41bcc3f8754f86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &705507995 -Transform: + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ClimbProvider: {fileID: 1178045156} + m_DestinationEvaluationSettings: + m_UseConstant: 1 + m_ConstantValue: + m_EnableDestinationEvaluationDelay: 0 + m_DestinationEvaluationDelayTime: 1 + m_PollForDestinationChange: 1 + m_DestinationPollFrequency: 1 + m_DestinationFilterObject: {fileID: 11400000, guid: 22becb1b271978f41bb17d1c741842e8, type: 2} + m_Variable: {fileID: 0} +--- !u!1 &861048854 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: 0.8864501, y: 0.40046445, z: 0.13547534, w: 0.18836364} - m_LocalPosition: {x: 0, y: 5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 13.029, y: 156.335, z: 128.636} ---- !u!21 &738067764 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Standard - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 3 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 0.4, g: 0.5882353, b: 1, a: 0.19607843} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] ---- !u!1 &740016309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 740016310} - m_Layer: 0 - m_Name: Index_1_Left + serializedVersion: 6 + m_Component: + - component: {fileID: 861048855} + - component: {fileID: 861048858} + - component: {fileID: 861048856} + - component: {fileID: 861048857} + m_Layer: 31 + m_Name: Stair 2 Teleportation Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &740016310 + m_IsActive: 0 +--- !u!4 &861048855 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 740016309} - m_LocalRotation: {x: 0.0029770152, y: -0.0028722505, z: -0.046370056, w: 0.9989158} - m_LocalPosition: {x: -0.033406343, y: 0.00000032424927, z: -0.00000019073485} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 861048854} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.8, z: 2.2} + m_LocalScale: {x: 0.04, y: 1, z: 0.04} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2109031085} - m_Father: {fileID: 1338586625} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 33704422} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &757363299 -GameObject: +--- !u!114 &861048856 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 757363300} - - component: {fileID: 757363302} - - component: {fileID: 757363301} - m_Layer: 8 - m_Name: Cylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &757363300 -Transform: + m_GameObject: {fileID: 861048854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 4cc351be75c35a46af43ba76169788b7 + guids: [] +--- !u!114 &861048857 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 757363299} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0.1} - m_LocalScale: {x: 1, y: 0.1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1731060433} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &757363301 -MeshRenderer: + m_GameObject: {fileID: 861048854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 2147483648 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 1 + m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} + m_AllowGazeInteraction: 0 + m_AllowGazeSelect: 0 + m_OverrideGazeTimeToSelect: 0 + m_GazeTimeToSelect: 0.5 + m_OverrideTimeToAutoDeselectGaze: 0 + m_TimeToAutoDeselectGaze: 3 + m_AllowGazeAssistance: 0 + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + m_TeleportationProvider: {fileID: 0} + m_MatchOrientation: 0 + m_MatchDirectionalInput: 0 + m_TeleportTrigger: 0 + m_FilterSelectionByHitNormal: 0 + m_UpNormalToleranceDegrees: 30 + m_Teleporting: + m_PersistentCalls: + m_Calls: [] +--- !u!64 &861048858 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 757363299} + m_GameObject: {fileID: 861048854} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a16db0f18ace882458e325d3243cb6da, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &757363302 -MeshFilter: + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!43 &862649805 +Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 757363299} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &790520235 + m_Name: + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 2532 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 779 + localAABB: + m_Center: {x: 0, y: 0, z: -0.09999999} + m_Extent: {x: 0.19999997, y: 0.19999997, z: 0.09999999} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 0 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000400050006000700080009000a000b000b000c0009000b000d000c000e000c000d000d000f000e0010000e000f00110010000f001200100011001200110013001400120013001400130015001600140015001600150017001800160017001800170019001a0011000f001b00180019001b0019001c000f001d001a001e001d000f001f001e000f000f0020001f001b001c00210022001b00210023002200210024002300210024002500230021002600240027002800290029002a00270029002b002a0029002c002b002c002d002b002e002a002b002b002f002e002f0030002e00300031002e0032002e00310033003200310033003100340034003500330035003400360037003500360036003800370034003900360034003a00390030003b003c003b003d003c003b003e003d003e003f003d003e0040003f00400041003f0040004200410042004300410042004400430044004500430044004600450046004700450046004800470048004900470048004a00490049004a004b004b004c0049004a004d004b004d004a00480048004e004d0048004f004e0050005100520052005300500052005400530050005300550055005300540054005600550056005700550055005800500055005900580059005a00580059005b005a005b005c005a005c005d005a005c005e005d005e005f005d005e0060005f00600061005f0060006200610062006300610062006400630064003200630065006600670067006600680068006900670066006a0068006a006b0068006b006c0068006b006d006c006b006e006d006e006f006d006f0070006d006f00710070006f00720071007200730071007200740073007400750073007400760075007700760078007800790077007a00780076007a0076007b007b007c007a007d007a007c007d007c007e007e007f007d007d007f008000800081007d0080008200810082008300810082008400830084008500830083008600810086008700810085008800830088008900830085008a0088008a008b0088008b008c0088008b008d008c008d008e008c008e008f008c008d0090008e00900091008e0091009000920093008e0091009100940093009500960097009700980095009800990095009a009900980098009b009a009b009c009a009b009d009c009d009e009c009d009f009e009b00a0009d009b00a100a0009d00a2009f009d00a300a200a200a4009f00a200a500a400a200a600a500a600a700a500a600a800a700a600a900a800a800aa00a700a800ab00aa00ac00aa00ab00ad00a700aa00aa00ae00ad00af00b000b100b100b200af00b200b300af00b200b400b300b400b500b300b400b600b500b700b800b900ba00bb00bc00bd00be00bf00c000c100c200c300c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100cf00d100d200d200d300cf00d300d200d400d300d400d500d500d400d600d500d600d700d500d700d800d900cf00d300d500d900d300da00d500d800da00d800db00db00dc00da00db00dd00dc00db00de00dd00d500da00df00da00e000df00d500df00e100d500e100d900d900e200cf00cf00e200e300e400e200d900e100e400d900e400e500e200e600e100df00e100e600e400e600df00e700e800e600e700e800e900e600e400e600e900e900e800ea00e900ea00eb00ec00e900eb00e500e400ed00e400e900ed00ec00ed00e900e500ed00ee00ed00ec00ef00ed00ef00ee00f000f100f200f000f300f100f300f000f400f500f300f400f400f000f600f400f600f700f400f800f500f400f700f900fa00f800f400f400f900fa00fa00fb00f800f900fc00fa00fb00fa00fc00f900fd00fc00fe00fb00fc00ff00fe00fc000001ff00fc00fc00fd00010102010001fc000301fc000101fc000301020103010101040105010301040106010201030105010701030106010301070108010601070108010701090109010a0108010b010a0109010b0109010c010d010e010f010d010f01100111010d011001110112010d01110113011201110114011301150113011401160115011401170111011001170114011101180110010f01170110011801160114011901170119011401160119011a0116011a011b01190117011c0119011c011a0118011c0117011c011d011a0118010f011e011e010f011f011e011f01200121011e012001220118011e01210122011e01180123011c012201230118012101240122012301220124012101250124011c0126011d0126011c0123012301240127012601230127012701240128012701280129012a01270129012a01260127012a011d0126012a012b011d012c012d012e012c012e012f0130012c012f01300131012c01300132013101300133013201340133013001340130012f0134013501330136012f012e0134012f01360136012e01370136013701380139013501340139013a0135013b0134013601360138013b013b01390134013b0138013c013d013c0138013d013e013c013c013e013f0140013c013f013b013c0140013b01410139013b014001410140014201410140014301420140013f014301390141014401390144013a014201440141013a01440145013a014501460144014701450142014701440148014701420149014801420142014a0149014b014a0142014b01420143014b0143013f014c014b013f014d014c013f014e014d013f014f014e013f013f0150014f0151015201530153015401510151015401550151015501560151015601570156015501580158015901560158015a0159015a015b0159015a015c015b015d015e015f015f0160015d01600161015d0160016201610160016301620162016301640164016501620165016401660165016601670165016701680165016801690169016a01650169016b016a0169016c016b016b016c016d016e016b016d016d016f016e016f0170016e01700171016e016f0172017001700172017301730174017001730175017401730176017501770178017901770179017a017b0177017a017b017c0177017b017d017c017b017e017d017f017d017e0180017f017e0181017b017a0181017e017b0182017a01790181017a01820180017e018301810183017e01800183018401800184018501830181018601830186018401820186018101860187018401820179018801880179018901880189018a018b0188018a018c01820188018b018c01880182018d0186018c018d0182018b018e018c018d018c018e018b018f018e01860190018701900186018d018d018e01910190018d01910191018e0192019101920193019401910193019401900191019401870190019401950187019601970198019601980199019a01960199019a019b0196019a019c019b019a019d019c019e019d019a019e019a0199019e019f019d01a001990198019e019901a001a0019801a101a001a101a201a3019f019e01a301a4019f01a5019e01a001a001a201a501a501a3019e01a501a201a601a701a601a201a701a801a601a601a801a901a501a601aa01aa01a601a901a501ab01a301a501aa01ab01a301ac01a401a301ab01ac01aa01ad01ab01ad01ac01ab01a401ac01ae01a401ae01af01ac01b001ae01ad01b001ac01aa01a901b101aa01b101ad01b201b001ad01b101b201ad01b201b301b001b101b401b201b401b101a901b401a901b501b601b701b801b901b601b801b801ba01b901bb01b901ba01bb01bc01b901bd01bc01bb01be01bd01bb01bf01be01bb01bb01c001bf01c101bf01c001c001c201c101c301c001bb01ba01c301bb01ba01b801c401b801c501c401ba01c401c601ba01c601c301c301c701c001c001c701c801c901c701c301c601c901c301c901ca01c701cb01c601c401c601cb01c901cb01c401cc01cd01cb01cc01cd01ce01cb01c901cb01ce01c901ce01cf01cf01ca01c901cf01d001ca01d101d201d301d101d301d401d501d101d401d501d601d101d501d701d601d501d801d701d401d901d501d801d501d901d401da01d901da01d401d301d901db01d801d301dc01da01dd01dc01d301dd01d301de01df01d801db01db01e001df01e001e101df01e101e201df01e201e301df01e401df01e301e401e301e501e201e601e301e301e701e501e801e301e601e301e801e701e601e901e801e801ea01e701e901eb01e801e801ec01ea01e801eb01ec01ed01ee01ef01ed01ef01f001ed01f001f101ed01f101f201f101f301f201f101f401f301f001ef01f501f501f601f001f601f101f001ef01f701f501f801f701ef01f801f901f701f601fa01f101f101fa01fb01f101fb01fc01f101fc01fd01f401f101fd01f401fd01fe01fe01ff01f401fe010002ff01fe01010200020202f401ff0100020202ff0102020302f401000204020202000205020402000206020502060200020102010207020602080209020a020a020b0208020b020a020c020c020a020d020e0208020b020e020f0208020f020e021002100211020f0212020e020b02120210020e020b020c02130212020b021302100214021102140215021102140216021502140217021602180217021402180214021902180219021a021a021b0218021a021c021b021d0213020c021d020c021e021d021e021f021d021f022002210213021d0221021d022002210212021302210220022202220223022102220224022302210223022502210225021202120225021002250226021002270228022902270229022a022b0227022a022b022c0227022b022d022c022b022e022d022f022d022e0230022f022e0231022b022a0231022e022b0232022a02290231022a02320230022e023302310233022e02300233023402300234023502330231023602330236023402320236023102360237023402320229023802380229023902380239023a023b0238023a023c02320238023b023c02380232023d0236023c023d0232023b023e023c023d023c023e023b023f023e02360240023702400236023d023d023e02410240023d02410241023e0242024102420243024402410243024402400241024402370240024402450237024602470248024602480249024a024602490249024b024a024c024a024b024c024b024d024c024d024e024f024e024d024f0250024e024e0251024c024e02500252024e025302510253024e025202530254025102530255025402530256025502570256025302530252025802590258025202590252025a02580259025b02530258025c0258025b025c02570253025d0253025c025d0257025d025e025c025e025d025e025f0257025e0260025f02610260025e0261025e0262025e02630262025c0263025e025b0263025c025b0264026302650266026702650267026802650268026902650269026a026a0269026b026a026b026c026d026b02690268026d026902680267026e0267026f026e0268026e027002680270026d026d0271026b026b0271027202730271026d02700273026d02730274027102750270026e0270027502730275026e02760277027502760277027802750273027502780273027802790279027402730279027a0274027b027c027d027b027d027e027b027e027f027b027f0280027f02810280027f02820281027e027d028302830284027e0284027f027e02840285027f027f028502860282027f0286028602870282028702880282028702890288027d028a0283027d028b028a028b027d028c028c027d028d028c028d028e028c028f028b028c028e02900291028f028c028c0290029102910292028f0290029302910292029102930290029402930295029202930293029402960293029702950296029702930296029802970299029a029b029c029a0299029d029a029c029d029e029a029e029d029f029e029f02a0029f02a102a0029f02a202a102a2029f02a3029d02a3029f02a202a302a402a302a502a402a302a602a502a602a302a7029d02a702a302a602a702a802a702a902a802aa02a7029d02aa029d029c02a702aa02a902ab02aa029c02ab02a902aa02ab029c02ac029c029902ac02ab02ad02a902ad02ae02a902af02ad02ab02af02ab02ac02af02b002ad02b102ac029902af02ac02b102b1029902b202b102b202b302b102b302b402af02b102b402af02b402b502b502b002af02b502b602b002b702b802b902ba02b702b902b902bb02ba02bc02ba02bb02bb02b902bd02bb02bd02be02bc02bf02ba02bb02be02c002bb02c002bc02c102bf02bc02c202c102bc02c302c202bc02c002c402bc02bc02c402c302c002c502c402c602c302c402c402c702c602c802c602c702c802c702c902c802c902ca02ca02cb02c802cc02ca02c902cc02cd02ca02ce02cb02ca02ca02cd02cf02ce02ca02cf02d002ce02cf02d102d002cf02cf02d202d102d302d402d502d302d502d602d702d302d602d702d802d302d702d902d802d702da02d902db02d902da02dc02db02da02dd02d702d602dd02da02d702de02d602d502dd02d602de02dc02da02df02dd02df02da02dc02df02e002dc02e002e102df02dd02e202df02e202e002de02e202dd02e202e302e002de02d502e402e402d502e502e402e502e602e702e402e602e802de02e402e702e802e402de02e902e202e802e902de02e702ea02e802e902e802ea02e702eb02ea02e202ec02e302ec02e202e902e902ea02ed02ec02e902ed02ed02ea02ee02ed02ee02ef02f002ed02ef02f002ec02ed02f002e302ec02f002f102e302f202f302f402f202f402f502f202f502f602f202f602f702f702f602f802f702f802f902fa02f802f602f502fa02f602f502f402fb02f402fc02fb02f502fb02fd02f502fd02fa02fe02fd02fb02fe02fa02fd02fb02ff02fe02fe020003fa02fa020103f8020103fa020003f80201030203000303030103040301030303030305030403050306030403060307030403070308030403040308030903040309030a03 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 779 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 37392 + _typelessdata: 77562f3bcecc4cbd0ad723be000000000000803f00000000000000000000803f00000000000080bf0b98ec3e00ab133f54562f3b989919be0ad723be000000000000803f000000000000803f0000000000000000000080bf5005083f5a07023f54562f3bcecc4c3d0ad723be000000000000803f000000000000803f0000000000000000000080bf7325c93ea64e253f6b562fbbcccc4c3d0ad723be000000000000803f00000000000000000000803f000000000000803f3242c73ede5b243f60562fbb9999193e0ad723be000000000000803f00000000000080bf00000000000000000000803f9bcfa33e84ff353f60562fbbcecc4cbd0ad723be000000000000803f00000000000080bf00000000000000000000803fcab4ea3e37b8123fcecc4c3d0ad723be5d562fbb000000000000803f00000000000000000000803f00000000000080bf4247a33ef3efa83e999919be0ad723be5d562fbb000000000000803f00000000000000000000803f00000000000080bf0ae0a63e36e2ef3ececc4cbd0ad723be6d562fbb000000000000803f00000000eea07ebf00000000e8b2d3bd000080bfa613a53e1469cc3e235b21be235b213e37b088bb54e524bf496a423f4a4bbbbdb877acbcc9b6d03d2f9c7e3f000080bfdd683c3e6d37253f0ad723bec33d1f3e6eca8abb267f73bfeaeb9c3e9a2c17bd1663ecbbcb97c73d50c67e3f000080bfb6443c3eeff3253f0ad723be78c31f3e000000001b807dbff0b80d3e248888bcec4b3bbb5386cb3d50bb7e3f000080bf6085403ef8ec253f27731ebe0ad7233e639e83bbf8b9babecaff6d3f341754bdaf66afbb69335b3d25a17f3f000080bfa2a73c3ec05a243fa7081fbe0ad7233e00000000b1527bbd08827f3f2bbb0ebce17549bb5be70b3c4efd7f3f000080bf6aab403e6f80243f999919be0ad7233e74562fbb000000000000803f000000006f0b473c000000002afb7f3f000080bfd4fe3d3e753b233f672c1d3e0ad7233e00000000668ee83d1c587e3f000000002639873c8047f7baf4f67f3f000080bf6aab403eb228b63ecccc4cbd0ad7233e74562fbb000000000000803f000000004015473c000000002afb7f3f000080bfd4fe3d3e91740b3fcbcc4c3d0ad7233e74562fbb000000000000803f000000005ce4463c000000002cfb7f3f000080bfd4fe3d3e5a5be73e07d723bd0ad7233e0e77b4bb000000000000803f000000009424473c000000002afb7f3f000080bf342a3b3ec811093f06d7233d0ad7233e0e77b4bb000000000000803f000000004202473c000000002afb7f3f000080bf342a3b3e8b18ec3e54b0d0bc0ad7233e3ae719bc000000000000803f00000000610c473c000000002afb7f3f000080bfd247373ec59a053f54b0d03c0ad7233e3ae719bc000000000000803f00000000a833473c0000000028fb7f3f000080bfd247373e11fbf23e2de719bc0ad7233e5cb0d0bc000000000000803f000000005c17473c000000002afb7f3f000080bffc34273e07bc013f23e7193c0ad7233e5cb0d0bc000000000000803f000000003814473c000000002afb7f3f000080bffc34273ef888fa3efd76b4bb0ad7233e07d723bd000000000000803f00000000e20b473c000000002afb7f3f000080bf49b0183ebdc4003ff376b43b0ad7233e07d723bd000000000000803f000000000b0c473c000000002afb7f3f000080bf49b0183e934cfc3e9999193e0ad7233e74562fbb000000000000803f0000000010f6463c000000002cfb7f3f000080bfd4fe3d3e92cdb73e66562fbb0ad7233ececc4cbd000000000000803f00000000f510473c000000002afb7f3f000080bf80b10e3ef810003f59562f3b0ad7233ececc4cbd000000000000803f000000008c16473c000000002afb7f3f000080bf80b10e3e8896fd3e672c1d3e0ad7233eb01a70bbee55fd3e5f775e3f00000000a6048b3ced4e1ebc81f37f3f000080bff5013d3e4723b63ef558203ef558203e62d46dbb67733d3fec2c2c3f000000004cff9a3c8a8caabc11e67f3f000080bf3eea3c3e1531b53e0ad7233e2b811c3e1cfb63bbe3ad543f8f7d0e3f00000000f9b77d3c3159bdbca3e67f3f000080bfd5ec3c3ec126b43e0ad7233e2b811c3e00000000b2887d3f46ca0d3e00000000f9d7523b0b81bcbc4fee7f3f000080bff666403ee62bb43e74562f3b0ad7233e989919be000000000000803f000000008615473c000000002afb7f3f000080bfb0f62a3d9a02fd3e66562fbb0ad7233e999919be000000000000803f00000000b421473c000000002afb7f3f000080bfb0f62a3d018eff3e9e7289bb0ad7233ed4171fbed13ca5bc263d7e3f793aecbdf7aad0bd5ddde63d03077d3f000080bf3484153d801f003f628091b90ad7233e64cb1fbe72db2cbd8d8c643f0da6e5bea064d2bcfa47e53e4acd643f000080bf20c7123d2461fe3e24678bbbcde5223ef83220be5015b0bddfd72e3f0fb139bf4d974fbe9069333f16152f3f000080bf880f113d9034003fa9ec933b0ad7233ec73f20be0ec12cbd5daf633fbb0ee9be291402bcdf1ae93e72eb633f000080bfb000113d2319fc3e6fe889bbdb6c213edb6c21be72ac91bd2c0f233f828244bfb02a173fe1e417bfb60b0cbf000080bfad8fa03e0713373f24678bbbcde5223ef83220be5015b0bddfd72e3f0fb139bf9421163f3dca0dbf414d17bf000080bf1209a03ee451373f628091b90ad7233e64cb1fbe72db2cbd8d8c643f0da6e5bebe721b3f03ccaabed89a38bf000080bfb61ca13ee22f383f606284bbca881e3e0ad723bef1d71abdc954ad3e81b070bfc0a02c3f968a2fbf1d4c8cbe000080bf169fa13e329b363fdb078d3b0a7d1f3e0ad723bee4b63fbd7e9bd63efb1d68bf58fe293f5b402abf81f5aebe000080bf1a3ca43edc3f383fa9ec933b0ad7233ec73f20be0ec12cbd5daf633fbb0ee9bef9371b3f24bcadbeaa1c38bf000080bf79cda23e4d09393f33d2913bcddf213eccdf21bebebb91bd1f0f233f5f8244bf554b173f15d017bf03ff0bbf000080bfe175a33eb3af383f60562fbb9999193e0ad723be0000000000000000000080bf0f96343f947335bf00000000000080bf9bcfa33e84ff353f77562f3b9999193e0ad723be0000000000000000000080bf0a96343f987335bf00000000000080bfdcb2a53e4df2363f54562f3bcecc4c3d0ad723be0000000000000000000080bf8495343f207435bf00000000000080bf7325c93ea64e253f54562f3b989919be0ad723be0000000000000000000080bf1596343f8f7335bf00000000000080bf5005083f5a07023f60562fbbcecc4cbd0ad723be0000000000000000000080bfdf95343fc27335bf00000000000080bfcab4ea3e37b8123f6b562fbb999919be0ad723be0000000000000000000080bf1396343f917335bf00000000000080bfb013073f9114013f5062843bc9881ebe0ad723be76a3293d53e4bdbe68816dbfa2622c3fc4f52cbf48ad993e000080bf931d093fac6b013fc3078dbb097d1fbe0ad723be97b1233d003db7be22d36ebf019d2a3f67a32fbf4860953e000080bf11cf073f058eff3e16c890390ad723be6ccb1fbe86e02a3deb3b65bfaeece2bedbaa1b3f9690a8becbee383f000080bfb45e093fd9adff3e1cd291bbcddf21beccdf21be1eab913d010f23bfaa8244bf542b173faee417bf3b0b0c3f000080bf2e32083f56aefe3e93ec93bb0ad723bec73f20be191cdc3c59e774bf677894befac2233fc56953bebc893d3f000080bf6286083f22fbfd3e05678b3bb9e522be073320be14319f3dda5928bff7d33fbfe4b2163fe38913bf511d113f000080bf92e8093ffdb4003f65e8893bda6c21bedb6c21be37c3913dec0e23bf738244bff001173fbffc17bfc51d0c3f000080bf48a5093fd7f3003feb76b43b0ad7233d0ad723be0000000000000000000080bf9095343f117435bf00000000000080bfaab0cd3e940b243f77562f3bcecc4cbd0ad723be0000000000000000000080bff695343fac7335bf00000000000080bf0b98ec3e00ab133f1877b43b06d723bd0ad723be0000000000000000000080bfff95343fa47335bf00000000000080bf570cea3e0fef153f21e7193c57b0d03c0ad723be0000000000000000000080bf0e96343f947335bf00000000000080bfbf35d43efe2b223f3ae7193c5cb0d0bc0ad723be0000000000000000000080bfb295343ff17335bf00000000000080bf3345e63e4c2f193f54b0d03c2de7193c0ad723be0000000000000000000080bffc95343fa87335bf00000000000080bf6495df3e792f223f5cb0d03c3ae719bc0ad723be0000000000000000000080bfea95343fb87335bf00000000000080bf3d3ee63e1fdf1e3f04d7233d0677b43b0ad723be0000000000000000000080bf1096343f927335bf00000000000080bfde15e63e0b13243f07d7233d0e77b4bb0ad723be0000000000000000000080bf1f96343f837335bf00000000000080bf68fde93ea821223fcbcc4c3d6b562f3b0ad723be0000000000000000000080bfdf95343fc47335bf00000000000080bffc9dea3ee558253fcecc4c3d6d562fbb0ad723be0000000000000000000080bfc195343fe17335bf00000000000080bf8e83ec3e4567243f9899193e60562f3b0ad723be0000000000000000000080bfd795343fcb7335bf00000000000080bfa4f2063f3012373f9999193e77562fbb0ad723be0000000000000000000080bfb195343ff17335bf00000000000080bf6de5073f9020363fd18d1d3e2600773b0ad723beb7e1e93ece0f503db15b63bfdca62a3f9d3d2ebfe19d9b3e000080bf646f073fc4f2373f87751d3e0e4875bb0ad723be3a6ddc3eba1d71bd969166bf2ba1273fc9992abf7e8eb63e000080bf08c0083f5e9b363faefb1d3e151886320ad723be3103293f320a38bca44140bf50c3093fcac130bf8f80f73e000080bf522d083f985b373f0ad7233efc4775bb87751dbe474a5a3fc7f090bde38004bf0ab9cc3efb980cbf87db3b3f000080bf6ad9093f19b6373f72a5203e465c78bb71a520be9f2e343f45c2c4bd8c2e34bf18e10c3f96830dbf3732203f000080bfb64e093f7726373f0ad7233efdfb8932aefb1dbe980d7c3fb799deba661c33be539f063e7a0527bf86113f3f000080bf992f093f1b5f383f0ad7233e1300773bd08d1dbef820593f82cf6f3d6ec806bfc4c9e23e9e9e1fbf1dec243f000080bf9784083f4c09393fbeb1203ef00d7a3bc0b120be1576343f51bba03df17534bf7216193f2ba719bf38fb073f000080bfc2f7073f0580383fd38d1dbe530077bb0ad723bec716ddbeacae44bd319366bf78dc2c3f9ae32dbf5f3593be000080bf75fba43e1914003fc1b120be1b0e7abbc1b120bead7734bf7bd69fbd877734bf6202193ff8b819bfaffd07bf000080bfb8eaa33eb10dff3e0ad723be410077bbd28d1dbedb4a5abf567b6cbdd5e904bfd880df3e79ea1fbf16c125bf000080bf0ed1a23e23fbfd3eb1fb1dbe151886320ad723beb5f228bf1aefd13bd55340bfbe4c0a3f5add30bf11fef5be000080bf967fa33e46ab003f0ad723befcfb8932b0fb1dbe990a7cbf5d49433b675b33be9708063e5ae926bfb7303fbf000080bf0a7ba13e864fff3e8b751dbe2048753b0ad723be68ece6beab987c3debef63bf3d57253f187d2abfa31fbfbe000080bf2c5aa23e806b013f0ad723be0f48753b89751dbee0e058bfe968933d87c206bf526cd03eab7b0cbf76ec3abf000080bf6827a03ec450003f73a520be555c783b72a520be092e34bf820fc53dd42d34bfb3e80c3ff26d0dbfa43e20bf000080bfd03ca13e67e0003f999919be6d562fbb0ad723be0000000000000000000080bf2796343f7c7335bf00000000000080bff4f4a53eadf4003f999919be6b562f3b0ad723be0000000000000000000080bf1896343f8b7335bf00000000000080bf620fa43e4ee6013fcccc4cbd77562fbb0ad723be0000000000000000000080bfdf95343fc37335bf00000000000080bf413cc93ef9ad123fcecc4cbd60562f3b0ad723be0000000000000000000080bfd595343fcd7335bf00000000000080bfaf56c73e999f133f09d723bdfd76b43b0ad723be0000000000000000000080bfd095343fd17335bf00000000000080bfd4dcc93e35e5153f05d723bd1877b4bb0ad723be0000000000000000000080bfe895343fba7335bf00000000000080bf5fc4cd3ed3f3133f57b0d0bc2de7193c0ad723be0000000000000000000080bf0e96343f947335bf00000000000080bf009ccd3ec027193f54b0d0bc3ae719bc0ad723be0000000000000000000080bf0996343f9a7335bf00000000000080bfd844d43e65d7153f2de719bc54b0d03c0ad723be0000000000000000000080bfbf95343fe27335bf00000000000080bf0a95cd3e92d71e3f2be719bc5cb0d0bc0ad723be0000000000000000000080bf1d96343f857335bf00000000000080bf7da4df3ee0da153f0677b4bb05d7233d0ad723be0000000000000000000080bff195343fb27335bf00000000000080bfe6cdc93ecf17223ff576b4bb0ad723bd0ad723be0000000000000000000080bf3596343f6e7335bf00000000000080bf9229e63e4afb133f6b562fbbcccc4c3d0ad723be0000000000000000000080bffc95343fa77335bf00000000000080bf3242c73ede5b243f05678b3bb9e522be073320be14319f3dda5928bff7d33fbfae3e06bf5bbd1c3f8f7b17bf000080bf74ebf03efcd3b83e5572893b0ad723becd171fbe824ea53cc53c7ebf4154ecbdbec494be8e3ed63d997c73bf000080bf575df03e802cb93e16c890390ad723be6ccb1fbe86e02a3deb3b65bfaeece2be03d390bda132e13e993165bf000080bffec6f03e5290ba3e60562fbb0ad723be989919be00000000000080bf000000000000000000000000000080bf000080bf15cfed3e7b9cbb3e93ec93bb0ad723bec73f20be191cdc3c59e774bf677894be7e2809bc9368943e130075bf000080bfce15f13e5743bc3e5d562f3b0ad723be999919be00000000000080bf000000000000000000000000000080bf000080bf74b6ed3e90b6b93e6d562f3b0ad723becbcc4cbd00000000000080bf000000000000000000000000000080bf000080bf2ec4bb3e97b8b93e6b562fbb0ad723bececc4cbd00000000000080bf000000000000000000000000000080bf000080bfd2dcbb3e839ebb3e0677b4bb0ad723be06d723bd00000000000080bf000000000000000000000000000080bf000080bf3aebb63ee39fbc3e0677b43b0ad723be07d723bd00000000000080bf000000000000000000000000000080bf000080bf84b8b63ea0b7b83e38e7193c0ad723be54b0d0bc00000000000080bf000000000000000000000000000080bf000080bf6265af3e0357b73e2de719bc0ad723be5cb0d0bc00000000000080bf000000000000000000000000000080bf000080bfe1bbaf3e1601be3e57b0d0bc0ad723be38e719bc00000000000080bf000000000000000000000000000080bf000080bfbafda73ec4b5c33e5cb0d03c0ad723be23e719bc00000000000080bf000000000000000000000000000080bf000080bf2913a73efda2b13e0ad723bd0ad723be0677b4bb00000000000080bf000000000000000000000000000080bf000080bfb54fa63ee8dcc83e06d7233d0ad723befd76b4bb00000000000080bf000000000000000000000000000080bf000080bf65dfa43e027cac3ececc4cbd0ad723be6d562fbb00000000000080bf000000000000000000000000000080bf000080bfa613a53e1469cc3ececc4c3d0ad723be5d562fbb00000000000080bf000000000000000000000000000080bf000080bf4247a33ef3efa83e999919be0ad723be5d562fbb00000000000080bf000000000000000000000000000080bf000080bf0ae0a63e36e2ef3e6c2c1dbe0ad723be00000000835d95bd77517fbf000000000000000000000000000080bf000080bf059aa53e2c1ff13e6c2c1dbe0ad723bede1a70bb3755fdbe94775ebf000000000000000000000000000080bf000080bf786ea73e191ff13e9e081f3e0ad723be000000004e4f0f3ef56d7dbfc2c5a2bc334405bd13467d3c77d57fbf000080bf5a0ca03e0195833e9899193e0ad723be6d562fbb00000000000080bf000000000000000000000000000080bf000080bfde7aa13ed376853e20731e3e0ad723be1d9e83bb38bbba3e88ff6dbfde1754bd256915bd022d293d6d9c7fbf000080bf8e10a23eb6c8833e0ad7233e71c31fbe00000000ba917f3f18cf6bbd5f2be3bb56c7a4bb5dca073d25db7fbf000080bf1209a03e7d83803e1e5b213e205b21befaaf88bb5ae5243f446a42bfac4bbbbd7eac84bd4e0e853d96eb7ebf000080bf7022a23e0dec813e0ad7233ebd3d1fbe37ca8abbf27e733f32ed9cbe5b2d17bd2a47eabc8246013d88c47fbf000080bffc28a23e6055803e0ad7233e999919be77562fbb0000803f00000000000000000000000000000000000080bf000080bfde7aa13e78c87c3e0ad7233e2b811c3e00000000b2887d3f46ca0d3e000000000000000000000000000080bf000080bf0297a53e08111d3d0ad7233ececc4cbd6d562fbb0000803f00000000000000000000000000000000000080bf000080bf4247a33e0647363e0ad7233ecccc4c3d77562fbb0000803f00000000000000000000000000000000000080bf000080bfa613a53e248bdf3d0ad7233e07d723bd0e77b4bb0000803f00000000000000000000000000000000000080bf000080bf65dfa43ef6392f3e0ad7233e5cb0d0bc3ae719bc0000803f00000000000000000000000000000000000080bf000080bf2913a73e12fc243e0ad7233e9999193e6d562fbb0000803f00000000000000000000000000000000000080bf000080bf0ae0a63e7810253d0ad7233e2b811c3e1cfb63bbe3ad543f8f7d0e3f000000000000000000000000000080bf000080bfce53a73e74101d3d0ad7233e54b0d03c3ae719bc0000803f00000000000000000000000000000000000080bf000080bfbafda73efb0f013e0ad7233e05d7233d1877b4bb0000803f00000000000000000000000000000000000080bf000080bfb54fa63ecca4ed3d0ad7233e3ae719bc5cb0d0bc0000803f00000000000000000000000000000000000080bf000080bf6265af3edaa4193e0ad7233e1877b4bb06d723bd0000803f00000000000000000000000000000000000080bf000080bf84b8b63ed4e6163e0ad7233e2de7193c5cb0d0bc0000803f00000000000000000000000000000000000080bf000080bfe1bbaf3ee5650c3e0ad7233e77562fbbcecc4cbd0000803f00000000000000000000000000000000000080bf000080bf2ec4bb3e46e7143e0ad7233e60562f3bcecc4cbd0000803f00000000000000000000000000000000000080bf000080bfd1dcbb3e7921113e0ad7233efd76b43b07d723bd0000803f00000000000000000000000000000000000080bf000080bf3aebb63ebc220f3e0ad7233e6d562fbb989919be0000803f00000000000000000000000000000000000080bf000080bf72b6ed3e36e3143e0ad7233efdfb8932aefb1dbe980d7c3fb799deba661c33be6f1c33be00000000b00d7cbf000080bf12e6ef3e2200133e0ad7233efc4775bb87751dbe474a5a3fc7f090bde38004bf100e04bfae492e3d6d0a5bbf000080bf6893ef3eb1a3153e0ad7233e6b562f3b999919be0000803f00000000000000000000000000000000000080bf000080bf16cfed3e681d113e0ad7233e1300773bd08d1dbef820593f82cf6f3d6ec806bf567506bffd9315bd3fa559bf000080bfd6c1ef3ee257103ef85820bef75820be9ed46dbb78733dbfdc2c2cbf0000000075cb01bd75d10e3d39b77f3f000080bf789b2d3faae97e3e6c2c1dbe0ad723bede1a70bb3755fdbe94775ebf0000000022701fbd188fb53c39be7f3f000080bf018c2d3f73c1813e6c2c1dbe0ad723be00000000835d95bd77517fbf00000000268f0bbd094a233bbed97f3f000080bf02762e3f87d7813e0ad723be2e811cbe00000000a6cd7fbfe58620bd00000000ea5f03bb3459513d37aa7f3f000080bfd6912e3f98057a3e0ad723be2e811cbe52fb63bb4efc5ebfc680fbbe000000009abacdbcd366363d4daa7f3f000080bfa5b32d3fa9db793e0ad723be989919be59562fbb000080bf0000000000000000000000006ea7873d13707f3f000080bff4e62d3f3fe2773e0ad723be78c31f3e000000001b807dbff0b80d3e248888bc262bf2bb21c4893dc2697f3f000080bfd6912e3fd87ff73c0ad723bececc4cbd6d562fbb000080bf00000000000000000000000096a5873d17707f3f000080bff4e62d3f16f3303e0ad723bececc4c3d59562fbb000080bf000000000000000000000000a2ab873d0b707f3f000080bff4e62d3fd407d43d0ad723be0ad723bd0677b4bb000080bf000000000000000000000000e6a2873d1d707f3f000080bf13322d3f09b9293e0ad723be5cb0d0bc36e719bc000080bf0000000000000000000000001da6873d17707f3f000080bfdc392c3f853c1f3e0ad723be9999193e6d562fbb000080bf000000000000000000000000bfa5873d17707f3f000080bff4e62d3f00530c3d0ad723bec33d1f3e6eca8abb267f73bfeaeb9c3e9a2c17bd50cb80bc370a923d0c517f3f000080bf4e832d3f60ccf83c0ad723be57b0d03c23e719bc000080bf0000000000000000000000002ea4873d1b707f3f000080bfdc392c3f0e31f63d0ad723be09d7233df376b4bb000080bf0000000000000000000000006c0f873d56717f3f000080bf13322d3f68f3e13d0ad723be36e719bc5cb0d0bc000080bf0000000000000000000000005ca5873d17707f3f000080bfbb36283f7712133e0ad723be0677b4bb0ad723bd000080bf000000000000000000000000bba5873d17707f3f000080bffc96243fafa10f3e0ad723be2de7193c54b0d0bc000080bf00000000000000000000000031bd873de56f7f3f000080bfbc36283fe6be053e0ad723be6d562fbbcecc4cbd000080bf0000000000000000000000005fa5873d17707f3f000080bf4518223fe4260d3e0ad723be66562f3bcbcc4cbd000080bf00000000000000000000000025a5873d19707f3f000080bf4518223f385b093e0ad723befd76b43b06d723bd000080bf000000000000000000000000cc95873d39707f3f000080bffc96243f82d1073e0ad723befcfb8932b0fb1dbe990a7cbf5d49433b675b33bed3bd32bef7d88a3dbe787b3f000080bfbe13083f0f58063e0ad723be60562f3b989919be000080bf00000000000000000000000003a6873d17707f3f000080bf2425093fd3a5043e0ad723be0f48753b89751dbee0e058bfe968933d87c206bf083304bf7cb8f83d3602593f000080bf6e34083f97b6033e0ad723be74562fbb999919be000080bf0000000000000000000000009fa5873d17707f3f000080bf2425093f8071083e0ad723be410077bbd28d1dbedb4a5abf567b6cbdd5e904bf0f8d05bf1e602d3d77225a3f000080bf832e083f8609093ea7081fbe0ad7233e0000000000000000000000000000803f000000000000803f00000000000080bf1209a03e203a963b0ad723be78c31f3e0000000000000000000000000000803f000000000000803f00000000000080bf670b9e3e000000000ad723be2e811cbe0000000000000000000000000000803f000000000000803f00000000000080bf0048e53b000000006c2c1dbe0ad723be0000000000000000000000000000803f000000000000803f00000000000080bf00000000a05fd03b672c1d3e0ad7233e0000000000000000000000000000803f000000000000803f00000000000080bf1209a03e91c79c3e9e081f3e0ad723be0000000000000000000000000000803f000000000000803f00000000000080bf0000000025b09d3e0ad7233e2b811c3e0000000000000000000000000000803f000000000000803f00000000000080bfef739c3e1209a03e0ad7233e71c31fbe0000000000000000000000000000803f000000000000803f00000000000080bf40d77e3b1209a03ecbcc4c3d6b562f3b0ad723be00000000000000000000803f0a5835bfb4b134bf000000000000803fde755b3e12efe43e04d7233d0677b43b0ad723be00000000000000000000803f0a5835bfb4b134bf000000000000803f53b35b3e9666e03e54b0d03c2de7193c0ad723be00000000000000000000803f0a5835bfb4b134bf000000000000803f8a0e5c3e91e5d93e57b0d0bc2de7193c0ad723be00000000000000000000803ff3672e3f3f663bbf000000000000803f03f3863e79973b3f09d723bdfd76b43b0ad723be00000000000000000000803ff3672e3f3d663bbf000000000000803fd1488a3e90c9383fcecc4cbd60562f3b0ad723be00000000000000000000803ff3672e3f3d663bbf000000000000803fce9c8c3e8dd5363f0ad723be57b0d03c23e719bc0000803f000000000000000000000000000000000000803f0000803fb837793f62e9d53e0ad723be09d7233df376b4bb0000803f000000000000000000000000000000000000803f0000803f3ca6763f69c6d03e0ad723bececc4c3d59562fbb0000803f000000000000000000000000000000000000803f0000803f96e1743f1c3dcd3e6b562fbb0ad723bececc4cbd000000000000803f000000000000000000000000000080bf0000803fd2dcbb3e839ebb3e0677b4bb0ad723be06d723bd000000000000803f000000000000000000000000000080bf0000803f3aebb63ee39fbc3e2de719bc0ad723be5cb0d0bc000000000000803f000000000000000000000000000080bf0000803fe1bbaf3e1601be3ecccc4cbd77562fbb0ad723be00000000000000000000803f9f2f8cbea337763f000000000000803fe199563fb2edf83e05d723bd1877b4bb0ad723be00000000000000000000803f9f2f8cbea337763f000000000000803f3623583f47e5f53e54b0d0bc3ae719bc0ad723be00000000000000000000803fa02f8cbea337763f000000000000803f28625a3f0c78f13e0ad723bececc4cbd6d562fbb0000803f00000000000000000000000000000000000080bf000080bff2f8773f3ae3fb3e0ad723be0ad723bd0677b4bb0000803f00000000000000000000000000000000000080bf000080bf5dd6793f588ef83e0ad723be5cb0d0bc36e719bc0000803f00000000000000000000000000000000000080bf000080bfd48b7c3f81b7f33e38e7193c0ad723be54b0d0bc000000000000803f0000000046ec7f3f00000000b3fcc8bc0000803fe4026f3f2cfa5e3c0677b43b0ad723be07d723bd000000000000803f0000000046ec7f3f00000000b4fcc8bc0000803f7b9f6e3ff6f4e33c6d562f3b0ad723becbcc4cbd000000000000803f0000000046ec7f3f00000000b3fcc8bc0000803ff7536e3fd7151a3d5cb0d03c3ae719bc0ad723be00000000000000000000803ff3b4acbefcfe703f000000000000803fd429753f5968603f07d7233d0e77b4bb0ad723be00000000000000000000803ff3b4acbefcfe703f000000000000803ff5c3723fc6845d3fcecc4c3d6d562fbb0ad723be00000000000000000000803ff3b4acbefbfe703f000000000000803f9e1b713f01855b3f9c15323e2bc0573c80b9d5bc026c063f4d723fbf84fdcf3e96198f3e264199be648c69bf000080bfd0dbaf3e1cbcff3d0ad7233e2de7193c5cb0d0bcc779733efa4f48bf4b54133fd0d0993e781301bff0444fbf000080bfe1bbaf3ee5650c3e0ad7233efd76b43b07d723bdc1fb813e458c6ebf10c5843e9f71553e6e1c56be949674bf000080bf3aebb63ebc220f3e0ad7233e60562f3bcecc4cbd3a4b843efd3c77bfab21ba3c0cf7a03debf61ebb11357fbf000080bfd1dcbb3e7921113e992a333e4fe2da3bcfcc4cbd88f80f3f9c8053bfb5b20a3d13e0203dafe468bccfc67fbf000080bf58aabb3e53b0033e0ad7233e6b562f3b999919be9053843e8f4c77bf484fa2bbf0f498bd489d73bcb4417fbf000080bf16cfed3e681d113e992a333e4fe2da3b989919bef1ed0f3f2b8753bf9aae0bbdfb0f22bdae826a3cf7c57fbf000080bf9c9ced3e43ac033e0ad7233e1300773bd08d1dbea8467f3e7a896ebf6d1a87be414759be9d6b5a3e7d2374bf000080bfd6c1ef3ee257103ebeb1203ef00d7a3bc0b120be0ba6723e94dc71bf5ad467befe863cbe9c953d3eab1e77bf000080bf5158f13e497d123ed18d1d3e2600773b0ad723be7ca8823e80686ebf691c85be8a2b50bec243583efac074bf000080bf02eff23e90b2143eb9f5453e9911cd3ccfcc4cbd6a2e5e3f064afdbeed41383d3084b13c4f2358bd49957fbf000080bf58aabb3ec874d33d9c15323e2bc0573c9c1532be5d30ea3e582743bf546feabe5fc29bbee90ab33e38d762bf000080bf9eb0f93e1ab0ff3d9899193e60562f3b0ad723be4fa6a83ceb3f77bfcd4c84beeebb66bee2417d3e1e3f71bf000080bfc0fbf23e3b35183e9899193e4fe2da3b992a33beb6b20a3d9c8053bf88f80fbfb2b77fbe8ab1093f3f214ebf000080bfee87fa3edb61153ecbcc4c3d4fe2da3b992a33beb2b20abd9d8053bf87f80fbf3be980be69360d3fc4914bbf000080bf5254fc3e1d545c3ecbcc4c3d6b562f3b0ad723be7b29e0bc432d77bfc08584bee0be7ebed1c4833ecc096fbf000080bf24c8f43e7c275f3ec9503f3e7bb9d53c9c1532be55ee4e3f5625d5be4f25d5bebef7a3be929a903e247d67bf000080bf9eb0f93e3c22db3d9d15323e7db9d53cc9503fbe5525d53e5525d5be54ee4ebfcc0012bf19a4123f75b716bf000080bf1d30003fb076ed3db9f5453e9711cd3c989919be6a2e5e3f064afdbeeb4138bda5dab2bc03f8563d0a967fbf000080bf9c9ced3eac6cd33dc9503f3e7db9d53c80b9d5bc54ee4e3f5525d5be5825d53e08e4a33e1dbd90be3c7b67bf000080bfd0dbaf3e402edb3d9c15323e7bb9d53c40c057bc0a29043fb7b5cdbeed9f413fcd790c3f26db05bf04fd26bf000080bf2ea3a93ecc84ed3dcbcc4c3ececc4c3dcbcc4cbd7e487f3fa09758bda697583de3133f3d4600e7bdf9157ebf000080bf8afebb3e7cc5a63db9f5453ececc4c3da011cdbc692e5e3fee4138bd0a4afd3eee81f03ef48e7fbe6fc758bf000080bfeba4af3eee41b03dcbcc4c3ecccc4c3d989919be7e487f3fa39758bd9e9758bdeb2b3fbd0334e63dcc187ebf000080bfcdf0ed3e5cbda63db9f5453ececc4c3d992a33be6a2e5e3feb4138bd064afdbe188af0be002d7f3e62cc58bf000080bfee87fa3ec035b03db9f5453e9899193e992a33be6a2e5e3fea41383d064afdbebd6ff8be4e7a943e852c53bf000080bf5254fc3e70cb8c3ccbcc4c3e9999193e999919be7e487f3fa297583d9f9758bd1d4378bd9a19213ede557cbf000080bf32bdef3ec0d34d3cc9503f3e9c15323e9d1532be54ee4e3f5825d53e5525d5be18740abf05937b3e7cf04dbf000080bf2d59fc3ec006ab3bb9f5453e982a333e989919be692e5e3f064afd3ef04138bde24223bed73e443ee1ea77bf000080bfe44ef03e00000000b9f5453e982a333ecfcc4cbd692e5e3f064afd3eed41383d8f86233eccb844be0de277bf000080bfa15cbe3e00408237cbcc4c3e9999193ecbcc4cbd7e487f3fa397583da397583d575a783d4b9c21be8e507cbf000080bfedcabd3eb0144e3cb9f5453e9899193ea011cdbc692e5e3ff041383d0b4afd3e3869f83e17b594be192453bf000080bf4f71b13e30fc8c3cc9503f3e9c15323e80b9d5bc51ee4e3f5825d53e5a25d53e327c0a3fd00c7cbebae14dbf000080bf5e84b23e00c7ab3b9c15323e7bb9d53c40c057bc0a29043fb7b5cdbeed9f413fcd9e29bf1d373fbfd636633d000080bf05e1d83e2a523b3f0ad7233e2de7193c5cb0d0bcc779733efa4f48bf4b54133fac9029bf366110bf307efcbe000080bfd0b3e33e16d43a3f9c15323e2bc0573c80b9d5bc026c063f4d723fbf84fdcf3ead4e1ebf2fc829bf21dcd7be000080bfc272dd3e4c09393f0ad7233e54b0d03c3ae719bcdb87753e013e0bbf0ddd4d3fa1b133bfa25a2bbfba4879be000080bffc03de3e00ac3d3f992a333ececc4c3d60e2dabbbe09113f0c62f7bcf6ce523fe5a01cbf87502fbf56aaca3e000080bfbe0cd03ea65c3f3f0ad7233e05d7233d1877b4bb5bf4783ec51c82be4aa56f3f20ff34bf8a0735bf74c308bc000080bf05e1d83e7c3d403fc9503f3e7db9d53c80b9d5bc54ee4e3f5525d5be5825d53e9a2e15bfb1992abfc920ee3e000080bf474fd43e4c09393fb9f5453ececc4c3da011cdbc692e5e3fee4138bd0a4afd3e2999cfbe92b523bf2937273f000080bf408fc93ee71d3c3f0ad7233ecccc4c3d77562fbb6451843eec474cbc6948773f29352fbf4c4235bfe424323e000080bfb857d53e2202423fb9f5453e9899193ea011cdbc692e5e3ff041383d0b4afd3e974bc8be16460dbfcf8a3c3f000080bf4932a63e63cc4d3f992a333e9899193e60e2dabb8bf80f3fb7b20a3d9c80533f604f21bf322221bf5cd1e83e000080bfc6afac3e220b513f0ad7233e9999193e6d562fbb154d843eccb3a53c6140773fd69233bf1ef92ebf3cd54e3e000080bfc0fab13e9fb0533f9c15323e9c15323e40c057bcf473ef3e2e75ef3eb801403fe7c407bff3c407bf0b52293f000080bfd09aa43e4575553fc9503f3e9c15323e80b9d5bc51ee4e3f5825d53e5a25d53ea47b86bee772c1be3e49633f000080bf1309a03e662c533f0ad7233e2b811c3e1cfb63bb9c467f3e7c1a873e7a896e3f54ae28bfe3ad28bfcbcbb93e000080bff6f9b03e0331543ff558203ef558203e62d46dbb0e14833e4ead833eb38c6e3f1bae28bf1bae28bfd0cbb93e000080bffcdab03e4575553f672c1d3e0ad7233eb01a70bb731a873eb6467f3e78896e3f16ae28bf1fae28bfd0cbb93e000080bfd4beb03ef59b563f9c15323ec7503f3e80b9d5bc5525d53e51ee4e3f5f25d53ea572c1bed47b86be4449633f000080bf1409a03e23be573f9999193e0ad7233e74562fbb0595a73cf64c843e1440773f98f92ebf8e8f33bf63fc4e3e000080bfc0fab13eeb39573f9899193e982a333e60e2dabbb0b20a3d8bf80f3f9c80533f2d2221bf644f21bf5dd1e83e000080bfc8afac3e68df593f9899193eb9f5453ea011cdbcf741383d672e5e3f124afd3e0d460dbfa44bc8bed38a3c3f000080bf4932a63e271e5d3fcbcc4c3db9f5453ea011cdbcf74138bd662e5e3f144afd3e3ec018bf664dd7be3bf82e3f000080bf408fc93ea2cc6e3fcbcc4c3d0ad7233e74562fbbc3474cbc6a51843e6748773f754235bf01352fbfc524323e000080bfb857d53e67e8683fcbcc4c3d982a333e60e2dabbd7f800bd13ab103fcf0c533fa80933bffd0a1abfd681c53e000080bfbf0cd03ee48d6b3f06d7233d0ad7233e0e77b4bb2ea785bee218813e838b6e3faaf434bf341335bf170dd9bb000080bf04e1d83e0dad6a3f78b9d53c9c15323e40c057bc632bcfbe4b91053fe543403f214e52bfd57411bf551344bd000080bf05e1d83e5f986f3f54b0d03c0ad7233e3ae719bc485413bfc979733efe4f483f618926bfb38136bfcf0e86be000080bffc03de3e893e6d3f23e7193c0ad7233e5cb0d0bc0ddd4dbfcf87753e043e0b3f89cf0abf9fbb2bbf178501bf000080bfd0b3e33e7316703f20c0573c9c15323e80b9d5bceb9f41bf0a29043fb5b5cd3e1f4827bf200b20bfd787dabe000080bfc272dd3e3ee1713fb9f5453ececc4c3d992a33be6a2e5e3feb4138bd064afdbe216dc7bce0a77d3fdbfe07be000080bfaebd143f1ce32e3fc9503f3e7bb9d53c9c1532be55ee4e3f5625d5be4f25d5be22b5693e5b965f3f1748dcbe000080bf10c30e3f7882303f9d15323e7db9d53cc9503fbe5525d53e5525d5be54ee4ebf6c3cb83b2be3633fc03fe9be000080bf10c30e3f99bd333f992a333ececc4c3db9f545be064afd3eeb4138bd6a2e5ebff60f25bdec137f3f0dd098bd000080bfaebd143ff679333f992a333e9899193eb9f545be064afd3eea41383d6a2e5ebf8a10253dec137f3f36d0983d000080bf18bf2d3ff679333fb9f5453e9899193e992a33be6a2e5e3fea41383d064afdbed76cc73ce0a77d3fc9fe073e000080bf18bf2d3f1ce32e3fc9503f3e9c15323e9d1532be54ee4e3f5825d53e5525d5be67a913be3558533fa1aa0b3f000080bfb6b9333f7882303f9c15323e9c15323ec9503fbe5125d53e5725d53e55ee4ebf7e53863c48ac623ff1cded3e000080bfb6b9333f9abd333f9c15323ec7503f3e9c1532be5a25d53e53ee4e3f5725d5be40faf5bd7fb3003f57265b3f000080bfd7f4363f9abd333f9899193eb9f5453e992a33befa41383d672e5e3f0e4afdbea2a349bcf1c5fd3ebc515e3f000080bf3394383f37b8393f9899193e9999193ecbcc4cbe9e97583da297583d7e487fbf42558b3baea27f3f93d0593d000080bf18bf2d3f37b8393f9999193ececc4c3dcbcc4cbe9f97583d9e9758bd7e487fbf17528bbbaea27f3f89d059bd000080bfaebd143f37b8393f9899193e982a333eb9f545bef241383d064afd3e692e5ebf0000000034685e3f328bfd3e000080bf59fd333f37b8393fcfcc4c3d982a333eb9f545bef04138bd084afd3e692e5ebf75fc7d3b496d5e3f6177fd3e000080bf59fd333fa1b9523fcfcc4c3db9f5453e992a33bef94138bd672e5e3f0e4afdbea0a3493cf1c5fd3ebc515e3f000080bf3394383fa1b9523fcbcc4c3d9999193ecbcc4cbea39758bd9f97583d7e487fbf7e5a8bbbaea27f3f9ad0593d000080bf18bf2d3fa2b9523f80b9d53c9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf14a6923dd8b9663f20c6da3e000080bfb6b9333f3fb4583f9899193e9911cd3cb9f545beed41383d064afdbe6a2e5ebf0000000034685e3f308bfdbe000080bf6c7f0e3f37b8393f9c15323e2bc0573c9c1532be5d30ea3e582743bf546feabe8f7fce3d8f580e3f5d3453bf000080bfef870b3f99bd333f9899193e4fe2da3b992a33beb6b20a3d9c8053bf88f80fbf8babd23bb918103f869653bf000080bf92e8093f37b8393fcbcc4c3d4fe2da3b992a33beb2b20abd9d8053bf87f80fbf83abd2bbb618103f879653bf000080bf92e8093fa1b9523fcbcc4c3d9711cd3cb9f545beea4138bd064afdbe692e5ebf0000000034685e3f328bfdbe000080bf6c7f0e3fa1b9523fcbcc4c3dcccc4c3dcbcc4cbea09758bda39758bd7e487fbf355c8b3baea27f3f9fd059bd000080bfaebd143fa2b9523f78b9d53c7bb9d53cc9503fbe5125d5be5125d5be57ee4ebfde34b8bb29e3633fc73fe9be000080bf10c30e3f3fb4583f78b9d53c2bc0573c9c1532be9ff1ccbe033142bf0ba003bfbfd58fbd61b6153f09e14ebf000080bfef870b3f3fb4583fa011cd3c9899193eb9f545be064afdbefa41383d692e5ebfeb0f25bdec137f3f15d0983d000080bf18bf2d3fe2f7583f9811cd3ccecc4c3db9f545be064afdbed54138bd6a2e5ebf3a10253dec137f3f14d098bd000080bfaebd143fe2f7583f20c0573c7db9d53c9d1532bee34340bf642bcfbe4f9105bf96ce34bec96f623fd614ddbe000080bf10c30e3f60ef5b3f40e2da3bcecc4c3d992a33becf0c53bfb1f800bd13ab10bfceb32e3deefd7d3f38a6f0bd000080bfaebd143fbd8e5d3f60e2da3b9899193e992a33be9c8053bfd0b20a3d8af80fbf7fa425bd36f77d3f9900f43d000080bf18bf2d3fbc8e5d3f40c0573c9c15323e9c1532beb5d23fbfc8bfef3ef9bfefbe444d763e55ec593f9ec7ee3e000080bfb6b9333f60ef5b3fb9f5453e982a333e989919be692e5e3f064afd3ef04138bd2bb866bdf67e403eaf057b3f000080bfd0322d3d1209a03ec9503f3e9c15323e9d1532be54ee4e3f5825d53e5525d5be3bfd063eeba80f3fbb2f513f000080bf30e39a3c7425a33e9c15323ec7503f3e9c1532be5a25d53e53ee4e3f5725d5be089229bd67cff23ed521613f000080bf08bf9e3ca24aa73e992a333eb9f5453e989919be104afd3e672e5e3ffb4138bd39edaebd47f0cc3d57c67d3f000080bf58f02f3d5ceca53e992a333eb9f5453ecfcc4cbd0e4afd3e672e5e3ffa41383d7ce9ed3d684ef0bd797c7c3f000080bfe9ef0f3e4a80a63eb9f5453e982a333ecfcc4cbd692e5e3f064afd3eed41383d4581a03d673567beaa94783f000080bf86400f3e009da03ec9503f3e9c15323e80b9d5bc51ee4e3f5825d53e5a25d53e35a2dabd7a7c17bf038d4c3f000080bfa11c273e2200a43e9c15323ec7503f3e80b9d5bc5525d53e51ee4e3f5f25d53eb6a4923dc49ef8be550a5f3f000080bf1a98273e4e25a83e9899193ecbcc4c3ecbcc4cbda097583d7e487f3fa997583d92827f3dbcfb65bdc8187f3f000080bfc02f103e2757b13e9899193eb9f5453ea011cdbcf741383d672e5e3f124afd3e6bc3bb3df84ffebec7f15c3f000080bf79e4283eae84b23e9999193ecbcc4c3e989919bea497583d7e487f3fa09758bd1a0a18bd17c9603d01707f3f000080bfb0ef303d38c3b03e9899193eb9f5453e992a33befa41383d672e5e3f0e4afdbea47688bde450fe3edf875d3f000080bf203c983ce1a6b13ecfcc4c3db9f5453e992a33bef94138bd672e5e3f0e4afdbe30b8f7bdff41f93eeb755d3f000080bf283c983ca834e13ecbcc4c3dcbcc4c3ecbcc4cbda69758bd7e487f3fa897583dd34b473d84194ebd435f7f3f000080bfbf2f103eefe4e03ecbcc4c3db9f5453ea011cdbcf74138bd662e5e3f144afd3e1374113ef01ff8be21f55c3f000080bf79e4283e7512e23ecbcc4c3dcbcc4c3e999919bea79758bd7e487f3fa79758bd9d4ad0bc8451533d82937f3f000080bfacef303d0051e03e80b9d53cc7503f3e9c1532be5f25d5be51ee4e3f5525d5bea96aecbd4d78d03e84f1673f000080bf10bf9e3c0e96ed3ecfcc4c3d982a333eb9f545bef04138bd084afd3e692e5ebf31446abe9e30573fe063fb3e000080bf0000000078f0e33e80b9d53c9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf724ca1bea995443fbac70e3f000080bf2046ce3bbf82ef3e40c0573c9c15323e9c1532beb5d23fbfc8bfef3ef9bfefbe688670be4047f23e425c593f000080bf40e39a3cd7baf53ea011cd3cb9f5453e989919be104afdbe672e5e3f024238bd897a273c8ece6b3de18f7f3f000080bf58f02f3d0a39ed3e9811cd3cb9f5453ecfcc4cbd104afdbe672e5e3fe341383d3e82273cb3323cbd5db77f3f000080bfe9ef0f3ef9cced3e40e2da3b982a333ecfcc4cbdf9ce52bfbb09113fc761f73c6a7defbc2ba3c3bd2ab87e3f000080bf86400f3e325ef93e60e2da3b982a333e989919be9c8053bf8af80f3fccb20abd1af8363d7b4e003e93b97d3f000080bfd0322d3d43caf83e78b9d53cc7503f3e80b9d5bc5a25d5be53ee4e3f5a25d53ef988093e97dccbbe1e4d683f000080bf1b98273eba70ee3e78b9d53c9c15323e40c057bc632bcfbe4b91053fe543403ff6728d3e3f9136bf17ef243f000080bfd706343ea683f03ecbcc4c3d982a333e60e2dabbd7f800bd13ab103fcf0c533f60ca6f3ec3354cbff0440e3f000080bf398d3a3e9204e53e20c0573c9c15323e80b9d5bceb9f41bf0a29043fb5b5cd3e215b403ea575d5beb8aa633f000080bfa11c273e8495f63e23e7193c0ad7233e5cb0d0bc0ddd4dbfcf87753e043e0b3f7babc43ef336fabe0989483f000080bffc34273ef888fa3ef376b43b0ad7233e07d723bd4ba56fbf61f4783eb81c823e1a99103e1acccdbe009b673f000080bf49b0183e934cfc3e59562f3b0ad7233ececc4cbd694877bf6451843e47474c3c5cf506bd84c22ebe6d1a7c3f000080bf80b10e3e8896fd3e74562f3b0ad7233e989919beb03e77bf2f4c843ecb2eb0bc32bf0c3dbccc563e5a267a3f000080bfb0f62a3d9a02fd3ea9ec933b0ad7233ec73f20be7a896ebfb1467f3e6f1a87be833108be2042e23ee91b633f000080bfb000113d2319fc3e33d2913bcddf213eccdf21bea38c6ebf5df9833eebc782be4a5102beada7da3e4d2d653f000080bf045f0a3da46afc3edb078d3b0a7d1f3e0ad723be78896ebf701a873ec5467fbe45b1fdbd1e2bd43e2bd1663f000080bf1859023de3d5fc3e77562f3b9999193e0ad723be0b3f77bf0d10ae3c574c84be4c7f67bee17ad63ec622613f000080bf507d013de87ffe3e60e2da3b9899193e992a33be9c8053bfd0b20a3d8af80fbfc16ef8be8ad7ed3e5ca43d3f000080bf604c8b3c4982fc3e78b9d53c2bc0573c9c1532be9ff1ccbe033142bf0ba003bfe7e4a7be838acfbe4c735a3f000080bf03034e3ee8c6d83ecbcc4c3d4fe2da3b992a33beb2b20abd9d8053bf87f80fbfba676abe2a950abf831d4f3f000080bf625f4c3e1084e33ecbcc4c3d6b562f3b0ad723be7b29e0bc432d77bfc08584be111e53be95dc7dbec453723f000080bfde755b3e12efe43e54b0d03c2de7193c0ad723bea39706bf179650bf81347abe2c4937be3c0b33be45db773f000080bf8a0e5c3e91e5d93e21e7193c57b0d03c0ad723befd4f48bf4a5413bfb87973bef13e2cbe536d30beca77783f000080bf8a0e5c3eea85ce3e20c0573c7db9d53c9d1532bee34340bf642bcfbe4f9105bf308ed2be13c1a9befe5d593f000080bf01034e3e6ea3cf3e78b9d53c7bb9d53cc9503fbe5125d5be5125d5be57ee4ebf818212bf7b2212bf7bb7163f000080bf6bab403e2e33d43eeb76b43b0ad7233d0ad723be888b6ebf1ca785beca1881beb2684fbe544c4fbe4e47753f000080bf52b35b3e6101c83e40e2da3bcecc4c3d992a33becf0c53bfb1f800bd13ab10bfd97c0abf3ebc7fbe86984d3f000080bf635f4c3e8ce0c43e54562f3bcecc4c3d0ad723be694877bf31474cbc595184beb20c7fbe5b0367bea01c713f000080bfde755b3e8776c33e60e2da3b9899193e992a33be9c8053bfd0b20a3d8af80fbf2b320dbf003181be57894b3f000080bf0306493e1873a13e77562f3b9999193e0ad723be0b3f77bf0d10ae3c574c84be4dc482bee55c7fbe78226f3f000080bf7d1c583e1209a03e2bc057bc9c15323e80b9d5bc4b723f3f076c063f82fdcf3eca56e73c44f222bf0150453f000080bf29ac9b3e6c1a673f2de719bc0ad7233e5cb0d0bcf94f483fc879733e4c54133fd7d35abe9bfb43bfd1591b3f000080bf7b1c9e3e1fc4653ffd76b4bb0ad7233e07d723bd478c6e3fc6fb813e0bc5843e7ca7dfbc01db29bff1673f3f000080bf6e4e973e2c6c643f66562fbb0ad7233ececc4cbdfd3c773f454b843eb021ba3c5865313e792e35bfcd552f3f000080bf1898923e9185633f4fe2dabb982a333ecfcc4cbd9d80533f87f80f3fb1b20a3d84f9b83e782f13bfa9ee3b3f000080bf2f3d903eca0e653f4fe2dabb982a333e989919beb628533f3e80103fd94e03bd0771fa3e111e2fbfd3860a3f000080bfe5244c3e56ac573f66562fbb0ad7233e999919beda4b773f3953843ea3e8dfbb0de0623ef95c50bfaf7d093f000080bfb8da503e1d23563f9e7289bb0ad7233ed4171fbe7c896e3fb9467f3e5a1a87bef412b33eb6a84fbf4af9ef3e000080bfb1dc4c3e342f553f2bc057bc9c15323e9d1532be8729403f722fef3edf39efbe2662233f8e1532bf88daa83e000080bf83ae3a3e6651533f24678bbbcde5223ef83220be7d896e3f95467f3e601a87beeb12b33eada84fbf6df9ef3e000080bf0c594c3eebe5543f6fe889bbdb6c213edb6c21be458c6e3f2acb843e91f581be75a2b43ef3b04fbf78b0ee3e000080bfc3e84b3eb289543f606284bbca881e3e0ad723be7c896e3f681a873e97467fbe1c4fb53e28d14fbfecbced3e000080bfa8034b3e82d7533f60562fbb9999193e0ad723be793f773f5065ab3c904c84be29e32f3e33574cbf02cf133f000080bf1e814c3ee55b533f4fe2dabb9899193e992a33be9d80533fa9b20a3d87f80fbf120aba3e627d4bbf93ccf83e000080bf8c48413e9fbc503f4fe2dabbcecc4c3d992a33bed10c533fd9f800bd10ab10bfa60faf3e319944bf13a60a3f000080bf001e6a3ee056423f6b562fbbcccc4c3d0ad723be6b48773fd7474cbc585184be88ca2b3e21f03abfa38b293f000080bf9356753e26f6443f0677b4bb05d7233d0ad723be858b6e3f24a785bed01881be005bb73bf62f2fbfe9a93a3f000080bfa4697a3e8815433f2bc057bc7bb9d53c9c1532bee443403f682bcfbe499105bf75d89c3d3f433bbfc3722d3f000080bfef0a773e16093e3f2de719bc54b0d03c0ad723befa4f483f4a5413bfca7973be60a130bee83511bfc0274e3f000080bf1ada803e6a64403f7db9d5bc2bc0573c9c1532be99f1cc3e023142bf0fa003bf569745be48461ebf250d433f000080bfa46b803ea52d3a3f7bb9d5bc7db9d53cc9503fbe5525d53e5325d5be54ee4ebfbd44173e5fa358bf790c033f000080bfffaa703e264f3a3f57b0d0bc2de7193c0ad723bea397063f179650bf8f347abe5537a1bec310e8be7f7b553f000080bf03f3863e79973b3fcecc4cbd60562f3b0ad723be6c29e03c432d77bfc18584be150aeebe3a4f77bee90d5a3f000080bfce9c8c3e8dd5363fcecc4cbd4fe2da3b992a33beb8b20a3d9c8053bf88f80fbfe551f0be3b8b02bfd98a383f000080bfd67b853e4c68353f999919be4fe2da3b992a33beb2b20abd9c8053bf88f80fbfab530abfed9eeabe53aa343f000080bf84fb963eeff3253f999919be6b562f3b0ad723be4462a8bcf63f77bfd24c84bef6fd02bf2ef658beb027553f000080bf7b1c9e3e2f61273f4fe2dabbcecc4c3d992a33bed10c533fd9f800bd10ab10bf6ab32ebdf0fd7d3f1ca6f0bd000080bfbf63363f87d7813e2bc057bc7bb9d53c9c1532bee443403f682bcfbe499105bfb3ce343ec86f623fd314ddbe000080bf2169303f3f16853e7bb9d5bc7db9d53cc9503fbe5525d53e5325d5be54ee4ebf0135b83b28e3633fc93fe9be000080bf2169303f828c8b3e9711cdbccecc4c3db9f545be064afd3ee94138bd692e5ebf621025bdec137f3f2dd098bd000080bfbf63363f3b058b3e9911cdbc9899193eb9f545be064afd3ee641383d6a2e5ebf8a10253dec137f3f34d0983d000080bf29654f3f3b058b3e4fe2dabb9899193e992a33be9d80533fa9b20a3d87f80fbff0a4253d34f77d3fcd00f43d000080bf29654f3f87d7813e2bc057bc9c15323e9d1532be8729403f722fef3edf39efbe16471cbeb5854f3f7eb8103f000080bfc75f553f4016853e7db9d5bc9c15323ec9503fbe5325d53e5525d53e54ee4ebf0353863c48ac623ff1cded3e000080bfc75f553f828c8b3e7cb9d5bcc7503f3e9c1532be5c25d53e53ee4e3f5425d5be3cfaf5bd7eb3003f59265b3f000080bfe89a583f828c8b3ececc4cbdb9f5453e992a33befe41383d672e5e3f0e4afdbea4a349bcf1c5fd3ebc515e3f000080bf443a5a3fbe81973ececc4cbd9999193ecbcc4cbea297583da797583d7e487fbf34558b3baea27f3f97d0593d000080bf29654f3fbe81973ecccc4cbdcecc4c3dcbcc4cbea497583da09758bd7e487fbfda548bbbaea27f3f93d059bd000080bfbf63363fbe81973ececc4cbd982a333eb9f545bef441383d064afd3e6a2e5ebf0000000035685e3f308bfd3e000080bf6aa3553fbe81973e989919be982a333eb9f545bef04138bd064afd3e692e5ebf86127e3b496d5e3f5d77fd3e000080bf6aa3553f9384c93e989919beb9f5453e992a33befa4138bd672e5e3f0e4afdbea0a3493cf1c5fd3ebc515e3f000080bf443a5a3f9384c93e999919be9999193ecbcc4cbea39758bda497583d7e487fbf04548bbbaea27f3f96d0593d000080bf29654f3f9384c93e9c1532be9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf61a6923ddab9663f19c6da3e000080bfc65f553fce79d53ececc4cbd9911cd3cb9f545bef041383d064afdbe6a2e5ebf0000000035685e3f2e8bfdbe000080bf7d25303fbe81973e7db9d5bc2bc0573c9c1532be99f1cc3e023142bf0fa003bfc4d58f3d62b6153f07e14ebf000080bf002e2d3f828c8b3ececc4cbd4fe2da3b992a33beb8b20a3d9c8053bf88f80fbf8fabd23bb918103f869653bf000080bfa38e2b3fbe81973e999919be4fe2da3b992a33beb2b20abd9c8053bf88f80fbf7fabd2bbb718103f869653bf000080bfa38e2b3f9384c93e999919be9711cd3cb9f545beeb4138bd064afdbe692e5ebf0000000034685e3f328bfdbe000080bf7d25303f9384c93e999919becccc4c3dcbcc4cbea29758bda39758bd7e487fbf83558b3baea27f3f96d059bd000080bfbe63363f9384c93e9d1532be7bb9d53cc9503fbe5025d5be5125d5be57ee4ebfea32b8bb28e3633fc93fe9be000080bf2169303fce79d53e9d1532be2bc0573c9c1532be7b20eabec83043bfc35feabe23a1cebd7c4e0e3fa33a53bf000080bfff2d2d3fce79d53e982a33be9899193eb9f545be064afdbefb41383d692e5ebf0f1025bdec137f3f1fd0983d000080bf29654f3f1401d63e992a33bececc4c3db9f545be064afdbed84138bd6a2e5ebf7a10253dec137f3f27d098bd000080bfbe63363f1501d63eca503fbe7db9d53c9d1532be58ee4ebf4e25d5be4e25d5beecb469be5a965f3f3448dcbe000080bf2169303f11f0db3eb9f545bececc4c3d992a33be692e5ebfd04138bd084afdbe7c6dc73cdea77d3fddfe07be000080bfbe63363fca2edf3eb9f545be9899193e992a33be692e5ebf0342383d0a4afdbe976dc7bcdea77d3ffcfe073e000080bf29654f3fc92edf3ec7503fbe9c15323e9c1532be51ee4ebf5f25d53e5625d5be18b5693e5a965f3f2948dc3e000080bfc65f553f10f0db3e4fe2dabb982a333e989919beb628533f3e80103fd94e03bdeaaebcbd84b4423e7a387a3f000080bf1257143f23fbfd3e2bc057bc9c15323e9d1532be8729403f722fef3edf39efbe843be93d27e81a3fa8b7493f000080bfb35f0e3f739d003f7cb9d5bcc7503f3e9c1532be5c25d53e53ee4e3f5425d5be4ad068bd09d0f53e2c18603f000080bfb4840e3fa5af023f9711cdbcb9f5453e989919be104afd3e672e5e3ff74138bdb9c2cebdbad4de3d142a7d3f000080bfa08b143fa8ee013f9911cdbcb9f5453ecfcc4cbd0e4afd3e672e5e3ff441383d4cc2ce3d78d4debd152a7d3f000080bf02892d3fa7ee013f4fe2dabb982a333ecfcc4cbd9d80533f87f80f3fb1b20a3d79d6b83d570744be6b337a3f000080bf74542d3f23fbfd3e2bc057bc9c15323e80b9d5bc4b723f3f076c063f82fdcf3eec1d48bd321411bf088d523f000080bf6450333f729d003f7db9d5bcc7503f3e80b9d5bc5825d53e51ee4e3f5a25d53eb3cf683d09d0f5be2c18603f000080bf6475333fa4af023fcecc4cbdcbcc4c3ecbcc4cbda397583d7e487f3fa997583d8d184c3d086b63bd61497f3f000080bf02a92d3fcf59073fcecc4cbdb9f5453ea011cdbcf841383d672e5e3f124afd3e5a71a23d9455febe5f405d3f000080bfd4d7333f47de073fcccc4cbdcbcc4c3e989919bea797583d7e487f3fa39758bdb5194cbd106b633d5f497f3f000080bfa0ab143fcf59073fcecc4cbdb9f5453e992a33befe41383d672e5e3f0e4afdbe7c72a2bd9155fe3e5c405d3f000080bff35f0e3f48de073f989919beb9f5453e992a33befa4138bd672e5e3f0e4afdbe56d606be40b2f83eb4375d3f000080bf53a60e3fc3a41f3f999919becbcc4c3ecbcc4cbda79758bd7e487f3fab97583d76f8173dcbb550bdb07d7f3f000080bf63ef2d3f4b201f3f999919beb9f5453ea011cdbcf74138bd672e5e3f124afd3e20d6063e43b2f8beb5375d3f000080bf341e343fc3a41f3f999919becbcc4c3e999919bea89758bd7e487f3fa79758bdadf817bdc5b5503dae7d7f3f000080bf00f2143f4b201f3f9c1532bec7503f3e9c1532be5f25d5be51ee4e3f5a25d5be8e0b00be3323ce3e5d23683f000080bfbcec0e3fc1d4253f989919be982a333eb9f545bef04138bd064afd3e692e5ebfdf3573be60ac563f7808fb3e000080bf92e8093fbb10213f9c1532be9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf4155a5be3d6c433f82380f3f000080bf38960b3f00d5263fc7503fbe9c15323e9c1532be51ee4ebf5f25d53e5625d5be69b062be036ee13e2dc15e3f000080bfecd90e3f6fe7293f982a33beb9f5453e989919be0e4afdbe672e5e3f054238bd00000000f1ea533d3aa87f3f000080bf25f5143f6394253f992a33beb9f5453ecfcc4cbd104afdbe672e5e3fe441383d00000000feea53bd3aa87f3f000080bf88f22d3f6394253f9d1532bec7503f3e80b9d5bc5a25d5be53ee4e3f5a25d53e360b003e4723cebe5b23683f000080bf6cdd333fc1d4253fb9f545be982a333ecfcc4cbd692e5ebf0a4afd3ed241383dfdc4a6bc0ded00becce87d3f000080bfced72d3f685d2b3f9d1532be9c15323e40c057bc787debbedd46eb3e0382423fe8f1963e3c653abf4f6b1e3f000080bf20fc363fffd4263f999919be982a333e60e2dabb4ed907bd5532103f125b533fb329683ea7df4cbf171b0e3f000080bfad8c383fba10213fca503fbe9c15323e80b9d5bc57ee4ebf5125d53e5525d53e40b0623e276ee1be27c15e3f000080bf9cca333f6fe7293fb9f545be982a333e989919be692e5ebf0d4afd3e044238bd6ac4a63c04ed003ecce87d3f000080bf6cda143f685d2b3fcbcc4cbe9999193ecbcc4cbd7e487fbf9b97583d9e97583d72bf273db06a52be4c517a3f000080bf94a62d3f1be32e3fb9f545be9899193ea011cdbc692e5ebfdd41383d0b4afd3e4089d93e1ec3e5be0044493f000080bf20df333f8a4c2d3fcbcc4cbe9999193e989919be7e487fbfa697583da39758bd78bf27bd9d6a523e4c517a3f000080bf32a9143f1be32e3fb9f545be9899193e992a33be692e5ebf0342383d0a4afdbe4089d9be14c3e53e0244493f000080bf3e670e3f8a4c2d3f0ad723befd76b43b06d723bdc3fb81be478c6ebf0cc5843ef7a9253ea2c6643e7511763f000080bffc96243f82d1073e0ad723be2de7193c54b0d0bcbc7973befb4f48bf4a54133fefce803e8fcd053fbf87503f000080bfbc36283fe6be053e9c1532be2bc0573c78b9d5bc026c06bf4d723fbf81fdcf3ed4947a3ee924a63e28e7693f000080bfee4a283fca80f23d0ad723be66562f3bcbcc4cbd414b84befd3c77bfb321ba3c3d09e53cc059833cf5dd7f3f000080bf4518223f385b093e982a33be4fe2da3bcbcc4cbd87f80fbf9d8053bfb8b20a3d000000003be6273deac87f3f000080bf3e58223f40f8f73d992a33be4fe2da3b989919be2dea0fbf978953bf64e40bbdf7a1a4bd811a5d3cec257f3f000080bf1e65093f788dee3d0ad723be60562f3b989919be9b5384be984c77bf0e7c9ebb583802be3c0dee3c05d07d3f000080bf2425093fd3a5043e0ad723be0f48753b89751dbe9a467fbe7f896ebf551a87be553d86be09194abe9cd2713f000080bf6e34083f97b6033e73a520be555c783b72a520be82e272be8fd471bfd41a68bea15e71be297a2ebed6ee743f000080bf4d60073f51ba053e8b751dbe2048753b0ad723be59a682be21686ebf2a2185be61b081bea8d347be728f723f000080bfca8b063fe0cd073e9d1532be2bc0573c9c1532be7b20eabec83043bfc35feabe2607b0beab73a5be4eb6613f000080bf6669033f2095e43d999919be6b562f3b0ad723be4462a8bcf63f77bfd24c84beff6980bea6177bbe39bc6f3f000080bfae7b063f83360b3e999919be4fe2da3b992a33beb2b20abd9c8053bf88f80fbf517f90becc2a08bf70634c3f000080bfb5bf023ff1aa073eb9f545be9911cd3c989919be692e5ebf0a4afdbed04138bdf60c3ebd7a7c1abc7fb67f3f000080bf90b3093f60b0ba3dc7503fbe7bb9d53c78b9d5bc53ee4ebf5725d5be5a25d53ede06993e045aa33e9c3d663f000080bf2882283f58fdcd3d9c1532be7db9d53c20c057bc11a003bf98f1ccbe0231423f23e5063f94e70c3f62c9253f000080bf36842b3f9463e13db9f545be9711cd3ccbcc4cbd692e5ebf0d4afdbefc41383d9d44f7ba882fc03db0de7e3f000080bfb1a6223f2c1bc43dca503fbe7db9d53c9d1532be58ee4ebf4e25d5be4e25d5be41ccafbe5ed776beea61683f000080bfa0a0033fac11c03d9d1532be7bb9d53cc9503fbe5025d5be5125d5be57ee4ebfd4fa19bfbe640abfbb93163f000080bf1d30003fec08d13dcbcc4cbececc4c3d999919be7e487fbf999758bd9b9758bdd2134dbd1eaf59bd14517f3f000080bf1cd0093f56de8d3db9f545bececc4c3d992a33be692e5ebfd04138bd084afdbe4c17f5be5ddf42be866b5b3f000080bfdf78033fceea943dcbcc4cbecccc4c3dcbcc4cbd7e487fbfa79758bda697583d4d65313d231e2c3e371d7c3f000080bf3ec3223f2049973db9f545bececc4c3d9811cdbc672e5ebfec4138bd0e4afd3ec1c5eb3e60ea993e54d0553f000080bf61e1283f6609a33db9f545be9899193ea011cdbc692e5ebfdd41383d0b4afd3ebf9ff73e71889b3eee23523f000080bf60e1283fa058293ccbcc4cbe9999193ecbcc4cbd7e487fbf9b97583d9e97583db0ba7e3d4058463e8ba57a3f000080bf3ec3223fc0ac963bcbcc4cbe9999193e989919be7e487fbfa697583da39758bd611b67bd4d208bbdf7ff7e3f000080bf1dd0093f00000000b9f545be9899193e992a33be692e5ebf0342383d0a4afdbe16e9fcbef3c83bbe8394593f000080bfdf78033f808f613bb9f545bececc4c3d9811cdbc672e5ebfec4138bd0e4afd3e3299cf3e8eb523bf2a37273f000080bf5afd6e3f9405d93ec7503fbe7bb9d53c78b9d5bc53ee4ebf5725d5be5a25d53e9a2e153fb9992abfb420ee3e000080bf5e5d743fca2edf3e9c1532be7db9d53c20c057bc11a003bf98f1ccbe0231423f27bd293f151c3fbf2149633d000080bf3ca6763f0d9dda3e982a33bececc4c3d40e2dabb89f80fbf9fb20abd9c80533f0c791d3fc7512fbf9603c83e000080bf1a3c723f1688d23e992a33be9899193e60e2dabb8af80fbfb1b20a3d9c80533f604f213f332221bf58d1e83e000080bf9d8d603f1e2baf3eb9f545be9899193ea011cdbc692e5ebfdd41383d0b4afd3e9a4bc83e15460dbfcf8a3c3f000080bfde4e5d3f9ca8b53eca503fbe9c15323e80b9d5bc57ee4ebf5125d53e5525d53e0728803ecf44cbbed60d623f000080bf443a5a3f96e8aa3e9d1532be9c15323e40c057bc787debbedd46eb3e0382423fb087093fb08b09bff570263f000080bf22835c3fd956a63e0ad723be9999193e6d562fbb6d4c84be5a5fad3c273f773fa885333fd2fa2ebf0a754f3e000080bf1a33633f24e0a93e0ad723bececc4c3d59562fbbc78584be4329e0bc432d773f61d62f3f224135bf6400283e000080bf96e1743f1c3dcd3e0ad723bec33d1f3e6eca8abb8dbd84be21bb823e2b736e3f959b283fd69c28bf994dba3e000080bfbc39623f69eda73e0ad723be57b0d03c23e719bc86347abea39706bf1796503f86f2323f73882dbf383e69be000080bfb837793f62e9d53e0ad723be2de7193c54b0d0bcbc7973befb4f48bf4a54133f8790293f3f6110bf787efcbe000080bfa20f7c3f3599db3e9c1532be2bc0573c78b9d5bc026c06bf4d723fbf81fdcf3ea34e1e3f2ec829bf40dcd7be000080bf1bef783fca2edf3e999919be982a333e60e2dabb4ed907bd5532103f125b533fcc5c273f59d31cbf0c6fe33e000080bf9d8d603f93829d3e235b21be235b213e37b088bbfeed6cbe7587723e5e8f713f43cf2a3f76cf2abffa83a93e000080bf0e4a623fd856a63e27731ebe0ad7233e639e83bb661a87bebe467f3e7a896e3f61ae283fd6ad28bfc9cbb93e000080bfb85c623f507aa43e999919be0ad7233e74562fbb0a45c6bb6e53843e2a4c773f0bd92e3f975b34bf2f65453e000080bf1a33633f8ccda23ececc4cbd982a333e60e2dabbb2b20a3d8af80f3f9a80533fc0512f3f10791dbf9d03c83e000080bf1a3c723f364b743e999919beb9f5453ea011cdbcf74138bd672e5e3f124afd3e3471153f6f0fc2beccd0373f000080bfde4e5d3f1505973ececc4cbdb9f5453ea011cdbcf841383d672e5e3f124afd3e90b5233f3399cfbe2837273f000080bf5afd6e3f3a50673ecccc4cbd0ad7233e74562fbbbf21ba3c4f4b843efb3c773f6855353fa5952fbf82d72a3e000080bf96e1743f28e17e3e7db9d5bcc7503f3e80b9d5bc5825d53e51ee4e3f5a25d53eb3be403f002b10bf0a5eae3e000080bf5e5d743fcffd5a3e7cb9d5bc9c15323e40c057bc7efdcf3e046c063f4d723f3f8e7c3f3fa34229bf9a3c6d3d000080bf3ca6763f4821643e07d723bd0ad7233e0e77b4bb18c5843ecffb813e448c6e3f511e353fb2ea34bf8a6c8ebb000080bf3ca6763f90ce773e2bc057bc9c15323e80b9d5bc4b723f3f076c063f82fdcf3e43b7263fc5f732bff02897be000080bf1bef783fcefd5a3e54b0d0bc0ad7233e3ae719bc4754133fd679733efd4f483f5289263fc78136bfa80e86be000080bfb837793f9e886d3e2de719bc0ad7233e5cb0d0bcf94f483fc879733e4c54133f3c61103f999029bf4f7efcbe000080bfa20f7c3ff728623ececc4cbdb9f545bea011cdbcf341383d692e5ebf064afd3eb3aa173f6f03d83e31b12f3f000080bf6e916f3ffe542a3f7cb9d5bcc9503fbe80b9d5bc5325d53e54ee4ebf5325d53eada0203f6d36163fb509033f000080bfdac2743fd4b52d3f7db9d5bc9d1532be40c057bc642bcf3e4d9105bfe343403f5e37363fc6ff313f8be3cb3d000080bfba2b773fd28e2b3fcecc4cbd992a33be60e2dabbeaf8003d13ab10bfcf0c533fc711243f55f4243f079cd53e000080bfa2fd723f5846273f989919be992a33be40e2dabbbc2a0ebd8cc10fbfb3a3533ffbd7163ffb19283f2408f13e000080bf3855623f28a0143f989919beb9f545be9811cdbcd94138bd6a2e5ebf064afd3e5ce8023f8191cf3ebdfa413f000080bf03e95e3fceae173f9c1532bec9503fbe78b9d5bc5325d5be54ee4ebf5525d53e38c6b73e82948c3e455e643f000080bf24235c3f9224123f9c1532be9c1532be20c057bc0dc2e9bebc7ee9be6890433f99db013ffe6c123fc905253f000080bf048c5e3f90fd0f3f0ad723bd0ad723be0677b4bb2ca7853ed91881be838b6e3fb3742a3f8ff53e3f24e67a3c000080bfa472773f80a5263fcecc4cbd0ad723be6d562fbb18484c3c5a5184be6948773f876c2a3f4b13393f75433d3e000080bf32c8753f15c8243f57b0d0bc0ad723be38e719bc4754133fcb7973befd4f483fbd211e3f7fe0403fa4c866be000080bf0fde793ff75a293f2bc057bc9c1532be80b9d5bc0231423f0ca003bfa1f1cc3e8ed2253fb369293fc244c1be000080bfbc52793fb2f72d3f2de719bc0ad723be5cb0d0bc1696503f8d347abea697063f4cf2033fd172383f2a87edbe000080bfd48b7c3fb65a2c3f999919be0ad723be5d562fbb2ef292bba35384beb24c773f906d243fb05a3d3ff2b14d3e000080bfc81f653fe421123f6c2c1dbe0ad723bede1a70bb651a87be98467fbe7d896e3fbffb1e3fa8fb313f1648b93e000080bff68a643f487b113ff85820bef75820be9ed46dbb791864be538972be2817723ff446213f198f343f3b6ca63e000080bf9ca9643fdc55103f0ad723be2e811cbe52fb63bb316485be1f9782beda606e3fe4d31e3f8ada313f4c4fba3e000080bf56cb643ffe120f3f0ad723be989919be59562fbb124d84be8fb3a5bc6140773f3b0c2a3fafe2383f0a78453e000080bfc252653f089a0e3f982a33be989919be40e2dabb89f80fbf9fb20abd9c80533f290d1a3fcf222b3f70c1df3e000080bf7ed4623f78cf0b3f992a33becfcc4cbd60e2dabb8af80fbfb3b20a3d9c80533f4bb2143fae303a3fb82cbb3e000080bfae7a753f1a4ef63e0ad723bececc4cbd6d562fbbc98584beb529e03c432d773fc360253f23803f3fd39f1b3e000080bff2f8773f3ae3fb3eb9f545be989919be9811cdbc692e5ebfeb4138bd0d4afd3e3252c03eaa9d173fde7c363f000080bfd8c55f3f4363083fc7503fbe9d1532be78b9d5bc53ee4ebf5725d5be5a25d53e4e2e663e58e0de3e3a2c5f3f000080bf02655c3fb0940d3fb9f545becfcc4cbda011cdbc692e5ebfdd41383d0d4afd3ee915c63e77942f3fabca1d3f000080bf086c723fb075ef3eca503fbe80b9d5bc80b9d5bc57ee4ebf5125d53e5325d53e1286133f5249343f0251d43e000080bf45f6773ff2e9e93e9d1532be80b9d5bc40c057bc0da003bf9af1cc3e0431423ff0b6363fb8ac303fa3f0f43d000080bf471d7a3fb2bbee3e0ad723be5cb0d0bc36e719bc96347abea397063f1696503f438e3c3fd9ab253f056d49be000080bfd48b7c3f81b7f33e6b562fbb0ad723bececc4cbd432d773fc08584be8329e03cc825df3bb4c9a3bd8f2c7fbf000080bfd2dcbb3e839ebb3e2de719bc0ad723be5cb0d0bc1696503f8d347abea697063f1fede93eae4393be407c57bf000080bfe1bbaf3e1601be3e2bc057bc9c1532be80b9d5bc0231423f0ca003bfa1f1cc3ed7b1963e702e8ebebd1a6abf000080bfd0dbaf3e443fc43e4fe2dabb992a33becfcc4cbd9d80533f87f80fbfb5b20a3ddbc75d3cfcf224bdd4c47fbf000080bf59aabb3ee750c23e7cb9d5bcc9503fbe80b9d5bc5325d53e54ee4ebf5325d53e67a98f3e7881a4be408a67bf000080bfd0dbaf3ebc62cd3e7db9d5bc9d1532be40c057bc642bcf3e4d9105bfe343403f3b30043fc8260cbfeb9428bf000080bf2fa3a93ee9d4c83e4fe2dabb992a33be989919be9c80533f88f80fbfaab20abd3fce60bc04d7233d5fc57fbf000080bf9c9ced3edf4ec23e60562fbb0ad723be989919beb23e773f254c84be7b2eb0bc00000000ee7da23d65317fbf000080bf15cfed3e7b9cbb3e2bc057bc9d1532be9c1532be3d22423f7518ecbeb7e7ebbe426eb3be687c9d3e377762bf000080bf9fb0f93e443cc43e93ec93bb0ad723bec73f20beea776e3f129284bea5c482beb67151be12b5543e75e174bf000080bfce15f13e5743bc3e9911cdbcb9f545be989919be064afd3e6a2e5ebfe64138bd1c1855bda6ffb43c3b977fbf000080bf9c9ced3ed749cf3e9711cdbcb9f545becfcc4cbd064afd3e6a2e5ebfe841383d4eed533d8d55b6bcf6977fbf000080bf59aabb3edf4bcf3e4fe2dabb989919be992a33be9644533fefe305bd195510bf23fe09bfff20813e41bb4dbf000080bfef87fa3e2581b93e1cd291bbcddf21beccdf21be57bb713f82106cbe7da070be4cee44be2fa9453e395076bf000080bf43e9f13e3b90bb3ec3078dbb097d1fbe0ad723be7f896e3f501a87bea7467fbe2f874cbe74964d3e058575bf000080bfc6e8f23ea6b0ba3e6b562fbb999919be0ad723bea54b773f9a97efbb125384be380c80be9496683ea7f270bf000080bfc0fbf23ece15b83e60562fbbcecc4cbd0ad723befd3c773fa121ba3c3a4b84be1bd281be6cd8953e2e076cbf000080bf24c8f43e14d5943e4fe2dabbcfcc4cbd992a33be9c80533fa9b20a3d88f80fbfcfbb0bbfb144973e42b948bf000080bf5254fc3e6c40963e2bc057bc80b9d5bc9d1532be4b723f3f82fdcf3e066c06bf61a622bfaa91553eaf573ebf000080bf2e59fc3ecf1f903ef576b4bb0ad723bd0ad723be478c6e3f0dc5843ebbfb81bea49caabe5b2fab3ed9ae61bf000080bf3803f53ec74f923e2be719bc5cb0d0bc0ad723bef94f483f4c54133fc17973be81e1e7bef420873edc025abf000080bffc57f53ed2918e3ecccc4cbdcbcc4cbecbcc4cbda397583d7e487fbfa397583dd79ee33dc4793fbde0217ebf000080bf8afebb3e0182da3ececc4cbdb9f545bea011cdbcf341383d692e5ebf064afd3e18997c3ee8c0f0be76ed58bf000080bfeca4af3eaf27d83e989919beb9f545be9811cdbcd94138bd6a2e5ebf064afd3e9b227b3eedb2fabe3c3356bf000080bf5071b13ecea0fb3e999919becbcc4cbecbcc4cbda39758bd7e487fbfa397583d8dbf063e718173bd2e517dbf000080bfeecabd3e22fbfd3ececc4cbdcbcc4cbe999919be9e97583d7e487fbfa39758bd526ae4bdd3613f3d181f7ebf000080bfcef0ed3efa7fda3e999919becbcc4cbe989919bea39758bd7e487fbf9e9758bd7b2e07bec295733d694d7dbf000080bf32bdef3e1af9fd3ececc4cbdb9f545be992a33bef041383d6a2e5ebf064afdbefffa7cbecdb8f03e94e858bf000080bfee87fa3ea324d83e999919beb9f545be992a33beeb4138bd6a2e5ebf064afdbe9a8c7bbe59aefa3ece2c56bf000080bf5254fc3ec49dfb3e7db9d5bcc9503fbe9c1532be5325d53e57ee4ebf5025d5be09cc8fbeb46da43e648867bf000080bf9eb0f93eba5fcd3e7bb9d5bc9c1532bec9503fbe5a25d53e4e25d5be54ee4ebfd90012bf0ea4123f73b716bf000080bf1d30003f60d1c83e4fe2dabb989919be992a33be9644533fefe305bd195510bfce262abda0fa7d3f2655f2bd000080bfb8512d3deff3253f2bc057bc9d1532be9c1532be3d22423f7518ecbeb7e7ebbede2f753e8fbd5a3fde0fecbe000080bfb04f9b3c4c93273f7bb9d5bc9c1532bec9503fbe5a25d53e4e25d5be54ee4ebfbf2bb83b24e3633fd73fe9be000080bfb84f9b3c6dce2a3f9711cdbc989919beb9f545be064afd3ee94138bd692e5ebf171125bdeb137f3f5ed098bd000080bfb8512d3dc98a2a3f9911cdbccfcc4cbdb9f545be044afd3ee541383d6a2e5ebf8110253dec137f3f31d0983d000080bf175a0f3eca8a2a3f4fe2dabbcfcc4cbd992a33be9c80533fa9b20a3d88f80fbf50a5253d34f77d3f1101f43d000080bf175a0f3eeff3253f2bc057bc80b9d5bc9d1532be4b723f3f82fdcf3e066c06bff598b2bdcb1c583f4466073f000080bf8e44273e4c93273f7db9d5bc80b9d5bcc9503fbe4f25d53e5625d53e55ee4ebfb651863c4bac623fe8cded3e000080bf8e44273e6dce2a3f7cb9d5bc40c057bc9c1532be9df1cc3e0331423f0ca003bfa2d58fbd5eb6153f0ae14e3f000080bf1231343e6dce2a3fcecc4cbd60e2dabb992a33bebab20a3d9a80533f8af80fbf8fabd2bbbc18103f8596533f000080bf84ae3a3e0bc9303fcecc4cbdcbcc4cbdcbcc4cbe9e97583da797583d7e487fbf29558b3baea27f3f99d0593d000080bf185a0f3e0bc9303fcccc4cbd989919becbcc4cbea097583d9e9758bd7e487fbf425b8bbbaea27f3f9ad059bd000080bfb8512d3d0ac9303fcecc4cbda011cdbcb9f545bef041383d0d4afd3e692e5ebf0000000034685e3f348bfd3e000080bf1b53283e0bc9303f989919bea011cdbcb9f545beee4138bd0a4afd3e692e5ebf06f97d3b486d5e3f6377fd3e000080bf1a53283e75ca493f989919be60e2dabb992a33beb7b20abd9c80533f8bf80fbf8aabd23bba18103f8596533f000080bf84ae3a3e75ca493f999919becbcc4cbdcbcc4cbea39758bda797583d7e487fbfa65b8bbbaea27f3fa5d0593d000080bf175a0f3e76ca493f9c1532be80b9d5bcc9503fbe5825d5be5a25d53e51ee4ebf1ca6923dd8b9663f20c6da3e000080bf8e44273e13c54f3fcecc4cbd992a33beb9f545bef141383d064afdbe6a2e5ebf0000000034685e3f328bfdbe000080bf48db923c0bc9303f7db9d5bcc9503fbe9c1532be5325d53e57ee4ebf5025d5be6bfaf53d7ab3003f5a265bbf000080bf20aecf3b6dce2a3fcecc4cbdb9f545be992a33bef041383d6a2e5ebf064afdbe8ba3493cecc5fd3ebf515ebf000080bf000000000bc9303f999919beb9f545be992a33beeb4138bd6a2e5ebf064afdbe87a349bcebc5fd3ebd515ebf000080bf0000000075ca493f999919be992a33beb9f545bee94138bd064afdbe6a2e5ebf0000000034685e3f328bfdbe000080bf48db923c75ca493f999919be999919becbcc4cbe9f9758bda39758bd7e487fbf755b8b3baea27f3fa1d059bd000080bfb4512d3d76ca493f9d1532be9d1532bec9503fbe5025d5be5525d5be57ee4ebfe834b8bb28e3633fcb3fe9be000080bfa84f9b3c13c54f3f9d1532bec9503fbe9c1532be5625d5be58ee4ebf4a25d5be57faf5bd78b3003f5c265bbf000080bf20aecf3b13c54f3f982a33becfcc4cbdb9f545be064afdbefa41383d692e5ebfd50f25bdec137f3f0fd0983d000080bf175a0f3eb608503f992a33be989919beb9f545be064afdbed34138bd6a2e5ebf3210253dec137f3f10d098bd000080bfb4512d3db608503fca503fbe9c1532be9d1532be58ee4ebf4a25d5be5225d5beefb469be5b965f3f2f48dcbe000080bfb04f9b3c3400533fb9f545be989919be992a33be692e5ebfd04138bd0b4afdbed76dc73cdea77d3feffe07be000080bfb4512d3d919f543fb9f545becfcc4cbd992a33be692e5ebf0442383d0a4afdbeec6cc7bce0a77d3fd6fe073e000080bf175a0f3e909f543fc7503fbe80b9d5bc9c1532be51ee4ebf5f25d53e5525d5be2cb5693e5b965f3f1b48dc3e000080bf8e44273e3400533f54b0d0bc3ae719bc0ad723bea397063f1696503f9b347abe9ae73b3f582894be414a1d3f000080bf28625a3f0c78f13e2be719bc5cb0d0bc0ad723bef94f483f4c54133fc17973be8a791a3f22461bbf0f87043f000080bf24235c3f8aaced3e2bc057bc80b9d5bc9d1532be4b723f3f82fdcf3e066c06bf0b98283f6bc50dbf1b6f023f000080bffc11593ff2e9e93e7cb9d5bc40c057bc9c1532be9df1cc3e0331423f0ca003bf7aef5d3f44c906beb721f63e000080bf3aa9573f8af6ec3ecccc4cbd77562fbb0ad723be9629e03c432d773fca8584becd833b3fe598203e2198293f000080bfe199563fb2edf83ececc4cbd60e2dabb992a33bebab20a3d9a80533f8af80fbfefa3463f8874aa3e442a093f000080bfecc9533f56dbf33e999919be6d562fbb0ad723be6da6a8bce93f773fd54c84bed91c2e3f11d64f3efc55343f000080bfa679453f43f50c3f989919be60e2dabb992a33beb7b20abd9c80533f8bf80fbf8d5e1d3f69faeb3eaddb233f000080bfb2a9423f156c0a3f9c1532be40c057bc9c1532be6830eabe5427433f526feabebb17f53e151f253f8b7d183f000080bf6a583e3fe4dc0e3f989919bea011cdbcb9f545beee4138bd0a4afd3e692e5ebf65d5d93e26a84b3f60e1dc3e000080bfd5603e3f9af1073f9c1532be80b9d5bcc9503fbe5825d5be5a25d53e51ee4ebfe3828e3ee199673f4829a53e000080bf31543b3f331e0d3fd38d1dbe530077bb0ad723be91a882be7d686e3f771c85be895f243f9480ba3e87b02c3f000080bff3be443f72a50d3fc7503fbe80b9d5bc9c1532be51ee4ebf5f25d53e5525d5bea2955c3e4e015e3f94dbe53e000080bf31543b3fc199113f982a33be60e2dabb989919bef2ed0fbf2b87533fa7ae0bbd31331b3f9334e13eb69d293f000080bfb2a9423f7d15133fc1b120be1b0e7abbc1b120be95a672be7bdc713f61d567bebd12283ff0ada73efaf22d3f000080bf6fbe443f9db60e3f0ad723be410077bbd28d1dbebc467fbe7f896e3f431a87bec653243f29dcb93e00e82c3f000080bff4be443fa3c60f3f0ad723be74562fbb999919bea15384be8d4c773fbf4fa2bb8b8b333f1bc0433e1acc2f3f000080bfa679453f646d103f0ad723be6d562fbbcecc4cbd4b4b84befb3c773fb121ba3caff5343faf22313e9f942f3f000080bfe199563f42a0223fb9f545bea011cdbc989919be672e5ebf0e4afd3e004238bde048cd3e2548403ff544063f000080bfd6603e3ffef8163fcbcc4cbecbcc4cbd989919be7e487fbfa797583d9f9758bd4ce2df3ca1776a3fb10ecd3e000080bf70ae3b3f183f193fb9f545becfcc4cbd992a33be692e5ebf0442383d0a4afdbe4e3fb9bda805773f6b587c3e000080bfae8c383fdb99133fcbcc4cbecbcc4cbdcbcc4cbd7e487fbf9d97583d9e97583de31b943d03a55c3ff77c003f000080bfabce4c3ff7712b3fb9f545bea011cdbccfcc4cbd692e5ebf0f4afd3ed041383daf5ad93eb80e313ffa95153f000080bf10814f3fdd2b293f992a33be60e2dabbcfcc4cbd8bf80fbf9c80533f98b20a3dfdf71b3f42cec53e8747313f000080bfecc9533f5c48253f9d1532be40c057bc80b9d5bc026c06bf50723f3f80fdcf3ea5c3303faa34c33de08f373f000080bf3aa9573fb0c3293f0ad723be0677b4bb0ad723bdc7fb81be448c6e3f18c5843ef7293d3f0fe7623c43742c3f000080bf3623583f2e94243f0ad723be36e719bc5cb0d0bccc7973befb4f483f4954133f6584453fd6c554be43ed193f000080bf28625a3f9967273f0ad723be5cb0d0bc36e719bc96347abea397063f1696503fc3ea443f1826d0bef869fc3e000080bf24235c3f10162b3f9d1532be80b9d5bc40c057bc0da003bf9af1cc3e0431423f27ac413f10f551bea3f81e3f000080bffc11593ff2b82c3fca503fbe80b9d5bc80b9d5bc57ee4ebf5125d53e5325d53e6b7c153fac14f43ee236283f000080bf01a5543f8d802c3fb9f545becfcc4cbda011cdbc692e5ebfdd41383d0d4afd3e6aaaaf3e6d43463f0610083f000080bf253a523f1ae32e3f999919becbcc4cbecbcc4cbda39758bd7e487fbfa397583da6a07fbf68fb553d1af05abc000080bf000040325fd1763f989919beb9f545be9811cdbcd94138bd6a2e5ebf064afd3e07317ebf2c05bf3dd134963d000080bfe074973b8aff7c3f9c1532bec9503fbe78b9d5bc5325d5be54ee4ebf5525d53ea01861bf28ebf23ed2d42b3d000080bf77afd13c71e17c3f982a33beb9f545becbcc4cbd064afdbe6a2e5ebff641383d0d765ebf0245fd3e491151bc000080bf72dfb23cb1f8763f992a33beb9f545be989919be064afdbe692e5ebfdd4138bd28515ebf14c7fd3eba134ebc000080bf70dfb23c76fe5d3f999919becbcc4cbe989919bea39758bd7e487fbf9e9758bd46747fbf3e70603d5a3a11bd000080bf0000000023d75d3f9d1532bec9503fbe9c1532be5625d5be58ee4ebf4a25d5be080960bfe9f9f53e6e4d6cbd000080bf76afd13c68f5573f999919beb9f545be992a33beeb4138bd6a2e5ebf064afdbece8f7cbfbf75ee3d4a9eeabd000080bfd074973b628c573fb9f545be992a33be989919be692e5ebf0a4afdbed54138bd62c6fdbe82515e3f39614b3c000080bf8a47413d9afe5d3fc7503fbe9d1532be78b9d5bc53ee4ebf5725d5be5a25d53e9ff3f2bed315613f9d842cbd000080bf80f3313d8be17c3f9c1532be9c1532be20c057bc0dc2e9bebc7ee9be6890433fddfd34bf090c353f00000000000080bfb9760d3d0000803fb9f545be992a33becbcc4cbd692e5ebf0b4afdbefe41383d0746fdbeec755e3ffc4e4e3c000080bf8b47413dd6f8763fca503fbe9c1532be9d1532be58ee4ebf4a25d5be5225d5bef0f1f5beea0b603f18a46b3d000080bf8af3313d82f5573f9d1532be9d1532bec9503fbe5025d5be5525d5be57ee4ebf470135bf9f08353f00000000000080bfb7760d3d909f543fcbcc4cbe989919be999919be7e487fbf969758bd999758bda2eb5fbd4c7a7f3fff15073d000080bfd6738d3d86d75d3fb9f545be989919be992a33be692e5ebfd04138bd0b4afdbe9eb7b1bdf38a7e3fa0397d3d000080bf5e05843db88c573fcbcc4cbe999919becbcc4cbd7e487fbfa49758bda397583d636c53bd33947f3f706acc3c000080bfd4738d3dc3d1763fb9f545be989919be9811cdbc692e5ebfeb4138bd0d4afd3e16b370bdc3897f3f91f449bc000080bf6105843de1ff7c3fb9f545becfcc4cbda011cdbc692e5ebfdd41383d0d4afd3ea19d643d2c987f3f6fa9e93b000080bfacdd083eed297c3fcbcc4cbecbcc4cbdcbcc4cbd7e487fbf9d97583d9e97583d70805f3ddb7e7f3fcbcdfd3c000080bfe7940d3ecffb753fcbcc4cbecbcc4cbd989919be7e487fbfa797583d9f9758bdd9e4503d837f7f3f169e143d000080bfe7940d3e93015d3fb9f545becfcc4cbd992a33be692e5ebf0442383d0a4afdbec645b93c8d997f3fff5b513d000080bfabdd083ec5b6563f9899193eb9f545bea011cdbcf341383d692e5ebf084afd3ef6450dbfaf4bc83ee18a3c3f000080bfcea83b3f32a6433f9c15323ec9503fbe80b9d5bc4f25d53e55ee4ebf5725d53ead44cbbe2528803ed90d623f000080bf3494383f3506493f9c15323e9d1532be40c057bc5b81ee3eb082eebe6d98403f8b2f08bf732f083f8aa6283f000080bf12dd3a3f144f4b3f9899193e992a33be60e2dabb35eb033d0e7510bffa2f533f4c2121bf8934213f261ee93e000080bf8de73e3ff0e4463fcfcc4c3d992a33be40e2dabbbdf800bd12ab10bfd00c533fd3632fbf57de1c3fd5a8c93e000080bf0996503f7536353fcfcc4c3db9f545be9811cdbcda4138bd692e5ebf0a4afd3e91b523bf2999cf3e2b37273f000080bf4a574d3fb6f7313f80b9d53cc9503fbe78b9d5bc5325d5be54ee4ebf5525d53ec9992abf942e153f9220ee3e000080bf4eb7523f1be32e3f80b9d53c9c1532be20c057bc682bcfbe499105bfe443403f47833fbf3e44293fca92663d000080bf2c00553ffa2b313f20731e3e0ad723be1d9e83bb6d1a873eb7467fbe7a896e3f0aae28bf2eae283fcbcbb93e000080bfaab6403fce604a3f9899193e0ad723be6d562fbba344c63b5c5384be2e4c773f0dd92ebf975b343f1065453e000080bf0a8d413f6d8a493fcecc4c3d0ad723be5d562fbb6b474cbc595184be6b48773f5a4235bf1c352f3fcf24323e000080bf863b533ff2db373f06d7233d0ad723befd76b4bb20a785bec91881be868b6e3f7ff434bf5f13353f3103d9bb000080bf2c00553f4b17363f5cb0d03c0ad723be23e719bc4d5413bfb57973bef94f483f498926bfce81363faf0e86be000080bfa891573fcf85333f40c0573c9d1532be78b9d5bc023142bf0fa003bf9bf1cc3ebf9f26bf997d203f513adbbe000080bf0a49573f1be32e3f38e7193c0ad723be54b0d0bc189650bf87347abea197063f8d3508bf45e22c3fb2be02bf000080bf92695a3fe6ad303f1e5b213e205b21befaaf88bb5edf833ee7e182beaa8c6e3f1cae28bf1cae283fc7cbb93e000080bf00a4403f144f4b3f0ad7233ebd3d1fbe37ca8abbb7467f3e6d1a87be7a896e3f1eae28bf1aae283fcacbb93e000080bfad93403f5d1a4c3f992a333e989919be60e2dabba482103f852d03bd2627533f923121bf4121213f7c26e93e000080bf8de73e3f37b94f3fc9503f3e9c1532be80b9d5bc54ee4e3f5025d5be5d25d53e322880be9f44cb3edb0d623f000080bf3494383ff2974d3fb9f5453e989919bea011cdbc692e5e3ff04138bd0d4afd3ea14bc8be0c460d3fd48a3c3f000080bfcea83b3ff6f7523f0ad7233e999919be77562fbb2f53843e70cae5bbc54b773fd44d34bfaedb2e3fc808463e000080bf0a8d413fba134d3fb9f5453ecfcc4cbda011cdbc692e5e3ff041383d0d4afd3e2299cfbe9fb5233f1f37273f000080bf4a574d3f72a6643f992a333ecfcc4cbd60e2dabb8af80f3fb7b20a3d9c80533f09791dbfcc512f3f9203c83e000080bf0996503fb367613f0ad7233ececc4cbd6d562fbb464b843ec021ba3cfd3c773f9c952fbf7255353f69d72a3e000080bf863b533f36c25e3f9c15323e80b9d5bc40c057bc026c063f82fdcf3e4e723f3f964229bf9b7c3f3f5e3b6d3d000080bf2c00553f2e72653fc9503f3e80b9d5bc80b9d5bc53ee4e3f5a25d53e5a25d53efd2a10bfb9be403ff35dae3e000080bf4eb7523f0cbb673f0ad7233e07d723bd0e77b4bbcdfb813e1bc5843e428c6e3fa5ea34bf5e1e353f01718ebb000080bf2c00553fdc86603f9c15323e40c057bc80b9d5bc026c063f4e723f3f82fdcf3ec6f732bf40b7263fff2897be000080bf0b49573f0cbb673f0ad7233e5cb0d0bc3ae719bcd179733e4a54133ffa4f483fb18136bf6189263fd30e86be000080bfa891573f5818633f0ad7233e3ae719bc5cb0d0bcd179733efa4f483f4a54133fac9029bf3661103f317efcbe000080bf92695a3f42f0653f9c15323ec9503fbe80b9d5bc4f25d53e55ee4ebf5725d53e78ba8fbec377a43e5589673f000080bf6a72283f7e70b23ec9503f3e9c1532be80b9d5bc54ee4e3f5025d5be5d25d53ebeeda3be2dac903e2a7c673f000080bf3a72283ff593bb3e9c15323e9d1532be40c057bc5b81ee3eb082eebe6d98403f84d907bf5b85083f78a6283f000080bfa38e2b3f93feb63eb9f5453e992a33becfcc4cbd692e5e3f064afdbef541383ddb2db2bc218f573da8957f3f000080bfec8a223fd881bd3ecbcc4c3e989919becbcc4cbd7e487f3f9b9758bda697583dd11f3fbd0f9be63d60177e3f000080bf9a60223fa8adc83eb9f5453e989919bea011cdbc692e5e3ff04138bd0d4afd3ef485f0bef35e7f3edbc9583f000080bf758d283f0c4fc63ecbcc4c3ecbcc4cbdcbcc4cbd7e487f3fa297583da297583de14e78bdb55b213e30537c3f000080bfb079213f4eeeeb3eb9f5453ecfcc4cbda011cdbc692e5e3ff041383d0d4afd3e6f6cf8be5598943e3728533f000080bf8ba6273fb28fe93ec9503f3e80b9d5bc80b9d5bc53ee4e3f5a25d53e5a25d53e45780abfbad17b3ee3e84d3f000080bfe41c273f4db0ef3eb9f5453ea011cdbccfcc4cbd692e5e3f0a4afd3eeb41383d456523bed07c443e65e6773f000080bfb530213fe65cf23ecbcc4c3ecbcc4cbd999919be7e487f3fa397583da09758bdd44e783d8d5b21be30537c3f000080bf8e80083f4eeeeb3eb9f5453ea011cdbc989919be692e5e3f0d4afd3eee4138bd2365233e8a7c44be6be6773f000080bf9337083fe65cf23ec9503f3e80b9d5bc9d1532be54ee4e3f5b25d53e5525d5be3b780a3f51d17bbef1e84d3f000080bf7c32023f4eb0ef3eb9f5453ecfcc4cbd992a33be692e5e3fea41383d064afdbe696cf83e3f9894be3b28533f000080bf0a35023fb28fe93ecbcc4c3e999919be989919be7e487f3f9e9758bd9b9758bdc61f3f3d029be6bd60177e3f000080bf7767093fa8adc83eb9f5453e989919be992a33be6a2e5e3fea4138bd044afdbeed85f03ed75e7fbedec9583f000080bff41b033f0c4fc63ec9503f3e9d1532be9c1532be55ee4e3f5625d5be4f25d5beb6eda33e1dac90be2d7c673f000080bfd387033ff693bb3eb9f5453e992a33be989919be692e5e3f064afdbeed4138bd802eb23c828e57bdaa957f3f000080bfca91093fd881bd3e992a333eb9f545be989919be064afd3e692e5ebfed4138bda981543de4abb5bc9b977f3f000080bf0e92093fe186b03e992a333eb9f545becfcc4cbd064afd3e6a2e5ebff041383dac8154bde6abb53c9b977f3f000080bf308b223fe086b03e9c15323ec9503fbe9c1532be4d25d53e57ee4ebf5525d5be4eba8f3ed677a4be5689673f000080bf0288033f7e70b23e9d15323e9c1532bec9503fbe5a25d53e4e25d5be54ee4ebf4dfa113f97aa12bf72b7163f000080bf1d30003f94feb63e9899193ecbcc4cbe999919be9e97583d7e487fbf9f9758bdf903e43dd96d3fbd7f207e3f000080bf2f68093fba50a53e9899193eb9f545be992a33bef041383d6a2e5ebf064afdbe47c97c3eebbcf0be0feb583f000080bf931c033f8eaba73e9999193ecbcc4cbecbcc4cbda297583d7e487fbfa397583d0e04e4bdd96d3f3d7d207e3f000080bf5161223fba50a53e9899193eb9f545bea011cdbcf341383d692e5ebf084afd3e78c97cbee6bcf03e0ceb583f000080bf148e283f8eaba73ecfcc4c3db9f545be9811cdbcda4138bd692e5ebf0a4afd3eff567bbeb0b0fa3e0e30563f000080bf9ba8273f5b32843ecbcc4c3dcbcc4cbecbcc4cbda39758bd7e487fbfa297583dadf606be8d8b733d504f7d3f000080bfd87b213f86d7813ecbcc4c3dcbcc4cbe989919bea39758bd7e487fbf9e9758bdbef6063e8c8b73bd4e4f7d3f000080bfb682083f86d7813ecbcc4c3db9f545be992a33beed4138bd692e5ebf064afdbe0e577b3ea9b0fabe0e30563f000080bf1937023f5b32843e0ad7233e1877b4bb06d723bdc8fb813e448c6e3f19c5843e44d526bfef7b08bd05fc413f000080bf3471773fd9a1343f0ad7233e3ae719bc5cb0d0bcd179733efa4f483f4a54133ff5043fbfc8c06dbeb2bb1f3f000080bffe677a3f7792323f9c15323e40c057bc80b9d5bc026c063f4e723f3f82fdcf3e9a443fbf91be343e870b243f000080bf0c50783f2464303f0ad7233e77562fbbcecc4cbd474b843efd3c773fcf21ba3cbd1527bf74f4203e3bbc3d3f000080bf1865753f520a363f992a333e60e2dabbcfcc4cbd8af80f3f9c80533fb8b20a3dacb121bf253bce3e2095293f000080bf6c44733fac95333f992a333e60e2dabb989919be2eea0f3f9789533f8ae40bbd0c702bbfd346f53e8646113f000080bf1002603f3482433fc9503f3e80b9d5bc80b9d5bc53ee4e3f5a25d53e5a25d53e7d8816bf5e35093f50141b3f000080bfaee1763f1be32e3fb9f5453ea011cdbccfcc4cbd692e5e3f0a4afd3eeb41383d4bf9dfbee7de373feb830a3f000080bf0a3c713fc572313f0ad7233e6d562fbb989919bea053843e984c773fe77b9ebb862b36bf836a463ecae22c3f000080bfbc22623fdaf6453fb9f5453ea011cdbc989919be692e5e3f0d4afd3eee4138bd701fddbe36d44b3f1bf1d83e000080bfaef95d3f4d5f413f0ad7233efc4775bb87751dbeb1467f3e7c896e3f621a87be3c4c2fbf677cb93e82e1213f000080bfa274613f43a2463f72a5203e465c78bb71a520bec1e2723e83d4713f631b68be21cf2fbfd9f9a73e400d263f000080bf5a56613fd3b2473f87751d3e0e4875bb0ad723be6aa6823e1f686e3f322185be170f2fbfbb56ba3effe4213f000080bf7736613fc9c1483f9c15323e40c057bc9c1532be7520ea3ec830433fcd5feabeead21abfeedc243f9de1ef3e000080bfefd75b3f1dee473fc9503f3e80b9d5bc9d1532be54ee4e3f5b25d53e5525d5beeda3abbe0220683f99fa823e000080bf91695a3f146d463f9999193e77562fbb0ad723be5362a83cf43f773fdc4c84be6b1231bffe294d3e16a0313f000080bff7be613f185f493f9899193e60e2dabb992a33beb8b20a3d9c80533f8bf80fbf793c31bf05b6d93e7c3e153f000080bff7085f3ff4034c3fcecc4c3d6d562fbb0ad723be8c29e0bc412d773fcd8584be292f2ebf89d22f3e3162363f000080bf9e1b713f01855b3fcfcc4c3d60e2dabb992a33beb7b20abd9c80533f8af80fbfcc9435bf66ccc03ebf8c183f000080bf9e656e3fdc295e3f80b9d53c40c057bc9c1532be9cf1ccbe0231423f0fa003bf0c9e34bfb2d7d23df07e333f000080bf3b8d723fc0c1623f5cb0d03c3ae719bc0ad723bea59706bf1696503f9b347abec6081cbfe55224be10c0463f000080bfd429753f5968603fcfcc4c3da011cdbcb9f545beee4138bd0b4afd3e692e5ebfe3da3abf03af133f2fbbbb3e000080bf20a66b3fc947623f80b9d53c80b9d5bcc9503fbe5825d5be5825d53e54ee4ebf586241bf3a3eac3e3ef30f3f000080bff49d703fbea7653f3ae7193c5cb0d0bc0ad723befa4f48bf4a54133fcd7973be89320bbf1f0ce4be6218363f000080bfb252783f625f643f40c0573c80b9d5bc9c1532be4d723fbf84fdcf3e026c06bfce4227bf08c89ebed4cb303f000080bf2517753f50f1653f1877b43b06d723bd0ad723be448c6ebf19c5843ecafb81be06b3b9beab5024bf02f62c3f000080bfe68a793fec05663f77562f3bcecc4cbd0ad723befd3c77bffd21ba3c3c4b84beead556be2b7927bf89053a3f000080bffe677a3f1730673f60e2da3bcfcc4cbd992a33be9c8053bfd2b20a3d8af80fbf8a08e6be7f5324bf94121f3f000080bf94e8763f31d8683fb9f5453e989919be992a33be6a2e5e3fea4138bd044afdbe566dc7bcdea77d3fe4fe07be000080bff266393f00000000c9503f3e9d1532be9c1532be55ee4e3f5625d5be4f25d5be19b5693e5b965f3f1d48dcbe000080bf546c333f20aecf3b9d15323e9c1532bec9503fbe5a25d53e4e25d5be54ee4ebf8439b83b2be3633fbe3fe9be000080bf546c333fa84f9b3c992a333e989919beb9f545be044afd3eea4138bd6a2e5ebf051025bdec137f3f12d098bd000080bff266393f48db923c992a333ecfcc4cbdb9f545be064afd3eed41383d6a2e5ebf4a10253dec137f3f28d0983d000080bf5c68523f48db923cb9f5453ecfcc4cbd992a33be692e5e3fea41383d064afdbe806dc73cdea77d3fecfe073e000080bf5c68523f00000000c9503f3e80b9d5bc9d1532be54ee4e3f5b25d53e5525d5be6da913be3558533f9faa0b3f000080bffa62583f40aecf3b9c15323e80b9d5bcc9503fbe4e25d53e5a25d53e54ee4ebf3952863c49ac623fedcded3e000080bffa62583fb84f9b3c9c15323e40c057bc9c1532be7520ea3ec830433fcd5feabe0ba1cebd7d4e0e3fa33a533f000080bf1b9e5b3fb84f9b3c9899193e60e2dabb992a33beb8b20a3d9c80533f8bf80fbf8cabd2bbbb18103f8596533f000080bf773d5d3fb8512d3d9899193ecbcc4cbdcbcc4cbe9997583da697583d7e487fbf16558b3baea27f3f97d0593d000080bf5c68523fb8512d3d9999193e989919becbcc4cbe9d97583d9d9758bd7e487fbf3f528bbbaea27f3f89d059bd000080bff266393fb4512d3d9899193ea011cdbcb9f545bef041383d0d4afd3e692e5ebf0000000032685e3f338bfd3e000080bf9da6583fb8512d3dcfcc4c3da011cdbcb9f545beee4138bd0b4afd3e692e5ebfd3147e3b496d5e3f6177fd3e000080bf9da6583f175a0f3ecfcc4c3d60e2dabb992a33beb7b20abd9c80533f8af80fbf8eabd23bba18103f8596533f000080bf773d5d3f175a0f3ecbcc4c3dcbcc4cbdcbcc4cbea09758bda297583d7e487fbf01548bbbaea27f3f8ed0593d000080bf5c68523f175a0f3e80b9d53c80b9d5bcc9503fbe5825d5be5825d53e54ee4ebf18a6923dd8b9663f1cc6da3e000080bffa62583f8d44273e9899193e992a33beb9f545bef041383d064afdbe6a2e5ebf0000000035685e3f2e8bfdbe000080bfb028333fb4512d3d9c15323ec9503fbe9c1532be4d25d53e57ee4ebf5525d5be56faf53d7db3003f59265bbf000080bf3331303fb04f9b3c9899193eb9f545be992a33bef041383d6a2e5ebf064afdbe8fa3493ceac5fd3ebf515ebf000080bfd6912e3fb4512d3dcbcc4c3db9f545be992a33beed4138bd692e5ebf064afdbe87a349bcebc5fd3ebd515ebf000080bfd6912e3f175a0f3ecbcc4c3d992a33beb9f545beeb4138bd064afdbe6a2e5ebf0000000034685e3f308bfdbe000080bfb028333f175a0f3ecbcc4c3d999919becbcc4cbe9e9758bda09758bd7e487fbf50558b3baea27f3f91d059bd000080bff266393f175a0f3e78b9d53c9d1532bec9503fbe5125d5be5525d5be57ee4ebf0535b8bb28e3633fcb3fe9be000080bf546c333f8e44273e78b9d53cc9503fbe9c1532be5825d5be57ee4ebf4925d5be5bfaf5bd78b3003f5c265bbf000080bf3231303f8e44273ea011cd3ccfcc4cbdb9f545be084afdbefb41383d692e5ebf3c1025bdec137f3f2dd0983d000080bf5c68523f1a53283e9811cd3c989919beb9f545be064afdbed54138bd6a2e5ebf4310253dec137f3f16d098bd000080bff266393f1b53283e20c0573c9c1532be9d1532be509042bf3566ebbedb2eebbefaf274be28e55a3fb98cebbe000080bf546c333f1331343e40e2da3b989919be992a33be205f53bf673708bd0c2c10bf43fd273d08f97d3fc71ff3bd000080bff266393f84ae3a3e60e2da3bcfcc4cbd992a33be9c8053bfd2b20a3d8af80fbfa9a425bd34f77d3fba00f43d000080bf5c68523f83ae3a3e40c0573c80b9d5bc9c1532be4d723fbf84fdcf3e026c06bf1679343e1650623feda7dd3e000080bffa62583f1231343ecbcc4c3dcbcc4cbecbcc4cbda39758bd7e487fbfa297583deb207f3f609765bd179c77bd000080bf0fb87d3f57cd063dcfcc4c3db9f545be9811cdbcda4138bd692e5ebf0a4afd3e486b7b3f752c04bed36e0cbe000080bf41087c3f5138173c80b9d53cc9503fbe78b9d5bc5325d5be54ee4ebf5525d53e3c0b5b3f86ce00bf2d77f8bd000080bfccb0763fe2ef3a3ca011cd3cb9f545becbcc4cbd084afdbe692e5ebff341383d81835d3f7f51febed3278abd000080bfae22783f59b20b3d9811cd3cb9f545be989919be084afdbe692e5ebfdb4138bd194b5e3f68a7fbbe6e0e88bd000080bfba2f7a3f287f063ecbcc4c3dcbcc4cbe989919bea39758bd7e487fbf9e9758bdd47d7f3f7cb950bda6b417bd000080bf1bc57f3fe845053e78b9d53cc9503fbe9c1532be5825d5be57ee4ebf4925d5bed18e643f6b6ce6be9e4b9bbc000080bfecb8793f72df1e3ecbcc4c3db9f545be992a33beed4138bd692e5ebf064afdbed6c97e3ff72fa7bd95eb573d000080bf7a1b7f3fa7be1e3e40e2da3b992a33be989919be9c8053bf89f80fbf94b20abd491e103f365852bfaf9db6bd000080bfd6b7733f4ca0083e40c0573c9d1532be78b9d5bc023142bf0fa003bf9bf1cc3e85e9063fdc6a58bff78fb2bd000080bf0023723f9fec523c80b9d53c9c1532be20c057bc682bcfbe499105bfe443403ff67b2f3f4d7637bfeba103be000080bf4427743f0000000060e2da3b992a33becbcc4cbd9c8053bf8af80fbfc5b20a3d91b30e3f921d53bfb95fc4bd000080bfcaaa713fec36143d6d562f3b0ad723becbcc4cbd432d77bfc28584beb129e03c26b0823e065376bf5b66c2bd000080bff7536e3fd7151a3d38e7193c0ad723be54b0d0bc189650bf87347abea197063fab38703edfde77bfc400b1bd000080bfe4026f3f2cfa5e3c5d562f3b0ad723be999919be3a3f77bf6e4c84bef7f4acbcc2b8843e540d76bfe16bc2bd000080bf0361703f08180a3e20c0573c9c1532be9d1532be509042bf3566ebbedb2eebbe1b5a0f3ffa6d52bf8781d4bd000080bf222b753f405f203e78b9d53c9d1532bec9503fbe5125d5be5525d5be57ee4ebf06ba413fedc526bf7d1a5ebd000080bf14b7773fc2eb2c3e5572893b0ad723becd171fbe71666ebf0cfa84be78da82be21f4943ea0c873bff918bdbd000080bfdac1703fdf650f3e40e2da3b989919be992a33be205f53bf673708bd0c2c10bffac5fc3d03177cbfc680fbbd000080bfefd66f3f67c5233e05678b3bb9e522be073320be75c073bfd60153bed11c67beeb5d6d3e0add77bfe360c0bd000080bfc7a0703f788e103e65e8893bda6c21bedb6c21be783571bfaf2171bedcf973be43f7863ee4c775bf8aa3bfbd000080bf4864703f97e1113e5062843bc9881ebe0ad723be7a896ebf721a87beab467fbe5ed7963e736f73bf6cd1c1bd000080bff3e96f3fe47d143e54562f3b989919be0ad723be234c77bf65a4c9bb575384be176c253d71b47dbf956902be000080bf54d36e3f54f7143e77562f3bcecc4cbd0ad723befd3c77bffd21ba3c3c4b84beb3fe363b9cc47ebf6699c8bd000080bf773d5d3faf1d1e3e60e2da3bcfcc4cbd992a33be9c8053bfd2b20a3d8af80fbf6c67ba3cb9d07ebfa533bfbd000080bf12415e3fc2eb2c3e + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: -0.09999999} + m_Extent: {x: 0.19999997, y: 0.19999997, z: 0.09999999} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1.6879306 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &880607833 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6878,39 +7519,39 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 790520236} - - component: {fileID: 790520239} - - component: {fileID: 790520238} - - component: {fileID: 790520237} + - component: {fileID: 880607834} + - component: {fileID: 880607836} + - component: {fileID: 880607835} m_Layer: 0 - m_Name: SnapPoint + m_Name: Controller_Base m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &790520236 +--- !u!4 &880607834 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790520235} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 880607833} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1525491574} - m_RootOrder: 0 + m_Children: + - {fileID: 1193047286} + m_Father: {fileID: 936988544} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &790520237 +--- !u!23 &880607835 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790520235} + m_GameObject: {fileID: 880607833} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -6921,10 +7562,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 539108941} + - {fileID: 2100000, guid: dca6b5fc8485ffd4c88bf8ae060949bc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6946,28 +7590,15 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &790520238 +--- !u!33 &880607836 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790520235} - m_Mesh: {fileID: 862649805} ---- !u!114 &790520239 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790520235} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 88ea78c93b844cc1b7f98cca70e8679c, type: 3} - m_Name: - m_EditorClassIdentifier: - parent: {fileID: 1525491575} ---- !u!1 &795450757 + m_GameObject: {fileID: 880607833} + m_Mesh: {fileID: 22788929071467060, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &886140062 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6975,66 +7606,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 795450758} + - component: {fileID: 886140063} m_Layer: 0 - m_Name: Little_2_Left + m_Name: Camera Offset m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &795450758 +--- !u!4 &886140063 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 795450757} - m_LocalRotation: {x: 0.007898328, y: 0.0033098771, z: -0.14792106, w: 0.9889621} - m_LocalPosition: {x: -0.021837996, y: 0.000000052452087, z: 0.0000003004074} + m_GameObject: {fileID: 886140062} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.36144, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 858105913} - m_Father: {fileID: 1307398688} - m_RootOrder: 0 + - {fileID: 1180278388} + - {fileID: 389396071} + - {fileID: 1272102072} + - {fileID: 1071573184} + - {fileID: 629046874} + - {fileID: 487972874} + - {fileID: 1240689138} + m_Father: {fileID: 2146169580} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &813701129 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 813701130} - m_Layer: 0 - m_Name: Station Unlock Chest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &813701130 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 813701129} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 1.5, y: 0, z: -2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2014095924} - - {fileID: 1241623310} - - {fileID: 2121825122} - - {fileID: 586564670} - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!1 &815556418 +--- !u!1 &903701277 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7042,195 +7644,136 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 815556419} - - component: {fileID: 815556422} - - component: {fileID: 815556423} - - component: {fileID: 815556421} - - component: {fileID: 815556420} - m_Layer: 8 - m_Name: Teleportation Spot + - component: {fileID: 903701278} + - component: {fileID: 903701280} + - component: {fileID: 903701279} + m_Layer: 31 + m_Name: Snap Volume m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &815556419 +--- !u!4 &903701278 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815556418} + m_GameObject: {fileID: 903701277} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1521703297} - m_Father: {fileID: 1527860102} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 232339300} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &815556420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815556418} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 584ad12357614f4fbb5460fdf72e8cc6, type: 3} - m_Name: - m_EditorClassIdentifier: - lockOnParentObjectLock: 1 - teleportEnded: - m_PersistentCalls: - m_Calls: [] - initialized: - m_PersistentCalls: - m_Calls: [] ---- !u!65 &815556421 +--- !u!65 &903701279 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815556418} + m_GameObject: {fileID: 903701277} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 0.01, z: 1} - m_Center: {x: 0, y: 0.02, z: 0} ---- !u!114 &815556422 + serializedVersion: 3 + m_Size: {x: 1.25, y: 0.6, z: 1.25} + m_Center: {x: 0, y: 0.3, z: 0} +--- !u!114 &903701280 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815556418} + m_GameObject: {fileID: 903701277} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0193c710a3042c6479b28370a44e0b0f, type: 3} + m_Script: {fileID: 11500000, guid: 87996e81a5026dc429bfd6a9271548b6, type: 3} m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 2 - m_DistanceCalculationMode: 1 - m_SelectMode: 1 - m_FocusMode: 1 - m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_TeleportationProvider: {fileID: 0} - m_MatchOrientation: 2 - m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 - m_FilterSelectionByHitNormal: 0 - m_UpNormalToleranceDegrees: 30 - m_Teleporting: - m_PersistentCalls: - m_Calls: [] - m_TeleportAnchorTransform: {fileID: 1521703297} ---- !u!114 &815556423 + m_InteractableObject: {fileID: 232339303} + m_SnapCollider: {fileID: 903701279} + m_DisableSnapColliderWhenSelected: 0 + m_SnapToCollider: {fileID: 0} +--- !u!1 &928609388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 928609389} + - component: {fileID: 928609390} + - component: {fileID: 928609391} + m_Layer: 2 + m_Name: Locomotion + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &928609389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 928609388} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1957432336} + - {fileID: 246867874} + - {fileID: 10366437} + - {fileID: 2092425255} + - {fileID: 1178045155} + m_Father: {fileID: 2146169580} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &928609390 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 815556418} + m_GameObject: {fileID: 928609388} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: 6fa7b4195685c3846be746c74f0ab2f8, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 8a8ba7249720634e83596d2c8de50700 - uniqueName: Teleportation Spot - tags: [] ---- !u!1 &820468470 +--- !u!114 &928609391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 928609388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a26c941eb8a46f7b6d00416227ab8c0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_XROrigin: {fileID: 2146169581} + m_BodyPositionEvaluatorObject: {fileID: 0} + m_ConstrainedBodyManipulatorObject: {fileID: 0} + m_UseCharacterControllerIfExists: 1 +--- !u!1 &936988543 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7238,31 +7781,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 820468471} + - component: {fileID: 936988544} m_Layer: 0 - m_Name: ModelPt + m_Name: UniversalController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &820468471 +--- !u!4 &936988544 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 820468470} + m_GameObject: {fileID: 936988543} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 54233951} - m_Father: {fileID: 1729154661} - m_RootOrder: 0 + - {fileID: 323365439} + - {fileID: 1223989042} + - {fileID: 880607834} + - {fileID: 1219978420} + - {fileID: 308734739} + - {fileID: 1000428120} + m_Father: {fileID: 1802169368} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &844459426 +--- !u!1 &947674859 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7270,74 +7818,312 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 844459427} - - component: {fileID: 844459430} - - component: {fileID: 844459429} - - component: {fileID: 844459428} + - component: {fileID: 947674860} + - component: {fileID: 947674862} + - component: {fileID: 947674861} m_Layer: 0 - m_Name: TargetCollider + m_Name: Button_B m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &844459427 +--- !u!4 &947674860 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 844459426} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 3, z: 0.36999983} + m_GameObject: {fileID: 947674859} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.012, y: 0.0013757758, z: -0.009} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 660021080} - m_RootOrder: 2 + m_Father: {fileID: 1000428120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &844459428 -MonoBehaviour: +--- !u!23 &947674861 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 844459426} + m_GameObject: {fileID: 947674859} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94f0bf7ce367d3942a1f56ec8dd56e41, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &844459429 -MonoBehaviour: + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &947674862 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 844459426} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} - m_Name: - m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 70c21327b894cc4682eeaaad4a2ccbf0 - uniqueName: TargetCollider - tags: [] ---- !u!65 &844459430 -BoxCollider: + m_GameObject: {fileID: 947674859} + m_Mesh: {fileID: 8449303727733987256, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &993039145 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 844459426} - m_Material: {fileID: 0} - m_IsTrigger: 1 + serializedVersion: 6 + m_Component: + - component: {fileID: 993039146} + - component: {fileID: 993039148} + - component: {fileID: 993039147} + m_Layer: 0 + m_Name: TouchPad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &993039146 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993039145} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: -0.0020741627, z: -0.0052528577} + m_LocalScale: {x: 0.982392, y: 1.55, z: 0.982392} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1129813367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &993039147 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993039145} m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: dca6b5fc8485ffd4c88bf8ae060949bc, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &993039148 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993039145} + m_Mesh: {fileID: -1120971793077124694, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &994902841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 994902842} + m_Layer: 0 + m_Name: XRController_Thumbstick_Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &994902842 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 994902841} serializedVersion: 2 - m_Size: {x: 0.35, y: 0.1, z: 0.35} - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &846924386 + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1757829521} + - {fileID: 1042048189} + - {fileID: 1687628410} + - {fileID: 1478590271} + m_Father: {fileID: 1129813367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1000428119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1000428120} + m_Layer: 0 + m_Name: XRController_Thumbstick_Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1000428120 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000428119} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1442437647} + - {fileID: 947674860} + - {fileID: 1127045218} + - {fileID: 1326720083} + m_Father: {fileID: 936988544} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1006305323 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2121825122} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.95 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d586649e59c967444a1607a4aed46c01, type: 2} + - target: {fileID: 919132149155446097, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + propertyPath: m_Name + value: Shield + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1854500747} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1831340547} + m_SourcePrefab: {fileID: 100100000, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} +--- !u!1 &1011416139 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7345,45 +8131,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 846924387} - - component: {fileID: 846924388} + - component: {fileID: 1011416140} m_Layer: 0 - m_Name: Input Action Manager + m_Name: Poke Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &846924387 +--- !u!4 &1011416140 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 846924386} + m_GameObject: {fileID: 1011416139} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0075} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1634918261} - m_RootOrder: 2 + m_Children: + - {fileID: 1669315465} + - {fileID: 578148354} + m_Father: {fileID: 1861251859} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &846924388 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 846924386} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ActionAssets: - - {fileID: -944628639613478452, guid: de2411ef647d9f24d981120efb63e621, type: 3} ---- !u!1 &853416177 +--- !u!1 &1028208102 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7391,174 +8164,386 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 853416178} - - component: {fileID: 853416181} - - component: {fileID: 853416179} - - component: {fileID: 853416180} - m_Layer: 8 - m_Name: Stair 1 Teleportation Area + - component: {fileID: 1028208103} + - component: {fileID: 1028208106} + - component: {fileID: 1028208105} + - component: {fileID: 1028208104} + m_Layer: 0 + m_Name: LineVisual m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &853416178 + m_IsActive: 1 +--- !u!4 &1028208103 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853416177} + m_GameObject: {fileID: 1028208102} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.4, z: 1.8} - m_LocalScale: {x: 0.04, y: 1, z: 0.04} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 33704422} - m_RootOrder: 2 + m_Father: {fileID: 1285588754} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &853416179 -MonoBehaviour: +--- !u!210 &1028208104 +SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853416177} + m_GameObject: {fileID: 1028208102} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} - m_Name: - m_EditorClassIdentifier: - serializedGuid: - serializedGuid: dab4a007ae520c47af9117adf3fb3c6f - uniqueName: Stair 1 Teleportation Area - tags: [] ---- !u!114 &853416180 -MonoBehaviour: + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30005 + m_SortAtRoot: 0 +--- !u!120 &1028208105 +LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853416177} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 2 - m_DistanceCalculationMode: 1 - m_SelectMode: 1 - m_FocusMode: 1 - m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_TeleportationProvider: {fileID: 0} - m_MatchOrientation: 0 - m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 - m_FilterSelectionByHitNormal: 0 - m_UpNormalToleranceDegrees: 30 - m_Teleporting: - m_PersistentCalls: - m_Calls: [] ---- !u!64 &853416181 -MeshCollider: + m_GameObject: {fileID: 1028208102} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: [] + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.012002945 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 8 + numCapVertices: 8 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 0 +--- !u!114 &1028208106 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853416177} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1028208102} m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &858105912 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80e353695beb436ab39a90d9ecefaee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LineRenderer: {fileID: 1028208105} + m_CurveVisualObject: {fileID: 1285588752} + m_OverrideLineOrigin: 1 + m_LineOriginTransform: {fileID: 1285588754} + m_VisualPointCount: 20 + m_MaxVisualCurveDistance: 10 + m_RestingVisualLineLength: 0.25 + m_LineDynamicsMode: 1 + m_RetractDelay: 1 + m_RetractDuration: 1 + m_ExtendLineToEmptyHit: 0 + m_ExtensionRate: 10 + m_EndPointExpansionRate: 10 + m_ComputeMidPointWithComplexCurves: 0 + m_SnapToSelectedAttachIfAvailable: 1 + m_SnapToSnapVolumeIfAvailable: 1 + m_CurveStartOffset: 0.015 + m_CurveEndOffset: 0.005 + m_CustomizeLinePropertiesForState: 1 + m_LinePropertyAnimationSpeed: 8 + m_NoValidHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.25 + m_AdjustWidth: 1 + m_StarWidth: 0.003 + m_EndWidth: 0.003 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 1, b: 1, a: 0.5019608} + key2: {r: 0, g: 0, b: 0, a: 0.2509804} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 193 + atime1: 8192 + atime2: 32768 + atime3: 55705 + atime4: 65342 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_UIHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.5 + m_AdjustWidth: 1 + m_StarWidth: 0.004 + m_EndWidth: 0.004 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 0.78431374, b: 0.5686275, a: 0.49019608} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 16384 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 8192 + atime2: 32768 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 4 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_UIPressHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.5 + m_AdjustWidth: 1 + m_StarWidth: 0.003 + m_EndWidth: 0.003 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.5686275, g: 0.78431374, b: 1, a: 0.627451} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 1, g: 1, b: 1, a: 0.78431374} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32768 + ctime2: 65535 + ctime3: 65535 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 8192 + atime2: 26214 + atime3: 42598 + atime4: 65535 + atime5: 65535 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 5 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_SelectHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.5 + m_AdjustWidth: 1 + m_StarWidth: 0.003 + m_EndWidth: 0.003 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.5686275, g: 0.78431374, b: 1, a: 0.627451} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 1, g: 1, b: 1, a: 0.78431374} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32768 + ctime2: 65535 + ctime3: 65535 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 8192 + atime2: 26214 + atime3: 42598 + atime4: 65535 + atime5: 65535 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 5 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.75 + m_HoverHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.25 + m_AdjustWidth: 1 + m_StarWidth: 0.004 + m_EndWidth: 0.004 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 0.78431374, b: 0.5686275, a: 0.49019608} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 1, g: 1, b: 1, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 16384 + ctime2: 65535 + ctime3: 65535 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 13878 + atime2: 32768 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 4 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_RenderLineInWorldSpace: 1 + m_SwapMaterials: 0 + m_BaseLineMaterial: {fileID: 0} + m_EmptyHitMaterial: {fileID: 0} +--- !u!1 &1042048188 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7566,30 +8551,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 858105913} + - component: {fileID: 1042048189} + - component: {fileID: 1042048191} + - component: {fileID: 1042048190} m_Layer: 0 - m_Name: Little_Tip_Left + m_Name: Button_B m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &858105913 +--- !u!4 &1042048189 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 858105912} - m_LocalRotation: {x: 0.000000022351742, y: 0.000000014901163, z: -0.00000002793968, w: 1} - m_LocalPosition: {x: -0.017860297, y: 0.00000007152557, z: -0.00000015258789} + m_GameObject: {fileID: 1042048188} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.012, y: 0.0013757758, z: -0.009} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 795450758} - m_RootOrder: 0 + m_Father: {fileID: 994902842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &861048854 +--- !u!23 &1042048190 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042048188} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1042048191 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042048188} + m_Mesh: {fileID: 8449303727733987256, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1060792102 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7597,338 +8637,263 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 861048855} - - component: {fileID: 861048858} - - component: {fileID: 861048856} - - component: {fileID: 861048857} - m_Layer: 8 - m_Name: Stair 2 Teleportation Area + - component: {fileID: 1060792103} + - component: {fileID: 1060792104} + m_Layer: 31 + m_Name: Interaction Affordance m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &861048855 + m_IsActive: 1 +--- !u!4 &1060792103 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861048854} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.8, z: 2.2} - m_LocalScale: {x: 0.04, y: 1, z: 0.04} + m_GameObject: {fileID: 1060792102} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 33704422} - m_RootOrder: 3 + m_Father: {fileID: 232339300} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &861048856 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861048854} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} - m_Name: - m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 4cc351be75c35a46af43ba76169788b7 - uniqueName: Stair 2 Teleportation Area - tags: [] ---- !u!114 &861048857 +--- !u!114 &1060792104 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861048854} + m_GameObject: {fileID: 1060792102} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: db00376f7b7d66e4da00d63492cb7971, type: 3} + m_Script: {fileID: 11500000, guid: 49e0a5b5ff5540f5b14dd29d46faec22, type: 3} m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 2 - m_DistanceCalculationMode: 1 - m_SelectMode: 1 - m_FocusMode: 1 - m_CustomReticle: {fileID: 3819676577015031517, guid: c9ea54082e6151843acb776fb52ed6f7, type: 3} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - m_TeleportationProvider: {fileID: 0} - m_MatchOrientation: 0 - m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 - m_FilterSelectionByHitNormal: 0 - m_UpNormalToleranceDegrees: 30 - m_Teleporting: - m_PersistentCalls: - m_Calls: [] ---- !u!64 &861048858 -MeshCollider: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractableSource: {fileID: 232339303} + m_IgnoreHoverEvents: 0 + m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!1 &1071573179 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 861048854} - m_Material: {fileID: 0} - m_IsTrigger: 0 + serializedVersion: 6 + m_Component: + - component: {fileID: 1071573184} + - component: {fileID: 1071573183} + - component: {fileID: 1071573182} + - component: {fileID: 1071573181} + - component: {fileID: 1071573180} + m_Layer: 0 + m_Name: Left Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1071573180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071573179} m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!43 &862649805 -Mesh: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: + m_UseReference: 1 + m_Action: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: Vector3 + m_Id: cd22b81e-c39a-4170-bdbf-33b5a06ea86f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -2024308242397127297, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_RotationInput: + m_UseReference: 1 + m_Action: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: Quaternion + m_Id: 04fa80c1-7876-441c-8416-c5ea3caea5c4 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 8248158260566104461, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_TrackingStateInput: + m_UseReference: 1 + m_Action: + m_Name: Tracking State + m_Type: 0 + m_ExpectedControlType: Integer + m_Id: fdcc0d62-5cd0-4fcc-8c3a-c07cf6230b7d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 684395432459739428, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_PositionAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: ddb05e9d-4218-401c-a7a8-003424f4b4fa + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_RotationAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: de98cdb6-b2c4-4d67-af3c-9c8bd60b295a + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 +--- !u!114 &1071573181 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071573179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b734f2bd29eeddd4d85afb0c266228c3, type: 3} m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 2532 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 779 - localAABB: - m_Center: {x: 0, y: 0, z: -0.09999999} - m_Extent: {x: 0.19999997, y: 0.19999997, z: 0.09999999} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 0 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000400050006000700080009000a000b000b000c0009000b000d000c000e000c000d000d000f000e0010000e000f00110010000f001200100011001200110013001400120013001400130015001600140015001600150017001800160017001800170019001a0011000f001b00180019001b0019001c000f001d001a001e001d000f001f001e000f000f0020001f001b001c00210022001b00210023002200210024002300210024002500230021002600240027002800290029002a00270029002b002a0029002c002b002c002d002b002e002a002b002b002f002e002f0030002e00300031002e0032002e00310033003200310033003100340034003500330035003400360037003500360036003800370034003900360034003a00390030003b003c003b003d003c003b003e003d003e003f003d003e0040003f00400041003f0040004200410042004300410042004400430044004500430044004600450046004700450046004800470048004900470048004a00490049004a004b004b004c0049004a004d004b004d004a00480048004e004d0048004f004e0050005100520052005300500052005400530050005300550055005300540054005600550056005700550055005800500055005900580059005a00580059005b005a005b005c005a005c005d005a005c005e005d005e005f005d005e0060005f00600061005f0060006200610062006300610062006400630064003200630065006600670067006600680068006900670066006a0068006a006b0068006b006c0068006b006d006c006b006e006d006e006f006d006f0070006d006f00710070006f00720071007200730071007200740073007400750073007400760075007700760078007800790077007a00780076007a0076007b007b007c007a007d007a007c007d007c007e007e007f007d007d007f008000800081007d0080008200810082008300810082008400830084008500830083008600810086008700810085008800830088008900830085008a0088008a008b0088008b008c0088008b008d008c008d008e008c008e008f008c008d0090008e00900091008e0091009000920093008e0091009100940093009500960097009700980095009800990095009a009900980098009b009a009b009c009a009b009d009c009d009e009c009d009f009e009b00a0009d009b00a100a0009d00a2009f009d00a300a200a200a4009f00a200a500a400a200a600a500a600a700a500a600a800a700a600a900a800a800aa00a700a800ab00aa00ac00aa00ab00ad00a700aa00aa00ae00ad00af00b000b100b100b200af00b200b300af00b200b400b300b400b500b300b400b600b500b700b800b900ba00bb00bc00bd00be00bf00c000c100c200c300c400c500c600c700c800c900ca00cb00cc00cd00ce00cf00d000d100cf00d100d200d200d300cf00d300d200d400d300d400d500d500d400d600d500d600d700d500d700d800d900cf00d300d500d900d300da00d500d800da00d800db00db00dc00da00db00dd00dc00db00de00dd00d500da00df00da00e000df00d500df00e100d500e100d900d900e200cf00cf00e200e300e400e200d900e100e400d900e400e500e200e600e100df00e100e600e400e600df00e700e800e600e700e800e900e600e400e600e900e900e800ea00e900ea00eb00ec00e900eb00e500e400ed00e400e900ed00ec00ed00e900e500ed00ee00ed00ec00ef00ed00ef00ee00f000f100f200f000f300f100f300f000f400f500f300f400f400f000f600f400f600f700f400f800f500f400f700f900fa00f800f400f400f900fa00fa00fb00f800f900fc00fa00fb00fa00fc00f900fd00fc00fe00fb00fc00ff00fe00fc000001ff00fc00fc00fd00010102010001fc000301fc000101fc000301020103010101040105010301040106010201030105010701030106010301070108010601070108010701090109010a0108010b010a0109010b0109010c010d010e010f010d010f01100111010d011001110112010d01110113011201110114011301150113011401160115011401170111011001170114011101180110010f01170110011801160114011901170119011401160119011a0116011a011b01190117011c0119011c011a0118011c0117011c011d011a0118010f011e011e010f011f011e011f01200121011e012001220118011e01210122011e01180123011c012201230118012101240122012301220124012101250124011c0126011d0126011c0123012301240127012601230127012701240128012701280129012a01270129012a01260127012a011d0126012a012b011d012c012d012e012c012e012f0130012c012f01300131012c01300132013101300133013201340133013001340130012f0134013501330136012f012e0134012f01360136012e01370136013701380139013501340139013a0135013b0134013601360138013b013b01390134013b0138013c013d013c0138013d013e013c013c013e013f0140013c013f013b013c0140013b01410139013b014001410140014201410140014301420140013f014301390141014401390144013a014201440141013a01440145013a014501460144014701450142014701440148014701420149014801420142014a0149014b014a0142014b01420143014b0143013f014c014b013f014d014c013f014e014d013f014f014e013f013f0150014f0151015201530153015401510151015401550151015501560151015601570156015501580158015901560158015a0159015a015b0159015a015c015b015d015e015f015f0160015d01600161015d0160016201610160016301620162016301640164016501620165016401660165016601670165016701680165016801690169016a01650169016b016a0169016c016b016b016c016d016e016b016d016d016f016e016f0170016e01700171016e016f0172017001700172017301730174017001730175017401730176017501770178017901770179017a017b0177017a017b017c0177017b017d017c017b017e017d017f017d017e0180017f017e0181017b017a0181017e017b0182017a01790181017a01820180017e018301810183017e01800183018401800184018501830181018601830186018401820186018101860187018401820179018801880179018901880189018a018b0188018a018c01820188018b018c01880182018d0186018c018d0182018b018e018c018d018c018e018b018f018e01860190018701900186018d018d018e01910190018d01910191018e0192019101920193019401910193019401900191019401870190019401950187019601970198019601980199019a01960199019a019b0196019a019c019b019a019d019c019e019d019a019e019a0199019e019f019d01a001990198019e019901a001a0019801a101a001a101a201a3019f019e01a301a4019f01a5019e01a001a001a201a501a501a3019e01a501a201a601a701a601a201a701a801a601a601a801a901a501a601aa01aa01a601a901a501ab01a301a501aa01ab01a301ac01a401a301ab01ac01aa01ad01ab01ad01ac01ab01a401ac01ae01a401ae01af01ac01b001ae01ad01b001ac01aa01a901b101aa01b101ad01b201b001ad01b101b201ad01b201b301b001b101b401b201b401b101a901b401a901b501b601b701b801b901b601b801b801ba01b901bb01b901ba01bb01bc01b901bd01bc01bb01be01bd01bb01bf01be01bb01bb01c001bf01c101bf01c001c001c201c101c301c001bb01ba01c301bb01ba01b801c401b801c501c401ba01c401c601ba01c601c301c301c701c001c001c701c801c901c701c301c601c901c301c901ca01c701cb01c601c401c601cb01c901cb01c401cc01cd01cb01cc01cd01ce01cb01c901cb01ce01c901ce01cf01cf01ca01c901cf01d001ca01d101d201d301d101d301d401d501d101d401d501d601d101d501d701d601d501d801d701d401d901d501d801d501d901d401da01d901da01d401d301d901db01d801d301dc01da01dd01dc01d301dd01d301de01df01d801db01db01e001df01e001e101df01e101e201df01e201e301df01e401df01e301e401e301e501e201e601e301e301e701e501e801e301e601e301e801e701e601e901e801e801ea01e701e901eb01e801e801ec01ea01e801eb01ec01ed01ee01ef01ed01ef01f001ed01f001f101ed01f101f201f101f301f201f101f401f301f001ef01f501f501f601f001f601f101f001ef01f701f501f801f701ef01f801f901f701f601fa01f101f101fa01fb01f101fb01fc01f101fc01fd01f401f101fd01f401fd01fe01fe01ff01f401fe010002ff01fe01010200020202f401ff0100020202ff0102020302f401000204020202000205020402000206020502060200020102010207020602080209020a020a020b0208020b020a020c020c020a020d020e0208020b020e020f0208020f020e021002100211020f0212020e020b02120210020e020b020c02130212020b021302100214021102140215021102140216021502140217021602180217021402180214021902180219021a021a021b0218021a021c021b021d0213020c021d020c021e021d021e021f021d021f022002210213021d0221021d022002210212021302210220022202220223022102220224022302210223022502210225021202120225021002250226021002270228022902270229022a022b0227022a022b022c0227022b022d022c022b022e022d022f022d022e0230022f022e0231022b022a0231022e022b0232022a02290231022a02320230022e023302310233022e02300233023402300234023502330231023602330236023402320236023102360237023402320229023802380229023902380239023a023b0238023a023c02320238023b023c02380232023d0236023c023d0232023b023e023c023d023c023e023b023f023e02360240023702400236023d023d023e02410240023d02410241023e0242024102420243024402410243024402400241024402370240024402450237024602470248024602480249024a024602490249024b024a024c024a024b024c024b024d024c024d024e024f024e024d024f0250024e024e0251024c024e02500252024e025302510253024e025202530254025102530255025402530256025502570256025302530252025802590258025202590252025a02580259025b02530258025c0258025b025c02570253025d0253025c025d0257025d025e025c025e025d025e025f0257025e0260025f02610260025e0261025e0262025e02630262025c0263025e025b0263025c025b0264026302650266026702650267026802650268026902650269026a026a0269026b026a026b026c026d026b02690268026d026902680267026e0267026f026e0268026e027002680270026d026d0271026b026b0271027202730271026d02700273026d02730274027102750270026e0270027502730275026e02760277027502760277027802750273027502780273027802790279027402730279027a0274027b027c027d027b027d027e027b027e027f027b027f0280027f02810280027f02820281027e027d028302830284027e0284027f027e02840285027f027f028502860282027f0286028602870282028702880282028702890288027d028a0283027d028b028a028b027d028c028c027d028d028c028d028e028c028f028b028c028e02900291028f028c028c0290029102910292028f0290029302910292029102930290029402930295029202930293029402960293029702950296029702930296029802970299029a029b029c029a0299029d029a029c029d029e029a029e029d029f029e029f02a0029f02a102a0029f02a202a102a2029f02a3029d02a3029f02a202a302a402a302a502a402a302a602a502a602a302a7029d02a702a302a602a702a802a702a902a802aa02a7029d02aa029d029c02a702aa02a902ab02aa029c02ab02a902aa02ab029c02ac029c029902ac02ab02ad02a902ad02ae02a902af02ad02ab02af02ab02ac02af02b002ad02b102ac029902af02ac02b102b1029902b202b102b202b302b102b302b402af02b102b402af02b402b502b502b002af02b502b602b002b702b802b902ba02b702b902b902bb02ba02bc02ba02bb02bb02b902bd02bb02bd02be02bc02bf02ba02bb02be02c002bb02c002bc02c102bf02bc02c202c102bc02c302c202bc02c002c402bc02bc02c402c302c002c502c402c602c302c402c402c702c602c802c602c702c802c702c902c802c902ca02ca02cb02c802cc02ca02c902cc02cd02ca02ce02cb02ca02ca02cd02cf02ce02ca02cf02d002ce02cf02d102d002cf02cf02d202d102d302d402d502d302d502d602d702d302d602d702d802d302d702d902d802d702da02d902db02d902da02dc02db02da02dd02d702d602dd02da02d702de02d602d502dd02d602de02dc02da02df02dd02df02da02dc02df02e002dc02e002e102df02dd02e202df02e202e002de02e202dd02e202e302e002de02d502e402e402d502e502e402e502e602e702e402e602e802de02e402e702e802e402de02e902e202e802e902de02e702ea02e802e902e802ea02e702eb02ea02e202ec02e302ec02e202e902e902ea02ed02ec02e902ed02ed02ea02ee02ed02ee02ef02f002ed02ef02f002ec02ed02f002e302ec02f002f102e302f202f302f402f202f402f502f202f502f602f202f602f702f702f602f802f702f802f902fa02f802f602f502fa02f602f502f402fb02f402fc02fb02f502fb02fd02f502fd02fa02fe02fd02fb02fe02fa02fd02fb02ff02fe02fe020003fa02fa020103f8020103fa020003f80201030203000303030103040301030303030305030403050306030403060307030403070308030403040308030903040309030a03 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 779 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 37392 - _typelessdata: 77562f3bcecc4cbd0ad723be000000000000803f00000000000000000000803f00000000000080bf0b98ec3e00ab133f54562f3b989919be0ad723be000000000000803f000000000000803f0000000000000000000080bf5005083f5a07023f54562f3bcecc4c3d0ad723be000000000000803f000000000000803f0000000000000000000080bf7325c93ea64e253f6b562fbbcccc4c3d0ad723be000000000000803f00000000000000000000803f000000000000803f3242c73ede5b243f60562fbb9999193e0ad723be000000000000803f00000000000080bf00000000000000000000803f9bcfa33e84ff353f60562fbbcecc4cbd0ad723be000000000000803f00000000000080bf00000000000000000000803fcab4ea3e37b8123fcecc4c3d0ad723be5d562fbb000000000000803f00000000000000000000803f00000000000080bf4247a33ef3efa83e999919be0ad723be5d562fbb000000000000803f00000000000000000000803f00000000000080bf0ae0a63e36e2ef3ececc4cbd0ad723be6d562fbb000000000000803f00000000eea07ebf00000000e8b2d3bd000080bfa613a53e1469cc3e235b21be235b213e37b088bb54e524bf496a423f4a4bbbbdb877acbcc9b6d03d2f9c7e3f000080bfdd683c3e6d37253f0ad723bec33d1f3e6eca8abb267f73bfeaeb9c3e9a2c17bd1663ecbbcb97c73d50c67e3f000080bfb6443c3eeff3253f0ad723be78c31f3e000000001b807dbff0b80d3e248888bcec4b3bbb5386cb3d50bb7e3f000080bf6085403ef8ec253f27731ebe0ad7233e639e83bbf8b9babecaff6d3f341754bdaf66afbb69335b3d25a17f3f000080bfa2a73c3ec05a243fa7081fbe0ad7233e00000000b1527bbd08827f3f2bbb0ebce17549bb5be70b3c4efd7f3f000080bf6aab403e6f80243f999919be0ad7233e74562fbb000000000000803f000000006f0b473c000000002afb7f3f000080bfd4fe3d3e753b233f672c1d3e0ad7233e00000000668ee83d1c587e3f000000002639873c8047f7baf4f67f3f000080bf6aab403eb228b63ecccc4cbd0ad7233e74562fbb000000000000803f000000004015473c000000002afb7f3f000080bfd4fe3d3e91740b3fcbcc4c3d0ad7233e74562fbb000000000000803f000000005ce4463c000000002cfb7f3f000080bfd4fe3d3e5a5be73e07d723bd0ad7233e0e77b4bb000000000000803f000000009424473c000000002afb7f3f000080bf342a3b3ec811093f06d7233d0ad7233e0e77b4bb000000000000803f000000004202473c000000002afb7f3f000080bf342a3b3e8b18ec3e54b0d0bc0ad7233e3ae719bc000000000000803f00000000610c473c000000002afb7f3f000080bfd247373ec59a053f54b0d03c0ad7233e3ae719bc000000000000803f00000000a833473c0000000028fb7f3f000080bfd247373e11fbf23e2de719bc0ad7233e5cb0d0bc000000000000803f000000005c17473c000000002afb7f3f000080bffc34273e07bc013f23e7193c0ad7233e5cb0d0bc000000000000803f000000003814473c000000002afb7f3f000080bffc34273ef888fa3efd76b4bb0ad7233e07d723bd000000000000803f00000000e20b473c000000002afb7f3f000080bf49b0183ebdc4003ff376b43b0ad7233e07d723bd000000000000803f000000000b0c473c000000002afb7f3f000080bf49b0183e934cfc3e9999193e0ad7233e74562fbb000000000000803f0000000010f6463c000000002cfb7f3f000080bfd4fe3d3e92cdb73e66562fbb0ad7233ececc4cbd000000000000803f00000000f510473c000000002afb7f3f000080bf80b10e3ef810003f59562f3b0ad7233ececc4cbd000000000000803f000000008c16473c000000002afb7f3f000080bf80b10e3e8896fd3e672c1d3e0ad7233eb01a70bbee55fd3e5f775e3f00000000a6048b3ced4e1ebc81f37f3f000080bff5013d3e4723b63ef558203ef558203e62d46dbb67733d3fec2c2c3f000000004cff9a3c8a8caabc11e67f3f000080bf3eea3c3e1531b53e0ad7233e2b811c3e1cfb63bbe3ad543f8f7d0e3f00000000f9b77d3c3159bdbca3e67f3f000080bfd5ec3c3ec126b43e0ad7233e2b811c3e00000000b2887d3f46ca0d3e00000000f9d7523b0b81bcbc4fee7f3f000080bff666403ee62bb43e74562f3b0ad7233e989919be000000000000803f000000008615473c000000002afb7f3f000080bfb0f62a3d9a02fd3e66562fbb0ad7233e999919be000000000000803f00000000b421473c000000002afb7f3f000080bfb0f62a3d018eff3e9e7289bb0ad7233ed4171fbed13ca5bc263d7e3f793aecbdf7aad0bd5ddde63d03077d3f000080bf3484153d801f003f628091b90ad7233e64cb1fbe72db2cbd8d8c643f0da6e5bea064d2bcfa47e53e4acd643f000080bf20c7123d2461fe3e24678bbbcde5223ef83220be5015b0bddfd72e3f0fb139bf4d974fbe9069333f16152f3f000080bf880f113d9034003fa9ec933b0ad7233ec73f20be0ec12cbd5daf633fbb0ee9be291402bcdf1ae93e72eb633f000080bfb000113d2319fc3e6fe889bbdb6c213edb6c21be72ac91bd2c0f233f828244bfb02a173fe1e417bfb60b0cbf000080bfad8fa03e0713373f24678bbbcde5223ef83220be5015b0bddfd72e3f0fb139bf9421163f3dca0dbf414d17bf000080bf1209a03ee451373f628091b90ad7233e64cb1fbe72db2cbd8d8c643f0da6e5bebe721b3f03ccaabed89a38bf000080bfb61ca13ee22f383f606284bbca881e3e0ad723bef1d71abdc954ad3e81b070bfc0a02c3f968a2fbf1d4c8cbe000080bf169fa13e329b363fdb078d3b0a7d1f3e0ad723bee4b63fbd7e9bd63efb1d68bf58fe293f5b402abf81f5aebe000080bf1a3ca43edc3f383fa9ec933b0ad7233ec73f20be0ec12cbd5daf633fbb0ee9bef9371b3f24bcadbeaa1c38bf000080bf79cda23e4d09393f33d2913bcddf213eccdf21bebebb91bd1f0f233f5f8244bf554b173f15d017bf03ff0bbf000080bfe175a33eb3af383f60562fbb9999193e0ad723be0000000000000000000080bf0f96343f947335bf00000000000080bf9bcfa33e84ff353f77562f3b9999193e0ad723be0000000000000000000080bf0a96343f987335bf00000000000080bfdcb2a53e4df2363f54562f3bcecc4c3d0ad723be0000000000000000000080bf8495343f207435bf00000000000080bf7325c93ea64e253f54562f3b989919be0ad723be0000000000000000000080bf1596343f8f7335bf00000000000080bf5005083f5a07023f60562fbbcecc4cbd0ad723be0000000000000000000080bfdf95343fc27335bf00000000000080bfcab4ea3e37b8123f6b562fbb999919be0ad723be0000000000000000000080bf1396343f917335bf00000000000080bfb013073f9114013f5062843bc9881ebe0ad723be76a3293d53e4bdbe68816dbfa2622c3fc4f52cbf48ad993e000080bf931d093fac6b013fc3078dbb097d1fbe0ad723be97b1233d003db7be22d36ebf019d2a3f67a32fbf4860953e000080bf11cf073f058eff3e16c890390ad723be6ccb1fbe86e02a3deb3b65bfaeece2bedbaa1b3f9690a8becbee383f000080bfb45e093fd9adff3e1cd291bbcddf21beccdf21be1eab913d010f23bfaa8244bf542b173faee417bf3b0b0c3f000080bf2e32083f56aefe3e93ec93bb0ad723bec73f20be191cdc3c59e774bf677894befac2233fc56953bebc893d3f000080bf6286083f22fbfd3e05678b3bb9e522be073320be14319f3dda5928bff7d33fbfe4b2163fe38913bf511d113f000080bf92e8093ffdb4003f65e8893bda6c21bedb6c21be37c3913dec0e23bf738244bff001173fbffc17bfc51d0c3f000080bf48a5093fd7f3003feb76b43b0ad7233d0ad723be0000000000000000000080bf9095343f117435bf00000000000080bfaab0cd3e940b243f77562f3bcecc4cbd0ad723be0000000000000000000080bff695343fac7335bf00000000000080bf0b98ec3e00ab133f1877b43b06d723bd0ad723be0000000000000000000080bfff95343fa47335bf00000000000080bf570cea3e0fef153f21e7193c57b0d03c0ad723be0000000000000000000080bf0e96343f947335bf00000000000080bfbf35d43efe2b223f3ae7193c5cb0d0bc0ad723be0000000000000000000080bfb295343ff17335bf00000000000080bf3345e63e4c2f193f54b0d03c2de7193c0ad723be0000000000000000000080bffc95343fa87335bf00000000000080bf6495df3e792f223f5cb0d03c3ae719bc0ad723be0000000000000000000080bfea95343fb87335bf00000000000080bf3d3ee63e1fdf1e3f04d7233d0677b43b0ad723be0000000000000000000080bf1096343f927335bf00000000000080bfde15e63e0b13243f07d7233d0e77b4bb0ad723be0000000000000000000080bf1f96343f837335bf00000000000080bf68fde93ea821223fcbcc4c3d6b562f3b0ad723be0000000000000000000080bfdf95343fc47335bf00000000000080bffc9dea3ee558253fcecc4c3d6d562fbb0ad723be0000000000000000000080bfc195343fe17335bf00000000000080bf8e83ec3e4567243f9899193e60562f3b0ad723be0000000000000000000080bfd795343fcb7335bf00000000000080bfa4f2063f3012373f9999193e77562fbb0ad723be0000000000000000000080bfb195343ff17335bf00000000000080bf6de5073f9020363fd18d1d3e2600773b0ad723beb7e1e93ece0f503db15b63bfdca62a3f9d3d2ebfe19d9b3e000080bf646f073fc4f2373f87751d3e0e4875bb0ad723be3a6ddc3eba1d71bd969166bf2ba1273fc9992abf7e8eb63e000080bf08c0083f5e9b363faefb1d3e151886320ad723be3103293f320a38bca44140bf50c3093fcac130bf8f80f73e000080bf522d083f985b373f0ad7233efc4775bb87751dbe474a5a3fc7f090bde38004bf0ab9cc3efb980cbf87db3b3f000080bf6ad9093f19b6373f72a5203e465c78bb71a520be9f2e343f45c2c4bd8c2e34bf18e10c3f96830dbf3732203f000080bfb64e093f7726373f0ad7233efdfb8932aefb1dbe980d7c3fb799deba661c33be539f063e7a0527bf86113f3f000080bf992f093f1b5f383f0ad7233e1300773bd08d1dbef820593f82cf6f3d6ec806bfc4c9e23e9e9e1fbf1dec243f000080bf9784083f4c09393fbeb1203ef00d7a3bc0b120be1576343f51bba03df17534bf7216193f2ba719bf38fb073f000080bfc2f7073f0580383fd38d1dbe530077bb0ad723bec716ddbeacae44bd319366bf78dc2c3f9ae32dbf5f3593be000080bf75fba43e1914003fc1b120be1b0e7abbc1b120bead7734bf7bd69fbd877734bf6202193ff8b819bfaffd07bf000080bfb8eaa33eb10dff3e0ad723be410077bbd28d1dbedb4a5abf567b6cbdd5e904bfd880df3e79ea1fbf16c125bf000080bf0ed1a23e23fbfd3eb1fb1dbe151886320ad723beb5f228bf1aefd13bd55340bfbe4c0a3f5add30bf11fef5be000080bf967fa33e46ab003f0ad723befcfb8932b0fb1dbe990a7cbf5d49433b675b33be9708063e5ae926bfb7303fbf000080bf0a7ba13e864fff3e8b751dbe2048753b0ad723be68ece6beab987c3debef63bf3d57253f187d2abfa31fbfbe000080bf2c5aa23e806b013f0ad723be0f48753b89751dbee0e058bfe968933d87c206bf526cd03eab7b0cbf76ec3abf000080bf6827a03ec450003f73a520be555c783b72a520be092e34bf820fc53dd42d34bfb3e80c3ff26d0dbfa43e20bf000080bfd03ca13e67e0003f999919be6d562fbb0ad723be0000000000000000000080bf2796343f7c7335bf00000000000080bff4f4a53eadf4003f999919be6b562f3b0ad723be0000000000000000000080bf1896343f8b7335bf00000000000080bf620fa43e4ee6013fcccc4cbd77562fbb0ad723be0000000000000000000080bfdf95343fc37335bf00000000000080bf413cc93ef9ad123fcecc4cbd60562f3b0ad723be0000000000000000000080bfd595343fcd7335bf00000000000080bfaf56c73e999f133f09d723bdfd76b43b0ad723be0000000000000000000080bfd095343fd17335bf00000000000080bfd4dcc93e35e5153f05d723bd1877b4bb0ad723be0000000000000000000080bfe895343fba7335bf00000000000080bf5fc4cd3ed3f3133f57b0d0bc2de7193c0ad723be0000000000000000000080bf0e96343f947335bf00000000000080bf009ccd3ec027193f54b0d0bc3ae719bc0ad723be0000000000000000000080bf0996343f9a7335bf00000000000080bfd844d43e65d7153f2de719bc54b0d03c0ad723be0000000000000000000080bfbf95343fe27335bf00000000000080bf0a95cd3e92d71e3f2be719bc5cb0d0bc0ad723be0000000000000000000080bf1d96343f857335bf00000000000080bf7da4df3ee0da153f0677b4bb05d7233d0ad723be0000000000000000000080bff195343fb27335bf00000000000080bfe6cdc93ecf17223ff576b4bb0ad723bd0ad723be0000000000000000000080bf3596343f6e7335bf00000000000080bf9229e63e4afb133f6b562fbbcccc4c3d0ad723be0000000000000000000080bffc95343fa77335bf00000000000080bf3242c73ede5b243f05678b3bb9e522be073320be14319f3dda5928bff7d33fbfae3e06bf5bbd1c3f8f7b17bf000080bf74ebf03efcd3b83e5572893b0ad723becd171fbe824ea53cc53c7ebf4154ecbdbec494be8e3ed63d997c73bf000080bf575df03e802cb93e16c890390ad723be6ccb1fbe86e02a3deb3b65bfaeece2be03d390bda132e13e993165bf000080bffec6f03e5290ba3e60562fbb0ad723be989919be00000000000080bf000000000000000000000000000080bf000080bf15cfed3e7b9cbb3e93ec93bb0ad723bec73f20be191cdc3c59e774bf677894be7e2809bc9368943e130075bf000080bfce15f13e5743bc3e5d562f3b0ad723be999919be00000000000080bf000000000000000000000000000080bf000080bf74b6ed3e90b6b93e6d562f3b0ad723becbcc4cbd00000000000080bf000000000000000000000000000080bf000080bf2ec4bb3e97b8b93e6b562fbb0ad723bececc4cbd00000000000080bf000000000000000000000000000080bf000080bfd2dcbb3e839ebb3e0677b4bb0ad723be06d723bd00000000000080bf000000000000000000000000000080bf000080bf3aebb63ee39fbc3e0677b43b0ad723be07d723bd00000000000080bf000000000000000000000000000080bf000080bf84b8b63ea0b7b83e38e7193c0ad723be54b0d0bc00000000000080bf000000000000000000000000000080bf000080bf6265af3e0357b73e2de719bc0ad723be5cb0d0bc00000000000080bf000000000000000000000000000080bf000080bfe1bbaf3e1601be3e57b0d0bc0ad723be38e719bc00000000000080bf000000000000000000000000000080bf000080bfbafda73ec4b5c33e5cb0d03c0ad723be23e719bc00000000000080bf000000000000000000000000000080bf000080bf2913a73efda2b13e0ad723bd0ad723be0677b4bb00000000000080bf000000000000000000000000000080bf000080bfb54fa63ee8dcc83e06d7233d0ad723befd76b4bb00000000000080bf000000000000000000000000000080bf000080bf65dfa43e027cac3ececc4cbd0ad723be6d562fbb00000000000080bf000000000000000000000000000080bf000080bfa613a53e1469cc3ececc4c3d0ad723be5d562fbb00000000000080bf000000000000000000000000000080bf000080bf4247a33ef3efa83e999919be0ad723be5d562fbb00000000000080bf000000000000000000000000000080bf000080bf0ae0a63e36e2ef3e6c2c1dbe0ad723be00000000835d95bd77517fbf000000000000000000000000000080bf000080bf059aa53e2c1ff13e6c2c1dbe0ad723bede1a70bb3755fdbe94775ebf000000000000000000000000000080bf000080bf786ea73e191ff13e9e081f3e0ad723be000000004e4f0f3ef56d7dbfc2c5a2bc334405bd13467d3c77d57fbf000080bf5a0ca03e0195833e9899193e0ad723be6d562fbb00000000000080bf000000000000000000000000000080bf000080bfde7aa13ed376853e20731e3e0ad723be1d9e83bb38bbba3e88ff6dbfde1754bd256915bd022d293d6d9c7fbf000080bf8e10a23eb6c8833e0ad7233e71c31fbe00000000ba917f3f18cf6bbd5f2be3bb56c7a4bb5dca073d25db7fbf000080bf1209a03e7d83803e1e5b213e205b21befaaf88bb5ae5243f446a42bfac4bbbbd7eac84bd4e0e853d96eb7ebf000080bf7022a23e0dec813e0ad7233ebd3d1fbe37ca8abbf27e733f32ed9cbe5b2d17bd2a47eabc8246013d88c47fbf000080bffc28a23e6055803e0ad7233e999919be77562fbb0000803f00000000000000000000000000000000000080bf000080bfde7aa13e78c87c3e0ad7233e2b811c3e00000000b2887d3f46ca0d3e000000000000000000000000000080bf000080bf0297a53e08111d3d0ad7233ececc4cbd6d562fbb0000803f00000000000000000000000000000000000080bf000080bf4247a33e0647363e0ad7233ecccc4c3d77562fbb0000803f00000000000000000000000000000000000080bf000080bfa613a53e248bdf3d0ad7233e07d723bd0e77b4bb0000803f00000000000000000000000000000000000080bf000080bf65dfa43ef6392f3e0ad7233e5cb0d0bc3ae719bc0000803f00000000000000000000000000000000000080bf000080bf2913a73e12fc243e0ad7233e9999193e6d562fbb0000803f00000000000000000000000000000000000080bf000080bf0ae0a63e7810253d0ad7233e2b811c3e1cfb63bbe3ad543f8f7d0e3f000000000000000000000000000080bf000080bfce53a73e74101d3d0ad7233e54b0d03c3ae719bc0000803f00000000000000000000000000000000000080bf000080bfbafda73efb0f013e0ad7233e05d7233d1877b4bb0000803f00000000000000000000000000000000000080bf000080bfb54fa63ecca4ed3d0ad7233e3ae719bc5cb0d0bc0000803f00000000000000000000000000000000000080bf000080bf6265af3edaa4193e0ad7233e1877b4bb06d723bd0000803f00000000000000000000000000000000000080bf000080bf84b8b63ed4e6163e0ad7233e2de7193c5cb0d0bc0000803f00000000000000000000000000000000000080bf000080bfe1bbaf3ee5650c3e0ad7233e77562fbbcecc4cbd0000803f00000000000000000000000000000000000080bf000080bf2ec4bb3e46e7143e0ad7233e60562f3bcecc4cbd0000803f00000000000000000000000000000000000080bf000080bfd1dcbb3e7921113e0ad7233efd76b43b07d723bd0000803f00000000000000000000000000000000000080bf000080bf3aebb63ebc220f3e0ad7233e6d562fbb989919be0000803f00000000000000000000000000000000000080bf000080bf72b6ed3e36e3143e0ad7233efdfb8932aefb1dbe980d7c3fb799deba661c33be6f1c33be00000000b00d7cbf000080bf12e6ef3e2200133e0ad7233efc4775bb87751dbe474a5a3fc7f090bde38004bf100e04bfae492e3d6d0a5bbf000080bf6893ef3eb1a3153e0ad7233e6b562f3b999919be0000803f00000000000000000000000000000000000080bf000080bf16cfed3e681d113e0ad7233e1300773bd08d1dbef820593f82cf6f3d6ec806bf567506bffd9315bd3fa559bf000080bfd6c1ef3ee257103ef85820bef75820be9ed46dbb78733dbfdc2c2cbf0000000075cb01bd75d10e3d39b77f3f000080bf789b2d3faae97e3e6c2c1dbe0ad723bede1a70bb3755fdbe94775ebf0000000022701fbd188fb53c39be7f3f000080bf018c2d3f73c1813e6c2c1dbe0ad723be00000000835d95bd77517fbf00000000268f0bbd094a233bbed97f3f000080bf02762e3f87d7813e0ad723be2e811cbe00000000a6cd7fbfe58620bd00000000ea5f03bb3459513d37aa7f3f000080bfd6912e3f98057a3e0ad723be2e811cbe52fb63bb4efc5ebfc680fbbe000000009abacdbcd366363d4daa7f3f000080bfa5b32d3fa9db793e0ad723be989919be59562fbb000080bf0000000000000000000000006ea7873d13707f3f000080bff4e62d3f3fe2773e0ad723be78c31f3e000000001b807dbff0b80d3e248888bc262bf2bb21c4893dc2697f3f000080bfd6912e3fd87ff73c0ad723bececc4cbd6d562fbb000080bf00000000000000000000000096a5873d17707f3f000080bff4e62d3f16f3303e0ad723bececc4c3d59562fbb000080bf000000000000000000000000a2ab873d0b707f3f000080bff4e62d3fd407d43d0ad723be0ad723bd0677b4bb000080bf000000000000000000000000e6a2873d1d707f3f000080bf13322d3f09b9293e0ad723be5cb0d0bc36e719bc000080bf0000000000000000000000001da6873d17707f3f000080bfdc392c3f853c1f3e0ad723be9999193e6d562fbb000080bf000000000000000000000000bfa5873d17707f3f000080bff4e62d3f00530c3d0ad723bec33d1f3e6eca8abb267f73bfeaeb9c3e9a2c17bd50cb80bc370a923d0c517f3f000080bf4e832d3f60ccf83c0ad723be57b0d03c23e719bc000080bf0000000000000000000000002ea4873d1b707f3f000080bfdc392c3f0e31f63d0ad723be09d7233df376b4bb000080bf0000000000000000000000006c0f873d56717f3f000080bf13322d3f68f3e13d0ad723be36e719bc5cb0d0bc000080bf0000000000000000000000005ca5873d17707f3f000080bfbb36283f7712133e0ad723be0677b4bb0ad723bd000080bf000000000000000000000000bba5873d17707f3f000080bffc96243fafa10f3e0ad723be2de7193c54b0d0bc000080bf00000000000000000000000031bd873de56f7f3f000080bfbc36283fe6be053e0ad723be6d562fbbcecc4cbd000080bf0000000000000000000000005fa5873d17707f3f000080bf4518223fe4260d3e0ad723be66562f3bcbcc4cbd000080bf00000000000000000000000025a5873d19707f3f000080bf4518223f385b093e0ad723befd76b43b06d723bd000080bf000000000000000000000000cc95873d39707f3f000080bffc96243f82d1073e0ad723befcfb8932b0fb1dbe990a7cbf5d49433b675b33bed3bd32bef7d88a3dbe787b3f000080bfbe13083f0f58063e0ad723be60562f3b989919be000080bf00000000000000000000000003a6873d17707f3f000080bf2425093fd3a5043e0ad723be0f48753b89751dbee0e058bfe968933d87c206bf083304bf7cb8f83d3602593f000080bf6e34083f97b6033e0ad723be74562fbb999919be000080bf0000000000000000000000009fa5873d17707f3f000080bf2425093f8071083e0ad723be410077bbd28d1dbedb4a5abf567b6cbdd5e904bf0f8d05bf1e602d3d77225a3f000080bf832e083f8609093ea7081fbe0ad7233e0000000000000000000000000000803f000000000000803f00000000000080bf1209a03e203a963b0ad723be78c31f3e0000000000000000000000000000803f000000000000803f00000000000080bf670b9e3e000000000ad723be2e811cbe0000000000000000000000000000803f000000000000803f00000000000080bf0048e53b000000006c2c1dbe0ad723be0000000000000000000000000000803f000000000000803f00000000000080bf00000000a05fd03b672c1d3e0ad7233e0000000000000000000000000000803f000000000000803f00000000000080bf1209a03e91c79c3e9e081f3e0ad723be0000000000000000000000000000803f000000000000803f00000000000080bf0000000025b09d3e0ad7233e2b811c3e0000000000000000000000000000803f000000000000803f00000000000080bfef739c3e1209a03e0ad7233e71c31fbe0000000000000000000000000000803f000000000000803f00000000000080bf40d77e3b1209a03ecbcc4c3d6b562f3b0ad723be00000000000000000000803f0a5835bfb4b134bf000000000000803fde755b3e12efe43e04d7233d0677b43b0ad723be00000000000000000000803f0a5835bfb4b134bf000000000000803f53b35b3e9666e03e54b0d03c2de7193c0ad723be00000000000000000000803f0a5835bfb4b134bf000000000000803f8a0e5c3e91e5d93e57b0d0bc2de7193c0ad723be00000000000000000000803ff3672e3f3f663bbf000000000000803f03f3863e79973b3f09d723bdfd76b43b0ad723be00000000000000000000803ff3672e3f3d663bbf000000000000803fd1488a3e90c9383fcecc4cbd60562f3b0ad723be00000000000000000000803ff3672e3f3d663bbf000000000000803fce9c8c3e8dd5363f0ad723be57b0d03c23e719bc0000803f000000000000000000000000000000000000803f0000803fb837793f62e9d53e0ad723be09d7233df376b4bb0000803f000000000000000000000000000000000000803f0000803f3ca6763f69c6d03e0ad723bececc4c3d59562fbb0000803f000000000000000000000000000000000000803f0000803f96e1743f1c3dcd3e6b562fbb0ad723bececc4cbd000000000000803f000000000000000000000000000080bf0000803fd2dcbb3e839ebb3e0677b4bb0ad723be06d723bd000000000000803f000000000000000000000000000080bf0000803f3aebb63ee39fbc3e2de719bc0ad723be5cb0d0bc000000000000803f000000000000000000000000000080bf0000803fe1bbaf3e1601be3ecccc4cbd77562fbb0ad723be00000000000000000000803f9f2f8cbea337763f000000000000803fe199563fb2edf83e05d723bd1877b4bb0ad723be00000000000000000000803f9f2f8cbea337763f000000000000803f3623583f47e5f53e54b0d0bc3ae719bc0ad723be00000000000000000000803fa02f8cbea337763f000000000000803f28625a3f0c78f13e0ad723bececc4cbd6d562fbb0000803f00000000000000000000000000000000000080bf000080bff2f8773f3ae3fb3e0ad723be0ad723bd0677b4bb0000803f00000000000000000000000000000000000080bf000080bf5dd6793f588ef83e0ad723be5cb0d0bc36e719bc0000803f00000000000000000000000000000000000080bf000080bfd48b7c3f81b7f33e38e7193c0ad723be54b0d0bc000000000000803f0000000046ec7f3f00000000b3fcc8bc0000803fe4026f3f2cfa5e3c0677b43b0ad723be07d723bd000000000000803f0000000046ec7f3f00000000b4fcc8bc0000803f7b9f6e3ff6f4e33c6d562f3b0ad723becbcc4cbd000000000000803f0000000046ec7f3f00000000b3fcc8bc0000803ff7536e3fd7151a3d5cb0d03c3ae719bc0ad723be00000000000000000000803ff3b4acbefcfe703f000000000000803fd429753f5968603f07d7233d0e77b4bb0ad723be00000000000000000000803ff3b4acbefcfe703f000000000000803ff5c3723fc6845d3fcecc4c3d6d562fbb0ad723be00000000000000000000803ff3b4acbefbfe703f000000000000803f9e1b713f01855b3f9c15323e2bc0573c80b9d5bc026c063f4d723fbf84fdcf3e96198f3e264199be648c69bf000080bfd0dbaf3e1cbcff3d0ad7233e2de7193c5cb0d0bcc779733efa4f48bf4b54133fd0d0993e781301bff0444fbf000080bfe1bbaf3ee5650c3e0ad7233efd76b43b07d723bdc1fb813e458c6ebf10c5843e9f71553e6e1c56be949674bf000080bf3aebb63ebc220f3e0ad7233e60562f3bcecc4cbd3a4b843efd3c77bfab21ba3c0cf7a03debf61ebb11357fbf000080bfd1dcbb3e7921113e992a333e4fe2da3bcfcc4cbd88f80f3f9c8053bfb5b20a3d13e0203dafe468bccfc67fbf000080bf58aabb3e53b0033e0ad7233e6b562f3b999919be9053843e8f4c77bf484fa2bbf0f498bd489d73bcb4417fbf000080bf16cfed3e681d113e992a333e4fe2da3b989919bef1ed0f3f2b8753bf9aae0bbdfb0f22bdae826a3cf7c57fbf000080bf9c9ced3e43ac033e0ad7233e1300773bd08d1dbea8467f3e7a896ebf6d1a87be414759be9d6b5a3e7d2374bf000080bfd6c1ef3ee257103ebeb1203ef00d7a3bc0b120be0ba6723e94dc71bf5ad467befe863cbe9c953d3eab1e77bf000080bf5158f13e497d123ed18d1d3e2600773b0ad723be7ca8823e80686ebf691c85be8a2b50bec243583efac074bf000080bf02eff23e90b2143eb9f5453e9911cd3ccfcc4cbd6a2e5e3f064afdbeed41383d3084b13c4f2358bd49957fbf000080bf58aabb3ec874d33d9c15323e2bc0573c9c1532be5d30ea3e582743bf546feabe5fc29bbee90ab33e38d762bf000080bf9eb0f93e1ab0ff3d9899193e60562f3b0ad723be4fa6a83ceb3f77bfcd4c84beeebb66bee2417d3e1e3f71bf000080bfc0fbf23e3b35183e9899193e4fe2da3b992a33beb6b20a3d9c8053bf88f80fbfb2b77fbe8ab1093f3f214ebf000080bfee87fa3edb61153ecbcc4c3d4fe2da3b992a33beb2b20abd9d8053bf87f80fbf3be980be69360d3fc4914bbf000080bf5254fc3e1d545c3ecbcc4c3d6b562f3b0ad723be7b29e0bc432d77bfc08584bee0be7ebed1c4833ecc096fbf000080bf24c8f43e7c275f3ec9503f3e7bb9d53c9c1532be55ee4e3f5625d5be4f25d5bebef7a3be929a903e247d67bf000080bf9eb0f93e3c22db3d9d15323e7db9d53cc9503fbe5525d53e5525d5be54ee4ebfcc0012bf19a4123f75b716bf000080bf1d30003fb076ed3db9f5453e9711cd3c989919be6a2e5e3f064afdbeeb4138bda5dab2bc03f8563d0a967fbf000080bf9c9ced3eac6cd33dc9503f3e7db9d53c80b9d5bc54ee4e3f5525d5be5825d53e08e4a33e1dbd90be3c7b67bf000080bfd0dbaf3e402edb3d9c15323e7bb9d53c40c057bc0a29043fb7b5cdbeed9f413fcd790c3f26db05bf04fd26bf000080bf2ea3a93ecc84ed3dcbcc4c3ececc4c3dcbcc4cbd7e487f3fa09758bda697583de3133f3d4600e7bdf9157ebf000080bf8afebb3e7cc5a63db9f5453ececc4c3da011cdbc692e5e3fee4138bd0a4afd3eee81f03ef48e7fbe6fc758bf000080bfeba4af3eee41b03dcbcc4c3ecccc4c3d989919be7e487f3fa39758bd9e9758bdeb2b3fbd0334e63dcc187ebf000080bfcdf0ed3e5cbda63db9f5453ececc4c3d992a33be6a2e5e3feb4138bd064afdbe188af0be002d7f3e62cc58bf000080bfee87fa3ec035b03db9f5453e9899193e992a33be6a2e5e3fea41383d064afdbebd6ff8be4e7a943e852c53bf000080bf5254fc3e70cb8c3ccbcc4c3e9999193e999919be7e487f3fa297583d9f9758bd1d4378bd9a19213ede557cbf000080bf32bdef3ec0d34d3cc9503f3e9c15323e9d1532be54ee4e3f5825d53e5525d5be18740abf05937b3e7cf04dbf000080bf2d59fc3ec006ab3bb9f5453e982a333e989919be692e5e3f064afd3ef04138bde24223bed73e443ee1ea77bf000080bfe44ef03e00000000b9f5453e982a333ecfcc4cbd692e5e3f064afd3eed41383d8f86233eccb844be0de277bf000080bfa15cbe3e00408237cbcc4c3e9999193ecbcc4cbd7e487f3fa397583da397583d575a783d4b9c21be8e507cbf000080bfedcabd3eb0144e3cb9f5453e9899193ea011cdbc692e5e3ff041383d0b4afd3e3869f83e17b594be192453bf000080bf4f71b13e30fc8c3cc9503f3e9c15323e80b9d5bc51ee4e3f5825d53e5a25d53e327c0a3fd00c7cbebae14dbf000080bf5e84b23e00c7ab3b9c15323e7bb9d53c40c057bc0a29043fb7b5cdbeed9f413fcd9e29bf1d373fbfd636633d000080bf05e1d83e2a523b3f0ad7233e2de7193c5cb0d0bcc779733efa4f48bf4b54133fac9029bf366110bf307efcbe000080bfd0b3e33e16d43a3f9c15323e2bc0573c80b9d5bc026c063f4d723fbf84fdcf3ead4e1ebf2fc829bf21dcd7be000080bfc272dd3e4c09393f0ad7233e54b0d03c3ae719bcdb87753e013e0bbf0ddd4d3fa1b133bfa25a2bbfba4879be000080bffc03de3e00ac3d3f992a333ececc4c3d60e2dabbbe09113f0c62f7bcf6ce523fe5a01cbf87502fbf56aaca3e000080bfbe0cd03ea65c3f3f0ad7233e05d7233d1877b4bb5bf4783ec51c82be4aa56f3f20ff34bf8a0735bf74c308bc000080bf05e1d83e7c3d403fc9503f3e7db9d53c80b9d5bc54ee4e3f5525d5be5825d53e9a2e15bfb1992abfc920ee3e000080bf474fd43e4c09393fb9f5453ececc4c3da011cdbc692e5e3fee4138bd0a4afd3e2999cfbe92b523bf2937273f000080bf408fc93ee71d3c3f0ad7233ecccc4c3d77562fbb6451843eec474cbc6948773f29352fbf4c4235bfe424323e000080bfb857d53e2202423fb9f5453e9899193ea011cdbc692e5e3ff041383d0b4afd3e974bc8be16460dbfcf8a3c3f000080bf4932a63e63cc4d3f992a333e9899193e60e2dabb8bf80f3fb7b20a3d9c80533f604f21bf322221bf5cd1e83e000080bfc6afac3e220b513f0ad7233e9999193e6d562fbb154d843eccb3a53c6140773fd69233bf1ef92ebf3cd54e3e000080bfc0fab13e9fb0533f9c15323e9c15323e40c057bcf473ef3e2e75ef3eb801403fe7c407bff3c407bf0b52293f000080bfd09aa43e4575553fc9503f3e9c15323e80b9d5bc51ee4e3f5825d53e5a25d53ea47b86bee772c1be3e49633f000080bf1309a03e662c533f0ad7233e2b811c3e1cfb63bb9c467f3e7c1a873e7a896e3f54ae28bfe3ad28bfcbcbb93e000080bff6f9b03e0331543ff558203ef558203e62d46dbb0e14833e4ead833eb38c6e3f1bae28bf1bae28bfd0cbb93e000080bffcdab03e4575553f672c1d3e0ad7233eb01a70bb731a873eb6467f3e78896e3f16ae28bf1fae28bfd0cbb93e000080bfd4beb03ef59b563f9c15323ec7503f3e80b9d5bc5525d53e51ee4e3f5f25d53ea572c1bed47b86be4449633f000080bf1409a03e23be573f9999193e0ad7233e74562fbb0595a73cf64c843e1440773f98f92ebf8e8f33bf63fc4e3e000080bfc0fab13eeb39573f9899193e982a333e60e2dabbb0b20a3d8bf80f3f9c80533f2d2221bf644f21bf5dd1e83e000080bfc8afac3e68df593f9899193eb9f5453ea011cdbcf741383d672e5e3f124afd3e0d460dbfa44bc8bed38a3c3f000080bf4932a63e271e5d3fcbcc4c3db9f5453ea011cdbcf74138bd662e5e3f144afd3e3ec018bf664dd7be3bf82e3f000080bf408fc93ea2cc6e3fcbcc4c3d0ad7233e74562fbbc3474cbc6a51843e6748773f754235bf01352fbfc524323e000080bfb857d53e67e8683fcbcc4c3d982a333e60e2dabbd7f800bd13ab103fcf0c533fa80933bffd0a1abfd681c53e000080bfbf0cd03ee48d6b3f06d7233d0ad7233e0e77b4bb2ea785bee218813e838b6e3faaf434bf341335bf170dd9bb000080bf04e1d83e0dad6a3f78b9d53c9c15323e40c057bc632bcfbe4b91053fe543403f214e52bfd57411bf551344bd000080bf05e1d83e5f986f3f54b0d03c0ad7233e3ae719bc485413bfc979733efe4f483f618926bfb38136bfcf0e86be000080bffc03de3e893e6d3f23e7193c0ad7233e5cb0d0bc0ddd4dbfcf87753e043e0b3f89cf0abf9fbb2bbf178501bf000080bfd0b3e33e7316703f20c0573c9c15323e80b9d5bceb9f41bf0a29043fb5b5cd3e1f4827bf200b20bfd787dabe000080bfc272dd3e3ee1713fb9f5453ececc4c3d992a33be6a2e5e3feb4138bd064afdbe216dc7bce0a77d3fdbfe07be000080bfaebd143f1ce32e3fc9503f3e7bb9d53c9c1532be55ee4e3f5625d5be4f25d5be22b5693e5b965f3f1748dcbe000080bf10c30e3f7882303f9d15323e7db9d53cc9503fbe5525d53e5525d5be54ee4ebf6c3cb83b2be3633fc03fe9be000080bf10c30e3f99bd333f992a333ececc4c3db9f545be064afd3eeb4138bd6a2e5ebff60f25bdec137f3f0dd098bd000080bfaebd143ff679333f992a333e9899193eb9f545be064afd3eea41383d6a2e5ebf8a10253dec137f3f36d0983d000080bf18bf2d3ff679333fb9f5453e9899193e992a33be6a2e5e3fea41383d064afdbed76cc73ce0a77d3fc9fe073e000080bf18bf2d3f1ce32e3fc9503f3e9c15323e9d1532be54ee4e3f5825d53e5525d5be67a913be3558533fa1aa0b3f000080bfb6b9333f7882303f9c15323e9c15323ec9503fbe5125d53e5725d53e55ee4ebf7e53863c48ac623ff1cded3e000080bfb6b9333f9abd333f9c15323ec7503f3e9c1532be5a25d53e53ee4e3f5725d5be40faf5bd7fb3003f57265b3f000080bfd7f4363f9abd333f9899193eb9f5453e992a33befa41383d672e5e3f0e4afdbea2a349bcf1c5fd3ebc515e3f000080bf3394383f37b8393f9899193e9999193ecbcc4cbe9e97583da297583d7e487fbf42558b3baea27f3f93d0593d000080bf18bf2d3f37b8393f9999193ececc4c3dcbcc4cbe9f97583d9e9758bd7e487fbf17528bbbaea27f3f89d059bd000080bfaebd143f37b8393f9899193e982a333eb9f545bef241383d064afd3e692e5ebf0000000034685e3f328bfd3e000080bf59fd333f37b8393fcfcc4c3d982a333eb9f545bef04138bd084afd3e692e5ebf75fc7d3b496d5e3f6177fd3e000080bf59fd333fa1b9523fcfcc4c3db9f5453e992a33bef94138bd672e5e3f0e4afdbea0a3493cf1c5fd3ebc515e3f000080bf3394383fa1b9523fcbcc4c3d9999193ecbcc4cbea39758bd9f97583d7e487fbf7e5a8bbbaea27f3f9ad0593d000080bf18bf2d3fa2b9523f80b9d53c9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf14a6923dd8b9663f20c6da3e000080bfb6b9333f3fb4583f9899193e9911cd3cb9f545beed41383d064afdbe6a2e5ebf0000000034685e3f308bfdbe000080bf6c7f0e3f37b8393f9c15323e2bc0573c9c1532be5d30ea3e582743bf546feabe8f7fce3d8f580e3f5d3453bf000080bfef870b3f99bd333f9899193e4fe2da3b992a33beb6b20a3d9c8053bf88f80fbf8babd23bb918103f869653bf000080bf92e8093f37b8393fcbcc4c3d4fe2da3b992a33beb2b20abd9d8053bf87f80fbf83abd2bbb618103f879653bf000080bf92e8093fa1b9523fcbcc4c3d9711cd3cb9f545beea4138bd064afdbe692e5ebf0000000034685e3f328bfdbe000080bf6c7f0e3fa1b9523fcbcc4c3dcccc4c3dcbcc4cbea09758bda39758bd7e487fbf355c8b3baea27f3f9fd059bd000080bfaebd143fa2b9523f78b9d53c7bb9d53cc9503fbe5125d5be5125d5be57ee4ebfde34b8bb29e3633fc73fe9be000080bf10c30e3f3fb4583f78b9d53c2bc0573c9c1532be9ff1ccbe033142bf0ba003bfbfd58fbd61b6153f09e14ebf000080bfef870b3f3fb4583fa011cd3c9899193eb9f545be064afdbefa41383d692e5ebfeb0f25bdec137f3f15d0983d000080bf18bf2d3fe2f7583f9811cd3ccecc4c3db9f545be064afdbed54138bd6a2e5ebf3a10253dec137f3f14d098bd000080bfaebd143fe2f7583f20c0573c7db9d53c9d1532bee34340bf642bcfbe4f9105bf96ce34bec96f623fd614ddbe000080bf10c30e3f60ef5b3f40e2da3bcecc4c3d992a33becf0c53bfb1f800bd13ab10bfceb32e3deefd7d3f38a6f0bd000080bfaebd143fbd8e5d3f60e2da3b9899193e992a33be9c8053bfd0b20a3d8af80fbf7fa425bd36f77d3f9900f43d000080bf18bf2d3fbc8e5d3f40c0573c9c15323e9c1532beb5d23fbfc8bfef3ef9bfefbe444d763e55ec593f9ec7ee3e000080bfb6b9333f60ef5b3fb9f5453e982a333e989919be692e5e3f064afd3ef04138bd2bb866bdf67e403eaf057b3f000080bfd0322d3d1209a03ec9503f3e9c15323e9d1532be54ee4e3f5825d53e5525d5be3bfd063eeba80f3fbb2f513f000080bf30e39a3c7425a33e9c15323ec7503f3e9c1532be5a25d53e53ee4e3f5725d5be089229bd67cff23ed521613f000080bf08bf9e3ca24aa73e992a333eb9f5453e989919be104afd3e672e5e3ffb4138bd39edaebd47f0cc3d57c67d3f000080bf58f02f3d5ceca53e992a333eb9f5453ecfcc4cbd0e4afd3e672e5e3ffa41383d7ce9ed3d684ef0bd797c7c3f000080bfe9ef0f3e4a80a63eb9f5453e982a333ecfcc4cbd692e5e3f064afd3eed41383d4581a03d673567beaa94783f000080bf86400f3e009da03ec9503f3e9c15323e80b9d5bc51ee4e3f5825d53e5a25d53e35a2dabd7a7c17bf038d4c3f000080bfa11c273e2200a43e9c15323ec7503f3e80b9d5bc5525d53e51ee4e3f5f25d53eb6a4923dc49ef8be550a5f3f000080bf1a98273e4e25a83e9899193ecbcc4c3ecbcc4cbda097583d7e487f3fa997583d92827f3dbcfb65bdc8187f3f000080bfc02f103e2757b13e9899193eb9f5453ea011cdbcf741383d672e5e3f124afd3e6bc3bb3df84ffebec7f15c3f000080bf79e4283eae84b23e9999193ecbcc4c3e989919bea497583d7e487f3fa09758bd1a0a18bd17c9603d01707f3f000080bfb0ef303d38c3b03e9899193eb9f5453e992a33befa41383d672e5e3f0e4afdbea47688bde450fe3edf875d3f000080bf203c983ce1a6b13ecfcc4c3db9f5453e992a33bef94138bd672e5e3f0e4afdbe30b8f7bdff41f93eeb755d3f000080bf283c983ca834e13ecbcc4c3dcbcc4c3ecbcc4cbda69758bd7e487f3fa897583dd34b473d84194ebd435f7f3f000080bfbf2f103eefe4e03ecbcc4c3db9f5453ea011cdbcf74138bd662e5e3f144afd3e1374113ef01ff8be21f55c3f000080bf79e4283e7512e23ecbcc4c3dcbcc4c3e999919bea79758bd7e487f3fa79758bd9d4ad0bc8451533d82937f3f000080bfacef303d0051e03e80b9d53cc7503f3e9c1532be5f25d5be51ee4e3f5525d5bea96aecbd4d78d03e84f1673f000080bf10bf9e3c0e96ed3ecfcc4c3d982a333eb9f545bef04138bd084afd3e692e5ebf31446abe9e30573fe063fb3e000080bf0000000078f0e33e80b9d53c9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf724ca1bea995443fbac70e3f000080bf2046ce3bbf82ef3e40c0573c9c15323e9c1532beb5d23fbfc8bfef3ef9bfefbe688670be4047f23e425c593f000080bf40e39a3cd7baf53ea011cd3cb9f5453e989919be104afdbe672e5e3f024238bd897a273c8ece6b3de18f7f3f000080bf58f02f3d0a39ed3e9811cd3cb9f5453ecfcc4cbd104afdbe672e5e3fe341383d3e82273cb3323cbd5db77f3f000080bfe9ef0f3ef9cced3e40e2da3b982a333ecfcc4cbdf9ce52bfbb09113fc761f73c6a7defbc2ba3c3bd2ab87e3f000080bf86400f3e325ef93e60e2da3b982a333e989919be9c8053bf8af80f3fccb20abd1af8363d7b4e003e93b97d3f000080bfd0322d3d43caf83e78b9d53cc7503f3e80b9d5bc5a25d5be53ee4e3f5a25d53ef988093e97dccbbe1e4d683f000080bf1b98273eba70ee3e78b9d53c9c15323e40c057bc632bcfbe4b91053fe543403ff6728d3e3f9136bf17ef243f000080bfd706343ea683f03ecbcc4c3d982a333e60e2dabbd7f800bd13ab103fcf0c533f60ca6f3ec3354cbff0440e3f000080bf398d3a3e9204e53e20c0573c9c15323e80b9d5bceb9f41bf0a29043fb5b5cd3e215b403ea575d5beb8aa633f000080bfa11c273e8495f63e23e7193c0ad7233e5cb0d0bc0ddd4dbfcf87753e043e0b3f7babc43ef336fabe0989483f000080bffc34273ef888fa3ef376b43b0ad7233e07d723bd4ba56fbf61f4783eb81c823e1a99103e1acccdbe009b673f000080bf49b0183e934cfc3e59562f3b0ad7233ececc4cbd694877bf6451843e47474c3c5cf506bd84c22ebe6d1a7c3f000080bf80b10e3e8896fd3e74562f3b0ad7233e989919beb03e77bf2f4c843ecb2eb0bc32bf0c3dbccc563e5a267a3f000080bfb0f62a3d9a02fd3ea9ec933b0ad7233ec73f20be7a896ebfb1467f3e6f1a87be833108be2042e23ee91b633f000080bfb000113d2319fc3e33d2913bcddf213eccdf21bea38c6ebf5df9833eebc782be4a5102beada7da3e4d2d653f000080bf045f0a3da46afc3edb078d3b0a7d1f3e0ad723be78896ebf701a873ec5467fbe45b1fdbd1e2bd43e2bd1663f000080bf1859023de3d5fc3e77562f3b9999193e0ad723be0b3f77bf0d10ae3c574c84be4c7f67bee17ad63ec622613f000080bf507d013de87ffe3e60e2da3b9899193e992a33be9c8053bfd0b20a3d8af80fbfc16ef8be8ad7ed3e5ca43d3f000080bf604c8b3c4982fc3e78b9d53c2bc0573c9c1532be9ff1ccbe033142bf0ba003bfe7e4a7be838acfbe4c735a3f000080bf03034e3ee8c6d83ecbcc4c3d4fe2da3b992a33beb2b20abd9d8053bf87f80fbfba676abe2a950abf831d4f3f000080bf625f4c3e1084e33ecbcc4c3d6b562f3b0ad723be7b29e0bc432d77bfc08584be111e53be95dc7dbec453723f000080bfde755b3e12efe43e54b0d03c2de7193c0ad723bea39706bf179650bf81347abe2c4937be3c0b33be45db773f000080bf8a0e5c3e91e5d93e21e7193c57b0d03c0ad723befd4f48bf4a5413bfb87973bef13e2cbe536d30beca77783f000080bf8a0e5c3eea85ce3e20c0573c7db9d53c9d1532bee34340bf642bcfbe4f9105bf308ed2be13c1a9befe5d593f000080bf01034e3e6ea3cf3e78b9d53c7bb9d53cc9503fbe5125d5be5125d5be57ee4ebf818212bf7b2212bf7bb7163f000080bf6bab403e2e33d43eeb76b43b0ad7233d0ad723be888b6ebf1ca785beca1881beb2684fbe544c4fbe4e47753f000080bf52b35b3e6101c83e40e2da3bcecc4c3d992a33becf0c53bfb1f800bd13ab10bfd97c0abf3ebc7fbe86984d3f000080bf635f4c3e8ce0c43e54562f3bcecc4c3d0ad723be694877bf31474cbc595184beb20c7fbe5b0367bea01c713f000080bfde755b3e8776c33e60e2da3b9899193e992a33be9c8053bfd0b20a3d8af80fbf2b320dbf003181be57894b3f000080bf0306493e1873a13e77562f3b9999193e0ad723be0b3f77bf0d10ae3c574c84be4dc482bee55c7fbe78226f3f000080bf7d1c583e1209a03e2bc057bc9c15323e80b9d5bc4b723f3f076c063f82fdcf3eca56e73c44f222bf0150453f000080bf29ac9b3e6c1a673f2de719bc0ad7233e5cb0d0bcf94f483fc879733e4c54133fd7d35abe9bfb43bfd1591b3f000080bf7b1c9e3e1fc4653ffd76b4bb0ad7233e07d723bd478c6e3fc6fb813e0bc5843e7ca7dfbc01db29bff1673f3f000080bf6e4e973e2c6c643f66562fbb0ad7233ececc4cbdfd3c773f454b843eb021ba3c5865313e792e35bfcd552f3f000080bf1898923e9185633f4fe2dabb982a333ecfcc4cbd9d80533f87f80f3fb1b20a3d84f9b83e782f13bfa9ee3b3f000080bf2f3d903eca0e653f4fe2dabb982a333e989919beb628533f3e80103fd94e03bd0771fa3e111e2fbfd3860a3f000080bfe5244c3e56ac573f66562fbb0ad7233e999919beda4b773f3953843ea3e8dfbb0de0623ef95c50bfaf7d093f000080bfb8da503e1d23563f9e7289bb0ad7233ed4171fbe7c896e3fb9467f3e5a1a87bef412b33eb6a84fbf4af9ef3e000080bfb1dc4c3e342f553f2bc057bc9c15323e9d1532be8729403f722fef3edf39efbe2662233f8e1532bf88daa83e000080bf83ae3a3e6651533f24678bbbcde5223ef83220be7d896e3f95467f3e601a87beeb12b33eada84fbf6df9ef3e000080bf0c594c3eebe5543f6fe889bbdb6c213edb6c21be458c6e3f2acb843e91f581be75a2b43ef3b04fbf78b0ee3e000080bfc3e84b3eb289543f606284bbca881e3e0ad723be7c896e3f681a873e97467fbe1c4fb53e28d14fbfecbced3e000080bfa8034b3e82d7533f60562fbb9999193e0ad723be793f773f5065ab3c904c84be29e32f3e33574cbf02cf133f000080bf1e814c3ee55b533f4fe2dabb9899193e992a33be9d80533fa9b20a3d87f80fbf120aba3e627d4bbf93ccf83e000080bf8c48413e9fbc503f4fe2dabbcecc4c3d992a33bed10c533fd9f800bd10ab10bfa60faf3e319944bf13a60a3f000080bf001e6a3ee056423f6b562fbbcccc4c3d0ad723be6b48773fd7474cbc585184be88ca2b3e21f03abfa38b293f000080bf9356753e26f6443f0677b4bb05d7233d0ad723be858b6e3f24a785bed01881be005bb73bf62f2fbfe9a93a3f000080bfa4697a3e8815433f2bc057bc7bb9d53c9c1532bee443403f682bcfbe499105bf75d89c3d3f433bbfc3722d3f000080bfef0a773e16093e3f2de719bc54b0d03c0ad723befa4f483f4a5413bfca7973be60a130bee83511bfc0274e3f000080bf1ada803e6a64403f7db9d5bc2bc0573c9c1532be99f1cc3e023142bf0fa003bf569745be48461ebf250d433f000080bfa46b803ea52d3a3f7bb9d5bc7db9d53cc9503fbe5525d53e5325d5be54ee4ebfbd44173e5fa358bf790c033f000080bfffaa703e264f3a3f57b0d0bc2de7193c0ad723bea397063f179650bf8f347abe5537a1bec310e8be7f7b553f000080bf03f3863e79973b3fcecc4cbd60562f3b0ad723be6c29e03c432d77bfc18584be150aeebe3a4f77bee90d5a3f000080bfce9c8c3e8dd5363fcecc4cbd4fe2da3b992a33beb8b20a3d9c8053bf88f80fbfe551f0be3b8b02bfd98a383f000080bfd67b853e4c68353f999919be4fe2da3b992a33beb2b20abd9c8053bf88f80fbfab530abfed9eeabe53aa343f000080bf84fb963eeff3253f999919be6b562f3b0ad723be4462a8bcf63f77bfd24c84bef6fd02bf2ef658beb027553f000080bf7b1c9e3e2f61273f4fe2dabbcecc4c3d992a33bed10c533fd9f800bd10ab10bf6ab32ebdf0fd7d3f1ca6f0bd000080bfbf63363f87d7813e2bc057bc7bb9d53c9c1532bee443403f682bcfbe499105bfb3ce343ec86f623fd314ddbe000080bf2169303f3f16853e7bb9d5bc7db9d53cc9503fbe5525d53e5325d5be54ee4ebf0135b83b28e3633fc93fe9be000080bf2169303f828c8b3e9711cdbccecc4c3db9f545be064afd3ee94138bd692e5ebf621025bdec137f3f2dd098bd000080bfbf63363f3b058b3e9911cdbc9899193eb9f545be064afd3ee641383d6a2e5ebf8a10253dec137f3f34d0983d000080bf29654f3f3b058b3e4fe2dabb9899193e992a33be9d80533fa9b20a3d87f80fbff0a4253d34f77d3fcd00f43d000080bf29654f3f87d7813e2bc057bc9c15323e9d1532be8729403f722fef3edf39efbe16471cbeb5854f3f7eb8103f000080bfc75f553f4016853e7db9d5bc9c15323ec9503fbe5325d53e5525d53e54ee4ebf0353863c48ac623ff1cded3e000080bfc75f553f828c8b3e7cb9d5bcc7503f3e9c1532be5c25d53e53ee4e3f5425d5be3cfaf5bd7eb3003f59265b3f000080bfe89a583f828c8b3ececc4cbdb9f5453e992a33befe41383d672e5e3f0e4afdbea4a349bcf1c5fd3ebc515e3f000080bf443a5a3fbe81973ececc4cbd9999193ecbcc4cbea297583da797583d7e487fbf34558b3baea27f3f97d0593d000080bf29654f3fbe81973ecccc4cbdcecc4c3dcbcc4cbea497583da09758bd7e487fbfda548bbbaea27f3f93d059bd000080bfbf63363fbe81973ececc4cbd982a333eb9f545bef441383d064afd3e6a2e5ebf0000000035685e3f308bfd3e000080bf6aa3553fbe81973e989919be982a333eb9f545bef04138bd064afd3e692e5ebf86127e3b496d5e3f5d77fd3e000080bf6aa3553f9384c93e989919beb9f5453e992a33befa4138bd672e5e3f0e4afdbea0a3493cf1c5fd3ebc515e3f000080bf443a5a3f9384c93e999919be9999193ecbcc4cbea39758bda497583d7e487fbf04548bbbaea27f3f96d0593d000080bf29654f3f9384c93e9c1532be9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf61a6923ddab9663f19c6da3e000080bfc65f553fce79d53ececc4cbd9911cd3cb9f545bef041383d064afdbe6a2e5ebf0000000035685e3f2e8bfdbe000080bf7d25303fbe81973e7db9d5bc2bc0573c9c1532be99f1cc3e023142bf0fa003bfc4d58f3d62b6153f07e14ebf000080bf002e2d3f828c8b3ececc4cbd4fe2da3b992a33beb8b20a3d9c8053bf88f80fbf8fabd23bb918103f869653bf000080bfa38e2b3fbe81973e999919be4fe2da3b992a33beb2b20abd9c8053bf88f80fbf7fabd2bbb718103f869653bf000080bfa38e2b3f9384c93e999919be9711cd3cb9f545beeb4138bd064afdbe692e5ebf0000000034685e3f328bfdbe000080bf7d25303f9384c93e999919becccc4c3dcbcc4cbea29758bda39758bd7e487fbf83558b3baea27f3f96d059bd000080bfbe63363f9384c93e9d1532be7bb9d53cc9503fbe5025d5be5125d5be57ee4ebfea32b8bb28e3633fc93fe9be000080bf2169303fce79d53e9d1532be2bc0573c9c1532be7b20eabec83043bfc35feabe23a1cebd7c4e0e3fa33a53bf000080bfff2d2d3fce79d53e982a33be9899193eb9f545be064afdbefb41383d692e5ebf0f1025bdec137f3f1fd0983d000080bf29654f3f1401d63e992a33bececc4c3db9f545be064afdbed84138bd6a2e5ebf7a10253dec137f3f27d098bd000080bfbe63363f1501d63eca503fbe7db9d53c9d1532be58ee4ebf4e25d5be4e25d5beecb469be5a965f3f3448dcbe000080bf2169303f11f0db3eb9f545bececc4c3d992a33be692e5ebfd04138bd084afdbe7c6dc73cdea77d3fddfe07be000080bfbe63363fca2edf3eb9f545be9899193e992a33be692e5ebf0342383d0a4afdbe976dc7bcdea77d3ffcfe073e000080bf29654f3fc92edf3ec7503fbe9c15323e9c1532be51ee4ebf5f25d53e5625d5be18b5693e5a965f3f2948dc3e000080bfc65f553f10f0db3e4fe2dabb982a333e989919beb628533f3e80103fd94e03bdeaaebcbd84b4423e7a387a3f000080bf1257143f23fbfd3e2bc057bc9c15323e9d1532be8729403f722fef3edf39efbe843be93d27e81a3fa8b7493f000080bfb35f0e3f739d003f7cb9d5bcc7503f3e9c1532be5c25d53e53ee4e3f5425d5be4ad068bd09d0f53e2c18603f000080bfb4840e3fa5af023f9711cdbcb9f5453e989919be104afd3e672e5e3ff74138bdb9c2cebdbad4de3d142a7d3f000080bfa08b143fa8ee013f9911cdbcb9f5453ecfcc4cbd0e4afd3e672e5e3ff441383d4cc2ce3d78d4debd152a7d3f000080bf02892d3fa7ee013f4fe2dabb982a333ecfcc4cbd9d80533f87f80f3fb1b20a3d79d6b83d570744be6b337a3f000080bf74542d3f23fbfd3e2bc057bc9c15323e80b9d5bc4b723f3f076c063f82fdcf3eec1d48bd321411bf088d523f000080bf6450333f729d003f7db9d5bcc7503f3e80b9d5bc5825d53e51ee4e3f5a25d53eb3cf683d09d0f5be2c18603f000080bf6475333fa4af023fcecc4cbdcbcc4c3ecbcc4cbda397583d7e487f3fa997583d8d184c3d086b63bd61497f3f000080bf02a92d3fcf59073fcecc4cbdb9f5453ea011cdbcf841383d672e5e3f124afd3e5a71a23d9455febe5f405d3f000080bfd4d7333f47de073fcccc4cbdcbcc4c3e989919bea797583d7e487f3fa39758bdb5194cbd106b633d5f497f3f000080bfa0ab143fcf59073fcecc4cbdb9f5453e992a33befe41383d672e5e3f0e4afdbe7c72a2bd9155fe3e5c405d3f000080bff35f0e3f48de073f989919beb9f5453e992a33befa4138bd672e5e3f0e4afdbe56d606be40b2f83eb4375d3f000080bf53a60e3fc3a41f3f999919becbcc4c3ecbcc4cbda79758bd7e487f3fab97583d76f8173dcbb550bdb07d7f3f000080bf63ef2d3f4b201f3f999919beb9f5453ea011cdbcf74138bd672e5e3f124afd3e20d6063e43b2f8beb5375d3f000080bf341e343fc3a41f3f999919becbcc4c3e999919bea89758bd7e487f3fa79758bdadf817bdc5b5503dae7d7f3f000080bf00f2143f4b201f3f9c1532bec7503f3e9c1532be5f25d5be51ee4e3f5a25d5be8e0b00be3323ce3e5d23683f000080bfbcec0e3fc1d4253f989919be982a333eb9f545bef04138bd064afd3e692e5ebfdf3573be60ac563f7808fb3e000080bf92e8093fbb10213f9c1532be9c15323ec9503fbe5a25d5be5a25d53e53ee4ebf4155a5be3d6c433f82380f3f000080bf38960b3f00d5263fc7503fbe9c15323e9c1532be51ee4ebf5f25d53e5625d5be69b062be036ee13e2dc15e3f000080bfecd90e3f6fe7293f982a33beb9f5453e989919be0e4afdbe672e5e3f054238bd00000000f1ea533d3aa87f3f000080bf25f5143f6394253f992a33beb9f5453ecfcc4cbd104afdbe672e5e3fe441383d00000000feea53bd3aa87f3f000080bf88f22d3f6394253f9d1532bec7503f3e80b9d5bc5a25d5be53ee4e3f5a25d53e360b003e4723cebe5b23683f000080bf6cdd333fc1d4253fb9f545be982a333ecfcc4cbd692e5ebf0a4afd3ed241383dfdc4a6bc0ded00becce87d3f000080bfced72d3f685d2b3f9d1532be9c15323e40c057bc787debbedd46eb3e0382423fe8f1963e3c653abf4f6b1e3f000080bf20fc363fffd4263f999919be982a333e60e2dabb4ed907bd5532103f125b533fb329683ea7df4cbf171b0e3f000080bfad8c383fba10213fca503fbe9c15323e80b9d5bc57ee4ebf5125d53e5525d53e40b0623e276ee1be27c15e3f000080bf9cca333f6fe7293fb9f545be982a333e989919be692e5ebf0d4afd3e044238bd6ac4a63c04ed003ecce87d3f000080bf6cda143f685d2b3fcbcc4cbe9999193ecbcc4cbd7e487fbf9b97583d9e97583d72bf273db06a52be4c517a3f000080bf94a62d3f1be32e3fb9f545be9899193ea011cdbc692e5ebfdd41383d0b4afd3e4089d93e1ec3e5be0044493f000080bf20df333f8a4c2d3fcbcc4cbe9999193e989919be7e487fbfa697583da39758bd78bf27bd9d6a523e4c517a3f000080bf32a9143f1be32e3fb9f545be9899193e992a33be692e5ebf0342383d0a4afdbe4089d9be14c3e53e0244493f000080bf3e670e3f8a4c2d3f0ad723befd76b43b06d723bdc3fb81be478c6ebf0cc5843ef7a9253ea2c6643e7511763f000080bffc96243f82d1073e0ad723be2de7193c54b0d0bcbc7973befb4f48bf4a54133fefce803e8fcd053fbf87503f000080bfbc36283fe6be053e9c1532be2bc0573c78b9d5bc026c06bf4d723fbf81fdcf3ed4947a3ee924a63e28e7693f000080bfee4a283fca80f23d0ad723be66562f3bcbcc4cbd414b84befd3c77bfb321ba3c3d09e53cc059833cf5dd7f3f000080bf4518223f385b093e982a33be4fe2da3bcbcc4cbd87f80fbf9d8053bfb8b20a3d000000003be6273deac87f3f000080bf3e58223f40f8f73d992a33be4fe2da3b989919be2dea0fbf978953bf64e40bbdf7a1a4bd811a5d3cec257f3f000080bf1e65093f788dee3d0ad723be60562f3b989919be9b5384be984c77bf0e7c9ebb583802be3c0dee3c05d07d3f000080bf2425093fd3a5043e0ad723be0f48753b89751dbe9a467fbe7f896ebf551a87be553d86be09194abe9cd2713f000080bf6e34083f97b6033e73a520be555c783b72a520be82e272be8fd471bfd41a68bea15e71be297a2ebed6ee743f000080bf4d60073f51ba053e8b751dbe2048753b0ad723be59a682be21686ebf2a2185be61b081bea8d347be728f723f000080bfca8b063fe0cd073e9d1532be2bc0573c9c1532be7b20eabec83043bfc35feabe2607b0beab73a5be4eb6613f000080bf6669033f2095e43d999919be6b562f3b0ad723be4462a8bcf63f77bfd24c84beff6980bea6177bbe39bc6f3f000080bfae7b063f83360b3e999919be4fe2da3b992a33beb2b20abd9c8053bf88f80fbf517f90becc2a08bf70634c3f000080bfb5bf023ff1aa073eb9f545be9911cd3c989919be692e5ebf0a4afdbed04138bdf60c3ebd7a7c1abc7fb67f3f000080bf90b3093f60b0ba3dc7503fbe7bb9d53c78b9d5bc53ee4ebf5725d5be5a25d53ede06993e045aa33e9c3d663f000080bf2882283f58fdcd3d9c1532be7db9d53c20c057bc11a003bf98f1ccbe0231423f23e5063f94e70c3f62c9253f000080bf36842b3f9463e13db9f545be9711cd3ccbcc4cbd692e5ebf0d4afdbefc41383d9d44f7ba882fc03db0de7e3f000080bfb1a6223f2c1bc43dca503fbe7db9d53c9d1532be58ee4ebf4e25d5be4e25d5be41ccafbe5ed776beea61683f000080bfa0a0033fac11c03d9d1532be7bb9d53cc9503fbe5025d5be5125d5be57ee4ebfd4fa19bfbe640abfbb93163f000080bf1d30003fec08d13dcbcc4cbececc4c3d999919be7e487fbf999758bd9b9758bdd2134dbd1eaf59bd14517f3f000080bf1cd0093f56de8d3db9f545bececc4c3d992a33be692e5ebfd04138bd084afdbe4c17f5be5ddf42be866b5b3f000080bfdf78033fceea943dcbcc4cbecccc4c3dcbcc4cbd7e487fbfa79758bda697583d4d65313d231e2c3e371d7c3f000080bf3ec3223f2049973db9f545bececc4c3d9811cdbc672e5ebfec4138bd0e4afd3ec1c5eb3e60ea993e54d0553f000080bf61e1283f6609a33db9f545be9899193ea011cdbc692e5ebfdd41383d0b4afd3ebf9ff73e71889b3eee23523f000080bf60e1283fa058293ccbcc4cbe9999193ecbcc4cbd7e487fbf9b97583d9e97583db0ba7e3d4058463e8ba57a3f000080bf3ec3223fc0ac963bcbcc4cbe9999193e989919be7e487fbfa697583da39758bd611b67bd4d208bbdf7ff7e3f000080bf1dd0093f00000000b9f545be9899193e992a33be692e5ebf0342383d0a4afdbe16e9fcbef3c83bbe8394593f000080bfdf78033f808f613bb9f545bececc4c3d9811cdbc672e5ebfec4138bd0e4afd3e3299cf3e8eb523bf2a37273f000080bf5afd6e3f9405d93ec7503fbe7bb9d53c78b9d5bc53ee4ebf5725d5be5a25d53e9a2e153fb9992abfb420ee3e000080bf5e5d743fca2edf3e9c1532be7db9d53c20c057bc11a003bf98f1ccbe0231423f27bd293f151c3fbf2149633d000080bf3ca6763f0d9dda3e982a33bececc4c3d40e2dabb89f80fbf9fb20abd9c80533f0c791d3fc7512fbf9603c83e000080bf1a3c723f1688d23e992a33be9899193e60e2dabb8af80fbfb1b20a3d9c80533f604f213f332221bf58d1e83e000080bf9d8d603f1e2baf3eb9f545be9899193ea011cdbc692e5ebfdd41383d0b4afd3e9a4bc83e15460dbfcf8a3c3f000080bfde4e5d3f9ca8b53eca503fbe9c15323e80b9d5bc57ee4ebf5125d53e5525d53e0728803ecf44cbbed60d623f000080bf443a5a3f96e8aa3e9d1532be9c15323e40c057bc787debbedd46eb3e0382423fb087093fb08b09bff570263f000080bf22835c3fd956a63e0ad723be9999193e6d562fbb6d4c84be5a5fad3c273f773fa885333fd2fa2ebf0a754f3e000080bf1a33633f24e0a93e0ad723bececc4c3d59562fbbc78584be4329e0bc432d773f61d62f3f224135bf6400283e000080bf96e1743f1c3dcd3e0ad723bec33d1f3e6eca8abb8dbd84be21bb823e2b736e3f959b283fd69c28bf994dba3e000080bfbc39623f69eda73e0ad723be57b0d03c23e719bc86347abea39706bf1796503f86f2323f73882dbf383e69be000080bfb837793f62e9d53e0ad723be2de7193c54b0d0bcbc7973befb4f48bf4a54133f8790293f3f6110bf787efcbe000080bfa20f7c3f3599db3e9c1532be2bc0573c78b9d5bc026c06bf4d723fbf81fdcf3ea34e1e3f2ec829bf40dcd7be000080bf1bef783fca2edf3e999919be982a333e60e2dabb4ed907bd5532103f125b533fcc5c273f59d31cbf0c6fe33e000080bf9d8d603f93829d3e235b21be235b213e37b088bbfeed6cbe7587723e5e8f713f43cf2a3f76cf2abffa83a93e000080bf0e4a623fd856a63e27731ebe0ad7233e639e83bb661a87bebe467f3e7a896e3f61ae283fd6ad28bfc9cbb93e000080bfb85c623f507aa43e999919be0ad7233e74562fbb0a45c6bb6e53843e2a4c773f0bd92e3f975b34bf2f65453e000080bf1a33633f8ccda23ececc4cbd982a333e60e2dabbb2b20a3d8af80f3f9a80533fc0512f3f10791dbf9d03c83e000080bf1a3c723f364b743e999919beb9f5453ea011cdbcf74138bd672e5e3f124afd3e3471153f6f0fc2beccd0373f000080bfde4e5d3f1505973ececc4cbdb9f5453ea011cdbcf841383d672e5e3f124afd3e90b5233f3399cfbe2837273f000080bf5afd6e3f3a50673ecccc4cbd0ad7233e74562fbbbf21ba3c4f4b843efb3c773f6855353fa5952fbf82d72a3e000080bf96e1743f28e17e3e7db9d5bcc7503f3e80b9d5bc5825d53e51ee4e3f5a25d53eb3be403f002b10bf0a5eae3e000080bf5e5d743fcffd5a3e7cb9d5bc9c15323e40c057bc7efdcf3e046c063f4d723f3f8e7c3f3fa34229bf9a3c6d3d000080bf3ca6763f4821643e07d723bd0ad7233e0e77b4bb18c5843ecffb813e448c6e3f511e353fb2ea34bf8a6c8ebb000080bf3ca6763f90ce773e2bc057bc9c15323e80b9d5bc4b723f3f076c063f82fdcf3e43b7263fc5f732bff02897be000080bf1bef783fcefd5a3e54b0d0bc0ad7233e3ae719bc4754133fd679733efd4f483f5289263fc78136bfa80e86be000080bfb837793f9e886d3e2de719bc0ad7233e5cb0d0bcf94f483fc879733e4c54133f3c61103f999029bf4f7efcbe000080bfa20f7c3ff728623ececc4cbdb9f545bea011cdbcf341383d692e5ebf064afd3eb3aa173f6f03d83e31b12f3f000080bf6e916f3ffe542a3f7cb9d5bcc9503fbe80b9d5bc5325d53e54ee4ebf5325d53eada0203f6d36163fb509033f000080bfdac2743fd4b52d3f7db9d5bc9d1532be40c057bc642bcf3e4d9105bfe343403f5e37363fc6ff313f8be3cb3d000080bfba2b773fd28e2b3fcecc4cbd992a33be60e2dabbeaf8003d13ab10bfcf0c533fc711243f55f4243f079cd53e000080bfa2fd723f5846273f989919be992a33be40e2dabbbc2a0ebd8cc10fbfb3a3533ffbd7163ffb19283f2408f13e000080bf3855623f28a0143f989919beb9f545be9811cdbcd94138bd6a2e5ebf064afd3e5ce8023f8191cf3ebdfa413f000080bf03e95e3fceae173f9c1532bec9503fbe78b9d5bc5325d5be54ee4ebf5525d53e38c6b73e82948c3e455e643f000080bf24235c3f9224123f9c1532be9c1532be20c057bc0dc2e9bebc7ee9be6890433f99db013ffe6c123fc905253f000080bf048c5e3f90fd0f3f0ad723bd0ad723be0677b4bb2ca7853ed91881be838b6e3fb3742a3f8ff53e3f24e67a3c000080bfa472773f80a5263fcecc4cbd0ad723be6d562fbb18484c3c5a5184be6948773f876c2a3f4b13393f75433d3e000080bf32c8753f15c8243f57b0d0bc0ad723be38e719bc4754133fcb7973befd4f483fbd211e3f7fe0403fa4c866be000080bf0fde793ff75a293f2bc057bc9c1532be80b9d5bc0231423f0ca003bfa1f1cc3e8ed2253fb369293fc244c1be000080bfbc52793fb2f72d3f2de719bc0ad723be5cb0d0bc1696503f8d347abea697063f4cf2033fd172383f2a87edbe000080bfd48b7c3fb65a2c3f999919be0ad723be5d562fbb2ef292bba35384beb24c773f906d243fb05a3d3ff2b14d3e000080bfc81f653fe421123f6c2c1dbe0ad723bede1a70bb651a87be98467fbe7d896e3fbffb1e3fa8fb313f1648b93e000080bff68a643f487b113ff85820bef75820be9ed46dbb791864be538972be2817723ff446213f198f343f3b6ca63e000080bf9ca9643fdc55103f0ad723be2e811cbe52fb63bb316485be1f9782beda606e3fe4d31e3f8ada313f4c4fba3e000080bf56cb643ffe120f3f0ad723be989919be59562fbb124d84be8fb3a5bc6140773f3b0c2a3fafe2383f0a78453e000080bfc252653f089a0e3f982a33be989919be40e2dabb89f80fbf9fb20abd9c80533f290d1a3fcf222b3f70c1df3e000080bf7ed4623f78cf0b3f992a33becfcc4cbd60e2dabb8af80fbfb3b20a3d9c80533f4bb2143fae303a3fb82cbb3e000080bfae7a753f1a4ef63e0ad723bececc4cbd6d562fbbc98584beb529e03c432d773fc360253f23803f3fd39f1b3e000080bff2f8773f3ae3fb3eb9f545be989919be9811cdbc692e5ebfeb4138bd0d4afd3e3252c03eaa9d173fde7c363f000080bfd8c55f3f4363083fc7503fbe9d1532be78b9d5bc53ee4ebf5725d5be5a25d53e4e2e663e58e0de3e3a2c5f3f000080bf02655c3fb0940d3fb9f545becfcc4cbda011cdbc692e5ebfdd41383d0d4afd3ee915c63e77942f3fabca1d3f000080bf086c723fb075ef3eca503fbe80b9d5bc80b9d5bc57ee4ebf5125d53e5325d53e1286133f5249343f0251d43e000080bf45f6773ff2e9e93e9d1532be80b9d5bc40c057bc0da003bf9af1cc3e0431423ff0b6363fb8ac303fa3f0f43d000080bf471d7a3fb2bbee3e0ad723be5cb0d0bc36e719bc96347abea397063f1696503f438e3c3fd9ab253f056d49be000080bfd48b7c3f81b7f33e6b562fbb0ad723bececc4cbd432d773fc08584be8329e03cc825df3bb4c9a3bd8f2c7fbf000080bfd2dcbb3e839ebb3e2de719bc0ad723be5cb0d0bc1696503f8d347abea697063f1fede93eae4393be407c57bf000080bfe1bbaf3e1601be3e2bc057bc9c1532be80b9d5bc0231423f0ca003bfa1f1cc3ed7b1963e702e8ebebd1a6abf000080bfd0dbaf3e443fc43e4fe2dabb992a33becfcc4cbd9d80533f87f80fbfb5b20a3ddbc75d3cfcf224bdd4c47fbf000080bf59aabb3ee750c23e7cb9d5bcc9503fbe80b9d5bc5325d53e54ee4ebf5325d53e67a98f3e7881a4be408a67bf000080bfd0dbaf3ebc62cd3e7db9d5bc9d1532be40c057bc642bcf3e4d9105bfe343403f3b30043fc8260cbfeb9428bf000080bf2fa3a93ee9d4c83e4fe2dabb992a33be989919be9c80533f88f80fbfaab20abd3fce60bc04d7233d5fc57fbf000080bf9c9ced3edf4ec23e60562fbb0ad723be989919beb23e773f254c84be7b2eb0bc00000000ee7da23d65317fbf000080bf15cfed3e7b9cbb3e2bc057bc9d1532be9c1532be3d22423f7518ecbeb7e7ebbe426eb3be687c9d3e377762bf000080bf9fb0f93e443cc43e93ec93bb0ad723bec73f20beea776e3f129284bea5c482beb67151be12b5543e75e174bf000080bfce15f13e5743bc3e9911cdbcb9f545be989919be064afd3e6a2e5ebfe64138bd1c1855bda6ffb43c3b977fbf000080bf9c9ced3ed749cf3e9711cdbcb9f545becfcc4cbd064afd3e6a2e5ebfe841383d4eed533d8d55b6bcf6977fbf000080bf59aabb3edf4bcf3e4fe2dabb989919be992a33be9644533fefe305bd195510bf23fe09bfff20813e41bb4dbf000080bfef87fa3e2581b93e1cd291bbcddf21beccdf21be57bb713f82106cbe7da070be4cee44be2fa9453e395076bf000080bf43e9f13e3b90bb3ec3078dbb097d1fbe0ad723be7f896e3f501a87bea7467fbe2f874cbe74964d3e058575bf000080bfc6e8f23ea6b0ba3e6b562fbb999919be0ad723bea54b773f9a97efbb125384be380c80be9496683ea7f270bf000080bfc0fbf23ece15b83e60562fbbcecc4cbd0ad723befd3c773fa121ba3c3a4b84be1bd281be6cd8953e2e076cbf000080bf24c8f43e14d5943e4fe2dabbcfcc4cbd992a33be9c80533fa9b20a3d88f80fbfcfbb0bbfb144973e42b948bf000080bf5254fc3e6c40963e2bc057bc80b9d5bc9d1532be4b723f3f82fdcf3e066c06bf61a622bfaa91553eaf573ebf000080bf2e59fc3ecf1f903ef576b4bb0ad723bd0ad723be478c6e3f0dc5843ebbfb81bea49caabe5b2fab3ed9ae61bf000080bf3803f53ec74f923e2be719bc5cb0d0bc0ad723bef94f483f4c54133fc17973be81e1e7bef420873edc025abf000080bffc57f53ed2918e3ecccc4cbdcbcc4cbecbcc4cbda397583d7e487fbfa397583dd79ee33dc4793fbde0217ebf000080bf8afebb3e0182da3ececc4cbdb9f545bea011cdbcf341383d692e5ebf064afd3e18997c3ee8c0f0be76ed58bf000080bfeca4af3eaf27d83e989919beb9f545be9811cdbcd94138bd6a2e5ebf064afd3e9b227b3eedb2fabe3c3356bf000080bf5071b13ecea0fb3e999919becbcc4cbecbcc4cbda39758bd7e487fbfa397583d8dbf063e718173bd2e517dbf000080bfeecabd3e22fbfd3ececc4cbdcbcc4cbe999919be9e97583d7e487fbfa39758bd526ae4bdd3613f3d181f7ebf000080bfcef0ed3efa7fda3e999919becbcc4cbe989919bea39758bd7e487fbf9e9758bd7b2e07bec295733d694d7dbf000080bf32bdef3e1af9fd3ececc4cbdb9f545be992a33bef041383d6a2e5ebf064afdbefffa7cbecdb8f03e94e858bf000080bfee87fa3ea324d83e999919beb9f545be992a33beeb4138bd6a2e5ebf064afdbe9a8c7bbe59aefa3ece2c56bf000080bf5254fc3ec49dfb3e7db9d5bcc9503fbe9c1532be5325d53e57ee4ebf5025d5be09cc8fbeb46da43e648867bf000080bf9eb0f93eba5fcd3e7bb9d5bc9c1532bec9503fbe5a25d53e4e25d5be54ee4ebfd90012bf0ea4123f73b716bf000080bf1d30003f60d1c83e4fe2dabb989919be992a33be9644533fefe305bd195510bfce262abda0fa7d3f2655f2bd000080bfb8512d3deff3253f2bc057bc9d1532be9c1532be3d22423f7518ecbeb7e7ebbede2f753e8fbd5a3fde0fecbe000080bfb04f9b3c4c93273f7bb9d5bc9c1532bec9503fbe5a25d53e4e25d5be54ee4ebfbf2bb83b24e3633fd73fe9be000080bfb84f9b3c6dce2a3f9711cdbc989919beb9f545be064afd3ee94138bd692e5ebf171125bdeb137f3f5ed098bd000080bfb8512d3dc98a2a3f9911cdbccfcc4cbdb9f545be044afd3ee541383d6a2e5ebf8110253dec137f3f31d0983d000080bf175a0f3eca8a2a3f4fe2dabbcfcc4cbd992a33be9c80533fa9b20a3d88f80fbf50a5253d34f77d3f1101f43d000080bf175a0f3eeff3253f2bc057bc80b9d5bc9d1532be4b723f3f82fdcf3e066c06bff598b2bdcb1c583f4466073f000080bf8e44273e4c93273f7db9d5bc80b9d5bcc9503fbe4f25d53e5625d53e55ee4ebfb651863c4bac623fe8cded3e000080bf8e44273e6dce2a3f7cb9d5bc40c057bc9c1532be9df1cc3e0331423f0ca003bfa2d58fbd5eb6153f0ae14e3f000080bf1231343e6dce2a3fcecc4cbd60e2dabb992a33bebab20a3d9a80533f8af80fbf8fabd2bbbc18103f8596533f000080bf84ae3a3e0bc9303fcecc4cbdcbcc4cbdcbcc4cbe9e97583da797583d7e487fbf29558b3baea27f3f99d0593d000080bf185a0f3e0bc9303fcccc4cbd989919becbcc4cbea097583d9e9758bd7e487fbf425b8bbbaea27f3f9ad059bd000080bfb8512d3d0ac9303fcecc4cbda011cdbcb9f545bef041383d0d4afd3e692e5ebf0000000034685e3f348bfd3e000080bf1b53283e0bc9303f989919bea011cdbcb9f545beee4138bd0a4afd3e692e5ebf06f97d3b486d5e3f6377fd3e000080bf1a53283e75ca493f989919be60e2dabb992a33beb7b20abd9c80533f8bf80fbf8aabd23bba18103f8596533f000080bf84ae3a3e75ca493f999919becbcc4cbdcbcc4cbea39758bda797583d7e487fbfa65b8bbbaea27f3fa5d0593d000080bf175a0f3e76ca493f9c1532be80b9d5bcc9503fbe5825d5be5a25d53e51ee4ebf1ca6923dd8b9663f20c6da3e000080bf8e44273e13c54f3fcecc4cbd992a33beb9f545bef141383d064afdbe6a2e5ebf0000000034685e3f328bfdbe000080bf48db923c0bc9303f7db9d5bcc9503fbe9c1532be5325d53e57ee4ebf5025d5be6bfaf53d7ab3003f5a265bbf000080bf20aecf3b6dce2a3fcecc4cbdb9f545be992a33bef041383d6a2e5ebf064afdbe8ba3493cecc5fd3ebf515ebf000080bf000000000bc9303f999919beb9f545be992a33beeb4138bd6a2e5ebf064afdbe87a349bcebc5fd3ebd515ebf000080bf0000000075ca493f999919be992a33beb9f545bee94138bd064afdbe6a2e5ebf0000000034685e3f328bfdbe000080bf48db923c75ca493f999919be999919becbcc4cbe9f9758bda39758bd7e487fbf755b8b3baea27f3fa1d059bd000080bfb4512d3d76ca493f9d1532be9d1532bec9503fbe5025d5be5525d5be57ee4ebfe834b8bb28e3633fcb3fe9be000080bfa84f9b3c13c54f3f9d1532bec9503fbe9c1532be5625d5be58ee4ebf4a25d5be57faf5bd78b3003f5c265bbf000080bf20aecf3b13c54f3f982a33becfcc4cbdb9f545be064afdbefa41383d692e5ebfd50f25bdec137f3f0fd0983d000080bf175a0f3eb608503f992a33be989919beb9f545be064afdbed34138bd6a2e5ebf3210253dec137f3f10d098bd000080bfb4512d3db608503fca503fbe9c1532be9d1532be58ee4ebf4a25d5be5225d5beefb469be5b965f3f2f48dcbe000080bfb04f9b3c3400533fb9f545be989919be992a33be692e5ebfd04138bd0b4afdbed76dc73cdea77d3feffe07be000080bfb4512d3d919f543fb9f545becfcc4cbd992a33be692e5ebf0442383d0a4afdbeec6cc7bce0a77d3fd6fe073e000080bf175a0f3e909f543fc7503fbe80b9d5bc9c1532be51ee4ebf5f25d53e5525d5be2cb5693e5b965f3f1b48dc3e000080bf8e44273e3400533f54b0d0bc3ae719bc0ad723bea397063f1696503f9b347abe9ae73b3f582894be414a1d3f000080bf28625a3f0c78f13e2be719bc5cb0d0bc0ad723bef94f483f4c54133fc17973be8a791a3f22461bbf0f87043f000080bf24235c3f8aaced3e2bc057bc80b9d5bc9d1532be4b723f3f82fdcf3e066c06bf0b98283f6bc50dbf1b6f023f000080bffc11593ff2e9e93e7cb9d5bc40c057bc9c1532be9df1cc3e0331423f0ca003bf7aef5d3f44c906beb721f63e000080bf3aa9573f8af6ec3ecccc4cbd77562fbb0ad723be9629e03c432d773fca8584becd833b3fe598203e2198293f000080bfe199563fb2edf83ececc4cbd60e2dabb992a33bebab20a3d9a80533f8af80fbfefa3463f8874aa3e442a093f000080bfecc9533f56dbf33e999919be6d562fbb0ad723be6da6a8bce93f773fd54c84bed91c2e3f11d64f3efc55343f000080bfa679453f43f50c3f989919be60e2dabb992a33beb7b20abd9c80533f8bf80fbf8d5e1d3f69faeb3eaddb233f000080bfb2a9423f156c0a3f9c1532be40c057bc9c1532be6830eabe5427433f526feabebb17f53e151f253f8b7d183f000080bf6a583e3fe4dc0e3f989919bea011cdbcb9f545beee4138bd0a4afd3e692e5ebf65d5d93e26a84b3f60e1dc3e000080bfd5603e3f9af1073f9c1532be80b9d5bcc9503fbe5825d5be5a25d53e51ee4ebfe3828e3ee199673f4829a53e000080bf31543b3f331e0d3fd38d1dbe530077bb0ad723be91a882be7d686e3f771c85be895f243f9480ba3e87b02c3f000080bff3be443f72a50d3fc7503fbe80b9d5bc9c1532be51ee4ebf5f25d53e5525d5bea2955c3e4e015e3f94dbe53e000080bf31543b3fc199113f982a33be60e2dabb989919bef2ed0fbf2b87533fa7ae0bbd31331b3f9334e13eb69d293f000080bfb2a9423f7d15133fc1b120be1b0e7abbc1b120be95a672be7bdc713f61d567bebd12283ff0ada73efaf22d3f000080bf6fbe443f9db60e3f0ad723be410077bbd28d1dbebc467fbe7f896e3f431a87bec653243f29dcb93e00e82c3f000080bff4be443fa3c60f3f0ad723be74562fbb999919bea15384be8d4c773fbf4fa2bb8b8b333f1bc0433e1acc2f3f000080bfa679453f646d103f0ad723be6d562fbbcecc4cbd4b4b84befb3c773fb121ba3caff5343faf22313e9f942f3f000080bfe199563f42a0223fb9f545bea011cdbc989919be672e5ebf0e4afd3e004238bde048cd3e2548403ff544063f000080bfd6603e3ffef8163fcbcc4cbecbcc4cbd989919be7e487fbfa797583d9f9758bd4ce2df3ca1776a3fb10ecd3e000080bf70ae3b3f183f193fb9f545becfcc4cbd992a33be692e5ebf0442383d0a4afdbe4e3fb9bda805773f6b587c3e000080bfae8c383fdb99133fcbcc4cbecbcc4cbdcbcc4cbd7e487fbf9d97583d9e97583de31b943d03a55c3ff77c003f000080bfabce4c3ff7712b3fb9f545bea011cdbccfcc4cbd692e5ebf0f4afd3ed041383daf5ad93eb80e313ffa95153f000080bf10814f3fdd2b293f992a33be60e2dabbcfcc4cbd8bf80fbf9c80533f98b20a3dfdf71b3f42cec53e8747313f000080bfecc9533f5c48253f9d1532be40c057bc80b9d5bc026c06bf50723f3f80fdcf3ea5c3303faa34c33de08f373f000080bf3aa9573fb0c3293f0ad723be0677b4bb0ad723bdc7fb81be448c6e3f18c5843ef7293d3f0fe7623c43742c3f000080bf3623583f2e94243f0ad723be36e719bc5cb0d0bccc7973befb4f483f4954133f6584453fd6c554be43ed193f000080bf28625a3f9967273f0ad723be5cb0d0bc36e719bc96347abea397063f1696503fc3ea443f1826d0bef869fc3e000080bf24235c3f10162b3f9d1532be80b9d5bc40c057bc0da003bf9af1cc3e0431423f27ac413f10f551bea3f81e3f000080bffc11593ff2b82c3fca503fbe80b9d5bc80b9d5bc57ee4ebf5125d53e5325d53e6b7c153fac14f43ee236283f000080bf01a5543f8d802c3fb9f545becfcc4cbda011cdbc692e5ebfdd41383d0d4afd3e6aaaaf3e6d43463f0610083f000080bf253a523f1ae32e3f999919becbcc4cbecbcc4cbda39758bd7e487fbfa397583da6a07fbf68fb553d1af05abc000080bf000040325fd1763f989919beb9f545be9811cdbcd94138bd6a2e5ebf064afd3e07317ebf2c05bf3dd134963d000080bfe074973b8aff7c3f9c1532bec9503fbe78b9d5bc5325d5be54ee4ebf5525d53ea01861bf28ebf23ed2d42b3d000080bf77afd13c71e17c3f982a33beb9f545becbcc4cbd064afdbe6a2e5ebff641383d0d765ebf0245fd3e491151bc000080bf72dfb23cb1f8763f992a33beb9f545be989919be064afdbe692e5ebfdd4138bd28515ebf14c7fd3eba134ebc000080bf70dfb23c76fe5d3f999919becbcc4cbe989919bea39758bd7e487fbf9e9758bd46747fbf3e70603d5a3a11bd000080bf0000000023d75d3f9d1532bec9503fbe9c1532be5625d5be58ee4ebf4a25d5be080960bfe9f9f53e6e4d6cbd000080bf76afd13c68f5573f999919beb9f545be992a33beeb4138bd6a2e5ebf064afdbece8f7cbfbf75ee3d4a9eeabd000080bfd074973b628c573fb9f545be992a33be989919be692e5ebf0a4afdbed54138bd62c6fdbe82515e3f39614b3c000080bf8a47413d9afe5d3fc7503fbe9d1532be78b9d5bc53ee4ebf5725d5be5a25d53e9ff3f2bed315613f9d842cbd000080bf80f3313d8be17c3f9c1532be9c1532be20c057bc0dc2e9bebc7ee9be6890433fddfd34bf090c353f00000000000080bfb9760d3d0000803fb9f545be992a33becbcc4cbd692e5ebf0b4afdbefe41383d0746fdbeec755e3ffc4e4e3c000080bf8b47413dd6f8763fca503fbe9c1532be9d1532be58ee4ebf4a25d5be5225d5bef0f1f5beea0b603f18a46b3d000080bf8af3313d82f5573f9d1532be9d1532bec9503fbe5025d5be5525d5be57ee4ebf470135bf9f08353f00000000000080bfb7760d3d909f543fcbcc4cbe989919be999919be7e487fbf969758bd999758bda2eb5fbd4c7a7f3fff15073d000080bfd6738d3d86d75d3fb9f545be989919be992a33be692e5ebfd04138bd0b4afdbe9eb7b1bdf38a7e3fa0397d3d000080bf5e05843db88c573fcbcc4cbe999919becbcc4cbd7e487fbfa49758bda397583d636c53bd33947f3f706acc3c000080bfd4738d3dc3d1763fb9f545be989919be9811cdbc692e5ebfeb4138bd0d4afd3e16b370bdc3897f3f91f449bc000080bf6105843de1ff7c3fb9f545becfcc4cbda011cdbc692e5ebfdd41383d0d4afd3ea19d643d2c987f3f6fa9e93b000080bfacdd083eed297c3fcbcc4cbecbcc4cbdcbcc4cbd7e487fbf9d97583d9e97583d70805f3ddb7e7f3fcbcdfd3c000080bfe7940d3ecffb753fcbcc4cbecbcc4cbd989919be7e487fbfa797583d9f9758bdd9e4503d837f7f3f169e143d000080bfe7940d3e93015d3fb9f545becfcc4cbd992a33be692e5ebf0442383d0a4afdbec645b93c8d997f3fff5b513d000080bfabdd083ec5b6563f9899193eb9f545bea011cdbcf341383d692e5ebf084afd3ef6450dbfaf4bc83ee18a3c3f000080bfcea83b3f32a6433f9c15323ec9503fbe80b9d5bc4f25d53e55ee4ebf5725d53ead44cbbe2528803ed90d623f000080bf3494383f3506493f9c15323e9d1532be40c057bc5b81ee3eb082eebe6d98403f8b2f08bf732f083f8aa6283f000080bf12dd3a3f144f4b3f9899193e992a33be60e2dabb35eb033d0e7510bffa2f533f4c2121bf8934213f261ee93e000080bf8de73e3ff0e4463fcfcc4c3d992a33be40e2dabbbdf800bd12ab10bfd00c533fd3632fbf57de1c3fd5a8c93e000080bf0996503f7536353fcfcc4c3db9f545be9811cdbcda4138bd692e5ebf0a4afd3e91b523bf2999cf3e2b37273f000080bf4a574d3fb6f7313f80b9d53cc9503fbe78b9d5bc5325d5be54ee4ebf5525d53ec9992abf942e153f9220ee3e000080bf4eb7523f1be32e3f80b9d53c9c1532be20c057bc682bcfbe499105bfe443403f47833fbf3e44293fca92663d000080bf2c00553ffa2b313f20731e3e0ad723be1d9e83bb6d1a873eb7467fbe7a896e3f0aae28bf2eae283fcbcbb93e000080bfaab6403fce604a3f9899193e0ad723be6d562fbba344c63b5c5384be2e4c773f0dd92ebf975b343f1065453e000080bf0a8d413f6d8a493fcecc4c3d0ad723be5d562fbb6b474cbc595184be6b48773f5a4235bf1c352f3fcf24323e000080bf863b533ff2db373f06d7233d0ad723befd76b4bb20a785bec91881be868b6e3f7ff434bf5f13353f3103d9bb000080bf2c00553f4b17363f5cb0d03c0ad723be23e719bc4d5413bfb57973bef94f483f498926bfce81363faf0e86be000080bfa891573fcf85333f40c0573c9d1532be78b9d5bc023142bf0fa003bf9bf1cc3ebf9f26bf997d203f513adbbe000080bf0a49573f1be32e3f38e7193c0ad723be54b0d0bc189650bf87347abea197063f8d3508bf45e22c3fb2be02bf000080bf92695a3fe6ad303f1e5b213e205b21befaaf88bb5edf833ee7e182beaa8c6e3f1cae28bf1cae283fc7cbb93e000080bf00a4403f144f4b3f0ad7233ebd3d1fbe37ca8abbb7467f3e6d1a87be7a896e3f1eae28bf1aae283fcacbb93e000080bfad93403f5d1a4c3f992a333e989919be60e2dabba482103f852d03bd2627533f923121bf4121213f7c26e93e000080bf8de73e3f37b94f3fc9503f3e9c1532be80b9d5bc54ee4e3f5025d5be5d25d53e322880be9f44cb3edb0d623f000080bf3494383ff2974d3fb9f5453e989919bea011cdbc692e5e3ff04138bd0d4afd3ea14bc8be0c460d3fd48a3c3f000080bfcea83b3ff6f7523f0ad7233e999919be77562fbb2f53843e70cae5bbc54b773fd44d34bfaedb2e3fc808463e000080bf0a8d413fba134d3fb9f5453ecfcc4cbda011cdbc692e5e3ff041383d0d4afd3e2299cfbe9fb5233f1f37273f000080bf4a574d3f72a6643f992a333ecfcc4cbd60e2dabb8af80f3fb7b20a3d9c80533f09791dbfcc512f3f9203c83e000080bf0996503fb367613f0ad7233ececc4cbd6d562fbb464b843ec021ba3cfd3c773f9c952fbf7255353f69d72a3e000080bf863b533f36c25e3f9c15323e80b9d5bc40c057bc026c063f82fdcf3e4e723f3f964229bf9b7c3f3f5e3b6d3d000080bf2c00553f2e72653fc9503f3e80b9d5bc80b9d5bc53ee4e3f5a25d53e5a25d53efd2a10bfb9be403ff35dae3e000080bf4eb7523f0cbb673f0ad7233e07d723bd0e77b4bbcdfb813e1bc5843e428c6e3fa5ea34bf5e1e353f01718ebb000080bf2c00553fdc86603f9c15323e40c057bc80b9d5bc026c063f4e723f3f82fdcf3ec6f732bf40b7263fff2897be000080bf0b49573f0cbb673f0ad7233e5cb0d0bc3ae719bcd179733e4a54133ffa4f483fb18136bf6189263fd30e86be000080bfa891573f5818633f0ad7233e3ae719bc5cb0d0bcd179733efa4f483f4a54133fac9029bf3661103f317efcbe000080bf92695a3f42f0653f9c15323ec9503fbe80b9d5bc4f25d53e55ee4ebf5725d53e78ba8fbec377a43e5589673f000080bf6a72283f7e70b23ec9503f3e9c1532be80b9d5bc54ee4e3f5025d5be5d25d53ebeeda3be2dac903e2a7c673f000080bf3a72283ff593bb3e9c15323e9d1532be40c057bc5b81ee3eb082eebe6d98403f84d907bf5b85083f78a6283f000080bfa38e2b3f93feb63eb9f5453e992a33becfcc4cbd692e5e3f064afdbef541383ddb2db2bc218f573da8957f3f000080bfec8a223fd881bd3ecbcc4c3e989919becbcc4cbd7e487f3f9b9758bda697583dd11f3fbd0f9be63d60177e3f000080bf9a60223fa8adc83eb9f5453e989919bea011cdbc692e5e3ff04138bd0d4afd3ef485f0bef35e7f3edbc9583f000080bf758d283f0c4fc63ecbcc4c3ecbcc4cbdcbcc4cbd7e487f3fa297583da297583de14e78bdb55b213e30537c3f000080bfb079213f4eeeeb3eb9f5453ecfcc4cbda011cdbc692e5e3ff041383d0d4afd3e6f6cf8be5598943e3728533f000080bf8ba6273fb28fe93ec9503f3e80b9d5bc80b9d5bc53ee4e3f5a25d53e5a25d53e45780abfbad17b3ee3e84d3f000080bfe41c273f4db0ef3eb9f5453ea011cdbccfcc4cbd692e5e3f0a4afd3eeb41383d456523bed07c443e65e6773f000080bfb530213fe65cf23ecbcc4c3ecbcc4cbd999919be7e487f3fa397583da09758bdd44e783d8d5b21be30537c3f000080bf8e80083f4eeeeb3eb9f5453ea011cdbc989919be692e5e3f0d4afd3eee4138bd2365233e8a7c44be6be6773f000080bf9337083fe65cf23ec9503f3e80b9d5bc9d1532be54ee4e3f5b25d53e5525d5be3b780a3f51d17bbef1e84d3f000080bf7c32023f4eb0ef3eb9f5453ecfcc4cbd992a33be692e5e3fea41383d064afdbe696cf83e3f9894be3b28533f000080bf0a35023fb28fe93ecbcc4c3e999919be989919be7e487f3f9e9758bd9b9758bdc61f3f3d029be6bd60177e3f000080bf7767093fa8adc83eb9f5453e989919be992a33be6a2e5e3fea4138bd044afdbeed85f03ed75e7fbedec9583f000080bff41b033f0c4fc63ec9503f3e9d1532be9c1532be55ee4e3f5625d5be4f25d5beb6eda33e1dac90be2d7c673f000080bfd387033ff693bb3eb9f5453e992a33be989919be692e5e3f064afdbeed4138bd802eb23c828e57bdaa957f3f000080bfca91093fd881bd3e992a333eb9f545be989919be064afd3e692e5ebfed4138bda981543de4abb5bc9b977f3f000080bf0e92093fe186b03e992a333eb9f545becfcc4cbd064afd3e6a2e5ebff041383dac8154bde6abb53c9b977f3f000080bf308b223fe086b03e9c15323ec9503fbe9c1532be4d25d53e57ee4ebf5525d5be4eba8f3ed677a4be5689673f000080bf0288033f7e70b23e9d15323e9c1532bec9503fbe5a25d53e4e25d5be54ee4ebf4dfa113f97aa12bf72b7163f000080bf1d30003f94feb63e9899193ecbcc4cbe999919be9e97583d7e487fbf9f9758bdf903e43dd96d3fbd7f207e3f000080bf2f68093fba50a53e9899193eb9f545be992a33bef041383d6a2e5ebf064afdbe47c97c3eebbcf0be0feb583f000080bf931c033f8eaba73e9999193ecbcc4cbecbcc4cbda297583d7e487fbfa397583d0e04e4bdd96d3f3d7d207e3f000080bf5161223fba50a53e9899193eb9f545bea011cdbcf341383d692e5ebf084afd3e78c97cbee6bcf03e0ceb583f000080bf148e283f8eaba73ecfcc4c3db9f545be9811cdbcda4138bd692e5ebf0a4afd3eff567bbeb0b0fa3e0e30563f000080bf9ba8273f5b32843ecbcc4c3dcbcc4cbecbcc4cbda39758bd7e487fbfa297583dadf606be8d8b733d504f7d3f000080bfd87b213f86d7813ecbcc4c3dcbcc4cbe989919bea39758bd7e487fbf9e9758bdbef6063e8c8b73bd4e4f7d3f000080bfb682083f86d7813ecbcc4c3db9f545be992a33beed4138bd692e5ebf064afdbe0e577b3ea9b0fabe0e30563f000080bf1937023f5b32843e0ad7233e1877b4bb06d723bdc8fb813e448c6e3f19c5843e44d526bfef7b08bd05fc413f000080bf3471773fd9a1343f0ad7233e3ae719bc5cb0d0bcd179733efa4f483f4a54133ff5043fbfc8c06dbeb2bb1f3f000080bffe677a3f7792323f9c15323e40c057bc80b9d5bc026c063f4e723f3f82fdcf3e9a443fbf91be343e870b243f000080bf0c50783f2464303f0ad7233e77562fbbcecc4cbd474b843efd3c773fcf21ba3cbd1527bf74f4203e3bbc3d3f000080bf1865753f520a363f992a333e60e2dabbcfcc4cbd8af80f3f9c80533fb8b20a3dacb121bf253bce3e2095293f000080bf6c44733fac95333f992a333e60e2dabb989919be2eea0f3f9789533f8ae40bbd0c702bbfd346f53e8646113f000080bf1002603f3482433fc9503f3e80b9d5bc80b9d5bc53ee4e3f5a25d53e5a25d53e7d8816bf5e35093f50141b3f000080bfaee1763f1be32e3fb9f5453ea011cdbccfcc4cbd692e5e3f0a4afd3eeb41383d4bf9dfbee7de373feb830a3f000080bf0a3c713fc572313f0ad7233e6d562fbb989919bea053843e984c773fe77b9ebb862b36bf836a463ecae22c3f000080bfbc22623fdaf6453fb9f5453ea011cdbc989919be692e5e3f0d4afd3eee4138bd701fddbe36d44b3f1bf1d83e000080bfaef95d3f4d5f413f0ad7233efc4775bb87751dbeb1467f3e7c896e3f621a87be3c4c2fbf677cb93e82e1213f000080bfa274613f43a2463f72a5203e465c78bb71a520bec1e2723e83d4713f631b68be21cf2fbfd9f9a73e400d263f000080bf5a56613fd3b2473f87751d3e0e4875bb0ad723be6aa6823e1f686e3f322185be170f2fbfbb56ba3effe4213f000080bf7736613fc9c1483f9c15323e40c057bc9c1532be7520ea3ec830433fcd5feabeead21abfeedc243f9de1ef3e000080bfefd75b3f1dee473fc9503f3e80b9d5bc9d1532be54ee4e3f5b25d53e5525d5beeda3abbe0220683f99fa823e000080bf91695a3f146d463f9999193e77562fbb0ad723be5362a83cf43f773fdc4c84be6b1231bffe294d3e16a0313f000080bff7be613f185f493f9899193e60e2dabb992a33beb8b20a3d9c80533f8bf80fbf793c31bf05b6d93e7c3e153f000080bff7085f3ff4034c3fcecc4c3d6d562fbb0ad723be8c29e0bc412d773fcd8584be292f2ebf89d22f3e3162363f000080bf9e1b713f01855b3fcfcc4c3d60e2dabb992a33beb7b20abd9c80533f8af80fbfcc9435bf66ccc03ebf8c183f000080bf9e656e3fdc295e3f80b9d53c40c057bc9c1532be9cf1ccbe0231423f0fa003bf0c9e34bfb2d7d23df07e333f000080bf3b8d723fc0c1623f5cb0d03c3ae719bc0ad723bea59706bf1696503f9b347abec6081cbfe55224be10c0463f000080bfd429753f5968603fcfcc4c3da011cdbcb9f545beee4138bd0b4afd3e692e5ebfe3da3abf03af133f2fbbbb3e000080bf20a66b3fc947623f80b9d53c80b9d5bcc9503fbe5825d5be5825d53e54ee4ebf586241bf3a3eac3e3ef30f3f000080bff49d703fbea7653f3ae7193c5cb0d0bc0ad723befa4f48bf4a54133fcd7973be89320bbf1f0ce4be6218363f000080bfb252783f625f643f40c0573c80b9d5bc9c1532be4d723fbf84fdcf3e026c06bfce4227bf08c89ebed4cb303f000080bf2517753f50f1653f1877b43b06d723bd0ad723be448c6ebf19c5843ecafb81be06b3b9beab5024bf02f62c3f000080bfe68a793fec05663f77562f3bcecc4cbd0ad723befd3c77bffd21ba3c3c4b84beead556be2b7927bf89053a3f000080bffe677a3f1730673f60e2da3bcfcc4cbd992a33be9c8053bfd2b20a3d8af80fbf8a08e6be7f5324bf94121f3f000080bf94e8763f31d8683fb9f5453e989919be992a33be6a2e5e3fea4138bd044afdbe566dc7bcdea77d3fe4fe07be000080bff266393f00000000c9503f3e9d1532be9c1532be55ee4e3f5625d5be4f25d5be19b5693e5b965f3f1d48dcbe000080bf546c333f20aecf3b9d15323e9c1532bec9503fbe5a25d53e4e25d5be54ee4ebf8439b83b2be3633fbe3fe9be000080bf546c333fa84f9b3c992a333e989919beb9f545be044afd3eea4138bd6a2e5ebf051025bdec137f3f12d098bd000080bff266393f48db923c992a333ecfcc4cbdb9f545be064afd3eed41383d6a2e5ebf4a10253dec137f3f28d0983d000080bf5c68523f48db923cb9f5453ecfcc4cbd992a33be692e5e3fea41383d064afdbe806dc73cdea77d3fecfe073e000080bf5c68523f00000000c9503f3e80b9d5bc9d1532be54ee4e3f5b25d53e5525d5be6da913be3558533f9faa0b3f000080bffa62583f40aecf3b9c15323e80b9d5bcc9503fbe4e25d53e5a25d53e54ee4ebf3952863c49ac623fedcded3e000080bffa62583fb84f9b3c9c15323e40c057bc9c1532be7520ea3ec830433fcd5feabe0ba1cebd7d4e0e3fa33a533f000080bf1b9e5b3fb84f9b3c9899193e60e2dabb992a33beb8b20a3d9c80533f8bf80fbf8cabd2bbbb18103f8596533f000080bf773d5d3fb8512d3d9899193ecbcc4cbdcbcc4cbe9997583da697583d7e487fbf16558b3baea27f3f97d0593d000080bf5c68523fb8512d3d9999193e989919becbcc4cbe9d97583d9d9758bd7e487fbf3f528bbbaea27f3f89d059bd000080bff266393fb4512d3d9899193ea011cdbcb9f545bef041383d0d4afd3e692e5ebf0000000032685e3f338bfd3e000080bf9da6583fb8512d3dcfcc4c3da011cdbcb9f545beee4138bd0b4afd3e692e5ebfd3147e3b496d5e3f6177fd3e000080bf9da6583f175a0f3ecfcc4c3d60e2dabb992a33beb7b20abd9c80533f8af80fbf8eabd23bba18103f8596533f000080bf773d5d3f175a0f3ecbcc4c3dcbcc4cbdcbcc4cbea09758bda297583d7e487fbf01548bbbaea27f3f8ed0593d000080bf5c68523f175a0f3e80b9d53c80b9d5bcc9503fbe5825d5be5825d53e54ee4ebf18a6923dd8b9663f1cc6da3e000080bffa62583f8d44273e9899193e992a33beb9f545bef041383d064afdbe6a2e5ebf0000000035685e3f2e8bfdbe000080bfb028333fb4512d3d9c15323ec9503fbe9c1532be4d25d53e57ee4ebf5525d5be56faf53d7db3003f59265bbf000080bf3331303fb04f9b3c9899193eb9f545be992a33bef041383d6a2e5ebf064afdbe8fa3493ceac5fd3ebf515ebf000080bfd6912e3fb4512d3dcbcc4c3db9f545be992a33beed4138bd692e5ebf064afdbe87a349bcebc5fd3ebd515ebf000080bfd6912e3f175a0f3ecbcc4c3d992a33beb9f545beeb4138bd064afdbe6a2e5ebf0000000034685e3f308bfdbe000080bfb028333f175a0f3ecbcc4c3d999919becbcc4cbe9e9758bda09758bd7e487fbf50558b3baea27f3f91d059bd000080bff266393f175a0f3e78b9d53c9d1532bec9503fbe5125d5be5525d5be57ee4ebf0535b8bb28e3633fcb3fe9be000080bf546c333f8e44273e78b9d53cc9503fbe9c1532be5825d5be57ee4ebf4925d5be5bfaf5bd78b3003f5c265bbf000080bf3231303f8e44273ea011cd3ccfcc4cbdb9f545be084afdbefb41383d692e5ebf3c1025bdec137f3f2dd0983d000080bf5c68523f1a53283e9811cd3c989919beb9f545be064afdbed54138bd6a2e5ebf4310253dec137f3f16d098bd000080bff266393f1b53283e20c0573c9c1532be9d1532be509042bf3566ebbedb2eebbefaf274be28e55a3fb98cebbe000080bf546c333f1331343e40e2da3b989919be992a33be205f53bf673708bd0c2c10bf43fd273d08f97d3fc71ff3bd000080bff266393f84ae3a3e60e2da3bcfcc4cbd992a33be9c8053bfd2b20a3d8af80fbfa9a425bd34f77d3fba00f43d000080bf5c68523f83ae3a3e40c0573c80b9d5bc9c1532be4d723fbf84fdcf3e026c06bf1679343e1650623feda7dd3e000080bffa62583f1231343ecbcc4c3dcbcc4cbecbcc4cbda39758bd7e487fbfa297583deb207f3f609765bd179c77bd000080bf0fb87d3f57cd063dcfcc4c3db9f545be9811cdbcda4138bd692e5ebf0a4afd3e486b7b3f752c04bed36e0cbe000080bf41087c3f5138173c80b9d53cc9503fbe78b9d5bc5325d5be54ee4ebf5525d53e3c0b5b3f86ce00bf2d77f8bd000080bfccb0763fe2ef3a3ca011cd3cb9f545becbcc4cbd084afdbe692e5ebff341383d81835d3f7f51febed3278abd000080bfae22783f59b20b3d9811cd3cb9f545be989919be084afdbe692e5ebfdb4138bd194b5e3f68a7fbbe6e0e88bd000080bfba2f7a3f287f063ecbcc4c3dcbcc4cbe989919bea39758bd7e487fbf9e9758bdd47d7f3f7cb950bda6b417bd000080bf1bc57f3fe845053e78b9d53cc9503fbe9c1532be5825d5be57ee4ebf4925d5bed18e643f6b6ce6be9e4b9bbc000080bfecb8793f72df1e3ecbcc4c3db9f545be992a33beed4138bd692e5ebf064afdbed6c97e3ff72fa7bd95eb573d000080bf7a1b7f3fa7be1e3e40e2da3b992a33be989919be9c8053bf89f80fbf94b20abd491e103f365852bfaf9db6bd000080bfd6b7733f4ca0083e40c0573c9d1532be78b9d5bc023142bf0fa003bf9bf1cc3e85e9063fdc6a58bff78fb2bd000080bf0023723f9fec523c80b9d53c9c1532be20c057bc682bcfbe499105bfe443403ff67b2f3f4d7637bfeba103be000080bf4427743f0000000060e2da3b992a33becbcc4cbd9c8053bf8af80fbfc5b20a3d91b30e3f921d53bfb95fc4bd000080bfcaaa713fec36143d6d562f3b0ad723becbcc4cbd432d77bfc28584beb129e03c26b0823e065376bf5b66c2bd000080bff7536e3fd7151a3d38e7193c0ad723be54b0d0bc189650bf87347abea197063fab38703edfde77bfc400b1bd000080bfe4026f3f2cfa5e3c5d562f3b0ad723be999919be3a3f77bf6e4c84bef7f4acbcc2b8843e540d76bfe16bc2bd000080bf0361703f08180a3e20c0573c9c1532be9d1532be509042bf3566ebbedb2eebbe1b5a0f3ffa6d52bf8781d4bd000080bf222b753f405f203e78b9d53c9d1532bec9503fbe5125d5be5525d5be57ee4ebf06ba413fedc526bf7d1a5ebd000080bf14b7773fc2eb2c3e5572893b0ad723becd171fbe71666ebf0cfa84be78da82be21f4943ea0c873bff918bdbd000080bfdac1703fdf650f3e40e2da3b989919be992a33be205f53bf673708bd0c2c10bffac5fc3d03177cbfc680fbbd000080bfefd66f3f67c5233e05678b3bb9e522be073320be75c073bfd60153bed11c67beeb5d6d3e0add77bfe360c0bd000080bfc7a0703f788e103e65e8893bda6c21bedb6c21be783571bfaf2171bedcf973be43f7863ee4c775bf8aa3bfbd000080bf4864703f97e1113e5062843bc9881ebe0ad723be7a896ebf721a87beab467fbe5ed7963e736f73bf6cd1c1bd000080bff3e96f3fe47d143e54562f3b989919be0ad723be234c77bf65a4c9bb575384be176c253d71b47dbf956902be000080bf54d36e3f54f7143e77562f3bcecc4cbd0ad723befd3c77bffd21ba3c3c4b84beb3fe363b9cc47ebf6699c8bd000080bf773d5d3faf1d1e3e60e2da3bcfcc4cbd992a33be9c8053bfd2b20a3d8af80fbf6c67ba3cb9d07ebfa533bfbd000080bf12415e3fc2eb2c3e - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: -0.09999999} - m_Extent: {x: 0.19999997, y: 0.19999997, z: 0.09999999} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1.6879306 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!1 &918098384 + m_EditorClassIdentifier: + m_HapticOutput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Haptic + m_Type: 2 + m_ExpectedControlType: + m_Id: a67d36a7-d7d4-428e-877d-0cad8d4a162f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -8785819595477538065, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_AmplitudeMultiplier: 1 +--- !u!114 &1071573182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071573179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4a50d88b55b45648927679791f472de, type: 3} + m_Name: + m_EditorClassIdentifier: + m_GroupName: Left + m_InteractionManager: {fileID: 0} + m_StartingGroupMembers: + - {fileID: 1861251858} + - {fileID: 1442193927} + m_StartingInteractionOverridesMap: + - groupMember: {fileID: 1861251858} + overrideGroupMembers: + - {fileID: 1442193927} +--- !u!114 &1071573183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071573179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b9a90fa34d4455469b76611722eae2a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RayInteractor: {fileID: 0} + m_NearFarInteractor: {fileID: 1442193927} + m_TeleportInteractor: {fileID: 2112048200} + m_TeleportMode: {fileID: 1263111715868034790, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_TeleportModeCancel: {fileID: 737890489006591557, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_Turn: {fileID: 1010738217276881514, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_SnapTurn: {fileID: -7374733323251553461, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_Move: {fileID: 6972639530819350904, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_UIScroll: {fileID: 2464016903823916871, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_SmoothMotionEnabled: 1 + m_SmoothTurnEnabled: 0 + m_NearFarEnableTeleportDuringNearInteraction: 1 + m_UIScrollingEnabled: 1 + m_RayInteractorChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &1071573184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071573179} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1861251859} + - {fileID: 1442193929} + - {fileID: 2112048195} + - {fileID: 695895226} + m_Father: {fileID: 886140063} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1106929323 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7936,37 +8901,39 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 918098385} - - component: {fileID: 918098386} + - component: {fileID: 1106929324} + - component: {fileID: 1106929327} + - component: {fileID: 1106929326} + - component: {fileID: 1106929325} m_Layer: 0 - m_Name: HandLeft + m_Name: SnapPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &918098385 +--- !u!4 &1106929324 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 918098384} + m_GameObject: {fileID: 1106929323} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 54233951} - m_RootOrder: 1 + m_Father: {fileID: 597715543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &918098386 -SkinnedMeshRenderer: +--- !u!23 &1106929325 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 918098384} + m_GameObject: {fileID: 1106929323} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -7975,12 +8942,15 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 3 + m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2ab12257a86442740ba3dc5694817baa, type: 2} + - {fileID: 2100000, guid: 34211d2175b5963469d4deb504fbcbaf, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8001,71 +8971,29 @@ SkinnedMeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: -1400252653696632910, guid: 3cc1bfa741063664e8b13a63afcd062f, type: 3} - m_Bones: - - {fileID: 2109031085} - - {fileID: 740016310} - - {fileID: 1714243700} - - {fileID: 933831182} - - {fileID: 1418001335} - - {fileID: 679583488} - - {fileID: 1836407205} - - {fileID: 2030842803} - - {fileID: 2146657147} - - {fileID: 695049119} - - {fileID: 1466462400} - - {fileID: 1338586625} - - {fileID: 1289966973} - - {fileID: 388840135} - - {fileID: 2139940513} - - {fileID: 628411316} - - {fileID: 1494241464} - - {fileID: 595536807} - - {fileID: 391997631} - - {fileID: 1909973946} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 1909973946} - m_AABB: - m_Center: {x: -0.10444905, y: -0.0046319105, z: 0.015674934} - m_Extent: {x: 0.10534169, y: 0.05054314, z: 0.081589594} - m_DirtyAABB: 0 ---- !u!1 &933831181 -GameObject: + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1106929326 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 933831182} - m_Layer: 0 - m_Name: Ring_2_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &933831182 -Transform: + m_GameObject: {fileID: 1106929323} + m_Mesh: {fileID: 524671518} +--- !u!114 &1106929327 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 933831181} - m_LocalRotation: {x: -0.0013731687, y: -0.0005792431, z: -0.08538537, w: 0.9963469} - m_LocalPosition: {x: -0.028493328, y: -0.00000044822693, z: -0.0000003170967} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 326836476} - m_Father: {fileID: 2146657147} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &995671519 + m_GameObject: {fileID: 1106929323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88ea78c93b844cc1b7f98cca70e8679c, type: 3} + m_Name: + m_EditorClassIdentifier: + parent: {fileID: 597715544} +--- !u!1 &1127045217 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8073,92 +9001,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 995671520} + - component: {fileID: 1127045218} + - component: {fileID: 1127045220} + - component: {fileID: 1127045219} m_Layer: 0 - m_Name: Ring_1_Left + m_Name: ThumbStick m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &995671520 +--- !u!4 &1127045218 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 995671519} - m_LocalRotation: {x: -0.00025817356, y: 0.00035699108, z: -0.14537643, w: 0.9893763} - m_LocalPosition: {x: -0.036576994, y: 0.00000019073485, z: 0.0000001502037} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1127045217} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.008775876, y: -0.002558912, z: -0.0074315914} + m_LocalScale: {x: 1.342947, y: 1.342947, z: 1.342947} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1481350550} - m_Father: {fileID: 1968119230} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 1000428120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1006305323 -PrefabInstance: +--- !u!23 &1127045219 +MeshRenderer: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2121825122} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalPosition.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalPosition.y - value: 1.95 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: d586649e59c967444a1607a4aed46c01, type: 2} - - target: {fileID: 919132149155446097, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - propertyPath: m_Name - value: Shield - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} ---- !u!1 &1015737781 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127045217} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1127045220 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127045217} + m_Mesh: {fileID: -2564423107879867638, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1129813366 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8166,76 +9087,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1015737782} - - component: {fileID: 1015737784} - - component: {fileID: 1015737783} + - component: {fileID: 1129813367} m_Layer: 0 - m_Name: LeftHand + m_Name: UniversalController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1015737782 +--- !u!4 &1129813367 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1015737781} - m_LocalRotation: {x: -0.27542365, y: 0.27542365, z: 0.65126175, w: 0.65126175} - m_LocalPosition: {x: -0.0358, y: 0.0577, z: -0.1296} - m_LocalScale: {x: 0.95, y: 0.95, z: 0.95} + m_GameObject: {fileID: 1129813366} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 105739408} - - {fileID: 1987239407} - - {fileID: 1199504349} - m_Father: {fileID: 506692965} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -45.848, y: 0, z: 90} ---- !u!114 &1015737783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1015737781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e241df096dff11c478f43d1b202d33af, type: 3} - m_Name: - m_EditorClassIdentifier: - selectFloat: Select - activateFloat: Activate - UIStateBool: UIEnabled - teleportStateBool: TeleportEnabled - baseController: {fileID: 0} - teleportController: {fileID: 0} - uiController: {fileID: 0} - controllerManager: {fileID: 0} ---- !u!95 &1015737784 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1015737781} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 3cc1bfa741063664e8b13a63afcd062f, type: 3} - m_Controller: {fileID: 9100000, guid: 6f17d5d554bc9b742b9bf585b813330c, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &1074416407 + - {fileID: 629305522} + - {fileID: 701476933} + - {fileID: 1257506428} + - {fileID: 993039146} + - {fileID: 1725178572} + - {fileID: 994902842} + m_Father: {fileID: 695895226} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1153135960 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8243,31 +9124,87 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1074416408} + - component: {fileID: 1153135962} + - component: {fileID: 1153135961} m_Layer: 0 - m_Name: Thumb_0_Left + m_Name: Pinch_Pointer_LOD0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1074416408 +--- !u!137 &1153135961 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1153135960} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f5ccd52dc494e054fbe7d7161dcabe25, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 1 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: -5120762275383614272, guid: b4b483f74ea008746be752bb01d9849b, type: 3} + m_Bones: [] + m_BlendShapeWeights: [] + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: 0, y: 0.009045093, z: 0} + m_Extent: {x: 0.0077457884, y: 0.016694028, z: 0.0077457884} + m_DirtyAABB: 0 +--- !u!4 &1153135962 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1074416407} - m_LocalRotation: {x: -0.017132446, y: 0.023738552, z: -0.011670226, w: 0.9995033} - m_LocalPosition: {x: -0.027674861, y: -0.00000018596648, z: 0.00000015173107} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1153135960} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 50, y: 50, z: 50} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 283625090} - m_Father: {fileID: 25957662} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1078070623 + m_Children: [] + m_Father: {fileID: 1951035652} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1178045154 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8275,31 +9212,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1078070624} - m_Layer: 0 - m_Name: Middle_1_Left + - component: {fileID: 1178045155} + - component: {fileID: 1178045156} + m_Layer: 2 + m_Name: Climb m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1078070624 +--- !u!4 &1178045155 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1078070623} - m_LocalRotation: {x: 0.0013464622, y: -0.0029157132, z: -0.22192244, w: 0.9750591} - m_LocalPosition: {x: -0.039041024, y: 0.0000006005168, z: 0.00000011503696} + m_GameObject: {fileID: 1178045154} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 626500155} - m_Father: {fileID: 1430860603} - m_RootOrder: 0 + - {fileID: 860339259} + m_Father: {fileID: 928609389} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1106929323 +--- !u!114 &1178045156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1178045154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 496880615cd240be960d436c1c8ae570, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_ClimbSettings: + m_UseConstant: 1 + m_ConstantValue: + m_AllowFreeXMovement: 1 + m_AllowFreeYMovement: 1 + m_AllowFreeZMovement: 1 + m_Variable: {fileID: 0} +--- !u!1 &1180278382 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8307,157 +9266,334 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1106929324} - - component: {fileID: 1106929327} - - component: {fileID: 1106929326} - - component: {fileID: 1106929325} + - component: {fileID: 1180278388} + - component: {fileID: 1180278383} + - component: {fileID: 1180278387} + - component: {fileID: 1180278386} + - component: {fileID: 1180278385} + - component: {fileID: 1180278384} m_Layer: 0 - m_Name: SnapPoint - m_TagString: Untagged + m_Name: Main Camera + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1106929324 -Transform: +--- !u!20 &1180278383 +Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106929323} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 597715543} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1106929325 -MeshRenderer: + m_GameObject: {fileID: 1180278382} + 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_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.01 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + 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!82 &1180278384 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106929323} + m_GameObject: {fileID: 1180278382} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 738067764} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1106929326 -MeshFilter: + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1180278385 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106929323} - m_Mesh: {fileID: 524671518} ---- !u!114 &1106929327 + m_GameObject: {fileID: 1180278382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!114 &1180278386 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106929323} + m_GameObject: {fileID: 1180278382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: + m_UseReference: 1 + m_Action: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: + m_Id: 0bacfa51-7938-4a88-adae-9e8ba6c59d23 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: f5efb008-b167-4d0f-b9e0-49a2350a85b3 + m_Path: /centerEyePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Position + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: 7862207684358717888, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_RotationInput: + m_UseReference: 1 + m_Action: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: 5439f14e-c9da-4bd1-ad3f-7121a75c10d9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: f984a7fd-f7e2-45ef-b21d-699a5d160f29 + m_Path: /centerEyeRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Rotation + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: -530380113134220495, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_TrackingStateInput: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Input + m_Type: 0 + m_ExpectedControlType: Integer + m_Id: be9cc21d-5595-4ea6-aa72-e48652a11968 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 1031966339891076899, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_PositionAction: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: + m_Id: 0bacfa51-7938-4a88-adae-9e8ba6c59d23 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: f5efb008-b167-4d0f-b9e0-49a2350a85b3 + m_Path: /centerEyePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Position + m_Flags: 0 + m_Flags: 0 + m_RotationAction: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: 5439f14e-c9da-4bd1-ad3f-7121a75c10d9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: f984a7fd-f7e2-45ef-b21d-699a5d160f29 + m_Path: /centerEyeRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Rotation + m_Flags: 0 + m_Flags: 0 +--- !u!81 &1180278387 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1180278382} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 88ea78c93b844cc1b7f98cca70e8679c, type: 3} - m_Name: - m_EditorClassIdentifier: - parent: {fileID: 597715544} ---- !u!1 &1142522480 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1142522481} - m_Layer: 0 - m_Name: Ring_Palm_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1142522481 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142522480} - m_LocalRotation: {x: 0.99804187, y: -0.04426889, z: 0.04315787, w: 0.009497783} - m_LocalPosition: {x: -0.05238823, y: 0.0045133065, z: -0.011750946} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1968119230} - m_Father: {fileID: 105739408} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1177651916 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1177651917} - m_Layer: 0 - m_Name: Middle_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1177651917 +--- !u!4 &1180278388 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1177651916} - m_LocalRotation: {x: -0.00000002980233, y: -0.00000005308539, z: -0.000000042258765, w: 1} - m_LocalPosition: {x: -0.022676239, y: 0.00000029563904, z: -0.000000077486035} + m_GameObject: {fileID: 1180278382} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 626500155} - m_RootOrder: 0 + m_Father: {fileID: 886140063} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1192304053 GameObject: @@ -8482,6 +9618,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1192304053} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} @@ -8492,9 +9629,8 @@ Transform: - {fileID: 2011926244} - {fileID: 535679137} m_Father: {fileID: 1527860102} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1199504348 +--- !u!1 &1193047285 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8502,34 +9638,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1199504349} + - component: {fileID: 1193047286} m_Layer: 0 - m_Name: AttachTransform + m_Name: VRB_Controller_Logo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1199504349 +--- !u!4 &1193047286 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199504348} - m_LocalRotation: {x: 0.56707263, y: -0.5567243, z: -0.42857793, w: 0.42989275} - m_LocalPosition: {x: -0.09850459, y: -0.018400598, z: -0.0062015653} + m_GameObject: {fileID: 1193047285} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1015737782} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0.594, y: -105.251, z: -90.602} + m_Children: + - {fileID: 1644637661} + m_Father: {fileID: 880607834} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1204090590 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1756511964} m_Modifications: - target: {fileID: -8679921383154817045, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} @@ -8577,11 +9715,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -7511558181221131132, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - target: {fileID: 919132149155446097, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} @@ -8593,6 +9735,12 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} + insertIndex: -1 + addedObject: {fileID: 1520088451} m_SourcePrefab: {fileID: 100100000, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} --- !u!4 &1204090591 stripped Transform: @@ -8623,13 +9771,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1216574280} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.4000002, y: 1.18, z: 0.6000003} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1756511964} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1216574282 MonoBehaviour: @@ -8645,9 +9793,8 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: c4a99b4c0ca9cb45a73a8f0d59cbc130 - uniqueName: LightSabre Origin - tags: [] ---- !u!1 &1222594155 + guids: [] +--- !u!1 &1219978419 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8655,42 +9802,41 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1222594156} - - component: {fileID: 1222594158} - - component: {fileID: 1222594157} - m_Layer: 8 - m_Name: Plane + - component: {fileID: 1219978420} + - component: {fileID: 1219978422} + - component: {fileID: 1219978421} + m_Layer: 0 + m_Name: TouchPad m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1222594156 +--- !u!4 &1219978420 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222594155} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1219978419} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: -0.0020741627, z: -0.0052528577} + m_LocalScale: {x: 0.982392, y: 1.55, z: 0.982392} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 134998304} - m_Father: {fileID: 1521703297} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!23 &1222594157 + m_Children: [] + m_Father: {fileID: 936988544} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1219978421 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222594155} + m_GameObject: {fileID: 1219978419} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -8698,10 +9844,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5984489a6c8753743953c8d64d3265fb, type: 2} + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8723,14 +9872,150 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1222594158 +--- !u!33 &1219978422 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222594155} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 1219978419} + m_Mesh: {fileID: -1120971793077124694, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1223989041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1223989042} + - component: {fileID: 1223989044} + - component: {fileID: 1223989043} + m_Layer: 0 + m_Name: Button_Home + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1223989042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223989041} + serializedVersion: 2 + m_LocalRotation: {x: 0.18379451, y: -0.00000008593347, z: 0.000000016067828, w: 0.9829647} + m_LocalPosition: {x: 0.0000000071757764, y: -0.0032368493, z: 0.024549427} + m_LocalScale: {x: 1.01935, y: 1.01935, z: 1.01935} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 936988544} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1223989043 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223989041} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1223989044 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223989041} + m_Mesh: {fileID: -8429650256770907399, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1240689137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1240689138} + - component: {fileID: 1240689139} + m_Layer: 0 + m_Name: Right Controller Teleport Stabilized Origin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1240689138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1240689137} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 773172690} + m_Father: {fileID: 886140063} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1240689139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1240689137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64d299502104b064388841ec2adf6def, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Target: {fileID: 1951035652} + m_AimTargetObject: {fileID: 1895599009} + m_UseLocalSpace: 0 + m_AngleStabilization: 20 + m_PositionStabilization: 0.25 --- !u!1 &1241623309 GameObject: m_ObjectHideFlags: 0 @@ -8748,6 +10033,7 @@ GameObject: - component: {fileID: 1241623313} - component: {fileID: 1241623312} - component: {fileID: 1241623311} + - component: {fileID: 1241623319} m_Layer: 0 m_Name: Ball m_TagString: Untagged @@ -8762,13 +10048,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241623309} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 2.125, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 813701130} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1241623311 MonoBehaviour: @@ -8822,9 +10108,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -8853,69 +10136,42 @@ MonoBehaviour: m_FirstSelectEntered: m_PersistentCalls: m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_SelectExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_AttachTransform: {fileID: 0} m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 + m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 + m_SnapToColliderVolume: 0 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 m_MovementType: 1 @@ -8956,10 +10212,10 @@ MonoBehaviour: m_ThrowAngularVelocityScale: 1 m_ForceGravityOnDetach: 0 m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 isTouchable: 1 isGrabbable: 1 isUsable: 0 @@ -8977,8 +10233,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: 0e1969c09cdcd146a3bba4ccd6b6b3bd - uniqueName: Ball - tags: [] + guids: [] --- !u!54 &1241623315 Rigidbody: m_ObjectHideFlags: 0 @@ -8986,10 +10241,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241623309} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.01 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -9003,9 +10269,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241623309} m_Material: {fileID: 13400000, guid: fb001adfa2edbb64887889d74d6fe41e, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.12 m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1241623317 @@ -9025,6 +10299,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9059,70 +10336,29 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1241623309} m_Mesh: {fileID: 6935877506589290101, guid: 1eef6eb71f126ba4aa31d33bb2f810c5, type: 3} ---- !u!1 &1268751233 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1268751234} - m_Layer: 8 - m_Name: Anchor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1268751234 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1268751233} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.01, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1731060433} - m_Father: {fileID: 232339300} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1275973670 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1275973671} - m_Layer: 0 - m_Name: Little_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1275973671 -Transform: +--- !u!114 &1241623319 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275973670} - m_LocalRotation: {x: 0.000000022351742, y: 0.000000014901163, z: -0.00000002793968, w: 1} - m_LocalPosition: {x: -0.017860297, y: 0.00000007152557, z: -0.00000015258789} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1418001335} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1289966972 + m_GameObject: {fileID: 1241623309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 1241623313} + m_PokeCollider: {fileID: 0} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!1 &1243447983 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9130,63 +10366,86 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1289966973} - m_Layer: 0 - m_Name: Little_Palm_Left + - component: {fileID: 1243447984} + - component: {fileID: 1243447986} + - component: {fileID: 1243447985} + m_Layer: 8 + m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1289966973 +--- !u!4 &1243447984 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1289966972} - m_LocalRotation: {x: 0.99290055, y: -0.033564012, z: 0.11202527, w: 0.02173406} - m_LocalPosition: {x: -0.048623275, y: 0.0027686262, z: -0.026522674} + m_GameObject: {fileID: 1243447983} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1466462400} - m_Father: {fileID: 1909973946} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1307398687 -GameObject: + - {fileID: 2035264206} + m_Father: {fileID: 2016722928} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &1243447985 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1307398688} - m_Layer: 0 - m_Name: Little_1_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1307398688 -Transform: + m_GameObject: {fileID: 1243447983} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ab885650ca87af54d8a0e2e50e88b644, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1243447986 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307398687} - m_LocalRotation: {x: 0.0012706812, y: -0.0023152584, z: -0.06524572, w: 0.99786574} - m_LocalPosition: {x: -0.033131722, y: 0.00000038266182, z: -0.00000061273573} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 795450758} - m_Father: {fileID: 2110589559} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1336895284 + m_GameObject: {fileID: 1243447983} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1257506427 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9194,200 +10453,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1336895285} - - component: {fileID: 1336895289} - - component: {fileID: 1336895288} - - component: {fileID: 1336895287} - - component: {fileID: 1336895286} + - component: {fileID: 1257506428} + - component: {fileID: 1257506430} + - component: {fileID: 1257506429} m_Layer: 0 - m_Name: Right UI Controller + m_Name: Controller_Base m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1336895285 +--- !u!4 &1257506428 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336895284} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1257506427} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 676405892} - m_Father: {fileID: 697578261} - m_RootOrder: 2 + - {fileID: 1969388070} + m_Father: {fileID: 1129813367} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1336895286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336895284} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LineWidth: 0.02 - m_OverrideInteractorLineLength: 1 - m_LineLength: 10 - m_AutoAdjustLineLength: 0 - m_MinLineLength: 0.5 - m_UseDistanceToHitAsMaxLineLength: 1 - m_LineRetractionDelay: 0.5 - m_LineLengthChangeSpeed: 12 - m_WidthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_SetLineColorGradient: 1 - m_ValidColorGradient: - serializedVersion: 2 - key0: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 0} - key1: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key2: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key3: {r: 0, g: 0, b: 0, a: 1} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 65535 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_InvalidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0.39215687, b: 0.18431373, a: 0} - key1: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key2: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_BlockedColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_TreatSelectionAsValidState: 0 - m_SmoothMovement: 0 - m_FollowTightness: 10 - m_SnapThresholdDistance: 10 - m_Reticle: {fileID: 0} - m_BlockedReticle: {fileID: 0} - m_StopLineAtFirstRaycastHit: 1 - m_StopLineAtSelection: 0 - m_SnapEndpointIfAvailable: 1 - m_LineBendRatio: 0.5 - m_OverrideInteractorLineOrigin: 1 - m_LineOriginTransform: {fileID: 0} - m_LineOriginOffset: 0 ---- !u!120 &1336895287 -LineRenderer: +--- !u!23 &1257506429 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336895284} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_GameObject: {fileID: 1257506427} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: dca6b5fc8485ffd4c88bf8ae060949bc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9407,429 +10522,417 @@ LineRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 - m_Positions: [] - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.02 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 0, g: 0, b: 1, a: 1} - key1: {r: 0, g: 0, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 4 - numCapVertices: 4 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &1336895288 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1257506430 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257506427} + m_Mesh: {fileID: 22788929071467060, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1272102071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1272102072} + - component: {fileID: 1272102073} + m_Layer: 0 + m_Name: Gaze Stabilized + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1272102072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272102071} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1806910830} + m_Father: {fileID: 886140063} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1272102073 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336895284} - m_Enabled: 0 + m_GameObject: {fileID: 1272102071} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 203357f2f04686b4c860a9361fd12c36, type: 3} + m_Script: {fileID: 11500000, guid: 64d299502104b064388841ec2adf6def, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 2089871579} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 32 - m_InteractionLayers: - m_Bits: 32 - m_AttachTransform: {fileID: 676405892} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 0 - m_TargetPriorityMode: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_AllowHoverAudioWhileSelecting: 1 - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_AllowHoverHapticsWhileSelecting: 1 - m_LineType: 0 - m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 30 - m_RayOriginTransform: {fileID: 0} - m_ReferenceFrame: {fileID: 0} - m_Velocity: 16 - m_Acceleration: 9.8 - m_AdditionalGroundHeight: 0.1 - m_AdditionalFlightTime: 0.5 - m_EndPointDistance: 30 - m_EndPointHeight: -10 - m_ControlPointDistance: 10 - m_ControlPointHeight: 5 - m_SampleFrequency: 20 - m_HitDetectionType: 0 - m_SphereCastRadius: 0 - m_ConeCastAngle: 6 - m_RaycastMask: - serializedVersion: 2 - m_Bits: 32 - m_RaycastTriggerInteraction: 1 - m_RaycastSnapVolumeInteraction: 1 - m_HitClosestOnly: 0 - m_HoverToSelect: 0 - m_HoverTimeToSelect: 0.5 - m_AutoDeselect: 0 - m_TimeToAutoDeselect: 3 - m_EnableUIInteraction: 1 - m_BlockUIOnInteractableSelection: 1 - m_AllowAnchorControl: 1 - m_UseForceGrab: 1 - m_RotateSpeed: 180 - m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 - m_UIHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_UIHoverExited: - m_PersistentCalls: - m_Calls: [] - m_EnableARRaycasting: 0 - m_OccludeARHitsWith3DObjects: 0 - m_OccludeARHitsWith2DObjects: 0 - m_ScaleMode: 0 ---- !u!114 &1336895289 + m_Target: {fileID: 389396071} + m_AimTargetObject: {fileID: 0} + m_UseLocalSpace: 1 + m_AngleStabilization: 20 + m_PositionStabilization: 0.25 +--- !u!1 &1285588751 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1285588754} + - component: {fileID: 1285588752} + - component: {fileID: 1285588756} + - component: {fileID: 1285588755} + - component: {fileID: 1285588753} + - component: {fileID: 1285588757} + m_Layer: 0 + m_Name: Right Near-Far Interactor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1285588752 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336895284} + m_GameObject: {fileID: 1285588751} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} + m_Script: {fileID: 11500000, guid: 25a07ef133a37d140a87cdf1f1c75fdf, type: 3} m_Name: m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 0 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 820468471} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -3326005586356538449, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotationAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 5101698808175986029, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_IsTrackedAction: - m_UseReference: 0 - m_Action: - m_Name: Is Tracked + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 1 + m_Handedness: 2 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_SelectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select m_Type: 1 m_ExpectedControlType: - m_Id: fc9b37cc-fd6c-4777-a440-ecfac6144601 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: 90359750-2287-4286-aed5-46e8351830e5 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: + m_Id: 2491b664-3d4e-4f20-a7ae-ee1861d845f2 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 187161793506945269, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value + m_InputActionValue: + m_Name: Select Value m_Type: 0 - m_ExpectedControlType: - m_Id: 6010ccb0-bc96-4f14-8cec-bb81835a63eb + m_ExpectedControlType: Axis + m_Id: fc42dacc-33eb-41ec-9c17-d242ac6b0c5b m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 4766120400929042988, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 + m_InputActionReferencePerformed: {fileID: 187161793506945269, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: -1758520528963094988, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 m_ExpectedControlType: - m_Id: + m_Id: 77660b9e-6bbe-4740-b80f-1fea8d0f59e1 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 83097790271614945, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateActionValue: - m_UseReference: 1 - m_Action: - m_Name: Activate Action Value + m_InputActionValue: + m_Name: Activate Value m_Type: 0 - m_ExpectedControlType: - m_Id: a770f569-5289-4c4d-ba37-79e50efe54ee + m_ExpectedControlType: Axis + m_Id: 94568f52-c27a-47fc-a190-5e3b17572929 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -3285721481334498719, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 + m_InputActionReferencePerformed: {fileID: 83097790271614945, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: 7904272356298805229, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_SelectActionTrigger: 1 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 1 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 1 + m_InteractionAttachController: {fileID: 1285588756} + m_EnableNearCasting: 1 + m_NearInteractionCaster: {fileID: 1285588755} + m_NearCasterSortingStrategy: 1 + m_SortNearTargetsAfterTargetFilter: 0 + m_EnableFarCasting: 1 + m_FarInteractionCaster: {fileID: 1285588753} + m_FarAttachMode: 1 + m_EnableUIInteraction: 1 + m_BlockUIOnInteractableSelection: 1 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_UIPressInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 m_ExpectedControlType: - m_Id: + m_Id: ded1ccb2-ff18-46c7-ade9-b80985fe2825 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 3279264004350380116, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value + m_InputActionValue: + m_Name: UI Press Value m_Type: 0 - m_ExpectedControlType: - m_Id: 532b2b0b-2859-4882-a216-c5bbec06b0ec + m_ExpectedControlType: Axis + m_Id: d762660e-30e0-4a4d-8e2a-e6b553e03f11 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 0} - m_UIScrollAction: - m_UseReference: 0 - m_Action: + m_InputActionReferencePerformed: {fileID: 3279264004350380116, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: -5908353012961274365, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 2 + m_InputAction: m_Name: UI Scroll m_Type: 0 m_ExpectedControlType: Vector2 - m_Id: c0c98540-834b-4be6-88b6-b84f677a5c16 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 1 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 9ad5ff42-2240-49bb-89c4-c981d3c023eb - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8222252007134549311, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5913262927076077117, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 8a29bfec-f245-4960-a581-9483a94f70d0 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 875253871413052681, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ScaleToggleAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Toggle - m_Type: 1 - m_ExpectedControlType: - m_Id: 26da0e49-599a-47eb-82d6-0a15fae0d588 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ScaleDeltaAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Delta - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: afa73a20-c36b-49cf-9c5a-b1e356d4be1d + m_Id: ef5cc4a5-b968-432c-9ae7-45e494178db0 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 ---- !u!1 &1338586624 + m_InputActionReference: {fileID: -6756787485274679044, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} +--- !u!114 &1285588753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285588751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ef20135915079454985abea5a2ec8967, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CastOrigin: {fileID: 1285588754} + m_EnableStabilization: 1 + m_PositionStabilization: 0.25 + m_AngleStabilization: 20 + m_AimTargetObject: {fileID: 1285588752} + m_RaycastMask: + serializedVersion: 2 + m_Bits: 32 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 1 + m_TargetNumCurveSegments: 1 + m_HitDetectionType: 2 + m_CastDistance: 10 + m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 +--- !u!4 &1285588754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285588751} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1028208103} + m_Father: {fileID: 487972874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1285588755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285588751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48139a683d3b4ac3a37cd5d24f71acf1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CastOrigin: {fileID: 1285588754} + m_EnableStabilization: 0 + m_PositionStabilization: 0.25 + m_AngleStabilization: 20 + m_AimTargetObject: {fileID: 0} + m_PhysicsLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_PhysicsTriggerInteraction: 1 + m_CastRadius: 0.1 +--- !u!114 &1285588756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285588751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 792f6c7eaa1a4b82abf8351559ac97eb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransformToFollow: {fileID: 1285588754} + m_MotionStabilizationMode: 1 + m_PositionStabilization: 0.25 + m_AngleStabilization: 20 + m_SmoothOffset: 0 + m_SmoothingSpeed: 10 + m_UseDistanceBasedVelocityScaling: 1 + m_UseMomentum: 1 + m_MomentumDecayScale: 1.25 + m_ZVelocityRampThreshold: 0.3 + m_PullVelocityBias: 1 + m_PushVelocityBias: 1.25 + m_MinAdditionalVelocityScalar: 0.05 + m_MaxAdditionalVelocityScalar: 1.5 +--- !u!114 &1285588757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285588751} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd0b9921bce4eeb49bd05815b1135ac2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractorSourceObject: {fileID: 1285588752} + m_HapticImpulsePlayer: {fileID: 0} + m_PlaySelectEntered: 1 + m_SelectEnteredData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectExited: 0 + m_SelectExitedData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectCanceled: 0 + m_SelectCanceledData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverEntered: 1 + m_HoverEnteredData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverExited: 0 + m_HoverExitedData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverCanceled: 0 + m_HoverCanceledData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_AllowHoverHapticsWhileSelecting: 0 +--- !u!1 &1326720082 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9837,31 +10940,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1338586625} + - component: {fileID: 1326720083} + - component: {fileID: 1326720085} + - component: {fileID: 1326720084} m_Layer: 0 - m_Name: Index_0_Left + m_Name: ThumbStick_Base m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1338586625 +--- !u!4 &1326720083 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1338586624} - m_LocalRotation: {x: 0.039005104, y: -0.077951096, z: -0.09432525, w: 0.9917182} - m_LocalPosition: {x: -0.059387933, y: -0.00000024288892, z: 0.0000000011920929} + m_GameObject: {fileID: 1326720082} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.008775877, y: 0.00152745, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 740016310} - m_Father: {fileID: 628411316} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 1000428120} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1352490007 +--- !u!23 &1326720084 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1326720082} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1326720085 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1326720082} + m_Mesh: {fileID: -2014588322676101042, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1333177533 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9869,30 +11026,84 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1352490008} + - component: {fileID: 1333177534} + - component: {fileID: 1333177536} + - component: {fileID: 1333177535} m_Layer: 0 - m_Name: Index_1_Left + m_Name: EventSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1352490008 +--- !u!4 &1333177534 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1352490007} - m_LocalRotation: {x: 0.0029770152, y: -0.0028722505, z: -0.046370056, w: 0.9989158} - m_LocalPosition: {x: -0.033406343, y: 0.00000032424927, z: -0.00000019073485} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 512971542} - m_Father: {fileID: 189572713} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1333177533} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.028, y: 0, z: -5.929} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3120982} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1333177535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333177533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_ClickSpeed: 0.3 + m_MoveDeadzone: 0.6 + m_RepeatDelay: 0.5 + m_RepeatRate: 0.1 + m_TrackedDeviceDragThresholdMultiplier: 2 + m_TrackedScrollDeltaMultiplier: 5 + m_ActiveInputMode: 1 + m_EnableXRInput: 1 + m_EnableMouseInput: 1 + m_EnableTouchInput: 1 + m_PointAction: {fileID: 2869410428622933342, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_LeftClickAction: {fileID: 1855836014308820768, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_MiddleClickAction: {fileID: -6289560987278519447, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_RightClickAction: {fileID: -2562941478296515153, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ScrollWheelAction: {fileID: 5825226938762934180, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_NavigateAction: {fileID: -7967456002180160679, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_SubmitAction: {fileID: 3994978066732806534, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_CancelAction: {fileID: 2387711382375263438, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_EnableBuiltinActionsAsFallback: 1 + m_EnableGamepadInput: 1 + m_EnableJoystickInput: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel +--- !u!114 &1333177536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333177533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 --- !u!1 &1359767050 GameObject: m_ObjectHideFlags: 0 @@ -9917,13 +11128,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1359767050} + serializedVersion: 2 m_LocalRotation: {x: 0.27059805, y: 0.27059805, z: 0.6532815, w: 0.6532815} m_LocalPosition: {x: 0.1617, y: 0, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 660021081} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 90} --- !u!136 &1359767052 CapsuleCollider: @@ -9933,8 +11144,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1359767050} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.02 m_Height: 0.2 m_Direction: 1 @@ -9995,44 +11215,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1364604469} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1390163569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1390163570} - m_Layer: 0 - m_Name: Index_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1390163570 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390163569} - m_LocalRotation: {x: 0.000000029802326, y: 9.492409e-15, z: 0.00000031851238, w: 1} - m_LocalPosition: {x: -0.02301526, y: 0.000000085830685, z: -0.000000114440915} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2109031085} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1390574009 Mesh: @@ -10041,7 +11230,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -10188,617 +11377,198 @@ Mesh: m_Center: {x: 0, y: 0, z: -0.09999999} m_Extent: {x: 0.19999997, y: 0.19999997, z: 0.09999999} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1.6879306 - m_MeshMetrics[1]: 1 + 'm_MeshMetrics[0]': 1.6879306 + 'm_MeshMetrics[1]': 1 m_MeshOptimizationFlags: 1 m_StreamData: serializedVersion: 2 offset: 0 size: 0 path: ---- !u!1 &1418001334 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1418001335} - m_Layer: 0 - m_Name: Little_2_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1418001335 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1418001334} - m_LocalRotation: {x: 0.007898328, y: 0.0033098771, z: -0.14792106, w: 0.9889621} - m_LocalPosition: {x: -0.021837996, y: 0.000000052452087, z: 0.0000003004074} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1275973671} - m_Father: {fileID: 679583488} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1421788324 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1421788325} - m_Layer: 0 - m_Name: Index_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1421788325 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1421788324} - m_LocalRotation: {x: 0.000000029802326, y: 9.492409e-15, z: 0.00000031851238, w: 1} - m_LocalPosition: {x: -0.02301526, y: 0.000000085830685, z: -0.000000114440915} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 512971542} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1423342052 +--- !u!1 &1392897537 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1423342053} - - component: {fileID: 1423342056} - - component: {fileID: 1423342057} - - component: {fileID: 1423342055} - - component: {fileID: 1423342054} - m_Layer: 0 - m_Name: Left Teleport Controller - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1423342053 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423342052} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1742313800} - m_Father: {fileID: 1773926310} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1423342054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423342052} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LineWidth: 0.02 - m_OverrideInteractorLineLength: 1 - m_LineLength: 10 - m_AutoAdjustLineLength: 0 - m_MinLineLength: 0.5 - m_UseDistanceToHitAsMaxLineLength: 1 - m_LineRetractionDelay: 0.5 - m_LineLengthChangeSpeed: 12 - m_WidthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_SetLineColorGradient: 1 - m_ValidColorGradient: - serializedVersion: 2 - key0: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 0} - key1: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key2: {r: 0.47058824, g: 0.94509804, b: 0.78431374, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_InvalidColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0.39215687, b: 0.18431373, a: 0} - key1: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key2: {r: 1, g: 0.39215687, b: 0.18431373, a: 1} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 32768 - ctime2: 65535 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 32768 - atime2: 65535 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 3 - m_NumAlphaKeys: 3 - m_BlockedColorGradient: - serializedVersion: 2 - key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - m_TreatSelectionAsValidState: 0 - m_SmoothMovement: 0 - m_FollowTightness: 10 - m_SnapThresholdDistance: 10 - m_Reticle: {fileID: 0} - m_BlockedReticle: {fileID: 0} - m_StopLineAtFirstRaycastHit: 1 - m_StopLineAtSelection: 0 - m_SnapEndpointIfAvailable: 1 - m_LineBendRatio: 0.5 - m_OverrideInteractorLineOrigin: 1 - m_LineOriginTransform: {fileID: 0} - m_LineOriginOffset: 0 ---- !u!120 &1423342055 -LineRenderer: + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1392897538} + - component: {fileID: 1392897539} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1392897538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392897537} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.0015, z: 0} + m_LocalScale: {x: 0.017, y: 0.017, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1644637661} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!212 &1392897539 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423342052} + m_GameObject: {fileID: 1392897537} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c69840bf05f5feb499c93b16ff5443fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 0} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.02 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 4 - numCapVertices: 4 - alignment: 0 - textureMode: 0 - shadowBias: 0 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!114 &1423342056 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423342052} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 0 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 506692965} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: - m_Id: ee2b90af-cb76-4d31-80a6-06fad8ac806a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -2024308242397127297, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotationAction: - m_UseReference: 1 - m_Action: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 4c57fe61-e6e1-4df3-bff3-6c688f6f9e9a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 8248158260566104461, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_IsTrackedAction: - m_UseReference: 0 - m_Action: - m_Name: Is Tracked - m_Type: 1 - m_ExpectedControlType: - m_Id: 23cf2d5a-2e3e-44af-b5ea-b28d71f092e1 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: df150c59-acdb-4a44-ae0d-6b7b17b9125b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: Select - m_Type: 0 - m_ExpectedControlType: - m_Id: 869302d5-d3c7-4c1b-a962-a7e033b42a15 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -4084014799535200556, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: b1d7c618-2863-40eb-94b0-bc55c977ad1f - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7039868187661461836, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: Activate - m_Type: 0 - m_ExpectedControlType: - m_Id: 4aec5842-effb-4789-a584-e3222db901f4 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5982496924579745919, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateActionValue: - m_UseReference: 1 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 6a145112-f236-49b9-9463-5bc169d5d003 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5393738492722007444, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: UI Press - m_Type: 0 - m_ExpectedControlType: - m_Id: e65a640e-2a41-422f-82dd-ebfb73c6c378 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6395602842196007441, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 4936da6e-2314-466c-ac19-aa23d9db394b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIScrollAction: - m_UseReference: 0 - m_Action: - m_Name: UI Scroll - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 78037b9b-94c5-4459-aaa7-fadfd326bbbe - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 1 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 80072ca0-f27a-4040-8ae9-a0fa7a761bbc - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8785819595477538065, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Rotate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 13f6cacf-e639-4a90-864c-abb89495ad0c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7363382999065477798, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 33f916ce-3f4c-4552-bf40-55535ae2298e - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Translate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 6713f8f9-89a2-46da-aad5-ae077ac477ee - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 7779212132400271959, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ScaleToggleAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Toggle - m_Type: 1 - m_ExpectedControlType: - m_Id: 6a05ceb9-e956-4d2e-b0b3-9b1ade5d8108 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ScaleDeltaAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Delta - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 4b35d4f1-f733-474e-8378-d24fb64bf06d - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 ---- !u!114 &1423342057 + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 6ef340f6eca30e241bf0d488dde83237, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1423653692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423653693} + - component: {fileID: 1423653694} + m_Layer: 0 + m_Name: Collider (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1423653693 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423653692} + serializedVersion: 2 + m_LocalRotation: {x: -0.27059805, y: -0.27059805, z: 0.6532815, w: 0.6532815} + m_LocalPosition: {x: 0.177, y: 0, z: -0.171} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 660021081} + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 90} +--- !u!136 &1423653694 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423653692} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.02 + m_Height: 0.2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1442193926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1442193929} + - component: {fileID: 1442193927} + - component: {fileID: 1442193931} + - component: {fileID: 1442193930} + - component: {fileID: 1442193928} + - component: {fileID: 1442193932} + m_Layer: 0 + m_Name: Left Near-Far Interactor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1442193927 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423342052} - m_Enabled: 0 + m_GameObject: {fileID: 1442193926} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3} + m_Script: {fileID: 11500000, guid: 25a07ef133a37d140a87cdf1f1c75fdf, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 2089871579} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 256 + m_InteractionManager: {fileID: 0} m_InteractionLayers: - m_Bits: 2 + m_Bits: 1 + m_Handedness: 1 m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 0 + m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 m_StartingSelectedInteractable: {fileID: 0} m_StartingTargetFilter: {fileID: 0} @@ -10816,22 +11586,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectActionTrigger: 0 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 1 + m_SelectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 2491b664-3d4e-4f20-a7ae-ee1861d845f2 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: fc42dacc-33eb-41ec-9c17-d242ac6b0c5b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6131295136447488360, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: 6558622148059887818, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 77660b9e-6bbe-4740-b80f-1fea8d0f59e1 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 94568f52-c27a-47fc-a190-5e3b17572929 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: -4289430672226363583, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_SelectActionTrigger: 1 + m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -10864,130 +11683,204 @@ MonoBehaviour: m_HapticHoverCancelIntensity: 0 m_HapticHoverCancelDuration: 0 m_AllowHoverHapticsWhileSelecting: 1 - m_LineType: 1 - m_BlendVisualLinePoints: 1 - m_MaxRaycastDistance: 30 - m_RayOriginTransform: {fileID: 1742313800} - m_ReferenceFrame: {fileID: 0} - m_Velocity: 10 - m_Acceleration: 9.8 - m_AdditionalGroundHeight: 0.1 - m_AdditionalFlightTime: 0.5 - m_EndPointDistance: 30 - m_EndPointHeight: -10 - m_ControlPointDistance: 10 - m_ControlPointHeight: 5 - m_SampleFrequency: 20 - m_HitDetectionType: 0 - m_SphereCastRadius: 0 - m_ConeCastAngle: 6 - m_RaycastMask: - serializedVersion: 2 - m_Bits: 256 - m_RaycastTriggerInteraction: 1 - m_RaycastSnapVolumeInteraction: 1 - m_HitClosestOnly: 0 - m_HoverToSelect: 1 - m_HoverTimeToSelect: 0 - m_AutoDeselect: 0 - m_TimeToAutoDeselect: 3 + m_InteractionAttachController: {fileID: 1442193931} + m_EnableNearCasting: 1 + m_NearInteractionCaster: {fileID: 1442193930} + m_NearCasterSortingStrategy: 1 + m_SortNearTargetsAfterTargetFilter: 0 + m_EnableFarCasting: 1 + m_FarInteractionCaster: {fileID: 1442193928} + m_FarAttachMode: 1 m_EnableUIInteraction: 1 m_BlockUIOnInteractableSelection: 1 - m_AllowAnchorControl: 1 - m_UseForceGrab: 1 - m_RotateSpeed: 180 - m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 m_UIHoverEntered: m_PersistentCalls: m_Calls: [] m_UIHoverExited: m_PersistentCalls: m_Calls: [] - m_EnableARRaycasting: 0 - m_OccludeARHitsWith3DObjects: 0 - m_OccludeARHitsWith2DObjects: 0 - m_ScaleMode: 0 ---- !u!1 &1423653692 -GameObject: + m_UIPressInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 + m_ExpectedControlType: + m_Id: ded1ccb2-ff18-46c7-ade9-b80985fe2825 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d762660e-30e0-4a4d-8e2a-e6b553e03f11 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6395602842196007441, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: 71106601250685021, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: ef5cc4a5-b968-432c-9ae7-45e494178db0 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 2464016903823916871, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} +--- !u!114 &1442193928 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1423653693} - - component: {fileID: 1423653694} - m_Layer: 0 - m_Name: Collider (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1423653693 + m_GameObject: {fileID: 1442193926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ef20135915079454985abea5a2ec8967, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CastOrigin: {fileID: 1442193929} + m_EnableStabilization: 1 + m_PositionStabilization: 0.25 + m_AngleStabilization: 20 + m_AimTargetObject: {fileID: 1442193927} + m_RaycastMask: + serializedVersion: 2 + m_Bits: 32 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 1 + m_TargetNumCurveSegments: 1 + m_HitDetectionType: 2 + m_CastDistance: 10 + m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 +--- !u!4 &1442193929 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423653692} - m_LocalRotation: {x: -0.27059805, y: -0.27059805, z: 0.6532815, w: 0.6532815} - m_LocalPosition: {x: 0.177, y: 0, z: -0.171} + m_GameObject: {fileID: 1442193926} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 660021081} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: -45, z: 90} ---- !u!136 &1423653694 -CapsuleCollider: + m_Children: + - {fileID: 1913886511} + m_Father: {fileID: 1071573184} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1442193930 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423653692} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1442193926} m_Enabled: 1 - m_Radius: 0.02 - m_Height: 0.2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &1430860602 -GameObject: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48139a683d3b4ac3a37cd5d24f71acf1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CastOrigin: {fileID: 1442193929} + m_EnableStabilization: 0 + m_PositionStabilization: 0.25 + m_AngleStabilization: 20 + m_AimTargetObject: {fileID: 0} + m_PhysicsLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_PhysicsTriggerInteraction: 1 + m_CastRadius: 0.1 +--- !u!114 &1442193931 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1430860603} - m_Layer: 0 - m_Name: Middle_0_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1430860603 -Transform: + m_GameObject: {fileID: 1442193926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 792f6c7eaa1a4b82abf8351559ac97eb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransformToFollow: {fileID: 1442193929} + m_MotionStabilizationMode: 1 + m_PositionStabilization: 0.25 + m_AngleStabilization: 20 + m_SmoothOffset: 0 + m_SmoothingSpeed: 10 + m_UseDistanceBasedVelocityScaling: 1 + m_UseMomentum: 1 + m_MomentumDecayScale: 1.25 + m_ZVelocityRampThreshold: 0.3 + m_PullVelocityBias: 1 + m_PushVelocityBias: 1.25 + m_MinAdditionalVelocityScalar: 0.05 + m_MaxAdditionalVelocityScalar: 1.5 +--- !u!114 &1442193932 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1430860602} - m_LocalRotation: {x: 0.037149172, y: -0.0391672, z: -0.020477412, w: 0.9983319} - m_LocalPosition: {x: -0.062340543, y: -0.00000025370625, z: -0.00000015303492} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1078070624} - m_Father: {fileID: 1675801262} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1466462399 + m_GameObject: {fileID: 1442193926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd0b9921bce4eeb49bd05815b1135ac2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractorSourceObject: {fileID: 1442193927} + m_HapticImpulsePlayer: {fileID: 0} + m_PlaySelectEntered: 1 + m_SelectEnteredData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectExited: 0 + m_SelectExitedData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectCanceled: 0 + m_SelectCanceledData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverEntered: 1 + m_HoverEnteredData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverExited: 0 + m_HoverExitedData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverCanceled: 0 + m_HoverCanceledData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_AllowHoverHapticsWhileSelecting: 0 +--- !u!1 &1442437646 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10995,30 +11888,84 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1466462400} + - component: {fileID: 1442437647} + - component: {fileID: 1442437649} + - component: {fileID: 1442437648} m_Layer: 0 - m_Name: Little_0_Left + m_Name: Button_A m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1466462400 +--- !u!4 &1442437647 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1466462399} - m_LocalRotation: {x: -0.018601296, y: 0.022547437, z: -0.058639184, w: 0.99785125} - m_LocalPosition: {x: -0.056403197, y: -0.00000059507784, z: 0.0000003004074} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 679583488} - m_Father: {fileID: 1289966973} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1442437646} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.007800013, y: 0.0013757758, z: 0.0055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1000428120} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1442437648 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442437646} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1442437649 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442437646} + m_Mesh: {fileID: 5083779560280695074, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} --- !u!1 &1471223337 GameObject: m_ObjectHideFlags: 0 @@ -11043,13 +11990,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1471223337} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 1.2, z: 1.125} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1192304054} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1471223339 MonoBehaviour: @@ -11065,9 +12012,8 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: 5ff70f47eac84445b28f57b8bc54153e - uniqueName: TransformerInside - tags: [] ---- !u!1 &1481350549 + guids: [] +--- !u!1 &1478590270 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11075,62 +12021,84 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1481350550} + - component: {fileID: 1478590271} + - component: {fileID: 1478590273} + - component: {fileID: 1478590272} m_Layer: 0 - m_Name: Ring_2_Left + m_Name: ThumbStick_Base m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1481350550 +--- !u!4 &1478590271 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1481350549} - m_LocalRotation: {x: -0.0013731687, y: -0.0005792431, z: -0.08538537, w: 0.9963469} - m_LocalPosition: {x: -0.028493328, y: -0.00000044822693, z: -0.0000003170967} + m_GameObject: {fileID: 1478590270} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.008775877, y: 0.00152745, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2131842499} - m_Father: {fileID: 995671520} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 994902842} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1494241463 -GameObject: +--- !u!23 &1478590272 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1494241464} - m_Layer: 0 - m_Name: Thumb_1_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1494241464 -Transform: + m_GameObject: {fileID: 1478590270} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1478590273 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494241463} - m_LocalRotation: {x: 0.0000025456518, y: 0.0000026570444, z: 0.10506754, w: 0.9944651} - m_LocalPosition: {x: -0.03307885, y: 0.000000052452087, z: -0.00000030398368} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 668594702} - m_Father: {fileID: 595536807} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1478590270} + m_Mesh: {fileID: -2014588322676101042, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} --- !u!1 &1507460096 GameObject: m_ObjectHideFlags: 0 @@ -11141,6 +12109,7 @@ GameObject: m_Component: - component: {fileID: 1507460097} - component: {fileID: 1507460098} + - component: {fileID: 1507460099} m_Layer: 0 m_Name: Light m_TagString: Untagged @@ -11155,13 +12124,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1507460096} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 1.511, z: 1.142} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 535679137} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1507460098 Light: @@ -11171,9 +12140,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1507460096} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 2 - m_Shape: 0 m_Color: {r: 1, g: 0, b: 1, a: 1} m_Intensity: 4 m_Range: 1 @@ -11223,40 +12191,62 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1 &1521703296 -GameObject: + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &1507460099 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1521703297} - m_Layer: 8 - m_Name: Anchor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1521703297 -Transform: + m_GameObject: {fileID: 1507460096} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &1520088448 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} + m_PrefabInstance: {fileID: 1204090590} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1520088451 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1521703296} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.01, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1222594156} - m_Father: {fileID: 815556419} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1520088448} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -2715810710897220760, guid: aac080cbebbc8d744ad7320f8bb657c9, type: 3} --- !u!1 &1525491573 GameObject: m_ObjectHideFlags: 0 @@ -11285,6 +12275,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1525491573} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.8, z: 2.2} m_LocalScale: {x: 1, y: 1, z: 1} @@ -11292,7 +12283,6 @@ Transform: m_Children: - {fileID: 790520236} m_Father: {fileID: 33704422} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!114 &1525491575 MonoBehaviour: @@ -11307,11 +12297,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_Handedness: 0 m_AttachTransform: {fileID: 790520236} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -11331,18 +12319,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] m_ShowInteractableHoverMeshes: 1 m_InteractableHoverMeshMaterial: {fileID: 0} m_InteractableCantHoverMeshMaterial: {fileID: 0} @@ -11368,9 +12344,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1525491573} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.4, y: 0.4, z: 0.2} m_Center: {x: 0, y: 0, z: -0.1} --- !u!114 &1525491577 @@ -11422,8 +12406,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: 6e662d7aa29798489718d4a6a25ea1d9 - uniqueName: Sliced Cube (1)_SnapZone_1 - tags: [] + guids: [] --- !u!1 &1527860101 GameObject: m_ObjectHideFlags: 0 @@ -11447,6 +12430,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1527860101} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3, y: 0, z: 6} m_LocalScale: {x: 1, y: 1, z: 1} @@ -11457,7 +12441,6 @@ Transform: - {fileID: 1192304054} - {fileID: 632093760} m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1583804100 GameObject: @@ -11483,13 +12466,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1583804100} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.2, z: -0.25} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1192304054} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1583804102 MonoBehaviour: @@ -11505,9 +12488,8 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: deaeb680dc4a6547b8ec1cd1bd3c03ae - uniqueName: TransformerOutside - tags: [] ---- !u!1 &1634918258 + guids: [] +--- !u!1 &1633703686 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11515,70 +12497,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1634918261} - - component: {fileID: 1634918260} - - component: {fileID: 1634918259} + - component: {fileID: 1633703687} + - component: {fileID: 1633703688} m_Layer: 0 - m_Name: XR_Setup_Action_Based_Hands + m_Name: Sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1634918259 -MonoBehaviour: +--- !u!4 &1633703687 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634918258} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb84184823a056249bfba5107e766ec3, type: 3} - m_Name: - m_EditorClassIdentifier: - layerSet: 2 - interactors: - - {fileID: 1423342057} - - {fileID: 496138947} ---- !u!114 &1634918260 -MonoBehaviour: + m_GameObject: {fileID: 1633703686} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.0015, z: 0} + m_LocalScale: {x: 0.017, y: 0.017, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 845665497} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!212 &1633703688 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634918258} + m_GameObject: {fileID: 1633703686} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f391ac734d94ea34697b6cde3269f11a, type: 3} - m_Name: - m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 1a980a02ca1df7479fbe908b857b9aa3 - uniqueName: User - tags: [] - head: {fileID: 2008584333} - leftHand: {fileID: 440165965} - rightHand: {fileID: 1729154661} ---- !u!4 &1634918261 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634918258} - m_LocalRotation: {x: -0, y: -0.8502079, z: -0, w: 0.52644706} - m_LocalPosition: {x: 0.01, y: 0, z: 7.39} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 361400739} - - {fileID: 2089871580} - - {fileID: 846924387} - - {fileID: 362215160} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: -116.469, z: 0} + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c69840bf05f5feb499c93b16ff5443fc, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 6ef340f6eca30e241bf0d488dde83237, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.56, y: 2.56} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1637849899 GameObject: m_ObjectHideFlags: 0 @@ -11602,15 +12599,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637849899} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 632093760} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1675801261 +--- !u!1 &1644637660 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11618,63 +12615,86 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1675801262} + - component: {fileID: 1644637661} + - component: {fileID: 1644637663} + - component: {fileID: 1644637662} m_Layer: 0 - m_Name: Middle_Palm_Left + m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1675801262 +--- !u!4 &1644637661 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1675801261} - m_LocalRotation: {x: 0.99872494, y: -0.046419356, z: -0.015558949, w: -0.012318821} - m_LocalPosition: {x: -0.05391815, y: 0.0050031445, z: 0.0017454529} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1644637660} + serializedVersion: 2 + m_LocalRotation: {x: 0.90965253, y: -0, z: -0, w: 0.41536996} + m_LocalPosition: {x: 0, y: -0.07550034, z: -0.040600345} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1430860603} - m_Father: {fileID: 105739408} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1714243699 -GameObject: + - {fileID: 1392897538} + m_Father: {fileID: 1193047286} + m_LocalEulerAnglesHint: {x: 130.91501, y: 0, z: 0} +--- !u!23 &1644637662 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1714243700} - m_Layer: 0 - m_Name: Middle_2_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1714243700 -Transform: + m_GameObject: {fileID: 1644637660} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: dca6b5fc8485ffd4c88bf8ae060949bc, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1644637663 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1714243699} - m_LocalRotation: {x: 0.007229151, y: 0.004674483, z: -0.10485168, w: 0.9944506} - m_LocalPosition: {x: -0.02966484, y: -0.00000024318695, z: 0.000000114440915} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 361187391} - m_Father: {fileID: 1836407205} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1729154660 + m_GameObject: {fileID: 1644637660} + m_Mesh: {fileID: 5083779560280695074, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1669315463 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11682,364 +12702,87 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1729154661} - - component: {fileID: 1729154664} - - component: {fileID: 1729154663} - - component: {fileID: 1729154662} + - component: {fileID: 1669315465} + - component: {fileID: 1669315464} m_Layer: 0 - m_Name: Right Base Controller + m_Name: Pinch_Pointer_LOD0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1729154661 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1729154660} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 820468471} - m_Father: {fileID: 697578261} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1729154662 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1729154660} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.05 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &1729154663 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1729154660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b7231d59cedbff745ae8517a2b954506, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 2089871579} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_InteractionLayers: - m_Bits: 1 - m_AttachTransform: {fileID: 2040506300} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 - m_AllowHoveredActivate: 0 - m_TargetPriorityMode: 0 - m_PlayAudioClipOnSelectEntered: 0 - m_AudioClipForOnSelectEntered: {fileID: 0} - m_PlayAudioClipOnSelectExited: 0 - m_AudioClipForOnSelectExited: {fileID: 0} - m_PlayAudioClipOnSelectCanceled: 0 - m_AudioClipForOnSelectCanceled: {fileID: 0} - m_PlayAudioClipOnHoverEntered: 0 - m_AudioClipForOnHoverEntered: {fileID: 0} - m_PlayAudioClipOnHoverExited: 0 - m_AudioClipForOnHoverExited: {fileID: 0} - m_PlayAudioClipOnHoverCanceled: 0 - m_AudioClipForOnHoverCanceled: {fileID: 0} - m_AllowHoverAudioWhileSelecting: 1 - m_PlayHapticsOnSelectEntered: 1 - m_HapticSelectEnterIntensity: 0.5 - m_HapticSelectEnterDuration: 0.25 - m_PlayHapticsOnSelectExited: 1 - m_HapticSelectExitIntensity: 0.5 - m_HapticSelectExitDuration: 0.125 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 1 - m_HapticHoverEnterIntensity: 0.25 - m_HapticHoverEnterDuration: 0.25 - m_PlayHapticsOnHoverExited: 1 - m_HapticHoverExitIntensity: 0.25 - m_HapticHoverExitDuration: 0.125 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 - m_AllowHoverHapticsWhileSelecting: 1 - m_ImproveAccuracyWithSphereCollider: 0 - m_PhysicsLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_PhysicsTriggerInteraction: 1 - precisionGrab: 1 ---- !u!114 &1729154664 -MonoBehaviour: +--- !u!137 &1669315464 +SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1729154660} + m_GameObject: {fileID: 1669315463} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 1 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 820468471} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -3326005586356538449, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotationAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 5101698808175986029, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_IsTrackedAction: - m_UseReference: 0 - m_Action: - m_Name: Is Tracked - m_Type: 1 - m_ExpectedControlType: - m_Id: 2f5ad2a7-d128-4be6-aa7b-324a04fda92e - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: b71180c0-70dd-45ad-9c7f-85180a861e1c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 187161793506945269, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 183beb27-b26f-4061-8868-236672560d69 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 4766120400929042988, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 83097790271614945, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ActivateActionValue: - m_UseReference: 1 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 657bd760-06f7-4d83-80e9-76b85139bb0d - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -3285721481334498719, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 3279264004350380116, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: bcba2e34-25ae-4ecc-bf14-8997a78e930e - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIScrollAction: - m_UseReference: 0 - m_Action: - m_Name: UI Scroll - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 3f81201c-5984-4321-b2d0-7d8ce8eccc75 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 1 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 59ea1b94-e9f8-4049-ab97-5920b11143a5 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -8222252007134549311, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5913262927076077117, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: c3ecb458-1b33-4991-8cb0-8cc06a515ea4 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: - m_Type: 0 - m_ExpectedControlType: - m_Id: - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 875253871413052681, guid: de2411ef647d9f24d981120efb63e621, type: 3} - m_ScaleToggleAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Toggle - m_Type: 1 - m_ExpectedControlType: - m_Id: 8ca72b5b-c2db-4bb5-a0ed-3936b2f58721 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ScaleDeltaAction: - m_UseReference: 0 - m_Action: - m_Name: Scale Delta - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 98b33f76-5007-42f1-82ed-b035914b715c - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 ---- !u!1 &1731060432 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f5ccd52dc494e054fbe7d7161dcabe25, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 1 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: -5120762275383614272, guid: b4b483f74ea008746be752bb01d9849b, type: 3} + m_Bones: [] + m_BlendShapeWeights: [] + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: 0, y: 0.009045093, z: 0} + m_Extent: {x: 0.0077457884, y: 0.016694028, z: 0.0077457884} + m_DirtyAABB: 0 +--- !u!4 &1669315465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669315463} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 50, y: 50, z: 50} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1011416140} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1687628409 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12047,42 +12790,41 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1731060433} - - component: {fileID: 1731060435} - - component: {fileID: 1731060434} - m_Layer: 8 - m_Name: Plane + - component: {fileID: 1687628410} + - component: {fileID: 1687628412} + - component: {fileID: 1687628411} + m_Layer: 0 + m_Name: ThumbStick m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1731060433 +--- !u!4 &1687628410 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1731060432} - m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_GameObject: {fileID: 1687628409} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.008775876, y: -0.002558912, z: -0.0074315914} + m_LocalScale: {x: 1.342947, y: 1.342947, z: 1.342947} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 757363300} - m_Father: {fileID: 1268751234} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!23 &1731060434 + m_Children: [] + m_Father: {fileID: 994902842} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1687628411 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1731060432} + m_GameObject: {fileID: 1687628409} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 @@ -12090,10 +12832,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5984489a6c8753743953c8d64d3265fb, type: 2} + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -12115,15 +12860,15 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1731060435 +--- !u!33 &1687628412 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1731060432} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1742313799 + m_GameObject: {fileID: 1687628409} + m_Mesh: {fileID: -2564423107879867638, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1725178571 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12131,29 +12876,84 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1742313800} + - component: {fileID: 1725178572} + - component: {fileID: 1725178574} + - component: {fileID: 1725178573} m_Layer: 0 - m_Name: RayOrigin + m_Name: Trigger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1742313800 +--- !u!4 &1725178572 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742313799} - m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} - m_LocalPosition: {x: -0.0215, y: 0.0244, z: -0.0387} + m_GameObject: {fileID: 1725178571} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.952414e-10, y: -0.012954317, z: -0.020195028} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1423342053} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} + m_Father: {fileID: 1129813367} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1725178573 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725178571} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1725178574 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1725178571} + m_Mesh: {fileID: -8653722315008560443, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} --- !u!1 &1743725475 GameObject: m_ObjectHideFlags: 0 @@ -12177,6 +12977,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743725475} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 1.5, y: 0, z: -5.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -12185,7 +12986,6 @@ Transform: - {fileID: 660021080} - {fileID: 2074732593} m_Father: {fileID: 0} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1745294526 GameObject: @@ -12213,13 +13013,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745294526} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 221845637} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1745294528 MeshRenderer: @@ -12238,6 +13038,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -12307,6 +13110,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1756511963} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: -1, y: 0, z: 2.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -12320,8 +13124,212 @@ Transform: - {fileID: 102893252} - {fileID: 1204090591} m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &1757829520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1757829521} + - component: {fileID: 1757829523} + - component: {fileID: 1757829522} + m_Layer: 0 + m_Name: Button_A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1757829521 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757829520} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.007800013, y: 0.0013757758, z: 0.0055} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 994902842} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1757829522 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757829520} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d20dcc1b8d971e0459877a92d15415c1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1757829523 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757829520} + m_Mesh: {fileID: 5083779560280695074, guid: e207c0ed9ef81ab48a0b24a5748d5460, type: 3} +--- !u!1 &1763474994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1763474995} + - component: {fileID: 1763474997} + - component: {fileID: 1763474996} + m_Layer: 31 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1763474995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763474994} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -0.1} + m_LocalScale: {x: 1, y: 0.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2041203274} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1763474996 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763474994} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a16db0f18ace882458e325d3243cb6da, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1763474997 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1763474994} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1765347202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1765347203} + m_Layer: 0 + m_Name: Poke Point Affordances + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1765347203 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1765347202} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 230423074} + - {fileID: 732697978} + m_Father: {fileID: 1861251859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1769588067 GameObject: m_ObjectHideFlags: 0 @@ -12346,13 +13354,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1769588067} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.244} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 660021081} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!136 &1769588069 CapsuleCollider: @@ -12362,154 +13370,27 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1769588067} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.02 m_Height: 0.2 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &1773926309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1773926310} - - component: {fileID: 1773926311} - m_Layer: 0 - m_Name: LeftHand - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1773926310 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773926309} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 440165965} - - {fileID: 1423342053} - - {fileID: 514757337} - m_Father: {fileID: 65634329} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1773926311 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773926309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41cc12ba1114e4f46929730a9389cb74, type: 3} - m_Name: - m_EditorClassIdentifier: - baseController: {fileID: 440165964} - teleportController: {fileID: 1423342052} - uiController: {fileID: 514757336} - teleportModeActivate: {fileID: 1263111715868034790, guid: de2411ef647d9f24d981120efb63e621, type: 3} - teleportModeCancel: {fileID: 737890489006591557, guid: de2411ef647d9f24d981120efb63e621, type: 3} - uiModeActivate: {fileID: 1201092935185683357, guid: de2411ef647d9f24d981120efb63e621, type: 3} - turn: {fileID: 1010738217276881514, guid: de2411ef647d9f24d981120efb63e621, type: 3} - move: {fileID: 6972639530819350904, guid: de2411ef647d9f24d981120efb63e621, type: 3} - translateAnchor: {fileID: 7779212132400271959, guid: de2411ef647d9f24d981120efb63e621, type: 3} - rotateAnchor: {fileID: -7363382999065477798, guid: de2411ef647d9f24d981120efb63e621, type: 3} - selectState: - enabled: 0 - m_ID: 1 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] - teleportState: - enabled: 0 - m_ID: 2 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] - interactState: - enabled: 0 - m_ID: 3 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] - uiState: - enabled: 0 - m_ID: 4 - onEnter: - m_PersistentCalls: - m_Calls: [] - onUpdate: - m_PersistentCalls: - m_Calls: [] - onExit: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1784977340 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1784977341} - m_Layer: 0 - m_Name: Little_Palm_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1784977341 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1784977340} - m_LocalRotation: {x: 0.99290055, y: -0.033564012, z: 0.11202527, w: 0.02173406} - m_LocalPosition: {x: -0.048623275, y: 0.0027686262, z: -0.026522674} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2110589559} - m_Father: {fileID: 105739408} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1785665711 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2121825122} m_Modifications: - target: {fileID: -8679921383154817045, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} @@ -12557,11 +13438,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -7511558181221131132, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: c434c7521ce308c46bde59286f6b7998, type: 2} - target: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} @@ -12573,13 +13458,55 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1785665728} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1785665720} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1785665727} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1785665726} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1785665725} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1785665724} m_SourcePrefab: {fileID: 100100000, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} --- !u!1 &1785665712 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} m_PrefabInstance: {fileID: 1785665711} m_PrefabAsset: {fileID: 0} ---- !u!114 &1785665713 +--- !u!65 &1785665720 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785665712} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.20000012, y: 0.2121321, z: 0.12727931} + m_Center: {x: 0.00000023841858, y: 0.03535535, z: -0.06363918} +--- !u!114 &1785665724 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12598,7 +13525,29 @@ MonoBehaviour: touchEnded: m_PersistentCalls: m_Calls: [] ---- !u!114 &1785665714 +--- !u!114 &1785665725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785665712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 1785665726} + m_PokeCollider: {fileID: 1785665720} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!114 &1785665726 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12612,9 +13561,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -12673,39 +13619,12 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_AttachTransform: {fileID: 0} m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 + m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 + m_SnapToColliderVolume: 0 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 m_MovementType: 1 @@ -12715,12 +13634,12 @@ MonoBehaviour: m_AngularVelocityScale: 1 m_TrackPosition: 1 m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 + m_SmoothPositionAmount: 8 + m_TightenPosition: 0.1 m_TrackRotation: 1 m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 m_TrackScale: 1 m_SmoothScale: 0 m_SmoothScaleAmount: 8 @@ -12746,79 +13665,353 @@ MonoBehaviour: m_ThrowAngularVelocityScale: 1 m_ForceGravityOnDetach: 0 m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 isTouchable: 1 isGrabbable: 0 isUsable: 0 ---- !u!54 &1785665715 +--- !u!54 &1785665727 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785665712} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &1785665716 + m_GameObject: {fileID: 1785665712} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1785665728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1785665712} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 64722e4363108c45b662b394c36ccaa4 + guids: [] +--- !u!1 &1799673990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1799673991} + - component: {fileID: 1799673992} + m_Layer: 0 + m_Name: Collider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1799673991 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1799673990} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1951035652} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1799673992 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1799673990} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.7 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1802169367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1802169368} + - component: {fileID: 1802169369} + m_Layer: 0 + m_Name: Right Controller Visual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1802169368 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802169367} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.05} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 936988544} + m_Father: {fileID: 487972874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1802169369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802169367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 099767effc44a8e478d295d0c4d98289, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ThumbstickTransform: {fileID: 1127045218} + m_StickRotationRange: {x: 30, y: 30} + m_StickInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Thumbstick + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: aa13759d-7cf9-4d6f-aaf3-41bd3fe4e97e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -8666952849799569744, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TriggerTransform: {fileID: 308734739} + m_TriggerXAxisRotationRange: {x: 0, y: -15} + m_TriggerInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Trigger + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 2d080dc4-1ed2-46db-b106-3bbc94b9243c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 7904272356298805229, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 + m_GripTransform: {fileID: 323365439} + m_GripRightRange: {x: -0.0125, y: -0.011} + m_GripInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Grip + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 2b6a1672-1377-4cbc-9b16-5a50bd489433 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -1758520528963094988, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 +--- !u!1 &1806910829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1806910830} + m_Layer: 0 + m_Name: Gaze Stabilized Attach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1806910830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806910829} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1272102072} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1815494800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815494806} + - component: {fileID: 1815494805} + - component: {fileID: 1815494804} + - component: {fileID: 1815494803} + - component: {fileID: 1815494802} + - component: {fileID: 1815494801} + m_Layer: 0 + m_Name: PROCESS_CONTROLLER + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1815494801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815494800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73d6fe59e43872c428b2ac1a9fd85e28, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1815494802 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785665712} + m_GameObject: {fileID: 1815494800} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: 05625e2da85e44bd82228234d8676e45, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 87dda0b1c10254438e10fb84f67942a6 - uniqueName: TouchPanel_1 - tags: [] ---- !u!65 &1785665720 -BoxCollider: +--- !u!114 &1815494803 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785665712} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1815494800} m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.20000012, y: 0.2121321, z: 0.12727931} - m_Center: {x: 0.00000023841858, y: 0.03535535, z: -0.06363918} ---- !u!114 &1785665721 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 6b02a44c110911f489b56953cced3f56, type: 3} + m_NotificationBehavior: 3 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Default + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &1815494804 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1785665712} + m_GameObject: {fileID: 1815494800} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3292d68f2db97a8418ca72f5b8bb5b69, type: 3} + m_Script: {fileID: 11500000, guid: bff89a8a00803ab45922cc05aaa080b7, type: 3} m_Name: m_EditorClassIdentifier: - defaultColor: - serializedVersion: 2 - rgba: 4294918375 - touchingColor: - serializedVersion: 2 - rgba: 4291359096 - materialIndex: 1 - materialColorProperty: _EmissionColor ---- !u!1 &1815494800 + processControllerQualifiedName: VRBuilder.ProcessController.StandardProcessController, + VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + autoStartProcess: 1 + useCustomPrefab: 0 + customPrefab: {fileID: 0} +--- !u!114 &1815494805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815494800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e218973d8ce7b141a938229d9877d26, type: 3} + m_Name: + m_EditorClassIdentifier: + lockSceneObjectsOnSceneStart: 1 +--- !u!4 &1815494806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1815494800} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1816767293 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12826,191 +14019,1013 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1815494806} - - component: {fileID: 1815494805} - - component: {fileID: 1815494804} - - component: {fileID: 1815494803} - - component: {fileID: 1815494802} - - component: {fileID: 1815494801} + - component: {fileID: 1816767294} + - component: {fileID: 1816767295} m_Layer: 0 - m_Name: PROCESS_CONTROLLER + m_Name: Collider (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1815494801 +--- !u!4 &1816767294 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816767293} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0.245, y: 0, z: -0.0040003136} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 660021081} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} +--- !u!136 &1816767295 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816767293} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.02 + m_Height: 0.2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1831340543 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + m_PrefabInstance: {fileID: 1006305323} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1831340544 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} + m_PrefabInstance: {fileID: 1006305323} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1831340547 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815494800} + m_GameObject: {fileID: 1831340543} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73d6fe59e43872c428b2ac1a9fd85e28, type: 3} + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1815494802 + serializedGuid: + serializedGuid: 9312dac0932f8845822278eeaf6370d4 + guids: [] +--- !u!1 &1854500746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1854500747} + - component: {fileID: 1854500748} + - component: {fileID: 1854500749} + m_Layer: 0 + m_Name: ShieldLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1854500747 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854500746} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.4, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1831340544} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &1854500748 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1854500746} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 2 + m_Color: {r: 1, g: 0, b: 1, a: 1} + m_Intensity: 2 + m_Range: 3 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &1854500749 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815494800} + m_GameObject: {fileID: 1854500746} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 05625e2da85e44bd82228234d8676e45, type: 3} + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1815494803 + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &1861251857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1861251859} + - component: {fileID: 1861251858} + - component: {fileID: 1861251860} + m_Layer: 0 + m_Name: Left Poke Interactor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1861251858 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815494800} + m_GameObject: {fileID: 1861251857} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Script: {fileID: 11500000, guid: 0924bcaa9eb50df458a783ae0e2b59f5, type: 3} m_Name: m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 6b02a44c110911f489b56953cced3f56, type: 3} - m_NotificationBehavior: 3 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 1 + m_Handedness: 1 + m_AttachTransform: {fileID: 1011416140} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: m_PersistentCalls: m_Calls: [] - m_DeviceRegainedEvent: + m_HoverExited: m_PersistentCalls: m_Calls: [] - m_ControlsChangedEvent: + m_SelectEntered: m_PersistentCalls: m_Calls: [] - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Default - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1815494804 + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_PokeDepth: 0.1 + m_PokeWidth: 0.0075 + m_PokeSelectWidth: 0.015 + m_PokeHoverRadius: 0.015 + m_PokeInteractionOffset: 0.005 + m_PhysicsLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_PhysicsTriggerInteraction: 1 + m_RequirePokeFilter: 1 + m_EnableUIInteraction: 1 + m_DebugVisualizationsEnabled: 0 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] +--- !u!4 &1861251859 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861251857} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1011416140} + - {fileID: 1765347203} + m_Father: {fileID: 1071573184} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1861251860 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815494800} + m_GameObject: {fileID: 1861251857} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bff89a8a00803ab45922cc05aaa080b7, type: 3} + m_Script: {fileID: 11500000, guid: dd0b9921bce4eeb49bd05815b1135ac2, type: 3} m_Name: m_EditorClassIdentifier: - processControllerQualifiedName: VRBuilder.UX.StandardProcessController, VRBuilder.Core, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - autoStartProcess: 1 - useCustomPrefab: 0 - customPrefab: {fileID: 0} ---- !u!114 &1815494805 + m_InteractorSourceObject: {fileID: 1861251858} + m_HapticImpulsePlayer: {fileID: 1071573181} + m_PlaySelectEntered: 1 + m_SelectEnteredData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectExited: 0 + m_SelectExitedData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectCanceled: 0 + m_SelectCanceledData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverEntered: 1 + m_HoverEnteredData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverExited: 0 + m_HoverExitedData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverCanceled: 0 + m_HoverCanceledData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_AllowHoverHapticsWhileSelecting: 0 +--- !u!1 &1895599008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1895599010} + - component: {fileID: 1895599009} + - component: {fileID: 1895599014} + - component: {fileID: 1895599013} + - component: {fileID: 1895599012} + - component: {fileID: 1895599011} + m_Layer: 0 + m_Name: Right Teleport Interactor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1895599009 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815494800} + m_GameObject: {fileID: 1895599008} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9e218973d8ce7b141a938229d9877d26, type: 3} + m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3} m_Name: m_EditorClassIdentifier: - lockSceneObjectsOnSceneStart: 1 ---- !u!4 &1815494806 + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2147483648 + m_Handedness: 2 + m_AttachTransform: {fileID: 773172690} + m_KeepSelectedTargetValid: 0 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_SelectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 36843f28-4fd5-4729-b5a6-afe92ef11597 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 1a51c331-470d-4462-b8e1-2522a24bd40c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -8061240218431744966, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: -8061240218431744966, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 0ace7244-e61f-4e60-8d0b-2ef8c3ae51af + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: bdf06a24-21b3-4f27-a8a3-72086e6c7f00 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 83097790271614945, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: 7904272356298805229, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_SelectActionTrigger: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 0 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 0 + m_LineType: 1 + m_BlendVisualLinePoints: 1 + m_MaxRaycastDistance: 30 + m_RayOriginTransform: {fileID: 1240689138} + m_ReferenceFrame: {fileID: 0} + m_Velocity: 10 + m_Acceleration: 9.8 + m_AdditionalGroundHeight: 0.1 + m_AdditionalFlightTime: 0.5 + m_EndPointDistance: 30 + m_EndPointHeight: -10 + m_ControlPointDistance: 10 + m_ControlPointHeight: 5 + m_SampleFrequency: 50 + m_HitDetectionType: 0 + m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 + m_RaycastMask: + serializedVersion: 2 + m_Bits: 2147483648 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 1 + m_HitClosestOnly: 0 + m_HoverToSelect: 0 + m_HoverTimeToSelect: 0.5 + m_AutoDeselect: 0 + m_TimeToAutoDeselect: 1 + m_EnableUIInteraction: 0 + m_BlockInteractionsWithScreenSpaceUI: 0 + m_BlockUIOnInteractableSelection: 1 + m_ManipulateAttachTransform: 1 + m_UseForceGrab: 0 + m_RotateSpeed: 180 + m_TranslateSpeed: 0 + m_RotateReferenceFrame: {fileID: 0} + m_RotateMode: 1 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_EnableARRaycasting: 0 + m_OccludeARHitsWith3DObjects: 0 + m_OccludeARHitsWith2DObjects: 0 + m_ScaleMode: 0 + m_UIPressInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 + m_ExpectedControlType: + m_Id: 54867c8e-3650-4605-a53c-ee8ffb351dcf + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 257d8673-0295-4ff5-b278-e63d20cd918b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 8c6b1aac-a242-4bf4-a5b3-bfad6e83b638 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TranslateManipulationInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Translate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 0f9fd0ee-650d-41a6-ab30-2a036c425c21 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RotateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Rotate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: cadca2d2-f642-4efc-a222-c1827be3e896 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -5913262927076077117, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_DirectionalManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Directional Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 472cbca3-7add-47a9-a5fc-73d3d10107aa + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -440298646266941818, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleToggleInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: Scale Toggle + m_Type: 1 + m_ExpectedControlType: + m_Id: 692a9304-a2fd-4dbd-9e2f-2fb4b6154f1c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Scale Toggle Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d0cf082b-f2d7-4100-b069-651cf2820425 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ScaleOverTimeInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Over Time + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 6f835f0d-f1c2-461c-b8bc-edc587e89149 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleDistanceDeltaInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Distance Delta + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 9140e1d5-f197-46d4-88c2-a02441edeac5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 +--- !u!4 &1895599010 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1815494800} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1895599008} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 + m_Father: {fileID: 487972874} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1816767293 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1816767294} - - component: {fileID: 1816767295} - m_Layer: 0 - m_Name: Collider (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1816767294 -Transform: +--- !u!114 &1895599011 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816767293} - m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} - m_LocalPosition: {x: 0.245, y: 0, z: -0.0040003136} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 660021081} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} ---- !u!136 &1816767295 -CapsuleCollider: + m_GameObject: {fileID: 1895599008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd0b9921bce4eeb49bd05815b1135ac2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractorSourceObject: {fileID: 1895599009} + m_HapticImpulsePlayer: {fileID: 0} + m_PlaySelectEntered: 1 + m_SelectEnteredData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectExited: 0 + m_SelectExitedData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectCanceled: 0 + m_SelectCanceledData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverEntered: 1 + m_HoverEnteredData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverExited: 0 + m_HoverExitedData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverCanceled: 0 + m_HoverCanceledData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_AllowHoverHapticsWhileSelecting: 1 +--- !u!210 &1895599012 +SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1816767293} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1895599008} m_Enabled: 1 - m_Radius: 0.02 - m_Height: 0.2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &1831340543 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - m_PrefabInstance: {fileID: 1006305323} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1831340544 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e0eb73a744a54e74a98efc5eed3a5d4d, type: 3} - m_PrefabInstance: {fileID: 1006305323} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1831340547 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30005 + m_SortAtRoot: 0 +--- !u!114 &1895599013 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1831340543} + m_GameObject: {fileID: 1895599008} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} m_Name: m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 9312dac0932f8845822278eeaf6370d4 - uniqueName: Shield - tags: [] ---- !u!1 &1836407204 + m_LineWidth: 0.01 + m_OverrideInteractorLineLength: 0 + m_LineLength: 10 + m_AutoAdjustLineLength: 0 + m_MinLineLength: 0.02 + m_UseDistanceToHitAsMaxLineLength: 1 + m_LineRetractionDelay: 0.5 + m_LineLengthChangeSpeed: 12 + m_WidthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_SetLineColorGradient: 1 + m_ValidColorGradient: + serializedVersion: 2 + key0: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 0.5882353} + key1: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 0.5882353} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_InvalidColorGradient: + serializedVersion: 2 + key0: {r: 1, g: 0, b: 0, a: 0.5882353} + key1: {r: 1, g: 0, b: 0, a: 0.5882353} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_BlockedColorGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_TreatSelectionAsValidState: 0 + m_SmoothMovement: 0 + m_FollowTightness: 10 + m_SnapThresholdDistance: 10 + m_Reticle: {fileID: 8748868027195207512, guid: 0c9c836faf8b16c4896fef2e890b91db, type: 3} + m_BlockedReticle: {fileID: 3177232254315139758, guid: 8963c70806d0e3441802c7bbc8162b5c, type: 3} + m_StopLineAtFirstRaycastHit: 1 + m_StopLineAtSelection: 0 + m_SnapEndpointIfAvailable: 1 + m_LineBendRatio: 0.5 + m_BendingEnabledInteractionLayers: + m_Bits: 4294967295 + m_OverrideInteractorLineOrigin: 1 + m_LineOriginTransform: {fileID: 1951035652} + m_LineOriginOffset: 0 +--- !u!120 &1895599014 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1895599008} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: [] + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.02 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 4 + numCapVertices: 4 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 0 +--- !u!1 &1913886510 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13018,125 +15033,386 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1836407205} + - component: {fileID: 1913886511} + - component: {fileID: 1913886514} + - component: {fileID: 1913886513} + - component: {fileID: 1913886512} m_Layer: 0 - m_Name: Middle_1_Left + m_Name: LineVisual m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1836407205 +--- !u!4 &1913886511 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1836407204} - m_LocalRotation: {x: 0.0013464622, y: -0.0029157132, z: -0.22192244, w: 0.9750591} - m_LocalPosition: {x: -0.039041024, y: 0.0000006005168, z: 0.00000011503696} + m_GameObject: {fileID: 1913886510} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1714243700} - m_Father: {fileID: 2030842803} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 1442193929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1854500746 -GameObject: +--- !u!210 &1913886512 +SortingGroup: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1854500747} - - component: {fileID: 1854500748} - m_Layer: 0 - m_Name: ShieldLight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1854500747 -Transform: + m_GameObject: {fileID: 1913886510} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30005 + m_SortAtRoot: 0 +--- !u!120 &1913886513 +LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1854500746} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.4, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1831340544} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!108 &1854500748 -Light: + m_GameObject: {fileID: 1913886510} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: [] + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.012002945 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 8 + numCapVertices: 8 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 0 +--- !u!114 &1913886514 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1854500746} + m_GameObject: {fileID: 1913886510} m_Enabled: 1 - serializedVersion: 10 - m_Type: 2 - m_Shape: 0 - m_Color: {r: 1, g: 0, b: 1, a: 1} - m_Intensity: 2 - m_Range: 3 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 1 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!1 &1883760418 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80e353695beb436ab39a90d9ecefaee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LineRenderer: {fileID: 1913886513} + m_CurveVisualObject: {fileID: 1442193927} + m_OverrideLineOrigin: 1 + m_LineOriginTransform: {fileID: 1442193929} + m_VisualPointCount: 20 + m_MaxVisualCurveDistance: 10 + m_RestingVisualLineLength: 0.25 + m_LineDynamicsMode: 1 + m_RetractDelay: 1 + m_RetractDuration: 1 + m_ExtendLineToEmptyHit: 0 + m_ExtensionRate: 10 + m_EndPointExpansionRate: 10 + m_ComputeMidPointWithComplexCurves: 0 + m_SnapToSelectedAttachIfAvailable: 1 + m_SnapToSnapVolumeIfAvailable: 1 + m_CurveStartOffset: 0.015 + m_CurveEndOffset: 0.005 + m_CustomizeLinePropertiesForState: 1 + m_LinePropertyAnimationSpeed: 8 + m_NoValidHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.25 + m_AdjustWidth: 1 + m_StarWidth: 0.003 + m_EndWidth: 0.003 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 1, b: 1, a: 0.5019608} + key2: {r: 0, g: 0, b: 0, a: 0.2509804} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 193 + atime1: 8192 + atime2: 32768 + atime3: 55705 + atime4: 65342 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 4 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_UIHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.5 + m_AdjustWidth: 1 + m_StarWidth: 0.004 + m_EndWidth: 0.004 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 0.78431374, b: 0.5686275, a: 0.49019608} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 16384 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 8192 + atime2: 32768 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 4 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_UIPressHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.5 + m_AdjustWidth: 1 + m_StarWidth: 0.003 + m_EndWidth: 0.003 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.5686275, g: 0.78431374, b: 1, a: 0.627451} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 1, g: 1, b: 1, a: 0.78431374} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32768 + ctime2: 65535 + ctime3: 65535 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 8192 + atime2: 26214 + atime3: 42598 + atime4: 65535 + atime5: 65535 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 5 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_SelectHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.5 + m_AdjustWidth: 1 + m_StarWidth: 0.003 + m_EndWidth: 0.003 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0.5686275, g: 0.78431374, b: 1, a: 0.627451} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 1, g: 1, b: 1, a: 0.78431374} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32768 + ctime2: 65535 + ctime3: 65535 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 8192 + atime2: 26214 + atime3: 42598 + atime4: 65535 + atime5: 65535 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 5 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.75 + m_HoverHitProperties: + m_SmoothlyCurveLine: 1 + m_LineBendRatio: 0.25 + m_AdjustWidth: 1 + m_StarWidth: 0.004 + m_EndWidth: 0.004 + m_EndWidthScaleDistanceFactor: 2 + m_AdjustGradient: 1 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 1, g: 0.78431374, b: 0.5686275, a: 0.49019608} + key2: {r: 1, g: 1, b: 1, a: 1} + key3: {r: 1, g: 1, b: 1, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 16384 + ctime2: 65535 + ctime3: 65535 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 13878 + atime2: 32768 + atime3: 65535 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 4 + m_CustomizeExpandLineDrawPercent: 1 + m_ExpandModeLineDrawPercent: 0.9 + m_RenderLineInWorldSpace: 1 + m_SwapMaterials: 0 + m_BaseLineMaterial: {fileID: 0} + m_EmptyHitMaterial: {fileID: 0} +--- !u!1 &1951035651 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13144,31 +15420,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1883760419} - m_Layer: 8 - m_Name: Anchor + - component: {fileID: 1951035652} + m_Layer: 0 + m_Name: Poke Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1883760419 +--- !u!4 &1951035652 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1883760418} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.00000005960466, y: 0.00999999, z: -0.000000059604638} - m_LocalScale: {x: 0.99999976, y: 1, z: 0.99999976} + m_GameObject: {fileID: 1951035651} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0075} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 375530500} - m_Father: {fileID: 2014095924} - m_RootOrder: 0 + - {fileID: 1153135962} + - {fileID: 1799673991} + m_Father: {fileID: 149866826} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1889204433 +--- !u!1 &1957432335 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13176,62 +15453,122 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1889204434} - m_Layer: 0 - m_Name: Thumb_Tip_Left + - component: {fileID: 1957432336} + - component: {fileID: 1957432338} + - component: {fileID: 1957432337} + m_Layer: 2 + m_Name: Turn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1889204434 +--- !u!4 &1957432336 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1889204433} - m_LocalRotation: {x: 0.0000000018626451, y: 0.000000005587936, z: -0.000000014901163, w: 1} - m_LocalPosition: {x: -0.029552078, y: 0.0000000667572, z: -0.00000015109777} + m_GameObject: {fileID: 1957432335} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 283625090} - m_RootOrder: 0 + m_Father: {fileID: 928609389} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1906445693 -GameObject: +--- !u!114 &1957432337 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1906445694} - m_Layer: 0 - m_Name: Index_Palm_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1906445694 -Transform: + m_GameObject: {fileID: 1957432335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 75b29b6c6428c984a8a73ffc2d58063b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_TurnSpeed: 60 + m_LeftHandTurnInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Left Hand Turn + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 3610965d-108d-4451-a143-a78d1ee8f9b8 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 1010738217276881514, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RightHandTurnInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Right Hand Turn + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: eeb82678-2af4-4b6c-87fc-621bb707edc5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -6493913391331992944, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} +--- !u!114 &1957432338 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1906445693} - m_LocalRotation: {x: 0.9956038, y: -0.056100972, z: -0.070293866, w: -0.026165245} - m_LocalPosition: {x: -0.05402496, y: 0.0060563944, z: 0.02002304} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 189572713} - m_Father: {fileID: 105739408} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1909973945 + m_GameObject: {fileID: 1957432335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e9f365cf844c03449bc8973eead2c3c1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_TurnAmount: 45 + m_DebounceTime: 0.5 + m_EnableTurnLeftRight: 1 + m_EnableTurnAround: 1 + m_DelayTime: 0 + m_LeftHandTurnInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Left Hand Snap Turn + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 536e141d-ee23-4272-b0fd-3984d1655f02 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -7374733323251553461, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RightHandTurnInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Right Hand Snap Turn + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: b17ca378-4740-48c7-abe1-7f35bce317e9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -8525429354371678379, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} +--- !u!1 &1969388069 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13239,65 +15576,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1909973946} + - component: {fileID: 1969388070} m_Layer: 0 - m_Name: BigHandLeft + m_Name: VRB_Controller_Logo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1909973946 +--- !u!4 &1969388070 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1909973945} + m_GameObject: {fileID: 1969388069} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: -1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 628411316} - - {fileID: 1289966973} - - {fileID: 2139940513} - - {fileID: 388840135} - - {fileID: 391997631} - m_Father: {fileID: 54233951} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1968119229 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1968119230} - m_Layer: 0 - m_Name: Ring_0_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1968119230 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1968119229} - m_LocalRotation: {x: 0.0037497291, y: 0.028980805, z: -0.08957866, w: 0.995551} - m_LocalPosition: {x: -0.060953286, y: -0.00000024797393, z: 0.00000015258789} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 995671520} - m_Father: {fileID: 1142522481} - m_RootOrder: 0 + - {fileID: 845665497} + m_Father: {fileID: 1257506428} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1969415632 stripped GameObject: @@ -13318,13 +15619,13 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: aef51f1ab9c2c94585af2ac8c731f577 - uniqueName: Ring - tags: [] + guids: [] --- !u!1001 &1977887389 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2011926244} m_Modifications: - target: {fileID: -8679921383154817045, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} @@ -13372,11 +15673,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -7511558181221131132, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: c434c7521ce308c46bde59286f6b7998, type: 2} - target: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} @@ -13388,6 +15693,30 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887394} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887391} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887393} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887395} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887396} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887397} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887400} m_SourcePrefab: {fileID: 100100000, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} --- !u!1 &1977887390 stripped GameObject: @@ -13402,11 +15731,24 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977887390} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.20000003, y: 0.2121321, z: 0.12727925} m_Center: {x: 0, y: 0.03535535, z: -0.063639626} +--- !u!4 &1977887392 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6db30c55efbe76c4c864604a925873d6, type: 3} + m_PrefabInstance: {fileID: 1977887389} + m_PrefabAsset: {fileID: 0} --- !u!114 &1977887393 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13421,9 +15763,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -13482,39 +15821,12 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_AttachTransform: {fileID: 0} m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 + m_UseDynamicAttach: 1 m_MatchAttachPosition: 1 m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 + m_SnapToColliderVolume: 0 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 m_MovementType: 1 @@ -13524,12 +15836,12 @@ MonoBehaviour: m_AngularVelocityScale: 1 m_TrackPosition: 1 m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 + m_SmoothPositionAmount: 8 + m_TightenPosition: 0.1 m_TrackRotation: 1 m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 m_TrackScale: 1 m_SmoothScale: 0 m_SmoothScaleAmount: 8 @@ -13555,10 +15867,10 @@ MonoBehaviour: m_ThrowAngularVelocityScale: 1 m_ForceGravityOnDetach: 0 m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 isTouchable: 1 isGrabbable: 0 isUsable: 0 @@ -13569,10 +15881,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977887390} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 1 m_Interpolate: 0 @@ -13592,8 +15915,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: abba5cf45ea87a4fa9ecd84b156589f3 - uniqueName: TouchPanel - tags: [] + guids: [] --- !u!114 &1977887396 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13633,11 +15955,34 @@ MonoBehaviour: rgba: 4291359096 materialIndex: 1 materialColorProperty: _EmissionColor +--- !u!114 &1977887400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977887390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 1977887393} + m_PokeCollider: {fileID: 1977887391} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 39.67 + m_Variable: {fileID: 0} --- !u!1001 &1978455790 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1756511964} m_Modifications: - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} @@ -13649,69 +15994,97 @@ PrefabInstance: value: 16 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[0] + propertyPath: 'serializedGuid.serializedGuid.Array.data[0]' value: 66 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[1] + propertyPath: 'serializedGuid.serializedGuid.Array.data[1]' value: 80 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[2] + propertyPath: 'serializedGuid.serializedGuid.Array.data[2]' value: 129 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[3] + propertyPath: 'serializedGuid.serializedGuid.Array.data[3]' value: 144 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[4] + propertyPath: 'serializedGuid.serializedGuid.Array.data[4]' value: 5 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[5] + propertyPath: 'serializedGuid.serializedGuid.Array.data[5]' value: 62 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[6] + propertyPath: 'serializedGuid.serializedGuid.Array.data[6]' value: 126 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[7] + propertyPath: 'serializedGuid.serializedGuid.Array.data[7]' value: 79 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[8] + propertyPath: 'serializedGuid.serializedGuid.Array.data[8]' value: 139 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[9] + propertyPath: 'serializedGuid.serializedGuid.Array.data[9]' value: 227 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[10] + propertyPath: 'serializedGuid.serializedGuid.Array.data[10]' value: 135 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[11] + propertyPath: 'serializedGuid.serializedGuid.Array.data[11]' value: 97 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[12] + propertyPath: 'serializedGuid.serializedGuid.Array.data[12]' value: 209 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[13] + propertyPath: 'serializedGuid.serializedGuid.Array.data[13]' value: 122 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[14] + propertyPath: 'serializedGuid.serializedGuid.Array.data[14]' value: 11 objectReference: {fileID: 0} - target: {fileID: 1978455793, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[15] + propertyPath: 'serializedGuid.serializedGuid.Array.data[15]' value: 3 objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalPosition.z + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2999420513341540992, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} propertyPath: uniqueId value: 58b7201a-9d6a-464f-8869-ffa708ccc6f8 @@ -13721,73 +16094,89 @@ PrefabInstance: value: 16 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[0] + propertyPath: 'serializedGuid.serializedGuid.Array.data[0]' value: 217 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[1] + propertyPath: 'serializedGuid.serializedGuid.Array.data[1]' value: 239 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[2] + propertyPath: 'serializedGuid.serializedGuid.Array.data[2]' value: 192 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[3] + propertyPath: 'serializedGuid.serializedGuid.Array.data[3]' value: 170 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[4] + propertyPath: 'serializedGuid.serializedGuid.Array.data[4]' value: 73 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[5] + propertyPath: 'serializedGuid.serializedGuid.Array.data[5]' value: 25 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[6] + propertyPath: 'serializedGuid.serializedGuid.Array.data[6]' value: 195 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[7] + propertyPath: 'serializedGuid.serializedGuid.Array.data[7]' value: 78 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[8] + propertyPath: 'serializedGuid.serializedGuid.Array.data[8]' value: 152 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[9] + propertyPath: 'serializedGuid.serializedGuid.Array.data[9]' value: 7 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[10] + propertyPath: 'serializedGuid.serializedGuid.Array.data[10]' value: 45 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[11] + propertyPath: 'serializedGuid.serializedGuid.Array.data[11]' value: 248 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[12] + propertyPath: 'serializedGuid.serializedGuid.Array.data[12]' value: 153 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[13] + propertyPath: 'serializedGuid.serializedGuid.Array.data[13]' value: 120 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[14] + propertyPath: 'serializedGuid.serializedGuid.Array.data[14]' value: 129 objectReference: {fileID: 0} - target: {fileID: 2999420514030884948, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} - propertyPath: serializedGuid.serializedGuid.Array.data[15] + propertyPath: 'serializedGuid.serializedGuid.Array.data[15]' value: 22 objectReference: {fileID: 0} + - target: {fileID: 2999420514030884954, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_AttachTransform + value: + objectReference: {fileID: 0} + - target: {fileID: 2999420514030884954, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_UseDynamicAttach + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2999420514030884954, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_SnapToColliderVolume + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5562819036174228372, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} propertyPath: m_Name value: LightSabre objectReference: {fileID: 0} + - target: {fileID: 5562819036174228372, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6459590485641253054, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} propertyPath: m_RootOrder value: 3 @@ -13833,44 +16222,191 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6246853691175774326, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} + insertIndex: -1 + addedObject: {fileID: 551482098} m_SourcePrefab: {fileID: 100100000, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} --- !u!4 &1978455791 stripped Transform: m_CorrespondingSourceObject: {fileID: 6459590485641253054, guid: 871cf8bed45c27f46a347df0553bdcec, type: 3} m_PrefabInstance: {fileID: 1978455790} m_PrefabAsset: {fileID: 0} ---- !u!1 &1982479363 +--- !u!1 &1981589078 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1982479364} - m_Layer: 0 - m_Name: RayOrigin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1982479364 -Transform: + serializedVersion: 6 + m_Component: + - component: {fileID: 1981589079} + - component: {fileID: 1981589082} + - component: {fileID: 1981589081} + - component: {fileID: 1981589080} + m_Layer: 0 + m_Name: NearFar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1981589079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981589078} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2029649882} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1981589080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981589078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 1981589082} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: d0eab193f3deddf459ada93a8c8366ef, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 1981589081} + m_ColorPropertyName: _BaseColor +--- !u!114 &1981589081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1981589078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer: {fileID: 1153135961} + m_MaterialIndex: 0 +--- !u!114 &1981589082 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982479363} - m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} - m_LocalPosition: {x: 0.0215, y: 0.0244, z: -0.0387} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 496138948} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} ---- !u!1 &1987239406 + m_GameObject: {fileID: 1981589078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c83f12c537584f51b92c01f10d7090c0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractorSource: {fileID: 149866825} + m_IgnoreHoverEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 1 + m_IgnoreUGUIHover: 0 + m_IgnoreUGUISelect: 0 + m_IgnoreXRInteractionEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 1 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!1 &1987015393 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13878,51 +16414,56 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1987239407} - - component: {fileID: 1987239408} - m_Layer: 0 - m_Name: HandLeft + - component: {fileID: 1987015394} + - component: {fileID: 1987015396} + - component: {fileID: 1987015395} + m_Layer: 8 + m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1987239407 +--- !u!4 &1987015394 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1987239406} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_GameObject: {fileID: 1987015393} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1015737782} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &1987239408 -SkinnedMeshRenderer: + m_Children: + - {fileID: 729381799} + m_Father: {fileID: 770514938} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &1987015395 +MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1987239406} + m_GameObject: {fileID: 1987015393} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RayTracingMode: 3 + m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2ab12257a86442740ba3dc5694817baa, type: 2} + - {fileID: 2100000, guid: ab885650ca87af54d8a0e2e50e88b644, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13943,366 +16484,68 @@ SkinnedMeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: -1400252653696632910, guid: 3cc1bfa741063664e8b13a63afcd062f, type: 3} - m_Bones: - - {fileID: 512971542} - - {fileID: 1352490008} - - {fileID: 626500155} - - {fileID: 1481350550} - - {fileID: 795450758} - - {fileID: 1307398688} - - {fileID: 1078070624} - - {fileID: 1430860603} - - {fileID: 995671520} - - {fileID: 1968119230} - - {fileID: 2110589559} - - {fileID: 189572713} - - {fileID: 1784977341} - - {fileID: 1142522481} - - {fileID: 1675801262} - - {fileID: 1906445694} - - {fileID: 283625090} - - {fileID: 1074416408} - - {fileID: 25957662} - - {fileID: 105739408} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 105739408} - m_AABB: - m_Center: {x: -0.10444905, y: -0.0046319105, z: 0.015674934} - m_Extent: {x: 0.10534169, y: 0.05054314, z: 0.081589594} - m_DirtyAABB: 0 ---- !u!1 &2008175315 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} - m_PrefabInstance: {fileID: 660021079} - m_PrefabAsset: {fileID: 0} ---- !u!65 &2008175316 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008175315} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 0.15393993, z: 1} - m_Center: {x: 0, y: 0.07696997, z: 0} ---- !u!65 &2008175317 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008175315} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.2, y: 3.5721025, z: 0.2} - m_Center: {x: 0, y: 1.7860513, z: 0} ---- !u!1 &2008584328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2008584333} - - component: {fileID: 2008584329} - - component: {fileID: 2008584332} - - component: {fileID: 2008584331} - - component: {fileID: 2008584330} - - component: {fileID: 2008584334} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!20 &2008584329 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008584328} - 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.01 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - 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!114 &2008584330 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008584328} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackingType: 0 - m_UpdateType: 0 - m_IgnoreTrackingState: 0 - m_PositionInput: - m_UseReference: 0 - m_Action: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: - m_Id: 0bacfa51-7938-4a88-adae-9e8ba6c59d23 - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: f5efb008-b167-4d0f-b9e0-49a2350a85b3 - m_Path: /centerEyePosition - m_Interactions: - m_Processors: - m_Groups: - m_Action: Position - m_Flags: 0 - m_Flags: 0 - m_Reference: {fileID: 0} - m_RotationInput: - m_UseReference: 0 - m_Action: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 5439f14e-c9da-4bd1-ad3f-7121a75c10d9 - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: f984a7fd-f7e2-45ef-b21d-699a5d160f29 - m_Path: /centerEyeRotation - m_Interactions: - m_Processors: - m_Groups: - m_Action: Rotation - m_Flags: 0 - m_Flags: 0 - m_Reference: {fileID: 0} - m_TrackingStateInput: - m_UseReference: 0 - m_Action: - m_Name: Tracking State Input - m_Type: 0 - m_ExpectedControlType: - m_Id: 78fa8c8c-b04c-41be-bcb0-b08932ba313a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_PositionAction: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: - m_Id: 0bacfa51-7938-4a88-adae-9e8ba6c59d23 - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: f5efb008-b167-4d0f-b9e0-49a2350a85b3 - m_Path: /centerEyePosition - m_Interactions: - m_Processors: - m_Groups: - m_Action: Position - m_Flags: 0 - m_Flags: 0 - m_RotationAction: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 5439f14e-c9da-4bd1-ad3f-7121a75c10d9 - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: f984a7fd-f7e2-45ef-b21d-699a5d160f29 - m_Path: /centerEyeRotation - m_Interactions: - m_Processors: - m_Groups: - m_Action: Rotation - m_Flags: 0 - m_Flags: 0 ---- !u!81 &2008584331 -AudioListener: + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1987015396 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008584328} - m_Enabled: 1 ---- !u!124 &2008584332 -Behaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_GameObject: {fileID: 1987015393} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2008175315 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: acf8029ebcbe52b4488ed515778fc70b, type: 3} + m_PrefabInstance: {fileID: 660021079} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008584328} - m_Enabled: 1 ---- !u!4 &2008584333 -Transform: +--- !u!65 &2008175316 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008584328} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 65634329} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &2008584334 -AudioSource: + m_GameObject: {fileID: 2008175315} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 0.15393993, z: 1} + m_Center: {x: 0, y: 0.07696997, z: 0} +--- !u!65 &2008175317 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2008584328} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: + m_GameObject: {fileID: 2008175315} + m_Material: {fileID: 0} + m_IncludeLayers: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: + m_Bits: 0 + m_ExcludeLayers: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.2, y: 3.5721025, z: 0.2} + m_Center: {x: 0, y: 1.7860513, z: 0} --- !u!1001 &2011926243 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1192304054} m_Modifications: - target: {fileID: -8679921383154817045, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} @@ -14350,15 +16593,19 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: m_StaticShadowCaster + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 3b8d4fff00195aa4792d649902e68bcd, type: 2} - target: {fileID: -7511558181221131132, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} - propertyPath: m_Materials.Array.data[1] + propertyPath: 'm_Materials.Array.data[1]' value: objectReference: {fileID: 2100000, guid: 525bac3f393fa1349a1508822fb6abb0, type: 2} - target: {fileID: -7511558181221131132, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} - propertyPath: m_Materials.Array.data[2] + propertyPath: 'm_Materials.Array.data[2]' value: objectReference: {fileID: 2100000, guid: 05eaaf1738723ca4a95a70d7a20e71b3, type: 2} - target: {fileID: 919132149155446097, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} @@ -14370,10 +16617,19 @@ PrefabInstance: value: 4294967295 objectReference: {fileID: 0} - target: {fileID: 4287207148634975974, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 2a4df160d58d76d4dac4a97bfb6dae35, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1977887392} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} + insertIndex: -1 + addedObject: {fileID: 2011926246} m_SourcePrefab: {fileID: 100100000, guid: d8aea3ae5508afb48a29b288fed4a3d1, type: 3} --- !u!4 &2011926244 stripped Transform: @@ -14399,8 +16655,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: 015b2c35646e844ab0f6b7d695b2ae03 - uniqueName: Button - tags: [] + guids: [] --- !u!1 &2014095923 GameObject: m_ObjectHideFlags: 0 @@ -14414,7 +16669,7 @@ GameObject: - component: {fileID: 2014095927} - component: {fileID: 2014095926} - component: {fileID: 2014095925} - m_Layer: 8 + m_Layer: 31 m_Name: Teleportation Spot m_TagString: Untagged m_Icon: {fileID: 0} @@ -14428,14 +16683,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014095923} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.5, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1883760419} + - {fileID: 250989853} + - {fileID: 789831090} + - {fileID: 36610241} m_Father: {fileID: 813701130} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!114 &2014095925 MonoBehaviour: @@ -14470,8 +16727,7 @@ MonoBehaviour: m_EditorClassIdentifier: serializedGuid: serializedGuid: f5eb8ec6cdff774a82274c2396bc2513 - uniqueName: Teleportation Spot_2 - tags: [] + guids: [] --- !u!65 &2014095927 BoxCollider: m_ObjectHideFlags: 0 @@ -14480,9 +16736,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014095923} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.01, z: 1} m_Center: {x: 0, y: 0.02, z: 0} --- !u!114 &2014095928 @@ -14499,11 +16763,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: - m_Bits: 2 + m_Bits: 2147483648 m_DistanceCalculationMode: 1 m_SelectMode: 1 m_FocusMode: 1 @@ -14560,156 +16821,255 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_TeleportationProvider: {fileID: 0} m_MatchOrientation: 2 m_MatchDirectionalInput: 0 - m_TeleportTrigger: 3 + m_TeleportTrigger: 0 m_FilterSelectionByHitNormal: 0 m_UpNormalToleranceDegrees: 30 m_Teleporting: m_PersistentCalls: m_Calls: [] - m_TeleportAnchorTransform: {fileID: 1883760419} ---- !u!21 &2018913513 -Material: - serializedVersion: 8 + m_TeleportAnchorTransform: {fileID: 250989853} +--- !u!1 &2016722927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2016722928} + m_Layer: 8 + m_Name: Anchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2016722928 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016722927} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.01, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1243447984} + m_Father: {fileID: 232339300} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2029649881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029649882} + m_Layer: 0 + m_Name: Poke Point Affordances + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2029649882 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029649881} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 808029741} + - {fileID: 1981589079} + m_Father: {fileID: 149866826} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2035264205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2035264206} + - component: {fileID: 2035264208} + - component: {fileID: 2035264207} + m_Layer: 8 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2035264206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2035264205} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -0.1} + m_LocalScale: {x: 1, y: 0.1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1243447984} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2035264207 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2035264205} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a16db0f18ace882458e325d3243cb6da, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2035264208 +MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Standard - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 3 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 0.4, g: 0.5882353, b: 1, a: 0.19607843} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] ---- !u!1 &2030842802 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2030842803} - m_Layer: 0 - m_Name: Middle_0_Left + m_GameObject: {fileID: 2035264205} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2041203273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2041203274} + - component: {fileID: 2041203276} + - component: {fileID: 2041203275} + m_Layer: 31 + m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2030842803 +--- !u!4 &2041203274 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2030842802} - m_LocalRotation: {x: 0.037149172, y: -0.0391672, z: -0.020477412, w: 0.9983319} - m_LocalPosition: {x: -0.062340543, y: -0.00000025370625, z: -0.00000015303492} + m_GameObject: {fileID: 2041203273} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1836407205} - m_Father: {fileID: 2139940513} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2040506299 + - {fileID: 1763474995} + m_Father: {fileID: 250989853} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!23 &2041203275 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041203273} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ab885650ca87af54d8a0e2e50e88b644, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2041203276 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041203273} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2074732592 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14717,30 +17077,93 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2040506300} + - component: {fileID: 2074732593} + - component: {fileID: 2074732594} m_Layer: 0 - m_Name: AttachTransform + m_Name: Ball origin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2074732593 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2074732592} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.125, z: -3} + m_LocalScale: {x: 0.2400001, y: 0.24, z: 0.2400001} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1743725476} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2074732594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2074732592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} + m_Name: + m_EditorClassIdentifier: + serializedGuid: + serializedGuid: 71e44fecd63a0743bae1b797028b6424 + guids: [] +--- !u!1 &2092425254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2092425255} + - component: {fileID: 2092425256} + m_Layer: 2 + m_Name: Teleportation m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2040506300 +--- !u!4 &2092425255 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2040506299} - m_LocalRotation: {x: 0.56707305, y: -0.556724, z: -0.42857817, w: 0.42989233} - m_LocalPosition: {x: -0.09850973, y: 0.018401135, z: -0.006201879} + m_GameObject: {fileID: 2092425254} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 54233951} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0.594, y: -105.251, z: -90.602} ---- !u!1 &2074732592 + m_Father: {fileID: 928609389} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2092425256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2092425254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01f69dc1cb084aa42b2f2f8cd87bc770, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Mediator: {fileID: 928609390} + m_TransformationPriority: 0 + m_DelayTime: 0 +--- !u!1 &2112048194 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -14748,156 +17171,678 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2074732593} - - component: {fileID: 2074732594} + - component: {fileID: 2112048195} + - component: {fileID: 2112048200} + - component: {fileID: 2112048199} + - component: {fileID: 2112048198} + - component: {fileID: 2112048197} + - component: {fileID: 2112048196} m_Layer: 0 - m_Name: Ball origin + m_Name: Left Teleport Interactor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2074732593 +--- !u!4 &2112048195 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074732592} + m_GameObject: {fileID: 2112048194} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 2.125, z: -3} - m_LocalScale: {x: 0.2400001, y: 0.24, z: 0.2400001} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1743725476} - m_RootOrder: 1 + m_Father: {fileID: 1071573184} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2074732594 +--- !u!114 &2112048196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112048194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd0b9921bce4eeb49bd05815b1135ac2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractorSourceObject: {fileID: 2112048200} + m_HapticImpulsePlayer: {fileID: 1071573181} + m_PlaySelectEntered: 1 + m_SelectEnteredData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectExited: 0 + m_SelectExitedData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlaySelectCanceled: 0 + m_SelectCanceledData: + m_Amplitude: 0.5 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverEntered: 1 + m_HoverEnteredData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverExited: 0 + m_HoverExitedData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_PlayHoverCanceled: 0 + m_HoverCanceledData: + m_Amplitude: 0.25 + m_Duration: 0.1 + m_Frequency: 0 + m_AllowHoverHapticsWhileSelecting: 1 +--- !u!210 &2112048197 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112048194} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30005 + m_SortAtRoot: 0 +--- !u!114 &2112048198 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074732592} + m_GameObject: {fileID: 2112048194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e988983f96fe1dd48800bcdfc82f23e9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LineWidth: 0.01 + m_OverrideInteractorLineLength: 0 + m_LineLength: 10 + m_AutoAdjustLineLength: 0 + m_MinLineLength: 0.02 + m_UseDistanceToHitAsMaxLineLength: 1 + m_LineRetractionDelay: 0.5 + m_LineLengthChangeSpeed: 12 + m_WidthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_SetLineColorGradient: 1 + m_ValidColorGradient: + serializedVersion: 2 + key0: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 0.5882353} + key1: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 0.5882353} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_InvalidColorGradient: + serializedVersion: 2 + key0: {r: 1, g: 0, b: 0, a: 0.5882353} + key1: {r: 1, g: 0, b: 0, a: 0.5882353} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_BlockedColorGradient: + serializedVersion: 2 + key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_TreatSelectionAsValidState: 0 + m_SmoothMovement: 0 + m_FollowTightness: 10 + m_SnapThresholdDistance: 10 + m_Reticle: {fileID: 8748868027195207512, guid: 0c9c836faf8b16c4896fef2e890b91db, type: 3} + m_BlockedReticle: {fileID: 3177232254315139758, guid: 8963c70806d0e3441802c7bbc8162b5c, type: 3} + m_StopLineAtFirstRaycastHit: 1 + m_StopLineAtSelection: 0 + m_SnapEndpointIfAvailable: 1 + m_LineBendRatio: 0.5 + m_BendingEnabledInteractionLayers: + m_Bits: 4294967295 + m_OverrideInteractorLineOrigin: 1 + m_LineOriginTransform: {fileID: 1951035652} + m_LineOriginOffset: 0 +--- !u!120 &2112048199 +LineRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112048194} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} - m_Name: - m_EditorClassIdentifier: - serializedGuid: - serializedGuid: 71e44fecd63a0743bae1b797028b6424 - uniqueName: Ball origin - tags: [] ---- !u!1 &2089871578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2089871580} - - component: {fileID: 2089871579} - m_Layer: 0 - m_Name: XR Interaction Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2089871579 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: [] + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.02 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 4 + numCapVertices: 4 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_MaskInteraction: 0 + m_UseWorldSpace: 1 + m_Loop: 0 + m_ApplyActiveColorSpace: 0 +--- !u!114 &2112048200 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089871578} + m_GameObject: {fileID: 2112048194} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Script: {fileID: 11500000, guid: 6803edce0201f574f923fd9d10e5b30a, type: 3} m_Name: m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 2147483648 + m_Handedness: 1 + m_AttachTransform: {fileID: 122397525} + m_KeepSelectedTargetValid: 0 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] ---- !u!4 &2089871580 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2089871578} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1634918261} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2109031084 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2109031085} - m_Layer: 0 - m_Name: Index_2_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2109031085 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2109031084} - m_LocalRotation: {x: 0.006532279, y: 0.0032989993, z: -0.17059992, w: 0.98531324} - m_LocalPosition: {x: -0.023907261, y: -0.00000026226044, z: 0.00000022888183} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1390163570} - m_Father: {fileID: 740016310} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2110589558 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2110589559} - m_Layer: 0 - m_Name: Little_0_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2110589559 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2110589558} - m_LocalRotation: {x: -0.018601296, y: 0.022547437, z: -0.058639184, w: 0.99785125} - m_LocalPosition: {x: -0.056403197, y: -0.00000059507784, z: 0.0000003004074} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1307398688} - m_Father: {fileID: 1784977341} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_SelectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 36843f28-4fd5-4729-b5a6-afe92ef11597 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 1a51c331-470d-4462-b8e1-2522a24bd40c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 1263111715868034790, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: 1263111715868034790, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 0ace7244-e61f-4e60-8d0b-2ef8c3ae51af + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: bdf06a24-21b3-4f27-a8a3-72086e6c7f00 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_InputActionReferenceValue: {fileID: -4289430672226363583, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_SelectActionTrigger: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 0 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 0 + m_LineType: 1 + m_BlendVisualLinePoints: 1 + m_MaxRaycastDistance: 30 + m_RayOriginTransform: {fileID: 629046874} + m_ReferenceFrame: {fileID: 0} + m_Velocity: 10 + m_Acceleration: 9.8 + m_AdditionalGroundHeight: 0.1 + m_AdditionalFlightTime: 0.5 + m_EndPointDistance: 30 + m_EndPointHeight: -10 + m_ControlPointDistance: 10 + m_ControlPointHeight: 5 + m_SampleFrequency: 50 + m_HitDetectionType: 0 + m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 + m_RaycastMask: + serializedVersion: 2 + m_Bits: 2147483648 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 1 + m_HitClosestOnly: 0 + m_HoverToSelect: 0 + m_HoverTimeToSelect: 0.5 + m_AutoDeselect: 0 + m_TimeToAutoDeselect: 1 + m_EnableUIInteraction: 0 + m_BlockInteractionsWithScreenSpaceUI: 0 + m_BlockUIOnInteractableSelection: 1 + m_ManipulateAttachTransform: 1 + m_UseForceGrab: 0 + m_RotateSpeed: 180 + m_TranslateSpeed: 0 + m_RotateReferenceFrame: {fileID: 0} + m_RotateMode: 1 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_EnableARRaycasting: 0 + m_OccludeARHitsWith3DObjects: 0 + m_OccludeARHitsWith2DObjects: 0 + m_ScaleMode: 0 + m_UIPressInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 + m_ExpectedControlType: + m_Id: 54867c8e-3650-4605-a53c-ee8ffb351dcf + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 257d8673-0295-4ff5-b278-e63d20cd918b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 8c6b1aac-a242-4bf4-a5b3-bfad6e83b638 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TranslateManipulationInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Translate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 0f9fd0ee-650d-41a6-ab30-2a036c425c21 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RotateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Rotate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: cadca2d2-f642-4efc-a222-c1827be3e896 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -7363382999065477798, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_DirectionalManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Directional Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 472cbca3-7add-47a9-a5fc-73d3d10107aa + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: -8811388872089202044, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleToggleInput: + m_InputSourceMode: 0 + m_InputActionPerformed: + m_Name: Scale Toggle + m_Type: 1 + m_ExpectedControlType: + m_Id: 692a9304-a2fd-4dbd-9e2f-2fb4b6154f1c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Scale Toggle Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d0cf082b-f2d7-4100-b069-651cf2820425 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ScaleOverTimeInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Over Time + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 6f835f0d-f1c2-461c-b8bc-edc587e89149 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleDistanceDeltaInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Distance Delta + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 9140e1d5-f197-46d4-88c2-a02441edeac5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 --- !u!43 &2119201252 Mesh: m_ObjectHideFlags: 0 @@ -14905,7 +17850,7 @@ Mesh: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 10 + serializedVersion: 11 m_SubMeshes: - serializedVersion: 2 firstByte: 0 @@ -15052,10 +17997,11 @@ Mesh: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0.19999997, y: 0.19999997, z: 0.19999997} m_MeshUsageFlags: 0 + m_CookingOptions: 30 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 3.0308292 - m_MeshMetrics[1]: 1 + 'm_MeshMetrics[0]': 3.0308292 + 'm_MeshMetrics[1]': 1 m_MeshOptimizationFlags: 1 m_StreamData: serializedVersion: 2 @@ -15080,75 +18026,20 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2121825121} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4437772860958094431, guid: be0e1e3e3f7708e4ca1d7556ae7893bc, type: 3} ---- !u!1 &2131842498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2131842499} - m_Layer: 0 - m_Name: Ring_Tip_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2131842499 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2131842498} - m_LocalRotation: {x: 0.000000011175867, y: -0.000000022351747, z: -0.00000020395967, w: 1} - m_LocalPosition: {x: -0.020554436, y: 0.000000114440915, z: -0.00000007867813} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481350550} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2139940512 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2139940513} - m_Layer: 0 - m_Name: Middle_Palm_Left - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2139940513 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2139940512} - m_LocalRotation: {x: 0.99872494, y: -0.046419356, z: -0.015558949, w: -0.012318821} - m_LocalPosition: {x: -0.05391815, y: 0.0050031445, z: 0.0017454529} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2030842803} - m_Father: {fileID: 1909973946} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2140681946 GameObject: m_ObjectHideFlags: 0 @@ -15173,13 +18064,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2140681946} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: -0.245, y: 0, z: -0.004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 660021081} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} --- !u!136 &2140681948 CapsuleCollider: @@ -15189,13 +18080,22 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2140681946} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.02 m_Height: 0.2 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &2146657146 +--- !u!1 &2146169579 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -15203,27 +18103,161 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2146657147} - m_Layer: 0 - m_Name: Ring_1_Left + - component: {fileID: 2146169580} + - component: {fileID: 2146169581} + - component: {fileID: 2146169585} + - component: {fileID: 2146169584} + - component: {fileID: 2146169583} + - component: {fileID: 2146169582} + m_Layer: 2 + m_Name: XRI Rig m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2146657147 +--- !u!4 &2146169580 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2146657146} - m_LocalRotation: {x: -0.00025817356, y: 0.00035699108, z: -0.14537643, w: 0.9893763} - m_LocalPosition: {x: -0.036576994, y: 0.00000019073485, z: 0.0000001502037} + m_GameObject: {fileID: 2146169579} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 933831182} - m_Father: {fileID: 695049119} - m_RootOrder: 0 + - {fileID: 886140063} + - {fileID: 928609389} + m_Father: {fileID: 3120982} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2146169581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146169579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Camera: {fileID: 1180278383} + m_OriginBaseGameObject: {fileID: 2146169579} + m_CameraFloorOffsetObject: {fileID: 886140062} + m_RequestedTrackingOriginMode: 0 + m_CameraYOffset: 1.36144 +--- !u!114 &2146169582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146169579} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c9b3d17eeb2e6bc47ada81d8f7f638d8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_GazeInteractor: {fileID: 389396068} + m_FallbackDivergence: 60 + m_HideCursorWithNoActiveRays: 1 + m_RayInteractors: + - m_Interactor: {fileID: 0} + m_TeleportRay: 0 + - m_Interactor: {fileID: 0} + m_TeleportRay: 1 + - m_Interactor: {fileID: 0} + m_TeleportRay: 0 + - m_Interactor: {fileID: 0} + m_TeleportRay: 1 + m_AimAssistRequiredAngle: 30 + m_AimAssistRequiredSpeed: 0.25 + m_AimAssistPercent: 0.8 + m_AimAssistMaxSpeedPercent: 10 +--- !u!114 &2146169583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146169579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82bc72d2ecc8add47b2fe00d40318500, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LeftHand: {fileID: 0} + m_RightHand: {fileID: 0} + m_LeftController: {fileID: 1071573179} + m_RightController: {fileID: 487972869} + m_TrackedHandModeStarted: + m_PersistentCalls: + m_Calls: [] + m_TrackedHandModeEnded: + m_PersistentCalls: + m_Calls: [] + m_MotionControllerModeStarted: + m_PersistentCalls: + m_Calls: [] + m_MotionControllerModeEnded: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2146169584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146169579} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ActionAssets: + - {fileID: -944628639613478452, guid: ed310a0831549ec44a986bf5d1ca06d5, type: 3} +--- !u!143 &2146169585 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2146169579} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Height: 1.36144 + m_Radius: 0.1 + m_SlopeLimit: 45 + m_StepOffset: 0.5 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.76072, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1364604472} + - {fileID: 1815494806} + - {fileID: 3120982} + - {fileID: 308985786} + - {fileID: 286338418} + - {fileID: 705507995} + - {fileID: 1527860102} + - {fileID: 1756511964} + - {fileID: 33704422} + - {fileID: 813701130} + - {fileID: 1743725476} + - {fileID: 248065651} diff --git a/Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity.meta b/Demo/Scenes/VR Builder Demo - Core Features.unity.meta similarity index 100% rename from Demo/Runtime/Scenes/VR Builder Demo - Core Features.unity.meta rename to Demo/Scenes/VR Builder Demo - Core Features.unity.meta diff --git a/Demo/Scenes/VR Builder Demo - Core Features/LightingData.asset b/Demo/Scenes/VR Builder Demo - Core Features/LightingData.asset new file mode 100644 index 000000000..c20abdff4 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/LightingData.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f052342a7368d6b7dc0d4d2ef527b8066fbb9ab02b4dd493e537717c102cebe5 +size 19313 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/LightingData.asset.meta b/Demo/Scenes/VR Builder Demo - Core Features/LightingData.asset.meta new file mode 100644 index 000000000..ae2ea0a8f --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1e23c1a9601859c4bae4058bed458a3b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_dir.png b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_dir.png new file mode 100644 index 000000000..4aaedd0cf --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7f6bd4277694e953e426cb7e9e24a19eba53926bc1515725b4876b24c8f7097 +size 488421 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_dir.png.meta b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_dir.png.meta new file mode 100644 index 000000000..0e957005c --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: fd54d11f77c23574b8febf8aad2d7d11 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_light.exr b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_light.exr new file mode 100644 index 000000000..fe0f0af66 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24ef86345ea8175869f31bed798d39732c58f27d3f85af2502e07e1dc4614967 +size 4431917 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_light.exr.meta b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_light.exr.meta new file mode 100644 index 000000000..4fade4723 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 8c03ec825b46441408438c0b773633a0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_shadowmask.png b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_shadowmask.png new file mode 100644 index 000000000..f1cea86cf --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_shadowmask.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:712ed4c6f71df7c475673871faa008a8965e72e03251617635b30147aaac73fb +size 269925 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_shadowmask.png.meta b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_shadowmask.png.meta new file mode 100644 index 000000000..f225cba67 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-0_comp_shadowmask.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: f5f43d22e8df22448a17e8ef9ac8e54a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 11 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_dir.png b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_dir.png new file mode 100644 index 000000000..5e9e81964 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2f66990fbe536c321549108bfa7d4065926a1c90921e440bc44a736cfb4bb0a +size 49131 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_dir.png.meta b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_dir.png.meta new file mode 100644 index 000000000..813f706ab --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_dir.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: e2a3ac00ca4945f488aa029a6edc6857 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_light.exr b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_light.exr new file mode 100644 index 000000000..7c116caf0 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_light.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee6e05130c593d79c6831bc380a641f2c91ccc6ec9a5b37f88ee362145ecdc25 +size 399435 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_light.exr.meta b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_light.exr.meta new file mode 100644 index 000000000..1f90d07a7 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_light.exr.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 3ee1b38362f29e54b81a7bdf88750558 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_shadowmask.png b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_shadowmask.png new file mode 100644 index 000000000..fedceaac5 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_shadowmask.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fea1004352208d39fd0fb166e20b980d9a94fd9c3767357a4717de0f14b82eb +size 22057 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_shadowmask.png.meta b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_shadowmask.png.meta new file mode 100644 index 000000000..dae38bd19 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/Lightmap-1_comp_shadowmask.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: fa0825898875f9149a66c0f0a014af69 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 11 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Scenes/VR Builder Demo - Core Features/ReflectionProbe-0.exr b/Demo/Scenes/VR Builder Demo - Core Features/ReflectionProbe-0.exr new file mode 100644 index 000000000..f25c73651 --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/ReflectionProbe-0.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f674a4726106e6ba081064f4cee8c5249f6929b2621527fecf09b752a335c269 +size 353699 diff --git a/Demo/Scenes/VR Builder Demo - Core Features/ReflectionProbe-0.exr.meta b/Demo/Scenes/VR Builder Demo - Core Features/ReflectionProbe-0.exr.meta new file mode 100644 index 000000000..fdc8ff05d --- /dev/null +++ b/Demo/Scenes/VR Builder Demo - Core Features/ReflectionProbe-0.exr.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 43548340845fd3447b0733c9c3e05112 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/Runtime/Scenes/WARNING - Don't open the demo scene from here!.txt b/Demo/Scenes/WARNING - Don't open the demo scene from here!.txt similarity index 100% rename from Demo/Runtime/Scenes/WARNING - Don't open the demo scene from here!.txt rename to Demo/Scenes/WARNING - Don't open the demo scene from here!.txt diff --git a/Demo/Runtime/Scenes/WARNING - Don't open the demo scene from here!.txt.meta b/Demo/Scenes/WARNING - Don't open the demo scene from here!.txt.meta similarity index 100% rename from Demo/Runtime/Scenes/WARNING - Don't open the demo scene from here!.txt.meta rename to Demo/Scenes/WARNING - Don't open the demo scene from here!.txt.meta diff --git a/Demo/Runtime/StaticAssets.meta b/Demo/StaticAssets.meta similarity index 100% rename from Demo/Runtime/StaticAssets.meta rename to Demo/StaticAssets.meta diff --git a/Demo/Runtime/StaticAssets/Materials.meta b/Demo/StaticAssets/Materials.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials.meta rename to Demo/StaticAssets/Materials.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Ball.physicMaterial b/Demo/StaticAssets/Materials/Ball.physicMaterial similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Ball.physicMaterial rename to Demo/StaticAssets/Materials/Ball.physicMaterial diff --git a/Demo/Runtime/StaticAssets/Materials/Ball.physicMaterial.meta b/Demo/StaticAssets/Materials/Ball.physicMaterial.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Ball.physicMaterial.meta rename to Demo/StaticAssets/Materials/Ball.physicMaterial.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Conveyor.mat b/Demo/StaticAssets/Materials/Conveyor.mat similarity index 50% rename from Demo/Runtime/StaticAssets/Materials/Conveyor.mat rename to Demo/StaticAssets/Materials/Conveyor.mat index 079f3f952..6f8d9bdfd 100644 --- a/Demo/Runtime/StaticAssets/Materials/Conveyor.mat +++ b/Demo/StaticAssets/Materials/Conveyor.mat @@ -2,23 +2,33 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Conveyor - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +65,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +105,34 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &4394630849495558957 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Runtime/StaticAssets/Materials/Conveyor.mat.meta b/Demo/StaticAssets/Materials/Conveyor.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Conveyor.mat.meta rename to Demo/StaticAssets/Materials/Conveyor.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Interactable.mat b/Demo/StaticAssets/Materials/Interactable.mat similarity index 51% rename from Demo/Runtime/StaticAssets/Materials/Interactable.mat rename to Demo/StaticAssets/Materials/Interactable.mat index 56fc386c8..2389a1a8e 100644 --- a/Demo/Runtime/StaticAssets/Materials/Interactable.mat +++ b/Demo/StaticAssets/Materials/Interactable.mat @@ -1,24 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-272127593926176777 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Interactable - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +78,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.815 - _GlossyReflections: 1 @@ -67,12 +118,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.815 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} - _Color: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/Interactable.mat.meta b/Demo/StaticAssets/Materials/Interactable.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Interactable.mat.meta rename to Demo/StaticAssets/Materials/Interactable.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/InteractableTrim.mat b/Demo/StaticAssets/Materials/InteractableTrim.mat similarity index 51% rename from Demo/Runtime/StaticAssets/Materials/InteractableTrim.mat rename to Demo/StaticAssets/Materials/InteractableTrim.mat index 1433ebcae..7218b0bca 100644 --- a/Demo/Runtime/StaticAssets/Materials/InteractableTrim.mat +++ b/Demo/StaticAssets/Materials/InteractableTrim.mat @@ -1,24 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3521980240719700933 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: InteractableTrim - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +78,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.74 - _GlossyReflections: 1 @@ -67,12 +118,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.74 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0.8745098, g: 0, b: 1, a: 1} - _Color: {r: 0.8745098, g: 0, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/InteractableTrim.mat.meta b/Demo/StaticAssets/Materials/InteractableTrim.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/InteractableTrim.mat.meta rename to Demo/StaticAssets/Materials/InteractableTrim.mat.meta diff --git a/Demo/StaticAssets/Materials/Light.mat b/Demo/StaticAssets/Materials/Light.mat new file mode 100644 index 000000000..23810f4c3 --- /dev/null +++ b/Demo/StaticAssets/Materials/Light.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4747966712143678865 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Light + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 15.999998, g: 15.999998, b: 15.999998, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/Light.mat.meta b/Demo/StaticAssets/Materials/Light.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Light.mat.meta rename to Demo/StaticAssets/Materials/Light.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/LightSaber.mat b/Demo/StaticAssets/Materials/LightSaber.mat similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/LightSaber.mat rename to Demo/StaticAssets/Materials/LightSaber.mat diff --git a/Demo/Runtime/StaticAssets/Materials/LightSaber.mat.meta b/Demo/StaticAssets/Materials/LightSaber.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/LightSaber.mat.meta rename to Demo/StaticAssets/Materials/LightSaber.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/MagicLight.mat b/Demo/StaticAssets/Materials/MagicLight.mat similarity index 51% rename from Demo/Runtime/StaticAssets/Materials/MagicLight.mat rename to Demo/StaticAssets/Materials/MagicLight.mat index b4aa69b39..d1f42322d 100644 --- a/Demo/Runtime/StaticAssets/Materials/MagicLight.mat +++ b/Demo/StaticAssets/Materials/MagicLight.mat @@ -2,23 +2,34 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: MagicLight - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +66,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +106,34 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 1.373061, g: 0.38041517, b: 1.5157166, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8653545428196316565 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Runtime/StaticAssets/Materials/MagicLight.mat.meta b/Demo/StaticAssets/Materials/MagicLight.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/MagicLight.mat.meta rename to Demo/StaticAssets/Materials/MagicLight.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Panel.mat b/Demo/StaticAssets/Materials/Panel.mat similarity index 51% rename from Demo/Runtime/StaticAssets/Materials/Panel.mat rename to Demo/StaticAssets/Materials/Panel.mat index 53d045381..4339a4041 100644 --- a/Demo/Runtime/StaticAssets/Materials/Panel.mat +++ b/Demo/StaticAssets/Materials/Panel.mat @@ -1,24 +1,48 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8247554484103522024 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Panel - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +79,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +119,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/Panel.mat.meta b/Demo/StaticAssets/Materials/Panel.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Panel.mat.meta rename to Demo/StaticAssets/Materials/Panel.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Platform.mat b/Demo/StaticAssets/Materials/Platform.mat similarity index 50% rename from Demo/Runtime/StaticAssets/Materials/Platform.mat rename to Demo/StaticAssets/Materials/Platform.mat index 8d061d4d3..ebf6dcdb6 100644 --- a/Demo/Runtime/StaticAssets/Materials/Platform.mat +++ b/Demo/StaticAssets/Materials/Platform.mat @@ -1,24 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3017498046970661717 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Platform - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +78,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +118,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/Platform.mat.meta b/Demo/StaticAssets/Materials/Platform.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Platform.mat.meta rename to Demo/StaticAssets/Materials/Platform.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/PlatformEmissive.mat b/Demo/StaticAssets/Materials/PlatformEmissive.mat similarity index 51% rename from Demo/Runtime/StaticAssets/Materials/PlatformEmissive.mat rename to Demo/StaticAssets/Materials/PlatformEmissive.mat index 6e1f587ed..262f93b5b 100644 --- a/Demo/Runtime/StaticAssets/Materials/PlatformEmissive.mat +++ b/Demo/StaticAssets/Materials/PlatformEmissive.mat @@ -1,24 +1,48 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-159655769012096971 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlatformEmissive - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +79,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +119,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0.6554734, g: 1.3041189, b: 1.0856278, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/PlatformEmissive.mat.meta b/Demo/StaticAssets/Materials/PlatformEmissive.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/PlatformEmissive.mat.meta rename to Demo/StaticAssets/Materials/PlatformEmissive.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Shaft.mat b/Demo/StaticAssets/Materials/Shaft.mat similarity index 50% rename from Demo/Runtime/StaticAssets/Materials/Shaft.mat rename to Demo/StaticAssets/Materials/Shaft.mat index 1235ea107..8a391ef96 100644 --- a/Demo/Runtime/StaticAssets/Materials/Shaft.mat +++ b/Demo/StaticAssets/Materials/Shaft.mat @@ -1,24 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3659172326881133459 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Shaft - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +78,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +118,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} - _Color: {r: 0.7490196, g: 0.7490196, b: 0.7490196, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/Shaft.mat.meta b/Demo/StaticAssets/Materials/Shaft.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Shaft.mat.meta rename to Demo/StaticAssets/Materials/Shaft.mat.meta diff --git a/Demo/StaticAssets/Materials/Shield.mat b/Demo/StaticAssets/Materials/Shield.mat new file mode 100644 index 000000000..2a7fa6bdb --- /dev/null +++ b/Demo/StaticAssets/Materials/Shield.mat @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Shield + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.754 + - _GlossyReflections: 1 + - _Metallic: 0.474 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.754 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0.90588236, g: 0.25098038, b: 1, a: 0.49411765} + - _Color: {r: 0.90588236, g: 0.25098035, b: 1, a: 0.49411765} + - _EmissionColor: {r: 0.4056604, g: 0, b: 0.35430175, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &198190117319477704 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Runtime/StaticAssets/Materials/Shield.mat.meta b/Demo/StaticAssets/Materials/Shield.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Shield.mat.meta rename to Demo/StaticAssets/Materials/Shield.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Skybox.mat b/Demo/StaticAssets/Materials/Skybox.mat similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Skybox.mat rename to Demo/StaticAssets/Materials/Skybox.mat diff --git a/Demo/Runtime/StaticAssets/Materials/Skybox.mat.meta b/Demo/StaticAssets/Materials/Skybox.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Skybox.mat.meta rename to Demo/StaticAssets/Materials/Skybox.mat.meta diff --git a/Demo/StaticAssets/Materials/Station.mat b/Demo/StaticAssets/Materials/Station.mat new file mode 100644 index 000000000..a47670463 --- /dev/null +++ b/Demo/StaticAssets/Materials/Station.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Station + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.836 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.836 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.39999998, g: 0.39999998, b: 0.39999998, a: 1} + - _Color: {r: 0.39999995, g: 0.39999995, b: 0.39999995, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8129293154011459022 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Runtime/StaticAssets/Materials/Station.mat.meta b/Demo/StaticAssets/Materials/Station.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Station.mat.meta rename to Demo/StaticAssets/Materials/Station.mat.meta diff --git a/Demo/StaticAssets/Materials/StationEmissive.mat b/Demo/StaticAssets/Materials/StationEmissive.mat new file mode 100644 index 000000000..3c213bc57 --- /dev/null +++ b/Demo/StaticAssets/Materials/StationEmissive.mat @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StationEmissive + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.5766016, g: 1.5135791, b: 3.4415908, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &6680165244515152192 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Runtime/StaticAssets/Materials/StationEmissive.mat.meta b/Demo/StaticAssets/Materials/StationEmissive.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/StationEmissive.mat.meta rename to Demo/StaticAssets/Materials/StationEmissive.mat.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures.meta b/Demo/StaticAssets/Materials/Textures.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures.meta rename to Demo/StaticAssets/Materials/Textures.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_back.png b/Demo/StaticAssets/Materials/Textures/purple-nebula_back.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_back.png rename to Demo/StaticAssets/Materials/Textures/purple-nebula_back.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_back.png.meta b/Demo/StaticAssets/Materials/Textures/purple-nebula_back.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_back.png.meta rename to Demo/StaticAssets/Materials/Textures/purple-nebula_back.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_down.png b/Demo/StaticAssets/Materials/Textures/purple-nebula_down.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_down.png rename to Demo/StaticAssets/Materials/Textures/purple-nebula_down.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_down.png.meta b/Demo/StaticAssets/Materials/Textures/purple-nebula_down.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_down.png.meta rename to Demo/StaticAssets/Materials/Textures/purple-nebula_down.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_front.png b/Demo/StaticAssets/Materials/Textures/purple-nebula_front.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_front.png rename to Demo/StaticAssets/Materials/Textures/purple-nebula_front.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_front.png.meta b/Demo/StaticAssets/Materials/Textures/purple-nebula_front.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_front.png.meta rename to Demo/StaticAssets/Materials/Textures/purple-nebula_front.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_left.png b/Demo/StaticAssets/Materials/Textures/purple-nebula_left.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_left.png rename to Demo/StaticAssets/Materials/Textures/purple-nebula_left.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_left.png.meta b/Demo/StaticAssets/Materials/Textures/purple-nebula_left.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_left.png.meta rename to Demo/StaticAssets/Materials/Textures/purple-nebula_left.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_right.png b/Demo/StaticAssets/Materials/Textures/purple-nebula_right.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_right.png rename to Demo/StaticAssets/Materials/Textures/purple-nebula_right.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_right.png.meta b/Demo/StaticAssets/Materials/Textures/purple-nebula_right.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_right.png.meta rename to Demo/StaticAssets/Materials/Textures/purple-nebula_right.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_up.png b/Demo/StaticAssets/Materials/Textures/purple-nebula_up.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_up.png rename to Demo/StaticAssets/Materials/Textures/purple-nebula_up.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_up.png.meta b/Demo/StaticAssets/Materials/Textures/purple-nebula_up.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/purple-nebula_up.png.meta rename to Demo/StaticAssets/Materials/Textures/purple-nebula_up.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/review.png b/Demo/StaticAssets/Materials/Textures/review.png similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/review.png rename to Demo/StaticAssets/Materials/Textures/review.png diff --git a/Demo/Runtime/StaticAssets/Materials/Textures/review.png.meta b/Demo/StaticAssets/Materials/Textures/review.png.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/Textures/review.png.meta rename to Demo/StaticAssets/Materials/Textures/review.png.meta diff --git a/Demo/Runtime/StaticAssets/Materials/TouchPanel.mat b/Demo/StaticAssets/Materials/TouchPanel.mat similarity index 50% rename from Demo/Runtime/StaticAssets/Materials/TouchPanel.mat rename to Demo/StaticAssets/Materials/TouchPanel.mat index f41b1029a..792366c56 100644 --- a/Demo/Runtime/StaticAssets/Materials/TouchPanel.mat +++ b/Demo/StaticAssets/Materials/TouchPanel.mat @@ -1,24 +1,48 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8468752464238058353 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TouchPanel - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +79,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +119,21 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Demo/Runtime/StaticAssets/Materials/TouchPanel.mat.meta b/Demo/StaticAssets/Materials/TouchPanel.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Materials/TouchPanel.mat.meta rename to Demo/StaticAssets/Materials/TouchPanel.mat.meta diff --git a/Demo/Runtime/StaticAssets/Meshes.meta b/Demo/StaticAssets/Meshes.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes.meta rename to Demo/StaticAssets/Meshes.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Ball.fbx b/Demo/StaticAssets/Meshes/Ball.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Ball.fbx rename to Demo/StaticAssets/Meshes/Ball.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Ball.fbx.meta b/Demo/StaticAssets/Meshes/Ball.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Ball.fbx.meta rename to Demo/StaticAssets/Meshes/Ball.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-L.fbx b/Demo/StaticAssets/Meshes/MagicCube-Split-L.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-L.fbx rename to Demo/StaticAssets/Meshes/MagicCube-Split-L.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-L.fbx.meta b/Demo/StaticAssets/Meshes/MagicCube-Split-L.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-L.fbx.meta rename to Demo/StaticAssets/Meshes/MagicCube-Split-L.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-R.fbx b/Demo/StaticAssets/Meshes/MagicCube-Split-R.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-R.fbx rename to Demo/StaticAssets/Meshes/MagicCube-Split-R.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-R.fbx.meta b/Demo/StaticAssets/Meshes/MagicCube-Split-R.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicCube-Split-R.fbx.meta rename to Demo/StaticAssets/Meshes/MagicCube-Split-R.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicCube.fbx b/Demo/StaticAssets/Meshes/MagicCube.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicCube.fbx rename to Demo/StaticAssets/Meshes/MagicCube.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicCube.fbx.meta b/Demo/StaticAssets/Meshes/MagicCube.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicCube.fbx.meta rename to Demo/StaticAssets/Meshes/MagicCube.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicSphere.fbx b/Demo/StaticAssets/Meshes/MagicSphere.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicSphere.fbx rename to Demo/StaticAssets/Meshes/MagicSphere.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/MagicSphere.fbx.meta b/Demo/StaticAssets/Meshes/MagicSphere.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/MagicSphere.fbx.meta rename to Demo/StaticAssets/Meshes/MagicSphere.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Pedestal.fbx b/Demo/StaticAssets/Meshes/Pedestal.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Pedestal.fbx rename to Demo/StaticAssets/Meshes/Pedestal.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Pedestal.fbx.meta b/Demo/StaticAssets/Meshes/Pedestal.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Pedestal.fbx.meta rename to Demo/StaticAssets/Meshes/Pedestal.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Platform.fbx b/Demo/StaticAssets/Meshes/Platform.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Platform.fbx rename to Demo/StaticAssets/Meshes/Platform.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Platform.fbx.meta b/Demo/StaticAssets/Meshes/Platform.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Platform.fbx.meta rename to Demo/StaticAssets/Meshes/Platform.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Podium.fbx b/Demo/StaticAssets/Meshes/Podium.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Podium.fbx rename to Demo/StaticAssets/Meshes/Podium.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Podium.fbx.meta b/Demo/StaticAssets/Meshes/Podium.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Podium.fbx.meta rename to Demo/StaticAssets/Meshes/Podium.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/PodiumTeleportArea.fbx b/Demo/StaticAssets/Meshes/PodiumTeleportArea.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/PodiumTeleportArea.fbx rename to Demo/StaticAssets/Meshes/PodiumTeleportArea.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/PodiumTeleportArea.fbx.meta b/Demo/StaticAssets/Meshes/PodiumTeleportArea.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/PodiumTeleportArea.fbx.meta rename to Demo/StaticAssets/Meshes/PodiumTeleportArea.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/ReviewPanel.fbx b/Demo/StaticAssets/Meshes/ReviewPanel.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/ReviewPanel.fbx rename to Demo/StaticAssets/Meshes/ReviewPanel.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/ReviewPanel.fbx.meta b/Demo/StaticAssets/Meshes/ReviewPanel.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/ReviewPanel.fbx.meta rename to Demo/StaticAssets/Meshes/ReviewPanel.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Shield.fbx b/Demo/StaticAssets/Meshes/Shield.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Shield.fbx rename to Demo/StaticAssets/Meshes/Shield.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Shield.fbx.meta b/Demo/StaticAssets/Meshes/Shield.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Shield.fbx.meta rename to Demo/StaticAssets/Meshes/Shield.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Table.fbx b/Demo/StaticAssets/Meshes/Table.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Table.fbx rename to Demo/StaticAssets/Meshes/Table.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Table.fbx.meta b/Demo/StaticAssets/Meshes/Table.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Table.fbx.meta rename to Demo/StaticAssets/Meshes/Table.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Target.fbx b/Demo/StaticAssets/Meshes/Target.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Target.fbx rename to Demo/StaticAssets/Meshes/Target.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Target.fbx.meta b/Demo/StaticAssets/Meshes/Target.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Target.fbx.meta rename to Demo/StaticAssets/Meshes/Target.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/TeleportArea.fbx b/Demo/StaticAssets/Meshes/TeleportArea.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/TeleportArea.fbx rename to Demo/StaticAssets/Meshes/TeleportArea.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/TeleportArea.fbx.meta b/Demo/StaticAssets/Meshes/TeleportArea.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/TeleportArea.fbx.meta rename to Demo/StaticAssets/Meshes/TeleportArea.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/TouchPanel.fbx b/Demo/StaticAssets/Meshes/TouchPanel.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/TouchPanel.fbx rename to Demo/StaticAssets/Meshes/TouchPanel.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/TouchPanel.fbx.meta b/Demo/StaticAssets/Meshes/TouchPanel.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/TouchPanel.fbx.meta rename to Demo/StaticAssets/Meshes/TouchPanel.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Meshes/Transformer.fbx b/Demo/StaticAssets/Meshes/Transformer.fbx similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Transformer.fbx rename to Demo/StaticAssets/Meshes/Transformer.fbx diff --git a/Demo/Runtime/StaticAssets/Meshes/Transformer.fbx.meta b/Demo/StaticAssets/Meshes/Transformer.fbx.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Meshes/Transformer.fbx.meta rename to Demo/StaticAssets/Meshes/Transformer.fbx.meta diff --git a/Demo/Runtime/StaticAssets/Prefabs.meta b/Demo/StaticAssets/Prefabs.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Prefabs.meta rename to Demo/StaticAssets/Prefabs.meta diff --git a/Demo/Runtime/StaticAssets/Prefabs/Laser Sword.prefab b/Demo/StaticAssets/Prefabs/Laser Sword.prefab similarity index 90% rename from Demo/Runtime/StaticAssets/Prefabs/Laser Sword.prefab rename to Demo/StaticAssets/Prefabs/Laser Sword.prefab index 3e4506a42..8a4a577d7 100644 --- a/Demo/Runtime/StaticAssets/Prefabs/Laser Sword.prefab +++ b/Demo/StaticAssets/Prefabs/Laser Sword.prefab @@ -25,12 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 508684785655102254} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.05} m_LocalScale: {x: 0.04, y: 0.14999999, z: 0.039999995} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &4412953697858053437 MeshFilter: @@ -51,11 +52,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -106,12 +111,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 557979103336592827} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.125} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &1205978523190690412 MeshFilter: @@ -132,11 +138,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -187,12 +197,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 597354256739779555} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.08} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &6625006998753807739 MeshFilter: @@ -213,11 +224,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -268,12 +283,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 633895321617891016} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.095} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &8530837503839076806 MeshFilter: @@ -294,11 +310,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -349,12 +369,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1742113465145833959} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.02} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &4154014934598821566 MeshFilter: @@ -375,11 +396,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -430,12 +455,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1880691540779218186} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0.025} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &3150097402008378882 MeshFilter: @@ -456,11 +482,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -511,12 +541,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055084202486242084} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.164} m_LocalScale: {x: 0.049999997, y: 0.036, z: 0.050000004} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &4882508451612549256 MeshFilter: @@ -537,11 +568,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -590,12 +625,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2999420513341540999} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6459590485641253054} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &4254628691805927976 GameObject: @@ -622,12 +658,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4254628691805927976} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0.064} m_LocalScale: {x: 0.049999997, y: 0.036, z: 0.050000004} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &7168213079512003282 MeshFilter: @@ -648,11 +685,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -694,6 +735,7 @@ GameObject: - component: {fileID: 2999420514030884954} - component: {fileID: 2999420514030884948} - component: {fileID: 916270464340596692} + - component: {fileID: 149081864450982852} m_Layer: 0 m_Name: Laser Sword m_TagString: Untagged @@ -708,15 +750,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5562819036174228372} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.25, y: 1.131, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5876255861038804467} - {fileID: 8387229585160524410} - {fileID: 2999420513341540992} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!54 &2999420514030884955 Rigidbody: @@ -725,10 +768,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5562819036174228372} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.0000001 m_Drag: 0 m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -747,6 +801,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lockOnParentObjectLock: 1 + useStarted: + m_PersistentCalls: + m_Calls: [] + useEnded: + m_PersistentCalls: + m_Calls: [] --- !u!114 &5562819036174228373 MonoBehaviour: m_ObjectHideFlags: 0 @@ -760,10 +820,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lockOnParentObjectLock: 1 - grabbed: + grabStarted: m_PersistentCalls: m_Calls: [] - ungrabbed: + grabEnded: m_PersistentCalls: m_Calls: [] --- !u!114 &2999420514030884953 @@ -779,10 +839,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: lockOnParentObjectLock: 1 - touched: + touchStarted: m_PersistentCalls: m_Calls: [] - untouched: + touchEnded: m_PersistentCalls: m_Calls: [] --- !u!114 &2999420514030884954 @@ -799,13 +859,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 1 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -850,6 +908,18 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] m_Activated: m_PersistentCalls: m_Calls: @@ -883,33 +953,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] m_AttachTransform: {fileID: 2999420513341540992} m_SecondaryAttachTransform: {fileID: 0} m_UseDynamicAttach: 0 @@ -931,6 +974,10 @@ MonoBehaviour: m_SmoothRotation: 0 m_SmoothRotationAmount: 5 m_TightenRotation: 0.5 + m_TrackScale: 1 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 m_ThrowOnDetach: 1 m_ThrowSmoothingDuration: 0.25 m_ThrowSmoothingCurve: @@ -952,10 +999,10 @@ MonoBehaviour: m_ThrowAngularVelocityScale: 1 m_ForceGravityOnDetach: 0 m_RetainTransformParent: 0 - m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 + m_FarAttachMode: 0 isTouchable: 1 isGrabbable: 1 isUsable: 1 @@ -971,7 +1018,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: m_EditorClassIdentifier: + serializedGuid: + serializedGuid: uniqueName: LightSabre + guids: [] tags: [] --- !u!136 &916270464340596692 CapsuleCollider: @@ -981,12 +1031,43 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5562819036174228372} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.025 m_Height: 0.3 m_Direction: 2 m_Center: {x: 0, y: 0, z: -0.025} +--- !u!114 &149081864450982852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562819036174228372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 2999420514030884954} + m_PokeCollider: {fileID: 0} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 0 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 0 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} --- !u!1 &5732931799074411065 GameObject: m_ObjectHideFlags: 0 @@ -1012,12 +1093,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5732931799074411065} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.05} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &8565178696383672930 MeshFilter: @@ -1038,11 +1120,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1095,12 +1181,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6246853691175774326} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.65} m_LocalScale: {x: 0.03, y: 0.7, z: 0.03} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6459590485641253054} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &4941949374068478407 MeshFilter: @@ -1121,11 +1208,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1159,9 +1250,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6246853691175774326} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 2 - m_Shape: 0 m_Color: {r: 1, g: 0, b: 1, a: 1} m_Intensity: 4 m_Range: 0.5 @@ -1211,8 +1301,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!114 &1978455793 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1225,7 +1319,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 64582d436c5a4e84d89ba2d25709ddca, type: 3} m_Name: m_EditorClassIdentifier: + serializedGuid: + serializedGuid: uniqueName: Light + guids: [] tags: [] --- !u!1 &7125113496480917027 GameObject: @@ -1252,12 +1349,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7125113496480917027} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.065} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &138145172504796051 MeshFilter: @@ -1278,11 +1376,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1333,12 +1435,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7393521196287695171} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.035} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &2234731582968991828 MeshFilter: @@ -1359,11 +1462,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1414,12 +1521,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7408909325635201331} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.11} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &214078848793112375 MeshFilter: @@ -1440,11 +1548,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1495,12 +1607,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8598360453421667616} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0.01} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &8524340244374439755 MeshFilter: @@ -1521,11 +1634,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1576,12 +1693,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8833920525693744542} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.005} m_LocalScale: {x: 0.045, y: 0.0030000003, z: 0.044999998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5876255861038804467} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &4331467306494673270 MeshFilter: @@ -1602,11 +1720,15 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1655,9 +1777,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9211277715948586494} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.075} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3443294533702717883} - {fileID: 9135070536443539102} @@ -1674,5 +1798,4 @@ Transform: - {fileID: 4065448324798803105} - {fileID: 6518330164100371419} m_Father: {fileID: 6459590485641253054} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Demo/Runtime/StaticAssets/Prefabs/Laser Sword.prefab.meta b/Demo/StaticAssets/Prefabs/Laser Sword.prefab.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Prefabs/Laser Sword.prefab.meta rename to Demo/StaticAssets/Prefabs/Laser Sword.prefab.meta diff --git a/Demo/Runtime/StaticAssets/Prefabs/Magic Cube.mat b/Demo/StaticAssets/Prefabs/Magic Cube.mat similarity index 50% rename from Demo/Runtime/StaticAssets/Prefabs/Magic Cube.mat rename to Demo/StaticAssets/Prefabs/Magic Cube.mat index b9ffc2b8a..bb25a7033 100644 --- a/Demo/Runtime/StaticAssets/Prefabs/Magic Cube.mat +++ b/Demo/StaticAssets/Prefabs/Magic Cube.mat @@ -2,24 +2,35 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Magic Cube - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,11 +67,39 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 1 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,12 +107,34 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.47058827, g: 0.9450981, b: 0.7843138, a: 0.5019608} + - _BaseColor: {r: 0.4705882, g: 0.9450981, b: 0.7843138, a: 0.5019608} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3447926199455230317 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Demo/Runtime/StaticAssets/Prefabs/Magic Cube.mat.meta b/Demo/StaticAssets/Prefabs/Magic Cube.mat.meta similarity index 100% rename from Demo/Runtime/StaticAssets/Prefabs/Magic Cube.mat.meta rename to Demo/StaticAssets/Prefabs/Magic Cube.mat.meta diff --git a/Demo/StaticAssets/VRB_CoreDemo_Lighting.lighting b/Demo/StaticAssets/VRB_CoreDemo_Lighting.lighting new file mode 100644 index 000000000..c81783dac --- /dev/null +++ b/Demo/StaticAssets/VRB_CoreDemo_Lighting.lighting @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VRB_CoreDemo_Lighting + serializedVersion: 9 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 1024 + m_LightmapSizeFixed: 0 + m_UseMipmapLimits: 1 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 1 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_EnableWorkerProcessBaking: 1 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 1 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 2 + m_PVRDenoiserTypeIndirect: 2 + m_PVRDenoiserTypeAO: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 2 + m_PVRFilteringGaussRadiusIndirect: 2 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Demo/StaticAssets/VRB_CoreDemo_Lighting.lighting.meta b/Demo/StaticAssets/VRB_CoreDemo_Lighting.lighting.meta new file mode 100644 index 000000000..7f5687dc2 --- /dev/null +++ b/Demo/StaticAssets/VRB_CoreDemo_Lighting.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43798e48bac48fb40a8f662065824ac1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Demo/StreamingAssets/Processes/Demo - Core Features/Demo - Core Features.json b/Demo/StreamingAssets/Processes/Demo - Core Features/Demo - Core Features.json index 4f161f812..8793cf102 100644 --- a/Demo/StreamingAssets/Processes/Demo - Core Features/Demo - Core Features.json +++ b/Demo/StreamingAssets/Processes/Demo - Core Features/Demo - Core Features.json @@ -17,7 +17,7 @@ "$id": "5", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 168.0, + "x": 227.0, "y": 0.0 }, "StepType": "default", @@ -46,7 +46,7 @@ "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { "$id": "12", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Welcome! I'll guide you through this course." }, "ExecutionStages": 1, @@ -93,10 +93,10 @@ "Mode": null, "ToUnlock": { "$id": "19", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { + "GroupsToUnlock": { "$id": "20", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, @@ -151,8 +151,8 @@ "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { "$id": "32", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", - "Text": "Teleport to the first station. Press and hold the trigger button to aim at the blue teleportation spot. Release the trigger button to teleport there." + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", + "Text": "Teleport to the first station. Push the right stick forward and aim at the blue teleportation spot. Release the stick to teleport there." }, "ExecutionStages": 1, "Volume": 1.0, @@ -201,22 +201,17 @@ ] } }, - "TeleportationPoint": { - "$id": "43", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITeleportationProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Teleportation Spot" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "44", + "$id": "43", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "45", + "$id": "44", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -230,54 +225,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "46", + "$id": "45", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "47", + "$id": "46", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "48", + "$id": "47", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "49", + "$id": "48", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "50", + "$id": "49", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "51", + "$id": "50", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "52", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" - }, - { - "$id": "53", + "$id": "51", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "$id": "52", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "54", + "$id": "53", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "55", + "$id": "54", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "56", + "$id": "55", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -289,7 +284,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "57", + "$id": "56", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -304,22 +299,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "58", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "57", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "59", + "GroupsToUnlock": { + "$id": "58", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "60", + "$id": "59", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "61", + "$id": "60", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "62", + "$id": "61", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -328,42 +323,42 @@ } }, { - "$id": "63", + "$id": "62", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "64", + "$id": "63", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 483.2, + "x": 515.3333, "y": 0.0 }, "StepType": "default", "Guid": "0aeb439a-dab4-486d-abfd-3acb4a60bb1f" }, "Data": { - "$id": "65", + "$id": "64", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Grab Magic Cube", "Description": null, "Behaviors": { - "$id": "66", + "$id": "65", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "67", + "$id": "66", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "68", + "$id": "67", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "69", + "$id": "68", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "70", + "$id": "69", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "71", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "70", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "First, use the transformer in front of you to make a cube out of the sphere to your left. Grab it by pressing the grab button on your controller. The grab button is on the side of your controller." }, "ExecutionStages": 1, @@ -377,48 +372,43 @@ } }, "Transitions": { - "$id": "72", + "$id": "71", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "73", + "$id": "72", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "74", + "$id": "73", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "75", + "$id": "74", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "76", + "$id": "75", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "77", + "$id": "76", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "78", + "$id": "77", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "79", + "$id": "78", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition+EntityData, VRBuilder.BasicInteraction", "KeepUnlocked": true, "Targets": { - "$id": "80", + "$id": "79", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "81", + "$id": "80", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "GrabbableProperty": { - "$id": "82", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "IsCompleted": false, "Metadata": null } @@ -426,11 +416,11 @@ ] }, "TargetStep": { - "$id": "83", + "$id": "81", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "84", + "$id": "82", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -444,45 +434,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "85", + "$id": "83", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "86", + "$id": "84", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "87", + "$id": "85", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "88", + "$id": "86", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "89", + "$id": "87", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "51" + "$id": "88", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "52" + "$id": "89", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "53" + "$id": "90", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "90", + "$id": "91", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "91", + "$id": "92", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "92", + "$id": "93", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -494,7 +493,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "93", + "$id": "94", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -509,22 +508,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "94", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "95", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "95", + "GroupsToUnlock": { + "$id": "96", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "96", + "$id": "97", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "97", + "$id": "98", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "98", + "$id": "99", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -533,10 +532,10 @@ } }, { - "$id": "99", + "$id": "100", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "100", + "$id": "101", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 734.4, @@ -546,29 +545,29 @@ "Guid": "ebd2c872-448d-4952-869c-7ca1983f0ce3" }, "Data": { - "$id": "101", + "$id": "102", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Place Magic Cube", "Description": null, "Behaviors": { - "$id": "102", + "$id": "103", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "103", + "$id": "104", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "104", + "$id": "105", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "105", + "$id": "106", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "106", + "$id": "107", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "107", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "108", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Now put it on the highlighted spot on the transformer." }, "ExecutionStages": 1, @@ -582,47 +581,42 @@ } }, "Transitions": { - "$id": "108", + "$id": "109", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "109", + "$id": "110", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "110", + "$id": "111", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "111", + "$id": "112", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "112", + "$id": "113", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "113", + "$id": "114", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "114", + "$id": "115", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "115", + "$id": "116", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition+EntityData, VRBuilder.BasicInteraction", "TargetObjects": { - "$id": "116", + "$id": "117", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "117", + "$id": "118", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "Target": { - "$id": "118", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "TargetSnapZone": { "$id": "119", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", @@ -634,22 +628,17 @@ ] } }, - "ZoneToSnapInto": { - "$id": "121", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube_SnapZone" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "122", + "$id": "121", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "123", + "$id": "122", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -663,45 +652,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "124", + "$id": "123", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "125", + "$id": "124", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "126", + "$id": "125", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "127", + "$id": "126", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "128", + "$id": "127", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "51" + "$id": "128", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "52" + "$id": "129", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "53" + "$id": "130", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "129", + "$id": "131", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "130", + "$id": "132", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "131", + "$id": "133", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -713,7 +711,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "132", + "$id": "134", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -728,22 +726,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "133", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "135", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "134", + "GroupsToUnlock": { + "$id": "136", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "135", + "$id": "137", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "136", + "$id": "138", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "137", + "$id": "139", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -752,82 +750,72 @@ } }, { - "$id": "138", + "$id": "140", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "139", + "$id": "141", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 1259.2, - "y": 0.0 + "x": 1286.0, + "y": -17.0 }, "StepType": "default", "Guid": "8c6dcfb4-9991-46d0-bede-fe71a0fd89d0" }, "Data": { - "$id": "140", + "$id": "142", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Transform Magic Cube", "Description": null, "Behaviors": { - "$id": "141", + "$id": "143", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "142", + "$id": "144", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "143", + "$id": "145", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "144", + "$id": "146", "$type": "VRBuilder.Core.Behaviors.BehaviorSequence, VRBuilder.Core", "Data": { - "$id": "145", + "$id": "147", "$type": "VRBuilder.Core.Behaviors.BehaviorSequence+EntityData, VRBuilder.Core", "PlaysOnRepeat": false, "Behaviors": { - "$id": "146", + "$id": "148", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "147", + "$id": "149", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior, VRBuilder.Core", "Data": { - "$id": "148", + "$id": "150", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior+EntityData, VRBuilder.Core", "TargetObject": { - "$id": "149", + "$id": "151", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "150", + "$id": "152", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "ab9fac41-ee4f-4e23-819d-2b79f916d92a" ] } }, - "Target": { - "$id": "151", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Magic Cube_SnapZone" - }, "FinalPosition": { - "$id": "152", + "$id": "153", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "153", + "$id": "154", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "470ff75f-c8ea-4544-b28f-57b8bc54153e" ] } }, - "PositionProvider": { - "$id": "154", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "TransformerInside" - }, "Duration": 1.0, "AnimationCurve": { "Keys": [ @@ -895,11 +883,6 @@ ] } }, - "Target": { - "$id": "163", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Cube" - }, "TargetScale": { "x": 1.0, "y": 1.0, @@ -934,27 +917,22 @@ } }, { - "$id": "164", + "$id": "163", "$type": "VRBuilder.Core.Behaviors.ScalingBehavior, VRBuilder.Core", "Data": { - "$id": "165", + "$id": "164", "$type": "VRBuilder.Core.Behaviors.ScalingBehavior+EntityData, VRBuilder.Core", "Targets": { - "$id": "166", + "$id": "165", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "167", + "$id": "166", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "fd2078d6-4d90-469f-873f-098e03179ac0" ] } }, - "Target": { - "$id": "168", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Sphere" - }, "TargetScale": { "x": 0.0, "y": 0.0, @@ -989,16 +967,16 @@ } }, { - "$id": "169", + "$id": "167", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "170", + "$id": "168", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "171", + "$id": "169", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "172", + "$id": "170", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "8025020b-2365-4872-bdd5-86d9a5633b28" @@ -1011,43 +989,33 @@ } }, { - "$id": "173", + "$id": "171", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior, VRBuilder.Core", "Data": { - "$id": "174", + "$id": "172", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior+EntityData, VRBuilder.Core", "TargetObject": { - "$id": "175", + "$id": "173", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "176", + "$id": "174", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "ab9fac41-ee4f-4e23-819d-2b79f916d92a" ] } }, - "Target": { - "$id": "177", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Magic Cube_SnapZone" - }, "FinalPosition": { - "$id": "178", + "$id": "175", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "179", + "$id": "176", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "80b6aede-4adc-4765-b8ec-1cd1bd3c03ae" ] } }, - "PositionProvider": { - "$id": "180", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "TransformerOutside" - }, "Duration": 1.0, "AnimationCurve": { "Keys": [ @@ -1086,23 +1054,23 @@ } }, "Transitions": { - "$id": "181", + "$id": "177", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "182", + "$id": "178", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "183", + "$id": "179", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "184", + "$id": "180", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "185", + "$id": "181", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "186", + "$id": "182", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [] }, @@ -1110,50 +1078,50 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "187", + "$id": "183", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "188", + "$id": "184", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "189", + "$id": "185", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "190", + "$id": "186", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "191", + "$id": "187", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "192", + "$id": "188", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "193", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" - }, - { - "$id": "194", + "$id": "189", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "$id": "190", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "195", + "$id": "191", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [] } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "196", + "$id": "192", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -1168,22 +1136,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "197", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "193", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "198", + "GroupsToUnlock": { + "$id": "194", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "199", + "$id": "195", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "200", + "$id": "196", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "201", + "$id": "197", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -1192,42 +1160,42 @@ } }, { - "$id": "202", + "$id": "198", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "203", + "$id": "199", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 973.6, + "x": 1037.0, "y": 0.0 }, "StepType": "default", "Guid": "d77a42a0-ddee-409d-8198-7b6a947b74aa" }, "Data": { - "$id": "204", + "$id": "200", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Activate Transformer", "Description": null, "Behaviors": { - "$id": "205", + "$id": "201", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "206", + "$id": "202", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "207", + "$id": "203", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "208", + "$id": "204", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "209", + "$id": "205", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "210", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "206", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Touch the panel to activate the transformer." }, "ExecutionStages": 1, @@ -1241,47 +1209,42 @@ } }, "Transitions": { - "$id": "211", + "$id": "207", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "212", + "$id": "208", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "213", + "$id": "209", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "214", + "$id": "210", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "215", + "$id": "211", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "216", + "$id": "212", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "217", + "$id": "213", "$type": "VRBuilder.BasicInteraction.Conditions.TouchedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "218", + "$id": "214", "$type": "VRBuilder.BasicInteraction.Conditions.TouchedCondition+EntityData, VRBuilder.BasicInteraction", "TouchableProperties": { - "$id": "219", + "$id": "215", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITouchableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "220", + "$id": "216", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "f45cbaab-a85e-4f7a-a9ec-d84b156589f3" ] } }, - "TouchableProperty": { - "$id": "221", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITouchableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "TouchPanel" - }, "IsCompleted": false, "Metadata": null } @@ -1289,11 +1252,11 @@ ] }, "TargetStep": { - "$id": "222", + "$id": "217", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "223", + "$id": "218", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -1307,54 +1270,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "224", + "$id": "219", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "225", + "$id": "220", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "226", + "$id": "221", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "227", + "$id": "222", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "228", + "$id": "223", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "229", + "$id": "224", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "230", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" - }, - { - "$id": "231", + "$id": "225", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "$id": "226", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "232", + "$id": "227", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "233", + "$id": "228", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "234", + "$id": "229", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -1366,7 +1329,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "235", + "$id": "230", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -1381,22 +1344,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "236", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "231", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "237", + "GroupsToUnlock": { + "$id": "232", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "238", + "$id": "233", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "239", + "$id": "234", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "240", + "$id": "235", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -1405,10 +1368,10 @@ } }, { - "$id": "241", + "$id": "236", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "242", + "$id": "237", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 200.0, @@ -1418,68 +1381,58 @@ "Guid": "bda68556-7bc8-4028-8f4d-21347bfdfc96" }, "Data": { - "$id": "243", + "$id": "238", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Grab cube", "Description": null, "Behaviors": { - "$id": "244", + "$id": "239", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "245", + "$id": "240", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "246", + "$id": "241", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "247", + "$id": "242", "$type": "VRBuilder.BasicInteraction.Behaviors.UnsnapBehavior, VRBuilder.BasicInteraction", "Data": { - "$id": "248", + "$id": "243", "$type": "VRBuilder.BasicInteraction.Behaviors.UnsnapBehavior+EntityData, VRBuilder.BasicInteraction", "TargetObject": { - "$id": "249", + "$id": "244", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "250", + "$id": "245", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "SnappedObject": { - "$id": "251", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "TargetSnapZone": { - "$id": "252", + "$id": "246", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "253", + "$id": "247", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [] } }, - "SnapZone": { - "$id": "254", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "" - }, "Metadata": null } }, { - "$id": "255", + "$id": "248", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "256", + "$id": "249", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "257", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "250", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Take the cube and teleport to the next station." }, "ExecutionStages": 1, @@ -1493,48 +1446,43 @@ } }, "Transitions": { - "$id": "258", + "$id": "251", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "259", + "$id": "252", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "260", + "$id": "253", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "261", + "$id": "254", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "262", + "$id": "255", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "263", + "$id": "256", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "264", + "$id": "257", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "265", + "$id": "258", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition+EntityData, VRBuilder.BasicInteraction", "KeepUnlocked": true, "Targets": { - "$id": "266", + "$id": "259", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "267", + "$id": "260", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "GrabbableProperty": { - "$id": "268", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "IsCompleted": false, "Metadata": null } @@ -1542,11 +1490,11 @@ ] }, "TargetStep": { - "$id": "269", + "$id": "261", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "270", + "$id": "262", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -1560,45 +1508,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "271", + "$id": "263", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "272", + "$id": "264", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "273", + "$id": "265", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "274", + "$id": "266", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "275", + "$id": "267", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "51" + "$id": "268", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "52" + "$id": "269", + "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.DeletableAttribute", + "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "53" + "$id": "270", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "276", + "$id": "271", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "277", + "$id": "272", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "278", + "$id": "273", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -1610,7 +1567,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "279", + "$id": "274", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -1625,22 +1582,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "280", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "275", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "281", + "GroupsToUnlock": { + "$id": "276", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "282", + "$id": "277", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "283", + "$id": "278", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "284", + "$id": "279", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -1649,10 +1606,10 @@ } }, { - "$id": "285", + "$id": "280", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "286", + "$id": "281", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 445.6, @@ -1662,76 +1619,71 @@ "Guid": "2728332f-cb82-4f74-bfb1-54c510e27abb" }, "Data": { - "$id": "287", + "$id": "282", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Teleport to slicer", "Description": null, "Behaviors": { - "$id": "288", + "$id": "283", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "289", + "$id": "284", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "290", + "$id": "285", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [] } } }, "Transitions": { - "$id": "291", + "$id": "286", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "292", + "$id": "287", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "293", + "$id": "288", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "294", + "$id": "289", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "295", + "$id": "290", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "296", + "$id": "291", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "297", + "$id": "292", "$type": "VRBuilder.BasicInteraction.Conditions.TeleportCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "298", + "$id": "293", "$type": "VRBuilder.BasicInteraction.Conditions.TeleportCondition+EntityData, VRBuilder.BasicInteraction", "TeleportationPoints": { - "$id": "299", + "$id": "294", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITeleportationProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "300", + "$id": "295", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "7fcf9fbb-9148-4236-9f6c-c417d678a54c" ] } }, - "TeleportationPoint": { - "$id": "301", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITeleportationProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Teleportation Spot_1" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "302", + "$id": "296", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "303", + "$id": "297", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -1745,54 +1697,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "304", + "$id": "298", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "305", + "$id": "299", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "306", + "$id": "300", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "307", + "$id": "301", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "308", + "$id": "302", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "309", - "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.FoldableAttribute", - "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + "$ref": "188" }, { - "$id": "310", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + "$ref": "189" }, { - "$id": "311", - "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.HelpAttribute", - "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + "$ref": "190" } ] }, "ChildMetadata": { - "$id": "312", + "$id": "303", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "313", + "$id": "304", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "314", + "$id": "305", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -1804,7 +1747,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "315", + "$id": "306", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -1814,37 +1757,32 @@ } }, { - "$id": "316", + "$id": "307", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "317", + "$id": "308", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "318", + "$id": "309", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "319", + "$id": "310", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "320", + "$id": "311", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition+EntityData, VRBuilder.BasicInteraction", "GrabbableProperties": { - "$id": "321", + "$id": "312", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "322", + "$id": "313", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "GrabbableProperty": { - "$id": "323", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "IsCompleted": false, "Metadata": null } @@ -1852,11 +1790,11 @@ ] }, "TargetStep": { - "$id": "324", + "$id": "314", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "325", + "$id": "315", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -1870,45 +1808,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "326", + "$id": "316", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "327", + "$id": "317", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "328", + "$id": "318", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "329", + "$id": "319", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "330", + "$id": "320", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "309" + "$ref": "188" }, { - "$ref": "310" + "$ref": "189" }, { - "$ref": "311" + "$ref": "190" } ] }, "ChildMetadata": { - "$id": "331", + "$id": "321", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "332", + "$id": "322", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "333", + "$id": "323", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -1920,7 +1858,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "334", + "$id": "324", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -1935,22 +1873,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "335", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "325", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "336", + "GroupsToUnlock": { + "$id": "326", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "337", + "$id": "327", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "338", + "$id": "328", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "339", + "$id": "329", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 1 } @@ -1959,10 +1897,10 @@ } }, { - "$id": "340", + "$id": "330", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "341", + "$id": "331", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 763.2, @@ -1972,29 +1910,29 @@ "Guid": "8fe7ae3d-3888-44ac-86f3-dd68b59b844d" }, "Data": { - "$id": "342", + "$id": "332", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Place cube in working area", "Description": null, "Behaviors": { - "$id": "343", + "$id": "333", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "344", + "$id": "334", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "345", + "$id": "335", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "346", + "$id": "336", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "347", + "$id": "337", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "348", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "338", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Place the cube on the table." }, "ExecutionStages": 1, @@ -2008,74 +1946,64 @@ } }, "Transitions": { - "$id": "349", + "$id": "339", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "350", + "$id": "340", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "351", + "$id": "341", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "352", + "$id": "342", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "353", + "$id": "343", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "354", + "$id": "344", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "355", + "$id": "345", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "356", + "$id": "346", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition+EntityData, VRBuilder.BasicInteraction", "TargetObjects": { - "$id": "357", + "$id": "347", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "358", + "$id": "348", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "Target": { - "$id": "359", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "TargetSnapZone": { - "$id": "360", + "$id": "349", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "361", + "$id": "350", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "063b8249-497d-475c-aac9-8eb841ddc61e" ] } }, - "ZoneToSnapInto": { - "$id": "362", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube_SnapZone_1" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "363", + "$id": "351", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "364", + "$id": "352", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -2089,54 +2017,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "365", + "$id": "353", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "366", + "$id": "354", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "367", + "$id": "355", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "368", + "$id": "356", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "369", + "$id": "357", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "370", + "$id": "358", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "371", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" - }, - { - "$id": "372", + "$id": "359", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "$id": "360", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "373", + "$id": "361", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "374", + "$id": "362", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "375", + "$id": "363", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -2148,7 +2076,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "376", + "$id": "364", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -2158,37 +2086,32 @@ } }, { - "$id": "377", + "$id": "365", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "378", + "$id": "366", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "379", + "$id": "367", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "380", + "$id": "368", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "381", + "$id": "369", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition+EntityData, VRBuilder.BasicInteraction", "GrabbableProperties": { - "$id": "382", + "$id": "370", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "383", + "$id": "371", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "GrabbableProperty": { - "$id": "384", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "IsCompleted": false, "Metadata": null } @@ -2196,11 +2119,11 @@ ] }, "TargetStep": { - "$id": "385", + "$id": "372", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "386", + "$id": "373", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -2214,45 +2137,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "387", + "$id": "374", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "388", + "$id": "375", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "389", + "$id": "376", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "390", + "$id": "377", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "391", + "$id": "378", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "370" + "$ref": "358" }, { - "$ref": "371" + "$ref": "359" }, { - "$ref": "372" + "$ref": "360" } ] }, "ChildMetadata": { - "$id": "392", + "$id": "379", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "393", + "$id": "380", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "394", + "$id": "381", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -2264,7 +2187,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "395", + "$id": "382", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -2279,22 +2202,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "396", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "383", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "397", + "GroupsToUnlock": { + "$id": "384", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "398", + "$id": "385", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "399", + "$id": "386", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "400", + "$id": "387", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -2303,10 +2226,10 @@ } }, { - "$id": "401", + "$id": "388", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "402", + "$id": "389", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 1058.4, @@ -2316,29 +2239,29 @@ "Guid": "7d10b876-f270-4757-9d10-0e76528c64db" }, "Data": { - "$id": "403", + "$id": "390", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Pick up tool", "Description": null, "Behaviors": { - "$id": "404", + "$id": "391", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "405", + "$id": "392", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "406", + "$id": "393", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "407", + "$id": "394", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "408", + "$id": "395", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "409", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "396", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Now you need to cut this cube in two pieces. First, pick up the tool to your right." }, "ExecutionStages": 1, @@ -2352,48 +2275,43 @@ } }, "Transitions": { - "$id": "410", + "$id": "397", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "411", + "$id": "398", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "412", + "$id": "399", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "413", + "$id": "400", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "414", + "$id": "401", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "415", + "$id": "402", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "416", + "$id": "403", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "417", + "$id": "404", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition+EntityData, VRBuilder.BasicInteraction", "KeepUnlocked": true, "Targets": { - "$id": "418", + "$id": "405", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "419", + "$id": "406", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" ] } }, - "GrabbableProperty": { - "$id": "420", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "LightSabre" - }, "IsCompleted": false, "Metadata": null } @@ -2401,11 +2319,11 @@ ] }, "TargetStep": { - "$id": "421", + "$id": "407", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "422", + "$id": "408", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -2419,45 +2337,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "423", + "$id": "409", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "424", + "$id": "410", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "425", + "$id": "411", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "426", + "$id": "412", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "427", + "$id": "413", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "370" + "$ref": "358" }, { - "$ref": "371" + "$ref": "359" }, { - "$ref": "372" + "$ref": "360" } ] }, "ChildMetadata": { - "$id": "428", + "$id": "414", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "429", + "$id": "415", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "430", + "$id": "416", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -2469,7 +2387,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "431", + "$id": "417", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -2484,22 +2402,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "432", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "418", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "433", + "GroupsToUnlock": { + "$id": "419", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "434", + "$id": "420", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "435", + "$id": "421", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "436", + "$id": "422", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -2508,10 +2426,10 @@ } }, { - "$id": "437", + "$id": "423", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "438", + "$id": "424", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 763.2, @@ -2521,29 +2439,29 @@ "Guid": "67e68ce4-5a29-48b8-b412-678a602975dc" }, "Data": { - "$id": "439", + "$id": "425", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Misplaced magic cube", "Description": null, "Behaviors": { - "$id": "440", + "$id": "426", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "441", + "$id": "427", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "442", + "$id": "428", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "443", + "$id": "429", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "444", + "$id": "430", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "445", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "431", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Pick up the cube again and place it on the table." }, "ExecutionStages": 1, @@ -2557,48 +2475,43 @@ } }, "Transitions": { - "$id": "446", + "$id": "432", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "447", + "$id": "433", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "448", + "$id": "434", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "449", + "$id": "435", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "450", + "$id": "436", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "451", + "$id": "437", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "452", + "$id": "438", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "453", + "$id": "439", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition+EntityData, VRBuilder.BasicInteraction", "KeepUnlocked": true, "Targets": { - "$id": "454", + "$id": "440", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "455", + "$id": "441", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" ] } }, - "GrabbableProperty": { - "$id": "456", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Magic Cube" - }, "IsCompleted": false, "Metadata": null } @@ -2606,11 +2519,11 @@ ] }, "TargetStep": { - "$id": "457", + "$id": "442", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "458", + "$id": "443", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -2624,45 +2537,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "459", + "$id": "444", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "460", + "$id": "445", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "461", + "$id": "446", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "462", + "$id": "447", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "463", + "$id": "448", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "370" + "$id": "449", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "371" + "$id": "450", + "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.DeletableAttribute", + "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "372" + "$id": "451", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "464", + "$id": "452", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "465", + "$id": "453", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "466", + "$id": "454", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -2674,7 +2596,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "467", + "$id": "455", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -2689,22 +2611,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "468", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "456", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "469", + "GroupsToUnlock": { + "$id": "457", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "470", + "$id": "458", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "471", + "$id": "459", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "472", + "$id": "460", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -2713,10 +2635,10 @@ } }, { - "$id": "473", + "$id": "461", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "474", + "$id": "462", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 1291.2, @@ -2726,29 +2648,29 @@ "Guid": "da8e6b38-2e19-4c3e-befd-5b0bd2f6b4d1" }, "Data": { - "$id": "475", + "$id": "463", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Use tool", "Description": null, "Behaviors": { - "$id": "476", + "$id": "464", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "477", + "$id": "465", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "478", + "$id": "466", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "479", + "$id": "467", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "480", + "$id": "468", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "481", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "469", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "While holding the tool, you can use it by pressing the trigger button." }, "ExecutionStages": 1, @@ -2762,47 +2684,42 @@ } }, "Transitions": { - "$id": "482", + "$id": "470", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "483", + "$id": "471", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "484", + "$id": "472", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "485", + "$id": "473", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "486", + "$id": "474", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "487", + "$id": "475", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "488", + "$id": "476", "$type": "VRBuilder.BasicInteraction.Conditions.UsedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "489", + "$id": "477", "$type": "VRBuilder.BasicInteraction.Conditions.UsedCondition+EntityData, VRBuilder.BasicInteraction", "UsableObjects": { - "$id": "490", + "$id": "478", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IUsableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "491", + "$id": "479", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" ] } }, - "UsableProperty": { - "$id": "492", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IUsableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "LightSabre" - }, "IsCompleted": false, "Metadata": null } @@ -2810,11 +2727,11 @@ ] }, "TargetStep": { - "$id": "493", + "$id": "480", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "494", + "$id": "481", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -2828,45 +2745,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "495", + "$id": "482", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "496", + "$id": "483", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "497", + "$id": "484", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "498", + "$id": "485", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "499", + "$id": "486", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "370" + "$id": "487", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "371" + "$id": "488", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "372" + "$id": "489", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "500", + "$id": "490", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "501", + "$id": "491", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "502", + "$id": "492", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -2878,7 +2804,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "503", + "$id": "493", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -2893,22 +2819,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "504", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "494", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "505", + "GroupsToUnlock": { + "$id": "495", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "506", + "$id": "496", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "507", + "$id": "497", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "508", + "$id": "498", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 1 } @@ -2917,10 +2843,10 @@ } }, { - "$id": "509", + "$id": "499", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "510", + "$id": "500", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 1605.6, @@ -2930,31 +2856,31 @@ "Guid": "06275921-c4b2-4381-8631-283277ce0811" }, "Data": { - "$id": "511", + "$id": "501", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Slice along the red highlight", "Description": null, "Behaviors": { - "$id": "512", + "$id": "502", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "513", + "$id": "503", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "514", + "$id": "504", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "515", + "$id": "505", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "516", + "$id": "506", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "517", + "$id": "507", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "518", + "$id": "508", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d7dd3185-de39-4915-8651-d945a022a74e" @@ -2967,14 +2893,14 @@ } }, { - "$id": "519", + "$id": "509", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "520", + "$id": "510", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "521", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "511", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Well done! Now slice the cube by moving the blade in the highlighted area." }, "ExecutionStages": 1, @@ -2988,75 +2914,66 @@ } }, "Transitions": { - "$id": "522", + "$id": "512", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "523", + "$id": "513", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "524", + "$id": "514", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "525", + "$id": "515", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "526", + "$id": "516", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "527", + "$id": "517", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "528", + "$id": "518", "$type": "VRBuilder.Core.Conditions.ObjectInColliderCondition, VRBuilder.Core", "Data": { - "$id": "529", + "$id": "519", "$type": "VRBuilder.Core.Conditions.ObjectInColliderCondition+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "530", + "$id": "520", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "531", + "$id": "521", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "90815042-3e05-4f7e-8be3-8761d17a0b03" ] } }, - "TargetObject": { - "$id": "532", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Light" - }, "TriggerObject": { - "$id": "533", + "$id": "522", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.Core.Properties.ColliderWithTriggerProperty, VRBuilder.Core]], VRBuilder.Core", "guids": { - "$id": "534", + "$id": "523", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d7dd3185-de39-4915-8651-d945a022a74e" ] } }, - "TriggerProperty": { - "$id": "535", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.Core.Properties.ColliderWithTriggerProperty, VRBuilder.Core]], VRBuilder.Core", - "UniqueName": "Slicing highlight" - }, "RequiredTimeInside": 0.1, + "ObjectsRequiredInTrigger": 1.0, "Metadata": null } } ] }, "TargetStep": { - "$id": "536", + "$id": "524", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "537", + "$id": "525", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -3070,45 +2987,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "538", + "$id": "526", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "539", + "$id": "527", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "540", + "$id": "528", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "541", + "$id": "529", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "542", + "$id": "530", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "370" + "$ref": "487" }, { - "$ref": "371" + "$ref": "488" }, { - "$ref": "372" + "$ref": "489" } ] }, "ChildMetadata": { - "$id": "543", + "$id": "531", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "544", + "$id": "532", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "545", + "$id": "533", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -3120,7 +3037,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "546", + "$id": "534", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -3130,37 +3047,32 @@ } }, { - "$id": "547", + "$id": "535", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "548", + "$id": "536", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "549", + "$id": "537", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "550", + "$id": "538", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "551", + "$id": "539", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition+EntityData, VRBuilder.BasicInteraction", "GrabbableProperties": { - "$id": "552", + "$id": "540", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "553", + "$id": "541", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" ] } }, - "GrabbableProperty": { - "$id": "554", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "LightSabre" - }, "IsCompleted": false, "Metadata": null } @@ -3168,11 +3080,11 @@ ] }, "TargetStep": { - "$id": "555", + "$id": "542", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "556", + "$id": "543", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -3186,54 +3098,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "557", + "$id": "544", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "558", + "$id": "545", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "559", + "$id": "546", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "560", + "$id": "547", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "561", + "$id": "548", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "562", - "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.FoldableAttribute", - "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + "$ref": "487" }, { - "$id": "563", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + "$ref": "488" }, { - "$id": "564", - "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.HelpAttribute", - "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + "$ref": "489" } ] }, "ChildMetadata": { - "$id": "565", + "$id": "549", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "566", + "$id": "550", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "567", + "$id": "551", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -3245,7 +3148,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "568", + "$id": "552", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -3260,22 +3163,17 @@ }, "Mode": null, "ToUnlock": { - "$id": "569", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "553", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "570", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "571", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, + "$id": "554", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "572", + "$id": "555", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "573", + "$id": "556", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" @@ -3285,18 +3183,13 @@ "Type": "VRBuilder.XRInteraction.Properties.UsableProperty, VRBuilder.XRInteraction, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "574", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "575", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, + "$id": "557", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "576", + "$id": "558", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "577", + "$id": "559", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" @@ -3306,18 +3199,13 @@ "Type": "VRBuilder.XRInteraction.Properties.GrabbableProperty, VRBuilder.XRInteraction, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "578", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "579", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, + "$id": "560", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "580", + "$id": "561", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "581", + "$id": "562", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" @@ -3327,18 +3215,13 @@ "Type": "VRBuilder.XRInteraction.Properties.TouchableProperty, VRBuilder.XRInteraction, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "582", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "583", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Magic Cube" - }, + "$id": "563", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "584", + "$id": "564", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "585", + "$id": "565", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" @@ -3348,18 +3231,13 @@ "Type": "VRBuilder.XRInteraction.Properties.GrabbableProperty, VRBuilder.XRInteraction, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "586", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "587", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Magic Cube" - }, + "$id": "566", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "588", + "$id": "567", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "589", + "$id": "568", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" @@ -3370,18 +3248,18 @@ } ] }, - "TagsToUnlock": { - "$id": "590", + "GroupsToUnlock": { + "$id": "569", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "591", + "$id": "570", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "592", + "$id": "571", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "593", + "$id": "572", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -3390,10 +3268,10 @@ } }, { - "$id": "594", + "$id": "573", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "595", + "$id": "574", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 1874.4, @@ -3403,31 +3281,31 @@ "Guid": "0777fb7c-03de-4ad1-a567-8590b431203f" }, "Data": { - "$id": "596", + "$id": "575", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Cube is sliced", "Description": null, "Behaviors": { - "$id": "597", + "$id": "576", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "598", + "$id": "577", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "599", + "$id": "578", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "600", + "$id": "579", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "601", + "$id": "580", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "602", + "$id": "581", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "603", + "$id": "582", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d7dd3185-de39-4915-8651-d945a022a74e" @@ -3440,16 +3318,16 @@ } }, { - "$id": "604", + "$id": "583", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "605", + "$id": "584", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "606", + "$id": "585", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "607", + "$id": "586", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "d2b11da8-a3fa-4de3-a620-e6951c2b6be7" @@ -3462,16 +3340,16 @@ } }, { - "$id": "608", + "$id": "587", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "609", + "$id": "588", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "610", + "$id": "589", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "611", + "$id": "590", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "dadfd54b-6114-46c5-b1ce-ff6d13ef92cb" @@ -3484,16 +3362,16 @@ } }, { - "$id": "612", + "$id": "591", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "613", + "$id": "592", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "614", + "$id": "593", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "615", + "$id": "594", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "f2830878-3f69-4ee4-98bc-a9b93f030cb7" @@ -3506,14 +3384,14 @@ } }, { - "$id": "616", + "$id": "595", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "617", + "$id": "596", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "618", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "597", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Great. Release the tool and it will go back to its original position." }, "ExecutionStages": 1, @@ -3527,47 +3405,42 @@ } }, "Transitions": { - "$id": "619", + "$id": "598", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "620", + "$id": "599", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "621", + "$id": "600", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "622", + "$id": "601", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "623", + "$id": "602", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "624", + "$id": "603", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "625", + "$id": "604", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "626", + "$id": "605", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition+EntityData, VRBuilder.BasicInteraction", "GrabbableProperties": { - "$id": "627", + "$id": "606", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "628", + "$id": "607", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" ] } }, - "GrabbableProperty": { - "$id": "629", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "LightSabre" - }, "IsCompleted": false, "Metadata": null } @@ -3575,11 +3448,11 @@ ] }, "TargetStep": { - "$id": "630", + "$id": "608", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "631", + "$id": "609", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -3593,36 +3466,36 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "632", + "$id": "610", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "633", + "$id": "611", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "634", + "$id": "612", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "635", + "$id": "613", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "636", + "$id": "614", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "637", + "$id": "615", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "638", + "$id": "616", "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.DeletableAttribute", "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "639", + "$id": "617", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" @@ -3630,17 +3503,17 @@ ] }, "ChildMetadata": { - "$id": "640", + "$id": "618", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "641", + "$id": "619", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "642", + "$id": "620", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -3652,7 +3525,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "643", + "$id": "621", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -3667,22 +3540,17 @@ }, "Mode": null, "ToUnlock": { - "$id": "644", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "622", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "645", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "646", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, + "$id": "623", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "647", + "$id": "624", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "648", + "$id": "625", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" @@ -3692,18 +3560,13 @@ "Type": "VRBuilder.XRInteraction.Properties.GrabbableProperty, VRBuilder.XRInteraction, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "649", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "650", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, + "$id": "626", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "651", + "$id": "627", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "652", + "$id": "628", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" @@ -3713,18 +3576,13 @@ "Type": "VRBuilder.XRInteraction.Properties.UsableProperty, VRBuilder.XRInteraction, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "653", - "$type": "VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core", - "Target": { - "$id": "654", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, + "$id": "629", + "$type": "VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core", "TargetObject": { - "$id": "655", + "$id": "630", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "656", + "$id": "631", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" @@ -3735,18 +3593,18 @@ } ] }, - "TagsToUnlock": { - "$id": "657", + "GroupsToUnlock": { + "$id": "632", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "658", + "$id": "633", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "659", + "$id": "634", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "660", + "$id": "635", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -3755,10 +3613,10 @@ } }, { - "$id": "661", + "$id": "636", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "662", + "$id": "637", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 2105.6, @@ -3768,58 +3626,48 @@ "Guid": "6e61534a-ba60-4b28-a181-29c9f66b6cbc" }, "Data": { - "$id": "663", + "$id": "638", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Move tool", "Description": null, "Behaviors": { - "$id": "664", + "$id": "639", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "665", + "$id": "640", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "666", + "$id": "641", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "667", + "$id": "642", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior, VRBuilder.Core", "Data": { - "$id": "668", + "$id": "643", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior+EntityData, VRBuilder.Core", "TargetObject": { - "$id": "669", + "$id": "644", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "670", + "$id": "645", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "aac0efd9-1949-4ec3-9807-2df899788116" ] } }, - "Target": { - "$id": "671", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre" - }, "FinalPosition": { - "$id": "672", + "$id": "646", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "673", + "$id": "647", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "4c9ba9c4-a90c-45cb-a73a-8f0d59cbc130" ] } }, - "PositionProvider": { - "$id": "674", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "LightSabre Origin" - }, "Duration": 1.0, "AnimationCurve": { "Keys": [ @@ -3853,23 +3701,23 @@ } }, "Transitions": { - "$id": "675", + "$id": "648", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "676", + "$id": "649", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "677", + "$id": "650", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "678", + "$id": "651", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "679", + "$id": "652", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "680", + "$id": "653", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [] }, @@ -3877,36 +3725,36 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "681", + "$id": "654", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "682", + "$id": "655", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "683", + "$id": "656", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "684", + "$id": "657", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "685", + "$id": "658", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "686", + "$id": "659", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "687", + "$id": "660", "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.DeletableAttribute", "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "688", + "$id": "661", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" @@ -3914,13 +3762,13 @@ ] }, "ChildMetadata": { - "$id": "689", + "$id": "662", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [] } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "690", + "$id": "663", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -3935,22 +3783,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "691", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "664", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "692", + "GroupsToUnlock": { + "$id": "665", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "693", + "$id": "666", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "694", + "$id": "667", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "695", + "$id": "668", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -3959,42 +3807,42 @@ } }, { - "$id": "696", + "$id": "669", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "697", + "$id": "670", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 544.0, + "x": 508.666656, "y": 0.0 }, "StepType": "default", "Guid": "3fe9edc1-423e-4c5d-a7f7-66244577a007" }, "Data": { - "$id": "698", + "$id": "671", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Place 1st step", "Description": null, "Behaviors": { - "$id": "699", + "$id": "672", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "700", + "$id": "673", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "701", + "$id": "674", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "702", + "$id": "675", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "703", + "$id": "676", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "704", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "677", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Now use the 2 pieces to build a staircase. Pick one of them up and teleport to the large podium. Notice that you can now freely teleport around the area." }, "ExecutionStages": 1, @@ -4008,74 +3856,64 @@ } }, "Transitions": { - "$id": "705", + "$id": "678", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "706", + "$id": "679", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "707", + "$id": "680", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "708", + "$id": "681", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "709", + "$id": "682", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "710", + "$id": "683", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "711", + "$id": "684", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "712", + "$id": "685", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition+EntityData, VRBuilder.BasicInteraction", "TargetObjects": { - "$id": "713", + "$id": "686", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "714", + "$id": "687", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "dadfd54b-6114-46c5-b1ce-ff6d13ef92cb" ] } }, - "Target": { - "$id": "715", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (1)" - }, "TargetSnapZone": { - "$id": "716", + "$id": "688", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "717", + "$id": "689", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "79ce37fe-e994-4ebd-9141-5ae124ae8aea" ] } }, - "ZoneToSnapInto": { - "$id": "718", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (1)_SnapZone" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "719", + "$id": "690", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "720", + "$id": "691", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -4089,36 +3927,36 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "721", + "$id": "692", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "722", + "$id": "693", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "723", + "$id": "694", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "724", + "$id": "695", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "725", + "$id": "696", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "726", + "$id": "697", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "727", + "$id": "698", "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.DeletableAttribute", "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "728", + "$id": "699", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" @@ -4126,17 +3964,17 @@ ] }, "ChildMetadata": { - "$id": "729", + "$id": "700", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "730", + "$id": "701", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "731", + "$id": "702", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -4148,7 +3986,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "732", + "$id": "703", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -4158,64 +3996,54 @@ } }, { - "$id": "733", + "$id": "704", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "734", + "$id": "705", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "735", + "$id": "706", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "736", + "$id": "707", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "737", + "$id": "708", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition+EntityData, VRBuilder.BasicInteraction", "TargetObjects": { - "$id": "738", + "$id": "709", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "739", + "$id": "710", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "f2830878-3f69-4ee4-98bc-a9b93f030cb7" ] } }, - "Target": { - "$id": "740", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (2)" - }, "TargetSnapZone": { - "$id": "741", + "$id": "711", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "742", + "$id": "712", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "79ce37fe-e994-4ebd-9141-5ae124ae8aea" ] } }, - "ZoneToSnapInto": { - "$id": "743", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (1)_SnapZone" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "744", + "$id": "713", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "745", + "$id": "714", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -4229,45 +4057,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "746", + "$id": "715", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "747", + "$id": "716", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "748", + "$id": "717", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "749", + "$id": "718", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "750", + "$id": "719", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "726" + "$ref": "697" }, { - "$ref": "727" + "$ref": "698" }, { - "$ref": "728" + "$ref": "699" } ] }, "ChildMetadata": { - "$id": "751", + "$id": "720", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "752", + "$id": "721", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "753", + "$id": "722", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -4279,7 +4107,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "754", + "$id": "723", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -4294,22 +4122,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "755", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "724", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "756", + "GroupsToUnlock": { + "$id": "725", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "757", + "$id": "726", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "758", + "$id": "727", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "759", + "$id": "728", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -4318,10 +4146,10 @@ } }, { - "$id": "760", + "$id": "729", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "761", + "$id": "730", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 272.0, @@ -4331,31 +4159,31 @@ "Guid": "f8e637e3-8434-4f39-a8c5-428022d1b0e2" }, "Data": { - "$id": "762", + "$id": "731", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Activate teleportation area", "Description": null, "Behaviors": { - "$id": "763", + "$id": "732", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "764", + "$id": "733", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "765", + "$id": "734", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "766", + "$id": "735", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "767", + "$id": "736", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "768", + "$id": "737", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "769", + "$id": "738", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c9d13eb8-87b1-466e-820d-20bbcae66652" @@ -4372,32 +4200,32 @@ } }, "Transitions": { - "$id": "770", + "$id": "739", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "771", + "$id": "740", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "772", + "$id": "741", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "773", + "$id": "742", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "774", + "$id": "743", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "775", + "$id": "744", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [] }, "TargetStep": { - "$id": "776", + "$id": "745", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "777", + "$id": "746", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -4411,41 +4239,50 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "778", + "$id": "747", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "779", + "$id": "748", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "780", + "$id": "749", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "781", + "$id": "750", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "782", + "$id": "751", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "686" + "$id": "752", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "687" + "$id": "753", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "688" + "$id": "754", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "783", + "$id": "755", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [] } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "784", + "$id": "756", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -4460,22 +4297,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "785", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "757", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "786", + "GroupsToUnlock": { + "$id": "758", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "787", + "$id": "759", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "788", + "$id": "760", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "789", + "$id": "761", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -4484,10 +4321,10 @@ } }, { - "$id": "790", + "$id": "762", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "791", + "$id": "763", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 792.8, @@ -4497,31 +4334,31 @@ "Guid": "a221ece1-d35c-4767-b617-3bd5b3b36fe1" }, "Data": { - "$id": "792", + "$id": "764", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Place 2nd step", "Description": null, "Behaviors": { - "$id": "793", + "$id": "765", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "794", + "$id": "766", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "795", + "$id": "767", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "796", + "$id": "768", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "797", + "$id": "769", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "798", + "$id": "770", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "799", + "$id": "771", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "07a0b4da-52ae-470c-af91-17adf3fb3c6f" @@ -4538,74 +4375,64 @@ } }, "Transitions": { - "$id": "800", + "$id": "772", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "801", + "$id": "773", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "802", + "$id": "774", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "803", + "$id": "775", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "804", + "$id": "776", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "805", + "$id": "777", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "806", + "$id": "778", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "807", + "$id": "779", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition+EntityData, VRBuilder.BasicInteraction", "TargetObjects": { - "$id": "808", + "$id": "780", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "809", + "$id": "781", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "dadfd54b-6114-46c5-b1ce-ff6d13ef92cb" ] } }, - "Target": { - "$id": "810", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (1)" - }, "TargetSnapZone": { - "$id": "811", + "$id": "782", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "812", + "$id": "783", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "7a2d666e-97a2-4898-9718-d4a6a25ea1d9" ] } }, - "ZoneToSnapInto": { - "$id": "813", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (1)_SnapZone_1" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "814", + "$id": "784", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "815", + "$id": "785", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -4619,36 +4446,36 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "816", + "$id": "786", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "817", + "$id": "787", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "818", + "$id": "788", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "819", + "$id": "789", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "820", + "$id": "790", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "821", + "$id": "791", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "822", + "$id": "792", "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.DeletableAttribute", "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "823", + "$id": "793", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" @@ -4656,17 +4483,17 @@ ] }, "ChildMetadata": { - "$id": "824", + "$id": "794", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "825", + "$id": "795", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "826", + "$id": "796", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -4678,7 +4505,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "827", + "$id": "797", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -4688,64 +4515,54 @@ } }, { - "$id": "828", + "$id": "798", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "829", + "$id": "799", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "830", + "$id": "800", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "831", + "$id": "801", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "832", + "$id": "802", "$type": "VRBuilder.BasicInteraction.Conditions.SnappedCondition+EntityData, VRBuilder.BasicInteraction", "TargetObjects": { - "$id": "833", + "$id": "803", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "834", + "$id": "804", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "f2830878-3f69-4ee4-98bc-a9b93f030cb7" ] } }, - "Target": { - "$id": "835", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnappableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (2)" - }, "TargetSnapZone": { - "$id": "836", + "$id": "805", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "837", + "$id": "806", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "7a2d666e-97a2-4898-9718-d4a6a25ea1d9" ] } }, - "ZoneToSnapInto": { - "$id": "838", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ISnapZoneProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Sliced Cube (1)_SnapZone_1" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "839", + "$id": "807", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "840", + "$id": "808", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -4759,45 +4576,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "841", + "$id": "809", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "842", + "$id": "810", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "843", + "$id": "811", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "844", + "$id": "812", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "845", + "$id": "813", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "821" + "$ref": "791" }, { - "$ref": "822" + "$ref": "792" }, { - "$ref": "823" + "$ref": "793" } ] }, "ChildMetadata": { - "$id": "846", + "$id": "814", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "847", + "$id": "815", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "848", + "$id": "816", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -4809,7 +4626,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "849", + "$id": "817", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -4824,22 +4641,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "850", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "818", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "851", + "GroupsToUnlock": { + "$id": "819", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "852", + "$id": "820", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "853", + "$id": "821", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "854", + "$id": "822", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -4848,10 +4665,10 @@ } }, { - "$id": "855", + "$id": "823", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "856", + "$id": "824", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 1161.6, @@ -4861,31 +4678,31 @@ "Guid": "83f4e8e2-0d56-40e9-9b36-c4a3b62c9da2" }, "Data": { - "$id": "857", + "$id": "825", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Enable teleportation on the stairs", "Description": null, "Behaviors": { - "$id": "858", + "$id": "826", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "859", + "$id": "827", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "860", + "$id": "828", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "861", + "$id": "829", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "862", + "$id": "830", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "863", + "$id": "831", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "864", + "$id": "832", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "be51c34c-c375-465a-af43-ba76169788b7" @@ -4902,23 +4719,23 @@ } }, "Transitions": { - "$id": "865", + "$id": "833", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "866", + "$id": "834", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "867", + "$id": "835", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "868", + "$id": "836", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "869", + "$id": "837", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "870", + "$id": "838", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [] }, @@ -4926,41 +4743,41 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "871", + "$id": "839", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "872", + "$id": "840", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "873", + "$id": "841", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "874", + "$id": "842", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "875", + "$id": "843", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "686" + "$ref": "659" }, { - "$ref": "687" + "$ref": "660" }, { - "$ref": "688" + "$ref": "661" } ] }, "ChildMetadata": { - "$id": "876", + "$id": "844", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [] } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "877", + "$id": "845", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -4975,22 +4792,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "878", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "846", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "879", + "GroupsToUnlock": { + "$id": "847", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "880", + "$id": "848", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "881", + "$id": "849", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "882", + "$id": "850", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -4999,10 +4816,10 @@ } }, { - "$id": "883", + "$id": "851", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "884", + "$id": "852", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 170.4, @@ -5012,29 +4829,29 @@ "Guid": "3b8d99f7-d100-4053-9db5-ecdeb3ec911f" }, "Data": { - "$id": "885", + "$id": "853", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Climb steps", "Description": null, "Behaviors": { - "$id": "886", + "$id": "854", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "887", + "$id": "855", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "888", + "$id": "856", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "889", + "$id": "857", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "890", + "$id": "858", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "891", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "859", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Well done! You can now climb the steps!" }, "ExecutionStages": 1, @@ -5048,58 +4865,53 @@ } }, "Transitions": { - "$id": "892", + "$id": "860", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "893", + "$id": "861", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "894", + "$id": "862", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "895", + "$id": "863", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "896", + "$id": "864", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "897", + "$id": "865", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "898", + "$id": "866", "$type": "VRBuilder.BasicInteraction.Conditions.TeleportCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "899", + "$id": "867", "$type": "VRBuilder.BasicInteraction.Conditions.TeleportCondition+EntityData, VRBuilder.BasicInteraction", "TeleportationPoints": { - "$id": "900", + "$id": "868", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITeleportationProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "901", + "$id": "869", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c68eebf5-ffcd-4a77-8227-4c2396bc2513" ] } }, - "TeleportationPoint": { - "$id": "902", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITeleportationProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Teleportation Spot_2" - }, "Metadata": null } } ] }, "TargetStep": { - "$id": "903", + "$id": "870", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "904", + "$id": "871", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -5113,45 +4925,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "905", + "$id": "872", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "906", + "$id": "873", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "907", + "$id": "874", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "908", + "$id": "875", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "909", + "$id": "876", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "562" + "$id": "877", + "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.FoldableAttribute", + "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "563" + "$id": "878", + "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.DeletableAttribute", + "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$ref": "564" + "$id": "879", + "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.HelpAttribute", + "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "910", + "$id": "880", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "911", + "$id": "881", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "912", + "$id": "882", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -5163,7 +4984,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "913", + "$id": "883", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -5178,22 +4999,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "914", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "884", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "915", + "GroupsToUnlock": { + "$id": "885", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "916", + "$id": "886", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "917", + "$id": "887", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "918", + "$id": "888", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 1 } @@ -5202,44 +5023,44 @@ } }, { - "$id": "919", + "$id": "889", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "920", + "$id": "890", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 609.6, + "x": 674.0, "y": 0.0 }, "StepType": "default", "Guid": "7910e584-deff-4a68-b248-e4ed4872f84b" }, "Data": { - "$id": "921", + "$id": "891", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Take ball", "Description": null, "Behaviors": { - "$id": "922", + "$id": "892", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "923", + "$id": "893", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "924", + "$id": "894", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "925", + "$id": "895", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "926", + "$id": "896", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "927", + "$id": "897", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "928", + "$id": "898", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c0da1293-2f93-4588-8222-78eeaf6370d4" @@ -5252,14 +5073,14 @@ } }, { - "$id": "929", + "$id": "899", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "930", + "$id": "900", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "931", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "901", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Now the shield has been disabled, you can grab the ball. To finish this course, you must shoot it through the ring. It will return to the initial position if you miss." }, "ExecutionStages": 1, @@ -5273,48 +5094,43 @@ } }, "Transitions": { - "$id": "932", + "$id": "902", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "933", + "$id": "903", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "934", + "$id": "904", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "935", + "$id": "905", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "936", + "$id": "906", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "937", + "$id": "907", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "938", + "$id": "908", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "939", + "$id": "909", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition+EntityData, VRBuilder.BasicInteraction", "KeepUnlocked": true, "Targets": { - "$id": "940", + "$id": "910", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "941", + "$id": "911", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c069190e-dc9c-46d1-a3bb-a4ccd6b6b3bd" ] } }, - "GrabbableProperty": { - "$id": "942", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Ball" - }, "IsCompleted": false, "Metadata": null } @@ -5325,36 +5141,36 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "943", + "$id": "912", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "944", + "$id": "913", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "945", + "$id": "914", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "946", + "$id": "915", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "947", + "$id": "916", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "948", + "$id": "917", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "949", + "$id": "918", "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.DeletableAttribute", "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "950", + "$id": "919", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" @@ -5362,17 +5178,17 @@ ] }, "ChildMetadata": { - "$id": "951", + "$id": "920", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "952", + "$id": "921", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "953", + "$id": "922", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -5384,7 +5200,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "954", + "$id": "923", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -5399,22 +5215,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "955", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "924", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "956", + "GroupsToUnlock": { + "$id": "925", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "957", + "$id": "926", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "958", + "$id": "927", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "959", + "$id": "928", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -5423,44 +5239,44 @@ } }, { - "$id": "960", + "$id": "929", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "961", + "$id": "930", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { - "x": 403.2, + "x": 468.0, "y": 0.0 }, "StepType": "default", "Guid": "131b33a7-02f8-4e03-9e13-9475f6a369af" }, "Data": { - "$id": "962", + "$id": "931", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Disable shield", "Description": null, "Behaviors": { - "$id": "963", + "$id": "932", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "964", + "$id": "933", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "965", + "$id": "934", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "966", + "$id": "935", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior, VRBuilder.Core", "Data": { - "$id": "967", + "$id": "936", "$type": "VRBuilder.Core.Behaviors.SetObjectsEnabledBehavior+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "968", + "$id": "937", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "969", + "$id": "938", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "9dd1b2b1-f799-4ac7-9759-a753b5c92766" @@ -5473,14 +5289,14 @@ } }, { - "$id": "970", + "$id": "939", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "971", + "$id": "940", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "972", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "941", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "You cannot take the ball while the shield is active. Touch the panel to disable the shield." }, "ExecutionStages": 1, @@ -5494,47 +5310,42 @@ } }, "Transitions": { - "$id": "973", + "$id": "942", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "974", + "$id": "943", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "975", + "$id": "944", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "976", + "$id": "945", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "977", + "$id": "946", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "978", + "$id": "947", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "979", + "$id": "948", "$type": "VRBuilder.BasicInteraction.Conditions.TouchedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "980", + "$id": "949", "$type": "VRBuilder.BasicInteraction.Conditions.TouchedCondition+EntityData, VRBuilder.BasicInteraction", "TouchableProperties": { - "$id": "981", + "$id": "950", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITouchableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "982", + "$id": "951", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ - "b1a0dd87-02c1-4354-8e10-fb84f67942a6" + "432e7264-1063-458c-b662-b394c36ccaa4" ] } }, - "TouchableProperty": { - "$id": "983", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.ITouchableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "TouchPanel_1" - }, "IsCompleted": false, "Metadata": null } @@ -5542,11 +5353,11 @@ ] }, "TargetStep": { - "$id": "984", + "$id": "952", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "985", + "$id": "953", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -5560,54 +5371,54 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "986", + "$id": "954", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "987", + "$id": "955", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "988", + "$id": "956", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "989", + "$id": "957", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "990", + "$id": "958", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "991", + "$id": "959", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "992", - "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", - "Name": "VRBuilder.Core.Attributes.DeletableAttribute", - "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" - }, - { - "$id": "993", + "$id": "960", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" + }, + { + "$id": "961", + "$type": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core", + "Name": "VRBuilder.Core.Attributes.MenuAttribute", + "TypeId": "VRBuilder.Core.Attributes.MenuAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } ] }, "ChildMetadata": { - "$id": "994", + "$id": "962", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "995", + "$id": "963", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, - "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, + "VRBuilder.Core.Attributes.MenuAttribute": null, "ReorderableElement": { - "$id": "996", + "$id": "964", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -5619,7 +5430,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "997", + "$id": "965", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -5634,22 +5445,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "998", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "966", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "999", + "GroupsToUnlock": { + "$id": "967", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "1000", + "$id": "968", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1001", + "$id": "969", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "1002", + "$id": "970", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -5658,10 +5469,10 @@ } }, { - "$id": "1003", + "$id": "971", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "1004", + "$id": "972", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 164.0, @@ -5671,29 +5482,29 @@ "Guid": "945f7ad3-556e-4b26-8e1d-59f3ead17a07" }, "Data": { - "$id": "1005", + "$id": "973", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Throw ball", "Description": null, "Behaviors": { - "$id": "1006", + "$id": "974", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "1007", + "$id": "975", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "1008", + "$id": "976", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1009", + "$id": "977", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "1010", + "$id": "978", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "1011", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "979", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Shoot!" }, "ExecutionStages": 1, @@ -5707,47 +5518,42 @@ } }, "Transitions": { - "$id": "1012", + "$id": "980", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "1013", + "$id": "981", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "1014", + "$id": "982", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1015", + "$id": "983", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "1016", + "$id": "984", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "1017", + "$id": "985", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1018", + "$id": "986", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "1019", + "$id": "987", "$type": "VRBuilder.BasicInteraction.Conditions.ReleasedCondition+EntityData, VRBuilder.BasicInteraction", "GrabbableProperties": { - "$id": "1020", + "$id": "988", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "1021", + "$id": "989", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c069190e-dc9c-46d1-a3bb-a4ccd6b6b3bd" ] } }, - "GrabbableProperty": { - "$id": "1022", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Ball" - }, "IsCompleted": false, "Metadata": null } @@ -5755,11 +5561,11 @@ ] }, "TargetStep": { - "$id": "1023", + "$id": "990", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "1024", + "$id": "991", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -5773,36 +5579,36 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "1025", + "$id": "992", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1026", + "$id": "993", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "1027", + "$id": "994", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "1028", + "$id": "995", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "1029", + "$id": "996", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1030", + "$id": "997", "$type": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.FoldableAttribute", "TypeId": "VRBuilder.Core.Attributes.FoldableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "1031", + "$id": "998", "$type": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.DeletableAttribute", "TypeId": "VRBuilder.Core.Attributes.DeletableAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" }, { - "$id": "1032", + "$id": "999", "$type": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core", "Name": "VRBuilder.Core.Attributes.HelpAttribute", "TypeId": "VRBuilder.Core.Attributes.HelpAttribute, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" @@ -5810,17 +5616,17 @@ ] }, "ChildMetadata": { - "$id": "1033", + "$id": "1000", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "1034", + "$id": "1001", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "1035", + "$id": "1002", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -5832,7 +5638,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "1036", + "$id": "1003", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -5847,22 +5653,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "1037", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "1004", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "1038", + "GroupsToUnlock": { + "$id": "1005", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "1039", + "$id": "1006", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1040", + "$id": "1007", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "1041", + "$id": "1008", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -5871,10 +5677,10 @@ } }, { - "$id": "1042", + "$id": "1009", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "1043", + "$id": "1010", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 436.0, @@ -5884,82 +5690,73 @@ "Guid": "e00cfd2a-4626-4b44-af38-db704d251db9" }, "Data": { - "$id": "1044", + "$id": "1011", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Check Throw", "Description": null, "Behaviors": { - "$id": "1045", + "$id": "1012", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "1046", + "$id": "1013", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "1047", + "$id": "1014", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [] } } }, "Transitions": { - "$id": "1048", + "$id": "1015", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "1049", + "$id": "1016", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "1050", + "$id": "1017", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1051", + "$id": "1018", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "1052", + "$id": "1019", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "1053", + "$id": "1020", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1054", + "$id": "1021", "$type": "VRBuilder.Core.Conditions.ObjectInColliderCondition, VRBuilder.Core", "Data": { - "$id": "1055", + "$id": "1022", "$type": "VRBuilder.Core.Conditions.ObjectInColliderCondition+EntityData, VRBuilder.Core", "TargetObjects": { - "$id": "1056", + "$id": "1023", "$type": "VRBuilder.Core.SceneObjects.MultipleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "1057", + "$id": "1024", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c069190e-dc9c-46d1-a3bb-a4ccd6b6b3bd" ] } }, - "TargetObject": { - "$id": "1058", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Ball" - }, "TriggerObject": { - "$id": "1059", + "$id": "1025", "$type": "VRBuilder.Core.SceneObjects.SingleScenePropertyReference`1[[VRBuilder.Core.Properties.ColliderWithTriggerProperty, VRBuilder.Core]], VRBuilder.Core", "guids": { - "$id": "1060", + "$id": "1026", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "2713c270-94b8-46cc-82ee-aaad4a2ccbf0" ] } }, - "TriggerProperty": { - "$id": "1061", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.Core.Properties.ColliderWithTriggerProperty, VRBuilder.Core]], VRBuilder.Core", - "UniqueName": "TargetCollider" - }, "RequiredTimeInside": 0.0, + "ObjectsRequiredInTrigger": 1.0, "Metadata": null } } @@ -5969,45 +5766,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "1062", + "$id": "1027", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1063", + "$id": "1028", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "1064", + "$id": "1029", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "1065", + "$id": "1030", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "1066", + "$id": "1031", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "1030" + "$ref": "997" }, { - "$ref": "1031" + "$ref": "998" }, { - "$ref": "1032" + "$ref": "999" } ] }, "ChildMetadata": { - "$id": "1067", + "$id": "1032", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "1068", + "$id": "1033", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "1069", + "$id": "1034", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -6019,7 +5816,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "1070", + "$id": "1035", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -6029,20 +5826,20 @@ } }, { - "$id": "1071", + "$id": "1036", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "1072", + "$id": "1037", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "1073", + "$id": "1038", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1074", + "$id": "1039", "$type": "VRBuilder.Core.Conditions.TimeoutCondition, VRBuilder.Core", "Data": { - "$id": "1075", + "$id": "1040", "$type": "VRBuilder.Core.Conditions.TimeoutCondition+EntityData, VRBuilder.Core", "Timeout": 4.0, "IsCompleted": false, @@ -6052,11 +5849,11 @@ ] }, "TargetStep": { - "$id": "1076", + "$id": "1041", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "1077", + "$id": "1042", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -6070,45 +5867,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "1078", + "$id": "1043", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1079", + "$id": "1044", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "1080", + "$id": "1045", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "1081", + "$id": "1046", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "1082", + "$id": "1047", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "1030" + "$ref": "997" }, { - "$ref": "1031" + "$ref": "998" }, { - "$ref": "1032" + "$ref": "999" } ] }, "ChildMetadata": { - "$id": "1083", + "$id": "1048", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "1084", + "$id": "1049", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "1085", + "$id": "1050", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -6120,7 +5917,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "1086", + "$id": "1051", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -6135,22 +5932,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "1087", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "1052", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "1088", + "GroupsToUnlock": { + "$id": "1053", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "1089", + "$id": "1054", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1090", + "$id": "1055", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "1091", + "$id": "1056", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 1 } @@ -6159,10 +5956,10 @@ } }, { - "$id": "1092", + "$id": "1057", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "1093", + "$id": "1058", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 288.0, @@ -6172,29 +5969,29 @@ "Guid": "16958c78-ea08-416b-b04e-d669ada7cf71" }, "Data": { - "$id": "1094", + "$id": "1059", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Reset", "Description": null, "Behaviors": { - "$id": "1095", + "$id": "1060", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "1096", + "$id": "1061", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "1097", + "$id": "1062", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1098", + "$id": "1063", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "1099", + "$id": "1064", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "1100", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "1065", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Try again!" }, "ExecutionStages": 1, @@ -6204,54 +6001,44 @@ } }, { - "$id": "1101", + "$id": "1066", "$type": "VRBuilder.Core.Behaviors.BehaviorSequence, VRBuilder.Core", "Data": { - "$id": "1102", + "$id": "1067", "$type": "VRBuilder.Core.Behaviors.BehaviorSequence+EntityData, VRBuilder.Core", "PlaysOnRepeat": false, "Behaviors": { - "$id": "1103", + "$id": "1068", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1104", + "$id": "1069", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior, VRBuilder.Core", "Data": { - "$id": "1105", + "$id": "1070", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior+EntityData, VRBuilder.Core", "TargetObject": { - "$id": "1106", + "$id": "1071", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "1107", + "$id": "1072", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c069190e-dc9c-46d1-a3bb-a4ccd6b6b3bd" ] } }, - "Target": { - "$id": "1108", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Ball" - }, "FinalPosition": { - "$id": "1109", + "$id": "1073", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "1110", + "$id": "1074", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "ec4fe471-3ad6-4307-bae1-b797028b6424" ] } }, - "PositionProvider": { - "$id": "1111", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Ball origin" - }, "Duration": 1.0, "AnimationCurve": { "Keys": [ @@ -6281,43 +6068,33 @@ } }, { - "$id": "1112", + "$id": "1075", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior, VRBuilder.Core", "Data": { - "$id": "1113", + "$id": "1076", "$type": "VRBuilder.Core.Behaviors.MoveObjectBehavior+EntityData, VRBuilder.Core", "TargetObject": { - "$id": "1114", + "$id": "1077", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "1115", + "$id": "1078", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c069190e-dc9c-46d1-a3bb-a4ccd6b6b3bd" ] } }, - "Target": { - "$id": "1116", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Ball" - }, "FinalPosition": { - "$id": "1117", + "$id": "1079", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "1118", + "$id": "1080", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "ec4fe471-3ad6-4307-bae1-b797028b6424" ] } }, - "PositionProvider": { - "$id": "1119", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "Ball origin" - }, "Duration": 0.01, "AnimationCurve": { "Keys": [ @@ -6356,48 +6133,43 @@ } }, "Transitions": { - "$id": "1120", + "$id": "1081", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "1121", + "$id": "1082", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "1122", + "$id": "1083", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1123", + "$id": "1084", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "1124", + "$id": "1085", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "1125", + "$id": "1086", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1126", + "$id": "1087", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition, VRBuilder.BasicInteraction", "Data": { - "$id": "1127", + "$id": "1088", "$type": "VRBuilder.BasicInteraction.Conditions.GrabbedCondition+EntityData, VRBuilder.BasicInteraction", "KeepUnlocked": true, "Targets": { - "$id": "1128", + "$id": "1089", "$type": "VRBuilder.Core.SceneObjects.MultipleScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", "guids": { - "$id": "1129", + "$id": "1090", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [ "c069190e-dc9c-46d1-a3bb-a4ccd6b6b3bd" ] } }, - "GrabbableProperty": { - "$id": "1130", - "$type": "VRBuilder.Core.SceneObjects.ScenePropertyReference`1[[VRBuilder.BasicInteraction.Properties.IGrabbableProperty, VRBuilder.BasicInteraction]], VRBuilder.Core", - "UniqueName": "Ball" - }, "IsCompleted": false, "Metadata": null } @@ -6405,11 +6177,11 @@ ] }, "TargetStep": { - "$id": "1131", + "$id": "1091", "$type": "VRBuilder.Core.Serialization.NewtonsoftJsonProcessSerializerV4+Wrapper+StepRef, VRBuilder.Core", "LifeCycle": null, "StepMetadata": { - "$id": "1132", + "$id": "1092", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 0.0, @@ -6423,45 +6195,45 @@ "Mode": null, "IsCompleted": false, "Metadata": { - "$id": "1133", + "$id": "1093", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1134", + "$id": "1094", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "Conditions": { - "$id": "1135", + "$id": "1095", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.ReorderableListOfAttribute": { - "$id": "1136", + "$id": "1096", "$type": "VRBuilder.Core.Attributes.ListOfAttribute+Metadata, VRBuilder.Core", "ChildAttributes": { - "$id": "1137", + "$id": "1097", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Attributes.MetadataAttribute, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "1030" + "$ref": "997" }, { - "$ref": "1031" + "$ref": "998" }, { - "$ref": "1032" + "$ref": "999" } ] }, "ChildMetadata": { - "$id": "1138", + "$id": "1098", "$type": "System.Collections.Generic.List`1[[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "$values": [ { - "$id": "1139", + "$id": "1099", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "VRBuilder.Core.Attributes.FoldableAttribute": true, "VRBuilder.Core.Attributes.DeletableAttribute": null, "VRBuilder.Core.Attributes.HelpAttribute": null, "ReorderableElement": { - "$id": "1140", + "$id": "1100", "$type": "VRBuilder.Core.UI.Drawers.Metadata.ReorderableElementMetadata, VRBuilder.Core", "MoveUp": false, "MoveDown": false, @@ -6473,7 +6245,7 @@ } }, "VRBuilder.Core.Attributes.ExtendableListAttribute": { - "$id": "1141", + "$id": "1101", "$type": "VRBuilder.Core.Attributes.ExtendableListAttribute+SerializedTypeWrapper, VRBuilder.Core", "Type": "VRBuilder.Core.Conditions.ICondition, VRBuilder.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" } @@ -6488,22 +6260,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "1142", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "1102", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "1143", + "GroupsToUnlock": { + "$id": "1103", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "1144", + "$id": "1104", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1145", + "$id": "1105", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "1146", + "$id": "1106", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -6512,10 +6284,10 @@ } }, { - "$id": "1147", + "$id": "1107", "$type": "VRBuilder.Core.Step, VRBuilder.Core", "StepMetadata": { - "$id": "1148", + "$id": "1108", "$type": "VRBuilder.Core.StepMetadata, VRBuilder.Core", "Position": { "x": 177.6, @@ -6525,29 +6297,29 @@ "Guid": "020003d6-1d00-4fc2-884a-2983a08d03f5" }, "Data": { - "$id": "1149", + "$id": "1109", "$type": "VRBuilder.Core.Step+EntityData, VRBuilder.Core", "Name": "Confetti!", "Description": null, "Behaviors": { - "$id": "1150", + "$id": "1110", "$type": "VRBuilder.Core.BehaviorCollection, VRBuilder.Core", "Data": { - "$id": "1151", + "$id": "1111", "$type": "VRBuilder.Core.BehaviorCollection+EntityData, VRBuilder.Core", "Behaviors": { - "$id": "1152", + "$id": "1112", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.IBehavior, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1153", + "$id": "1113", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior, VRBuilder.Core", "Data": { - "$id": "1154", + "$id": "1114", "$type": "VRBuilder.Core.Behaviors.PlayAudioBehavior+EntityData, VRBuilder.Core", "AudioData": { - "$id": "1155", - "$type": "VRBuilder.TextToSpeech.Audio.TextToSpeechAudio, VRBuilder.TextToSpeech", + "$id": "1115", + "$type": "VRBuilder.Core.TextToSpeech.TextToSpeechAudio, VRBuilder.Core", "Text": "Great shot! This concludes the demo process. If you like VR Builder, please make sure to leave a review on the Unity Asset store. We would be grateful!" }, "ExecutionStages": 1, @@ -6557,26 +6329,21 @@ } }, { - "$id": "1156", + "$id": "1116", "$type": "VRBuilder.Core.Behaviors.ConfettiBehavior, VRBuilder.Core", "Data": { - "$id": "1157", + "$id": "1117", "$type": "VRBuilder.Core.Behaviors.ConfettiBehavior+EntityData, VRBuilder.Core", "IsAboveUser": true, "ConfettiPosition": { - "$id": "1158", + "$id": "1118", "$type": "VRBuilder.Core.SceneObjects.SingleSceneObjectReference, VRBuilder.Core", "guids": { - "$id": "1159", + "$id": "1119", "$type": "System.Collections.Generic.List`1[[System.Guid, mscorlib]], mscorlib", "$values": [] } }, - "PositionProvider": { - "$id": "1160", - "$type": "VRBuilder.Core.SceneObjects.SceneObjectReference, VRBuilder.Core", - "UniqueName": "" - }, "ConfettiMachinePrefabPath": "Confetti/Prefabs/MindPortConfettiMachine", "AreaRadius": 1.0, "Duration": 15.0, @@ -6589,23 +6356,23 @@ } }, "Transitions": { - "$id": "1161", + "$id": "1120", "$type": "VRBuilder.Core.TransitionCollection, VRBuilder.Core", "Data": { - "$id": "1162", + "$id": "1121", "$type": "VRBuilder.Core.TransitionCollection+EntityData, VRBuilder.Core", "Transitions": { - "$id": "1163", + "$id": "1122", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.ITransition, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1164", + "$id": "1123", "$type": "VRBuilder.Core.Transition, VRBuilder.Core", "Data": { - "$id": "1165", + "$id": "1124", "$type": "VRBuilder.Core.Transition+EntityData, VRBuilder.Core", "Conditions": { - "$id": "1166", + "$id": "1125", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Conditions.ICondition, VRBuilder.Core]], mscorlib", "$values": [] }, @@ -6621,22 +6388,22 @@ }, "Mode": null, "ToUnlock": { - "$id": "1167", - "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.Behaviors.LockablePropertyReference, VRBuilder.Core]], mscorlib", + "$id": "1126", + "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.RestrictiveEnvironment.LockablePropertyReference, VRBuilder.Core]], mscorlib", "$values": [] }, - "TagsToUnlock": { - "$id": "1168", + "GroupsToUnlock": { + "$id": "1127", "$type": "System.Collections.Generic.Dictionary`2[[System.Guid, mscorlib],[System.Collections.Generic.IEnumerable`1[[System.Type, mscorlib]], mscorlib]], mscorlib" }, "Metadata": { - "$id": "1169", + "$id": "1128", "$type": "VRBuilder.Core.Metadata, VRBuilder.Core", "values": { - "$id": "1170", + "$id": "1129", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib]], mscorlib", "TabsGroup": { - "$id": "1171", + "$id": "1130", "$type": "System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Object, mscorlib]], mscorlib", "selected": 0 } @@ -6647,44 +6414,58 @@ ] }, "Process": { - "$id": "1172", + "$id": "1131", "$type": "VRBuilder.Core.Process, VRBuilder.Core", "CurrentStep": null, "ProcessMetadata": { - "$id": "1173", + "$id": "1132", "$type": "VRBuilder.Core.ProcessMetadata, VRBuilder.Core", "StringLocalizationTable": null, "Guid": "30bb3047-44ad-4af1-a744-9102beeff0c9" }, "Data": { - "$id": "1174", + "$id": "1133", "$type": "VRBuilder.Core.Process+EntityData, VRBuilder.Core", "Chapters": { - "$id": "1175", + "$id": "1134", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IChapter, VRBuilder.Core]], mscorlib", "$values": [ { - "$id": "1176", + "$id": "1135", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1177", + "$id": "1136", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": 0.0, "y": 0.0 }, - "Guid": "5fc899d8-cb5c-4a38-8ccf-5bc170a5b831" + "Guid": "5fc899d8-cb5c-4a38-8ccf-5bc170a5b831", + "ViewTransform": { + "$id": "1137", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": 908.0, + "y": 530.4, + "z": 0.0 + }, + "Scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + } + } }, "Data": { - "$id": "1178", + "$id": "1138", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "Introduction", "FirstStep": { "$ref": "4" }, "Steps": { - "$id": "1179", + "$id": "1139", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { @@ -6695,243 +6476,327 @@ } }, { - "$id": "1180", + "$id": "1140", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1181", + "$id": "1141", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": 0.0, "y": 0.0 }, - "Guid": "53cd98f5-7288-4cd6-aac1-d6f9d42662f9" + "Guid": "53cd98f5-7288-4cd6-aac1-d6f9d42662f9", + "ViewTransform": { + "$id": "1142", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": 594.4, + "y": 629.6, + "z": 0.0 + }, + "Scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + } + } }, "Data": { - "$id": "1182", + "$id": "1143", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "The magic cube", "FirstStep": { "$ref": "24" }, "Steps": { - "$id": "1183", + "$id": "1144", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { "$ref": "24" }, { - "$ref": "63" + "$ref": "62" }, { - "$ref": "99" + "$ref": "100" }, { - "$ref": "138" + "$ref": "140" }, { - "$ref": "202" + "$ref": "198" } ] } } }, { - "$id": "1184", + "$id": "1145", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1185", + "$id": "1146", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": 0.0, "y": 0.0 }, - "Guid": "1eb3fcef-7d88-4639-ae1f-26b83f68c1dc" + "Guid": "1eb3fcef-7d88-4639-ae1f-26b83f68c1dc", + "ViewTransform": { + "$id": "1147", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": -266.666656, + "y": 106.666664, + "z": 0.0 + }, + "Scale": { + "x": 0.8695652, + "y": 0.8695652, + "z": 1.0 + } + } }, "Data": { - "$id": "1186", + "$id": "1148", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "Slice the magic cube", "FirstStep": { - "$ref": "241" + "$ref": "236" }, "Steps": { - "$id": "1187", + "$id": "1149", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "241" + "$ref": "236" }, { - "$ref": "285" + "$ref": "280" }, { - "$ref": "340" + "$ref": "330" }, { - "$ref": "401" + "$ref": "388" }, { - "$ref": "437" + "$ref": "423" }, { - "$ref": "473" + "$ref": "461" }, { - "$ref": "509" + "$ref": "499" }, { - "$ref": "594" + "$ref": "573" }, { - "$ref": "661" + "$ref": "636" } ] } } }, { - "$id": "1188", + "$id": "1150", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1189", + "$id": "1151", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": -35.2, "y": 0.0 }, - "Guid": "fa66dc89-dbc6-47ec-88cb-534ec7ce0580" + "Guid": "fa66dc89-dbc6-47ec-88cb-534ec7ce0580", + "ViewTransform": { + "$id": "1152", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": -227.333328, + "y": 111.333336, + "z": 0.0 + }, + "Scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + } + } }, "Data": { - "$id": "1190", + "$id": "1153", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "Assemble stairs", "FirstStep": { - "$ref": "760" + "$ref": "729" }, "Steps": { - "$id": "1191", + "$id": "1154", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "696" + "$ref": "669" }, { - "$ref": "760" + "$ref": "729" }, { - "$ref": "790" + "$ref": "762" }, { - "$ref": "855" + "$ref": "823" } ] } } }, { - "$id": "1192", + "$id": "1155", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1193", + "$id": "1156", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": 0.0, "y": 0.0 }, - "Guid": "6caae853-2510-42fe-947b-4e44a41aaf26" + "Guid": "6caae853-2510-42fe-947b-4e44a41aaf26", + "ViewTransform": { + "$id": "1157", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": 400.0, + "y": 431.0, + "z": 0.0 + }, + "Scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + } + } }, "Data": { - "$id": "1194", + "$id": "1158", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "Disable shield", "FirstStep": { - "$ref": "883" + "$ref": "851" }, "Steps": { - "$id": "1195", + "$id": "1159", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "883" + "$ref": "851" }, { - "$ref": "919" + "$ref": "889" }, { - "$ref": "960" + "$ref": "929" } ] } } }, { - "$id": "1196", + "$id": "1160", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1197", + "$id": "1161", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": -21.6, "y": 0.0 }, - "Guid": "82c893d1-f030-4716-bea7-16cdbb5b27b5" + "Guid": "82c893d1-f030-4716-bea7-16cdbb5b27b5", + "ViewTransform": { + "$id": "1162", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": 421.6, + "y": 431.0, + "z": 0.0 + }, + "Scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + } + } }, "Data": { - "$id": "1198", + "$id": "1163", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "Throw ball", "FirstStep": { - "$ref": "1003" + "$ref": "971" }, "Steps": { - "$id": "1199", + "$id": "1164", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "1003" + "$ref": "971" }, { - "$ref": "1042" + "$ref": "1009" }, { - "$ref": "1092" + "$ref": "1057" } ] } } }, { - "$id": "1200", + "$id": "1165", "$type": "VRBuilder.Core.Chapter, VRBuilder.Core", "ChapterMetadata": { - "$id": "1201", + "$id": "1166", "$type": "VRBuilder.Core.ChapterMetadata, VRBuilder.Core", "LastSelectedStep": null, "EntryNodePosition": { "x": 0.0, "y": 0.0 }, - "Guid": "815698a8-1cb5-48c1-8ab4-303ea405fd3e" + "Guid": "815698a8-1cb5-48c1-8ab4-303ea405fd3e", + "ViewTransform": { + "$id": "1167", + "$type": "VRBuilder.Core.ViewTransform, VRBuilder.Core", + "Position": { + "x": 400.0, + "y": 431.0, + "z": 0.0 + }, + "Scale": { + "x": 1.0, + "y": 1.0, + "z": 1.0 + } + } }, "Data": { - "$id": "1202", + "$id": "1168", "$type": "VRBuilder.Core.Chapter+EntityData, VRBuilder.Core", "Name": "Outro", "FirstStep": { - "$ref": "1147" + "$ref": "1107" }, "Steps": { - "$id": "1203", + "$id": "1169", "$type": "System.Collections.Generic.List`1[[VRBuilder.Core.IStep, VRBuilder.Core]], mscorlib", "$values": [ { - "$ref": "1147" + "$ref": "1107" } ] } @@ -6940,7 +6805,7 @@ ] }, "FirstChapter": { - "$ref": "1176" + "$ref": "1135" }, "Name": "Demo - Core Features", "Mode": null, diff --git a/Documentation/VR-Builder-Manual.pdf b/Documentation/VR-Builder-Manual.pdf new file mode 100644 index 000000000..24d7a8387 Binary files /dev/null and b/Documentation/VR-Builder-Manual.pdf differ diff --git a/Documentation/vr-builder-manual.pdf.meta b/Documentation/VR-Builder-Manual.pdf.meta similarity index 100% rename from Documentation/vr-builder-manual.pdf.meta rename to Documentation/VR-Builder-Manual.pdf.meta diff --git a/Documentation/vr-builder-manual.pdf b/Documentation/vr-builder-manual.pdf deleted file mode 100644 index dd94f47ef..000000000 Binary files a/Documentation/vr-builder-manual.pdf and /dev/null differ diff --git a/NOTICE.txt b/NOTICE.txt index 23746d81c..20ba0f6d4 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -17,6 +17,6 @@ This product contains parts of UltimateXR (https://github.com/VRMADA/ultimatexr- This product contains software Microsoft Speech Library developed by Microsoft, license is unknown as of 2019-12-20. -This product includes software Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License http://www.unity3d.com/legal/licenses/Unity_Companion_License. +This product includes software and assets Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License http://www.unity3d.com/legal/licenses/Unity_Companion_License Modifications copyright 2021-2024 MindPort GmbH \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors.meta b/Source/Basic-Conditions-And-Behaviors.meta deleted file mode 100644 index f27ff9690..000000000 --- a/Source/Basic-Conditions-And-Behaviors.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3b40b0ff0d826541b7cbf3690b75b46 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/.azure-pipelines.yml b/Source/Basic-Conditions-And-Behaviors/.azure-pipelines.yml deleted file mode 100644 index 9b4617a61..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.azure-pipelines.yml +++ /dev/null @@ -1,196 +0,0 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml - -resources: - repositories: - - repository: Creator - type: github - endpoint: Innoactive - name: Innoactive/Creator - ref: develop - - repository: UnityProject - type: github - endpoint: Innoactive - name: Innoactive/Empty-Unity-Project-2019 - ref: develop - -trigger: - - master - - develop -pr: - branches: - include: - - develop - -pool: Unity - -variables: - - group: basic-unity -stages: - - stage: Lint - displayName: Lint - jobs: - - job: CommitMessageCheck - displayName: Commit Message Check - steps: - - script: npm install @commitlint/cli commitlint-azure-pipelines-cli @commitlint/config-conventional - - script: > - npx - -p @commitlint/cli - -p commitlint-azure-pipelines-cli - -p @commitlint/config-conventional - commitlint-azure-pipelines --config .commitlintrc.json - - - stage: Build - displayName: 'Build & Test' - condition: succeeded() - jobs: - - job: build - workspace: - clean: all - steps: - - checkout: UnityProject - lfs: true - - checkout: Creator - lfs: true - - checkout: self - lfs: true - - - task: UseNode@1 - - - task: PowerShell@2 - displayName: "Run Semantic release" - condition: eq(variables['Build.SourceBranchName'], 'master') - inputs: - targetType: 'inline' - script: | - npx -p semantic-release-ado semantic-release - workingDirectory: "Basic-Conditions-And-Behaviors/" - env: - GH_TOKEN: "$(GITHUB_TOKEN)" - - - task: PowerShell@2 - displayName: Fetch version from git - condition: ne(variables['Build.SourceBranchName'], 'master') - inputs: - targetType: 'inline' - script: | - $TAG = (git tag -l "v*" --sort=committerdate | Select -last 1) - if(!$TAG) { $TAG = "v0.0.0" } - $TAG = $TAG.TrimStart("v") + "-" + (git log -1 --pretty=format:%h) - Write-Host "##vso[task.setvariable variable=Version]$TAG" - workingDirectory: "Basic-Conditions-And-Behaviors/" - - - task: PowerShell@2 - displayName: Publish variables - inputs: - targetType: 'inline' - script: | - echo "##vso[task.setvariable variable=Version;isOutput=true]v$(Version)" - name: ExportedVariables - - - task: CopyFiles@2 - inputs: - SourceFolder: "Empty-Unity-Project-2019/" - Contents: "**" - TargetFolder: "$(Path.Project)" - displayName: Copy base Project - - - task: CopyFiles@2 - inputs: - SourceFolder: "Creator/" - Contents: "**" - TargetFolder: "$(Path.Creator)/Core" - displayName: Copy Creator Core - - - task: CopyFiles@2 - inputs: - SourceFolder: "Basic-Conditions-And-Behaviors/" - Contents: "**" - TargetFolder: "$(Path.Creator)/Components/Basic-Conditions-And-Behaviors" - displayName: Copy Basic Conditions and Behaviors - - - task: DeleteFiles@1 - inputs: - Contents: "!(Project)" - displayName: Clean Up - - - task: PowerShell@2 - displayName: Build Project - inputs: - targetType: 'inline' - script: | - u3d available -f - u3d install $(UnityVersion) - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor-build.log -nographics -quit -batchmode -buildWindows64Player Build\\TestBuild\\TestBuild.exe - - - task: PowerShell@2 - displayName: Run Tests - inputs: - targetType: 'inline' - script: | - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_editmode_tests.log -batchmode -runTests -testPlatform editmode -testResults $(System.DefaultWorkingDirectory)\TEST-EditMode.xml - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_playmode_tests.log -batchmode -runTests -testPlatform playmode -testResults $(System.DefaultWorkingDirectory)\TEST-PlayMode.xml - - - task: PublishTestResults@2 - inputs: - testResultsFormat: "NUnit" - testResultsFiles: "TEST-*.xml" - - - task: PowerShell@2 - displayName: Export Unity package - inputs: - targetType: 'inline' - script: | - echo 'Exporting version $(Version)' - ((Get-Content -path $(Path.ExportConfig)/$(ExportConfigName) -Raw) -replace '{version}','v$(Version)') | Set-Content -Path $(Path.Project)/export-config.json - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_export.log -batchmode -quit -executeMethod Innoactive.CreatorEditor.PackageExporter.Export --export-config export-config.json - Start-Sleep -s 5 - - - task: PublishPipelineArtifact@1 - displayName: "Publish Unity Package" - inputs: - targetPath: "$(Build.ArtifactStagingDirectory)/packages/" - artifact: "creator-basic-condition-behaviors-unitypackage" - publishLocation: "pipeline" - - - task: PublishPipelineArtifact@1 - displayName: "Publish Logs" - condition: always() - inputs: - targetPath: "$(Build.ArtifactStagingDirectory)/logs/" - artifact: "creator-basic-condition-behaviors-logs-$(System.JobId)" - publishLocation: "pipeline" - - - stage: Release - displayName: Release - dependsOn: - - Lint - - Build - condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master')) - jobs: - - job: - workspace: - clean: all - variables: - Version: $[stageDependencies.Build.build.outputs['ExportedVariables.Version']] - steps: - - task: DownloadPipelineArtifact@2 - displayName: 'Download exported package' - inputs: - buildType: 'current' - artifactName: 'creator-basic-condition-behaviors-unitypackage' - targetPath: '$(Build.ArtifactStagingDirectory)/packages/' - - - task: GitHubRelease@1 - inputs: - gitHubConnection: 'Github.com - Jenkins / CI User' - repositoryName: 'Innoactive/Basic-Conditions-And-Behaviors' - action: 'edit' - target: '$(Build.SourceVersion)' - tag: '$(Version)' - assetUploadMode: "replace" - assets: "$(Build.ArtifactStagingDirectory)/packages/*" - addChangeLog: false diff --git a/Source/Basic-Conditions-And-Behaviors/.commitlintrc.json b/Source/Basic-Conditions-And-Behaviors/.commitlintrc.json deleted file mode 100644 index 14473e999..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.commitlintrc.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": ["@commitlint/config-conventional"] } \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/.gitattributes b/Source/Basic-Conditions-And-Behaviors/.gitattributes deleted file mode 100644 index f02d6ffc6..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.gitattributes +++ /dev/null @@ -1,129 +0,0 @@ -# Kindly borrowed (and extended) -# from https://gist.github.com/nemotoo/b8a1c3a0f1225bb9231979f389fd4f3f - -# Set the default behavior, in case people don't have core.autocrlf set. -* text=auto - -## Unity ## - -*.cs diff=csharp text -*.cginc text -*.shader text - -# linguist-generated leads to diffs not being shown on github -# see https://github.com/github/linguist#generated-code and -# https://stackoverflow.com/a/24382933/1142028 -*.mat binary merge=unityyamlmerge linguist-generated=true -*.anim binary merge=unityyamlmerge linguist-generated=true -*.unity binary merge=unityyamlmerge linguist-generated=true -*.prefab binary merge=unityyamlmerge linguist-generated=true -*.physicsMaterial2D binary merge=unityyamlmerge linguist-generated=true -*.physicsMaterial binary merge=unityyamlmerge linguist-generated=true -#*.asset binary merge=unityyamlmerge linguist-generated=true -*.meta binary merge=unityyamlmerge linguist-generated=true -*.controller binary merge=unityyamlmerge linguist-generated=true - -## git-lfs ## - -# Graphics -*.jpg filter=lfs diff=lfs merge=lfs -text -*.JPG filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text -*.JPEG filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.PNG filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.PSD filter=lfs diff=lfs merge=lfs -text -*.ai filter=lfs diff=lfs merge=lfs -text -*.AI filter=lfs diff=lfs merge=lfs -text -*.bmp filter=lfs diff=lfs merge=lfs -text -*.BMP filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.GIF filter=lfs diff=lfs merge=lfs -text -*.img filter=lfs diff=lfs merge=lfs -text -*.IMG filter=lfs diff=lfs merge=lfs -text -*.tif filter=lfs diff=lfs merge=lfs -text -*.TIF filter=lfs diff=lfs merge=lfs -text -*.xcf filter=lfs diff=lfs merge=lfs -text -*.XCV filter=lfs diff=lfs merge=lfs -text -*.tga filter=lfs diff=lfs merge=lfs -text -*.TGA filter=lfs diff=lfs merge=lfs -text - -# Videos -*.mpg filter=lfs diff=lfs merge=lfs -text -*.MPG filter=lfs diff=lfs merge=lfs -text -*.mpeg filter=lfs diff=lfs merge=lfs -text -*.MPEG filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.MP4 filter=lfs diff=lfs merge=lfs -text -*.avi filter=lfs diff=lfs merge=lfs -text -*.AVI filter=lfs diff=lfs merge=lfs -text -*.asf filter=lfs diff=lfs merge=lfs -text -*.ASF filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.MP4 filter=lfs diff=lfs merge=lfs -text -*.mov filter=lfs diff=lfs merge=lfs -text -*.MOV filter=lfs diff=lfs merge=lfs -text - -# Audio -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.MP3 filter=lfs diff=lfs merge=lfs -text -*.ogg filter=lfs diff=lfs merge=lfs -text -*.OGG filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.WAV filter=lfs diff=lfs merge=lfs -text - -# Models -*.obj filter=lfs diff=lfs merge=lfs -text -*.OBJ filter=lfs diff=lfs merge=lfs -text -*.fbx filter=lfs diff=lfs merge=lfs -text -*.FBX filter=lfs diff=lfs merge=lfs -text -*.ply filter=lfs diff=lfs merge=lfs -text -*.PLY filter=lfs diff=lfs merge=lfs -text -*.raw filter=lfs diff=lfs merge=lfs -text -*.RAW filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.BLEND filter=lfs diff=lfs merge=lfs -text -*.3ds filter=lfs diff=lfs merge=lfs -text -*.3DS filter=lfs diff=lfs merge=lfs -text -*.stl filter=lfs diff=lfs merge=lfs -text -*.STL filter=lfs diff=lfs merge=lfs -text -*.pmd filter=lfs diff=lfs merge=lfs -text -*.PMD filter=lfs diff=lfs merge=lfs -text -*.mesh filter=lfs diff=lfs merge=lfs -text -*.MESH filter=lfs diff=lfs merge=lfs -text - -# Libs -*.dll filter=lfs diff=lfs merge=lfs -text -*.DLL filter=lfs diff=lfs merge=lfs -text -*.a filter=lfs diff=lfs merge=lfs -text -*.A filter=lfs diff=lfs merge=lfs -text -*.so filter=lfs diff=lfs merge=lfs -text -*.SO filter=lfs diff=lfs merge=lfs -text -*.lib filter=lfs diff=lfs merge=lfs -text -*.LIB filter=lfs diff=lfs merge=lfs -text -*.jar filter=lfs diff=lfs merge=lfs -text -*.JAR filter=lfs diff=lfs merge=lfs -text - -# Unity Light Build -*.exr filter=lfs diff=lfs merge=lfs -text -*.EXR filter=lfs diff=lfs merge=lfs -text -LightingData.asset filter=lfs diff=lfs merge=lfs -text - -# Others -*.pdf filter=lfs diff=lfs merge=lfs -text -*.PDF filter=lfs diff=lfs merge=lfs -text -*.r16 filter=lfs diff=lfs merge=lfs -text -*.R16 filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.unitypackage filter=lfs diff=lfs merge=lfs -text -*.aif filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text -*.TTF filter=lfs diff=lfs merge=lfs -text -*.rns filter=lfs diff=lfs merge=lfs -text -*.reason filter=lfs diff=lfs merge=lfs -text -*.lxo filter=lfs diff=lfs merge=lfs -text - -# 3D Modelling tools -*.sbs filter=lfs diff=lfs merge=lfs -text -*.max filter=lfs diff=lfs merge=lfs -text diff --git a/Source/Basic-Conditions-And-Behaviors/.github/CODE_OF_CONDUCT.md b/Source/Basic-Conditions-And-Behaviors/.github/CODE_OF_CONDUCT.md deleted file mode 100644 index 9716a0ad6..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.github/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,85 +0,0 @@ -# Contributor Code of Conduct - -**Table of Contents:** - -* [Summary](#summary) -* [Our Standards](#our-standards) -* [Our Responsibilities](#our-responsibilities) -* [Scope](#scope) -* [Enforcement](#enforcement) -* [Attribution](#attribution) - -**Version**: 1.0.0 - -## Summary - -In order to keep the Open Source Innoactive community a warm, welcoming, and a safe place we ask that all participants read and adhere to the following code of conduct. - -* **Be friendly and patient:** Remember you might not be communicating in someone else's primary spoken or programming language, and others may not have your level of understanding. - -* **Be welcoming and inclusive:** Our communities welcome and support people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. - -* **Be considerate:** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language. - -* **Be respectful:** We are a world-wide community of professionals, and we conduct ourselves professionally. Disagreement is no excuse for poor behavior and poor manners. Disrespectful and unacceptable behavior includes, but is not limited to: - * Violent threats or language. - * Discriminatory or derogatory jokes and language. - * Posting sexually explicit or violent material. - * Posting, or threatening to post, people's personally identifying information ("doxing"). - * Insults, especially those using discriminatory terms or slurs. - * Behavior that could be perceived as sexual attention. - * Advocating for or encouraging any of the above behaviors. - -* **Understand disagreements:** Disagreements, both social and technical, are useful learning opportunities. Seek to understand the other viewpoints and resolve differences constructively. - -* **This code is not exhaustive or complete.** It serves to capture our common understanding of a productive, collaborative environment. We expect the code to be followed in spirit as much as in the letter. - -We expect all contributors to uphold our standards of conduct. If any member of the community violates this code of conduct, the Innoactive team and project maintainers will take action. We reserve the right to remove issues, comments, and PRs that do not comply with our conduct standards. Repeated or significant offenses will result in blocked accounts and disassociation with our projects and the Innoactive community. - -If you are subject to or witness unacceptable behavior, or have any other concerns, please communicate with any of our [maintainers](CONTRIBUTING.md#maintainers). - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling -* Insults or other derogatory comments -* Personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, discussions in a public or private Innoactive channel, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise, unacceptable behavior may be reported by contacting any of our [maintainers](CONTRIBUTING.md#maintainers). - -All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. We are obligated to maintain confidentiality concerning the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This code of conduct is based on the template established by the [TODO Group](https://todogroup.org/) and used by numerous other large communities (e.g., Microsoft, Facebook, Twitter, GitHub and the Scope section from the [Contributor Covenant](https://www.contributor-covenant.org), [version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html). - -For answers to common questions about this code of conduct, see [Contributor Covenant's F.A.Q.](https://www.contributor-covenant.org/faq). diff --git a/Source/Basic-Conditions-And-Behaviors/.github/CODING_CONVENTIONS.md b/Source/Basic-Conditions-And-Behaviors/.github/CODING_CONVENTIONS.md deleted file mode 100644 index 8846c9f95..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.github/CODING_CONVENTIONS.md +++ /dev/null @@ -1,509 +0,0 @@ -# Coding Conventions - -Unless otherwise specified, the Innoactive projects adhere to the MSDN C# [Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions) and [Design Guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/). -In the following, the most important guidelines and custom decisions are listed. - -## Language -* Code, documentation, and comments are to be written in English. - -## Naming Conventions - -### Name -* Use meaningful but concise names. -* Do not use special characters in any names. -* Do not use abbreviations. - -```cs -public class RuntimeStatistics -{ - // very bad: - private int n; - // bad: - private int numFrms; - private int frameCnt; - // good: - private int numberOfFrames; - private int frameCount; - // too verbose: - private int numberOfElapsedFramesSinceApplicationStart; -} -``` - -* Keep the most specific descriptor left, e.g. pauseButton not buttonPause. -* Boolean variables and Properties should start with Is or Has, e.g. isActive. - -### Formatting -* Classes, properties, and public fields are written in PascalCase. -* Private fields are written in camelCase. -* Static and const fields (public, protected, or private) are formatted like non-const/static fields. - -```cs -public class MyClass -{ - public float MyProperty { get; private set; } - public bool MyPublicVariable; - private string myPrivateVariable; - public static string MyStaticVariable = "someValue"; - protected const string MyConstVariable = "someOtherValue"; - private const string myPrivateConstVariable = "yetAnotherValue"; -} -``` - -* Functions are written in PascalCase. -* Function parameters are written in camelCase. -* Local variables are written in camelCase. - -```cs -public bool MyFunction(bool myFunctionParameter) -{ - float myLocalVariable = 0; -} -``` - -* Interfaces are written in PascalCase, but start with an *I*. - -```cs -public interface IMyInterface -{ -} -``` - -* Enums are written in PascalCase. -* Enum Values are written in PascalCase. - -```cs -public enum MyEnum -{ - FirstEnumValue, - SecondEnumValue, - ThirdEnumValue, -} -``` - -## Bracing and Indentation -* Each opening and closing brace is placed in a separate line. -* Braces start at the indentation level of the outlying scope. -* Add Braces even for short single-line scopes. - -```cs -// Do -if (condition == true) -{ - return; -} -// Don't -if (condition == true) - return; -if (condition == true) return; -``` - -* Exception: Default properties are implemented in a single line. - Encapsulating properties and properties with simple single-statement accessors place accessors on a single line together with the respective implementation. - Complex accessors with multiple statements follow the general rule of placing braces and statements on separate lines. - -```cs -public bool DefaultProperty { get; protected set; } - -public bool EncapsulatingProperty -{ - get { return wrappedValue; } - protected set { wrappedValue = value; } -} - -public bool SimpleProperty -{ - get { return entry == "MagicValue"; } - set { entry = string.Format("Bla{0}", value); } -} - -public bool ComplexProperty -{ - get - { - if(wrappedValue == null) - { - throw new OperationException(); - } - - wrappedValue; - } - protected set - { - wrappedValue = value; - - if (implementation != null) - { - implementation.ForwardValue(value); - } - } -} - -public bool MixedProperty -{ - get - { - return wrappedValue; - } - protected set - { - wrappedValue = value; - - if (implementation != null) - { - implementation.ForwardValue(value); - } - } -} -``` - -* Content of the braced scope is indented an additional level. -* Indent by 4 spaces. -* Indent every scope (namespaces, classes, loops, ...). - -```cs -public class ClassInTopScope -{ - public bool PropertyInClassScope { get; set; } - - public float FunctionInClassScope() - { - public float functionVariable; - - { - float scopedVariable = 3; - } - - for (int i = 0; i < 100; ++i) - { - float scopedVariable = i; - } - } -} -``` - -* Do not indent compile `#if` and `#pragma`. -* Indent `#region` specifications. -* Do not further indent code inside compile directives like `#if` or `#region`s. - -```cs -namespace MyNamespace -{ - public class MyClass1 - { - public bool FirstFunction(); - -#pragma warning disable 0618 // temporarily disable obsolete usage warning - CallObsoleteFunction(); -#pragma warning restore 0618 - - #region First Region - public bool SecondFunction(); - #endregion - - #region Second Region - public bool ThirdFunction(); - #endregion - } - -#if COMPILE_DEFINE - public class MyClass2 - { - } -#endif -} -``` - -* When splitting a statement or declaration, indent the split line by one level. -* When defining local delegates, do not indent the opening and closing braces. - -```cs -public float FunctionWithManyParameters() -{ - bool expression = CheckConditionOne() - && CheckConditionTwo() - && CheckConditionThree() - && CheckConditionFour(); - - Action localTask = () => - { - // [...] - } - - new AsyncTask(localTask).Execute(); - - new AsyncTask(() => - { - // [...] - }) - .Execute(); -} -``` - -## Code comments -* Enrich your code with meaningful comments. -* Use `//` for inline code comments, and `///` for API docs. -* Add xml API docs to all elements of the public API: classes, functions, properties, fields, and events. -* Comments should always start with a capital letter, be separated from the comment symbol by a space, and end with a period. -* All sentence-like parts of a comment (e.g. ` and ` texts) should end with a period. - - -```cs -/// -/// Explain the general intent and typical usage of the class here. -/// -public class ExampleClass -{ - /// - /// Provide additional detail here. - /// - public float ExampleProperty { get; private set; } - - /// - /// Provide details about what the function does. - /// - /// Explain parameter here. - /// Explain return type here. - /// When is this exception thrown. - public int ExampleFunction(float exampleParameter) - { - // [...] - } -} -``` - -* Avoid empty xml tags components like `param` or `return`. Either add a valuable descriptions, or remove the tag. - -```cs -public class ExampleClass -{ - //Do - - /// - /// This function computes the square root of a value. - /// - public float SquareRoot(float value) - { - // [...] - } - - // Don't - - /// - /// This function computes the square root of a value. - /// - /// - /// - public float SquareRoot(float value) - { - // [...] - } -} -``` - -## Whitespaces -* Use empty lines to separate classes/class members/blocks of statements. -* Do not use two or more consecutive empty lines (use regions instead to group blocks). -* Add a whitespace to separate a condition/iteration keyword (`if`, `while`, `for`, ...) and its braces. -* Do not use a whitespace to separate a function name and its brace. - -```cs -if (CheckParameters(param1, param2) && param3) -{ - // [...] -} - -while (pi == 3) -{ - // [...] -} - -SomeFunction(param); -``` - -* Add whitespaces after commas and around operators. - -```cs -if (CheckParameters(param1, param2) && param3) -{ - return param1 + (param2 * param3); -} -``` - -## Events - -* Use C# events - avoid UnityEvents, Actions, or similar. -* Use EventArgs classes instead of delegates or actions for event definitions. -* Use immutable `EventArgs` classes, which provide public readonly fields. Initialize these fields from a constructor. - -```cs -public class MyButton -{ - // Do - public class ClickedEventArgs : System.EventArgs - { - public readonly string SomeData; - public ClickedEventArgs(string data) - { - SomeData = data; - } - } - - public event EventHandler Clicked; - - // Don't - public delegate void ClickedEvent(string someData); - public event ClickedEvent Clicked; - - // Don't - public event Action Clicked; -} -``` - -* EventArgs classes end with `EventArgs`, and are derived from `System.EventArgs`. -* Name Events with a verb describing the event (without pre- or suffix), Loaded, Finished. -* Event handling functions start with `On`, followed by the scope and the event name. -* If an event can be triggered by a child class, provide a function called `EmitEVENTNAME`. - -```cs -public class MyButton -{ - public class ClickedEventArgs : System.EventArgs - { - public readonly string someData; - public ClickedEventArgs(string data) - { - someData = data; - } - } - - public event EventHandler Clicked; - - protected void EmitClicked(string data) - { - Clicked.Invoke(this, new ClickedEventArgs() { someData = data }); - } -} - -public class ButtonObserver -{ - public void Observe - { - new MyButton().Clicked += OnButtonClicked; - } - - private void OnButtonClicked(object sender, MyButton.ClickedEventArgs args) -} -``` - -## Logging - -* Prefer format syntax over explicit string concatenation. - -```cs -private void SomeFunction() -{ - int numberOfThings = 42; - - // Do - Debug.Log($"I know {numberOfThings} things"); - - // Or - Debug.LogFormat("I know {0} things", numberOfThings); - - // Don't - Debug.Log("I know " + numberOfThings + " things"); -} -``` - -## Exceptions - -* Exception names end with `Exception`. -* If exceptions are to be thrown by only one class, define them inside this class. -* Exceptions thrown by multiple sources are defined in a separate file, in the matching namespace (no Exceptions sub-namespace). - -## Access Modifiers - -* Only use public variables or Properties with public setters for data objects. -* Always specify an Access Modifier. - -```cs -public class MyClass -{ - // Do - private float myPrivateVariable1; - // Don't - float myPrivateVariable2; -} -``` - -## Unity-specific - -* Prefer private variables marked with `[SerializeField]` over public variables for Inspector fields. -* When using a public variable in a MonoBehaviour, still add `[SerializeField]` to ease detection of Inspector fields. -* Use the `[Tooltip("...")}` attribute in Inspector fields for documentation / usage hints. -* Always initialize Inspector fields (to prevent never-assigned-warnings). -* Avoid the automatic conversion from `UnityEngine.Object` to bool. -* When using Enum-typed Inspector fields, consider hard-wiring the enum values to prevent serialization errors when changing available enum values. - -```cs -// Do -if (gameObject != null) -{ - // [...] -} - -// Don't -if (gameObject) -{ - // [...] -} -``` - -## Lambdas - -* Prefer lambda-style expressions over delegate-style. - -```cs -// Do -(float param1, string param2) => {} - -// Don't -delegate(float param1, string param2) {} -``` - -* Prefer named functions over lambdas. -* Assign longer or more complex lambdas to named local `Action`/`Func`. -* If nested lambdas are required, assign each one to named local `Action`/`Func`. -* Avoid defining long lambdas directly as parameter of a function call. - -## Obsoletion - -* Avoid changes in code that break existing APIs (i.e. Class Names, Function Argument types, Renaming of public members / properties, return types). -* Use `System.Obsolete` to mark outdated code that will be removed in newer versions. -* When re-naming classes/properties/methods, try to maintain the old version tagged as obsolete. -* Obsolete code will be maintained for one (major) release, and is deleted afterwards. - -## Misc - -* Define class-specific Exceptions, Enums, EventArgs, ... inside the corresponding class. -* For Interfaces, define Exceptions, Enums, EventArgs, ... in the same file as the interface. -* Do not use `var`, always specify the full type name. -* Use `Invoke` to trigger actions or events. -* Only use `this.` before members where absolutely necessary. -* Decide whether or not to design for inheritance. - * If not intended to be derived from, make all non-public entities `private`. - * If intended to be derived from, take care to mark necessary entities `protected` and/or `virtual`. -* Consider using early returns in functions to prevent deeply nested scopes. -* Use parentheses to group parts of complex statements. - Especially, always group sub-clauses when combining different boolean operators. -* Do not omit the array type specifier when using array initialization lists. - -```cs -// Do -string[] myList = new string[] { "a", "b", "c", "d" }; - -// Don't -string[] myList = new [] { "a", "b", "c", "d" }; -``` - -* Do not prefix static method defined in the same or parent class with the class scope. \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/.github/CONTRIBUTING.md b/Source/Basic-Conditions-And-Behaviors/.github/CONTRIBUTING.md deleted file mode 100644 index d544a1014..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.github/CONTRIBUTING.md +++ /dev/null @@ -1,174 +0,0 @@ -# How to contribute - -At Innoactive we want to thank you for being part of this community and helping us to improve the Creator. - -There are many ways to contribute, it could be by suggesting new features and ideas, reporting bugs, extending and modifying functionalities, and even from just using the Creator and developing amazing VR training applications. - -In this guide, we summarize how you can do all those actions. - -### Table of Contents: - -1. [Getting Started](#getting-started) -1. [Code of Conduct](#code-of-conduct) -1. [Feature Request](#feature-request) -1. [Bug Report](#bug-report) -1. [Submitting Changes](#submitting-changes) -1. [Maintainers](#maintainers) -1. [Coding Conventions](#coding-conventions) -1. [Source Control Commit Guidelines](#source-control-commit-guidelines) -1. [Contributors](#contributors) - -## Getting Started - -The easiest and simplest way to get started and try out the Creator is by downloading the latest version from our [resources site](http://developers.innoactive.de/creator/). - -Make sure to read the [documentation](http://developers.innoactive.de/documentation/creator/) for a deeper understanding of how the tool works. - -## Code of Conduct - -This project and everyone participating in it are governed by the [Innoactive Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to our [maintainers](#maintainers). - -## Feature Request - -We are keen to listen to your feature requests. - -To request a feature, please go to the `Issues` section of this repository and create a new issue using the `Feature request` template. Be as detailed as possible, if possible, try to include references, and explain what is the benefit of the feature. - -Make sure your idea is unique using the search functionality. If a similar feature request already exists, try providing additional information instead of creating a new issue. - -In the case that a similar feature request already exits but is closed without being resolved, you are welcome to create a new one if you think it makes sense. - -## Bug Report - -If you find an error in the source code, or experience one when using the Creator, you can help us by submitting a bug report issue to our GitHub issue tracker. - -Before submitting a new bug report, make sure there has not been reported already by using the search functionality in the issues section of this repository. - -To report a new bug, please go to the `Issues` section of this repository and create a new issue using the `Bug report` template. Be as detailed as possible, explain how to reproduce it, if possible, try to include references and rate of reproducibility. - -You can also [submit a Pull Request](#submitting-changes) with a fix! - -Creating comprehensive bug reports helps the community to quickly understand the problem and the severity. - -If you find a security vulnerability, do NOT open an issue. Contact a [maintainer](#maintainers) instead. - -Alternatively, customers can contact us directly using our [support channel](https://jira.innoactive.de/servicedesk/customer/portal/3). - -## Submitting Changes - -By default, this repository is protected, the only way to submit changes is by merging via [creating a pull request from a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork), this is only intending to provide the best quality and add a security layer, we could detect and prevent new bugs, breaking functionalities and avoid violations to our [code convention](#coding-conventions). - -Use the [pull request template](PULL_REQUEST_TEMPLATE.md) for detail as much as possible all the changes included in the pull request, this way it is easier for everyone to review. - -Make sure to also follow the [Source Control Commit Guidelines](#source-control-commit-guidelines). - -See more about [Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) and [how to fork a repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo). - -## Maintainers - -Meet out maintainers: - -[SimonTheSourcerer](https://github.com/SimonTheSourcerer) | [tomwim](https://github.com/tomwim) | -:---: | :---: | -[Simon L](mailto:simon.lerch@innoactive.de) | [Thomas W.](mailto:thomas.wimmer@innoactive.de) - -Maintainers are responsible for this repository and its community. - -## Coding Conventions - -By encouraging coding conventions we ensure: - -* The code to having a consistent look, so that readers can focus on content, not layout. -* Enabling readers to understand the code more quickly by making assumptions based on previous experience. -* Facilitating copying, changing, and maintaining the code. -* Sticking to C# best practices. - -Please follow our [Coding Conventions](CODING_CONVENTIONS.md). - -## Source Control Commit Guidelines - -When committing to an Innoactive git project, please adhere to the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). This leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to generate automated release notes. - -### Commit Message Format -Every commit message consists of a **header** (mandatory), a **body**, and a **footer**. -The header has a special format that includes a **type** and **subject**: - -``` -: - -[optional body] - -[optional footer(s)] -``` - -Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier -to read on GitHub as well as in various git tools. - -The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any. - - -### Revert -If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit .`, where the hash is the SHA of the commit being reverted. - -### Type -Must be one of the following: - -* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm) -* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs) -* **docs**: Documentation only changes -* **feat**: A new feature -* **fix**: A bug fix -* **perf**: A code change that improves performance -* **refactor**: A code change that neither fixes a bug nor adds a feature -* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) -* **test**: Adding missing tests or correcting existing tests - -### Subject -The subject contains a succinct description of the change: - -* use the imperative, present tense: "change" not "changed" nor "changes" -* don't capitalize the first letter -* no dot (.) at the end - -### Body -Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes". -The body should include the motivation for the change and contrast this with previous behavior. - -### Footer -The footer should contain any information about **Breaking Changes** and is also the place to -reference GitHub issues that this commit **Closes**. - -**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this. - -### Examples: - -#### Commit message with no body - -``` -docs: update changelog to beta.5 -``` - -#### Commit message with both -``` -fix: need to depend on latest rxjs and zone.js - -The version in our package.json gets copied to the one we publish, and users need the latest of these. -``` - -#### Commit message with multi-paragraph body and multiple footers -``` -fix: correct minor typos in code - -see the issue for details - -on typos fixed. - -Reviewed-by: Z -Refs #133 -``` - -See more [Conventional Commits Examples](https://www.conventionalcommits.org/en/v1.0.0/#examples) - -## Contributors - -Thank you all for your help, we appreciate all your [contributions](https://github.com/Innoactive/Creator/graphs/contributors). diff --git a/Source/Basic-Conditions-And-Behaviors/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/Source/Basic-Conditions-And-Behaviors/.github/ISSUE_TEMPLATE/BUG_REPORT.md deleted file mode 100644 index 37c0fd1ad..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -### Describe the bug - - -### Steps to Reproduce - - -1. -1. -1. -1. -1. - - -### Expected behavior - - -### Current behavior - - -### Screenshots - - -### Context (Environment) - - -### Possible Solution - \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/Source/Basic-Conditions-And-Behaviors/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md deleted file mode 100644 index 55f231cb8..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -### Is the feature request related to a problem? - - -### Proposal - - -### Alternatives - - -### Additional context - \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/.github/PULL_REQUEST_TEMPLATE.md b/Source/Basic-Conditions-And-Behaviors/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 18ad54ac0..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,38 +0,0 @@ -### Description - - -**Fixes**: # (issue) - -### Type of change - - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] This change requires a documentation update - -### How Has This Been Tested? - - - -**Test Configuration**: - - -### Aditional Notes - - -### Checklist - - -- [ ] My code follows the [Coding Conventions](#coding-conventions) -- [ ] I have performed a self-review of my code -- [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have made corresponding changes to the documentation -- [ ] My changes generate no new warnings -- [ ] I have added tests that prove my fix is effective or that my feature works -- [ ] New and existing unit tests pass locally with my changes -- [ ] Any dependent changes have been merged and published in downstream modules \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/.gitignore b/Source/Basic-Conditions-And-Behaviors/.gitignore deleted file mode 100644 index 287da7c1e..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/Assets/AssetStoreTools* - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd - - -# Unity3D generated meta files -*.pidb.meta - -# Unity3D Generated File On Crash Reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage -site/ - -################# -# DocFx Ignores # -################# -/**/DROP/ -/**/TEMP/ -/**/packages/ -/**/bin/ -/**/obj/ -/**/obj.meta -.Documentation/_site -.Documentation/api diff --git a/Source/Basic-Conditions-And-Behaviors/.releaserc.json b/Source/Basic-Conditions-And-Behaviors/.releaserc.json deleted file mode 100644 index 7d34d68d6..000000000 --- a/Source/Basic-Conditions-And-Behaviors/.releaserc.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "branch": "master", - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", - "@semantic-release/github", - ["semantic-release-ado", { - "varName": "Version", - "setOnlyOnRelease": false - }] - ] - } \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers.meta deleted file mode 100644 index 49e50b4d3..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 85bda9da87bdda645baccb49de485ba4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer.meta deleted file mode 100644 index 7a3a57506..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 86281505ffa9a8b40891c82c9514c2e8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledByTagBehaviorDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledByTagBehaviorDrawer.cs deleted file mode 100644 index 35ab5c877..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledByTagBehaviorDrawer.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEngine; -using VRBuilder.Core.Behaviors; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UI.Drawers; -using VRBuilder.Editor.UndoRedo; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - [Obsolete("This drawer is obsolete and will be removed in the next major version.")] - [DefaultProcessDrawer(typeof(SetComponentEnabledByTagBehavior.EntityData))] - public class SetComponentEnabledByTagBehaviorDrawer : NameableDrawer - { - private const string noComponentSelected = ""; - - public override Rect Draw(Rect rect, object currentValue, Action changeValueCallback, GUIContent label) - { - rect = base.Draw(rect, currentValue, changeValueCallback, label); - float height = DrawLabel(rect, currentValue, changeValueCallback, label); - height += EditorDrawingHelper.VerticalSpacing; - Rect nextPosition = new Rect(rect.x, rect.y + height, rect.width, rect.height); - - SetComponentEnabledByTagBehavior.EntityData data = currentValue as SetComponentEnabledByTagBehavior.EntityData; - - nextPosition = DrawerLocator.GetDrawerForValue(data.TargetObjects, typeof(SceneObjectTagBase)).Draw(nextPosition, data.TargetObjects, changeValueCallback, "Objects"); - - height += nextPosition.height; - height += EditorDrawingHelper.VerticalSpacing; - nextPosition.y = rect.y + height; - - List components = new List(); - - if (data.TargetObjects.IsEmpty() == false) - { - components = data.TargetObjects.Values - .SelectMany(sceneObject => sceneObject.GameObject.GetComponents()) - .Where(CanBeDisabled) - .Where(component => component is ISceneObject == false && component is ISceneObjectProperty == false) // Make it impossible to use this behavior to disable VR Builder components - .ToList(); - } - - int currentComponent = 0; - - List componentLabels = components.Select(c => c.GetType().Name).ToList(); - componentLabels.Insert(0, noComponentSelected); - - if (string.IsNullOrEmpty(data.ComponentType) == false) - { - if (componentLabels.Contains(data.ComponentType)) - { - currentComponent = componentLabels.IndexOf(componentLabels.First(l => l == data.ComponentType)); - } - else - { - currentComponent = 0; - ChangeComponentType("", data, changeValueCallback); - } - } - - int newComponent = EditorGUI.Popup(nextPosition, "Component type", currentComponent, componentLabels.ToArray()); - - if (newComponent != currentComponent) - { - currentComponent = newComponent; - - if (currentComponent == 0) - { - ChangeComponentType("", data, changeValueCallback); - } - else - { - ChangeComponentType(componentLabels[currentComponent], data, changeValueCallback); - } - - changeValueCallback(data); - } - - height += EditorDrawingHelper.SingleLineHeight; - height += EditorDrawingHelper.VerticalSpacing; - nextPosition.y = rect.y + height; - - string revertState = data.SetEnabled ? "Disable" : "Enable"; - nextPosition = DrawerLocator.GetDrawerForValue(data.RevertOnDeactivation, typeof(bool)).Draw(nextPosition, data.RevertOnDeactivation, (value) => UpdateRevertOnDeactivate(value, data, changeValueCallback), $"{revertState} at end of step"); - - height += EditorDrawingHelper.SingleLineHeight; - height += EditorDrawingHelper.VerticalSpacing; - nextPosition.y = rect.y + height; - - rect.height = height; - return rect; - } - - private bool CanBeDisabled(Component component) - { - return component.GetType().GetProperty("enabled") != null; - } - - private void ChangeComponentType(string newValue, SetComponentEnabledByTagBehavior.EntityData data, Action changeValueCallback) - { - string oldValue = data.ComponentType; - - if (newValue != oldValue) - { - RevertableChangesHandler.Do( - new ProcessCommand( - () => - { - data.ComponentType = newValue; - changeValueCallback(data); - }, - () => - { - data.ComponentType = oldValue; - changeValueCallback(data); - })); - } - } - - private void UpdateRevertOnDeactivate(object value, SetComponentEnabledByTagBehavior.EntityData data, Action changeValueCallback) - { - bool newValue = (bool)value; - bool oldValue = data.RevertOnDeactivation; - - if (newValue != oldValue) - { - RevertableChangesHandler.Do( - new ProcessCommand( - () => - { - data.RevertOnDeactivation = newValue; - changeValueCallback(data); - }, - () => - { - data.RevertOnDeactivation = oldValue; - changeValueCallback(data); - })); - } - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers.meta deleted file mode 100644 index 512e8b96a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 01c01d8b50b0dbf4a837a51779b1f00b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/BooleanProcessVariableDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/BooleanProcessVariableDrawer.cs deleted file mode 100644 index 1b7f57006..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/BooleanProcessVariableDrawer.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEditor; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - /// - /// Implementation of that draws bool variables. - /// - [DefaultProcessDrawer(typeof(ProcessVariable))] - internal class BooleanProcessVariableDrawer : ProcessVariableDrawer - { - /// - protected override bool DrawConstField(bool value) - { - return EditorGUILayout.Toggle(value); - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/BooleanProcessVariableDrawer.cs.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/BooleanProcessVariableDrawer.cs.meta deleted file mode 100644 index 5203ebe6b..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/BooleanProcessVariableDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e242151cf30a51d44b951e0e5208e7db -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareValuesDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareValuesDrawer.cs deleted file mode 100644 index ea72df29a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareValuesDrawer.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System; -using UnityEngine; -using VRBuilder.Core.Conditions; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UI.Drawers; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - /// - /// Custom drawer for . - /// - public abstract class CompareValuesDrawer : NameableDrawer where T : IEquatable, IComparable - { - /// - /// Draws the dropdown for selecting the operator depending on the operands' type - /// - protected abstract Rect DrawOperatorDropdown(Action changeValueCallback, Rect nextPosition, CompareValuesCondition.EntityData data); - - /// - public override Rect Draw(Rect rect, object currentValue, Action changeValueCallback, GUIContent label) - { - rect = base.Draw(rect, currentValue, changeValueCallback, label); - float height = rect.height; - height += EditorDrawingHelper.VerticalSpacing; - - Rect nextPosition = new Rect(rect.x, rect.y + height, rect.width, rect.height); - - CompareValuesCondition.EntityData data = currentValue as CompareValuesCondition.EntityData; - - ProcessVariableSelectableValue left = new ProcessVariableSelectableValue(data.LeftValue, data.LeftProperty, data.IsLeftConst); - - nextPosition = DrawerLocator.GetDrawerForValue(left, typeof(ProcessVariableSelectableValue)).Draw(nextPosition, left, (value) => UpdateLeftOperand(value, data, changeValueCallback), "Left Operand"); - height += nextPosition.height; - height += EditorDrawingHelper.VerticalSpacing; - nextPosition.y = rect.y + height; - - nextPosition = DrawOperatorDropdown(changeValueCallback, nextPosition, data); - height += nextPosition.height; - height += EditorDrawingHelper.VerticalSpacing; - nextPosition.y = rect.y + height; - - ProcessVariableSelectableValue right = new ProcessVariableSelectableValue(data.RightValue, data.RightProperty, data.IsRightConst); - - nextPosition = DrawerLocator.GetDrawerForValue(right, typeof(ProcessVariableSelectableValue)).Draw(nextPosition, right, (value) => UpdateRightOperand(value, data, changeValueCallback), "Right Operand"); - height += nextPosition.height; - nextPosition.y = rect.y + height; - - rect.height = height; - return rect; - } - - private void UpdateLeftOperand(object value, CompareValuesCondition.EntityData data, Action changeValueCallback) - { - ProcessVariableSelectableValue newOperand = (ProcessVariableSelectableValue)value; - ProcessVariableSelectableValue oldOperand = new ProcessVariableSelectableValue(data.LeftValue, data.LeftProperty, data.IsLeftConst); - - bool valueChanged = false; - - if (newOperand.SecondValue != oldOperand.SecondValue) - { - data.LeftProperty = newOperand.SecondValue; - valueChanged = true; - } - - if (newOperand.FirstValue != null && newOperand.FirstValue.Equals(oldOperand.FirstValue) == false) - { - data.LeftValue = newOperand.FirstValue; - valueChanged = true; - } - - if (newOperand.IsFirstValueSelected != oldOperand.IsFirstValueSelected) - { - data.IsLeftConst = newOperand.IsFirstValueSelected; - valueChanged = true; - } - - if (valueChanged) - { - changeValueCallback(data); - } - } - - private void UpdateRightOperand(object value, CompareValuesCondition.EntityData data, Action changeValueCallback) - { - ProcessVariableSelectableValue newOperand = (ProcessVariableSelectableValue)value; - ProcessVariableSelectableValue oldOperand = new ProcessVariableSelectableValue(data.RightValue, data.RightProperty, data.IsRightConst); - - bool valueChanged = false; - - if (newOperand.SecondValue.Guids != oldOperand.SecondValue.Guids) - { - data.RightProperty = newOperand.SecondValue; - valueChanged = true; - } - - if (newOperand.FirstValue != null && newOperand.FirstValue.Equals(oldOperand.FirstValue) == false) - { - data.RightValue = newOperand.FirstValue; - valueChanged = true; - } - - if (newOperand.IsFirstValueSelected != oldOperand.IsFirstValueSelected) - { - data.IsRightConst = newOperand.IsFirstValueSelected; - valueChanged = true; - } - - if (valueChanged) - { - changeValueCallback(data); - } - } - } -} diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/FloatProcessVariableDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/FloatProcessVariableDrawer.cs deleted file mode 100644 index 228afbd85..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/FloatProcessVariableDrawer.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEditor; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - /// - /// Implementation of that draws float variables. - /// - [DefaultProcessDrawer(typeof(ProcessVariable))] - internal class FloatProcessVariableDrawer : ProcessVariableDrawer - { - /// - protected override float DrawConstField(float value) - { - return EditorGUILayout.FloatField("", value); - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/FloatProcessVariableDrawer.cs.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/FloatProcessVariableDrawer.cs.meta deleted file mode 100644 index 056697922..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/FloatProcessVariableDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6335bcf2ec0d7d84ea0741a641d60cc6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/IntProcessVariableDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/IntProcessVariableDrawer.cs deleted file mode 100644 index 4a369bf4e..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/IntProcessVariableDrawer.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEditor; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - /// - /// Implementation of that draws int variables. - /// - [DefaultProcessDrawer(typeof(ProcessVariable))] - internal class IntProcessVariableDrawer : ProcessVariableDrawer - { - /// - protected override int DrawConstField(int value) - { - return EditorGUILayout.IntField("", value); - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/IntProcessVariableDrawer.cs.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/IntProcessVariableDrawer.cs.meta deleted file mode 100644 index f95c03a57..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/IntProcessVariableDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1f0adaeb12c7485458cc854487f6c195 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/ProcessVariableDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/ProcessVariableDrawer.cs deleted file mode 100644 index f22523f65..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/ProcessVariableDrawer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System; -using UnityEngine; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UI.Drawers; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - /// - /// Drawer for - /// - internal abstract class ProcessVariableDrawer : AbstractDrawer where T : IEquatable - { - /// - /// Draws the field for the constant value depending on its type. - /// - protected abstract T DrawConstField(T value); - - /// - public override Rect Draw(Rect rect, object currentValue, Action changeValueCallback, GUIContent label) - { - if (RuntimeConfigurator.Exists == false) - { - return rect; - } - - ProcessVariable processVariable = (ProcessVariable)currentValue; - ProcessVariableSelectableValue selectableValue = new ProcessVariableSelectableValue(processVariable.ConstValue, processVariable.Property, processVariable.IsConst); - - rect.height += DrawerLocator.GetDrawerForValue(selectableValue, selectableValue.GetType()).Draw(rect, selectableValue, (value) => ChangeValue( - - () => - { - ProcessVariableSelectableValue processVariableSelectableValue = value as ProcessVariableSelectableValue; - ProcessVariable variable = new ProcessVariable(); - - variable.ConstValue = processVariableSelectableValue.FirstValue; - variable.Property = processVariableSelectableValue.SecondValue; - variable.IsConst = processVariableSelectableValue.IsFirstValueSelected; - return variable; - }, - () => processVariable, - (newValue) => - { - processVariable = (ProcessVariable)newValue; - changeValueCallback(newValue); - } - ), label).height; - - return rect; - } - - private Guid GetIDFromSelectedObject(GameObject selectedSceneObject, Type valueType, Guid oldUniqueName) - { - Guid newGuid = Guid.Empty; - - if (selectedSceneObject != null) - { - if (selectedSceneObject.GetComponent(valueType) != null) - { - if (typeof(ISceneObject).IsAssignableFrom(valueType)) - { - newGuid = GetUniqueIdFromSceneObject(selectedSceneObject); - } - else if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - newGuid = GetUniqueIdFromProcessProperty(selectedSceneObject, valueType, oldUniqueName); - } - } - else - { - // TODO handle non-PSO - } - } - - return newGuid; - } - - private Guid GetUniqueIdFromSceneObject(GameObject selectedSceneObject) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent(); - - if (sceneObject != null) - { - return sceneObject.Guid; - } - - Debug.LogWarning($"Game Object \"{selectedSceneObject.name}\" does not have a Process Object component."); - return Guid.Empty; - } - - private Guid GetUniqueIdFromProcessProperty(GameObject selectedProcessPropertyObject, Type valueType, Guid oldGuid) - { - if (selectedProcessPropertyObject.GetComponent(valueType) is ISceneObjectProperty processProperty) - { - return processProperty.SceneObject.Guid; - } - - Debug.LogWarning($"Scene Object \"{selectedProcessPropertyObject.name}\" with Object ID \"{oldGuid}\" does not have a {valueType.Name} component."); - return Guid.Empty; - } - - protected Rect AddNewRectLine(ref Rect currentRect) - { - Rect newRectLine = currentRect; - newRectLine.height = EditorDrawingHelper.SingleLineHeight; - newRectLine.y += currentRect.height + EditorDrawingHelper.VerticalSpacing; - - currentRect.height += EditorDrawingHelper.SingleLineHeight + EditorDrawingHelper.VerticalSpacing; - return newRectLine; - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/ProcessVariableDrawer.cs.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/ProcessVariableDrawer.cs.meta deleted file mode 100644 index 9efa349d0..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/ProcessVariableDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 214e9872a3e75cb4fb6bff8be0b21659 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/StringProcessVariableDrawer.cs b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/StringProcessVariableDrawer.cs deleted file mode 100644 index 67407b23f..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/StringProcessVariableDrawer.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEditor; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; - -namespace VRBuilder.Editor.Core.UI.Drawers -{ - /// - /// Implementation of that draws string variables. - /// - [DefaultProcessDrawer(typeof(ProcessVariable))] - internal class StringProcessVariableDrawer : ProcessVariableDrawer - { - /// - protected override string DrawConstField(string value) - { - return EditorGUILayout.TextField("", value); - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/StringProcessVariableDrawer.cs.meta b/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/StringProcessVariableDrawer.cs.meta deleted file mode 100644 index fc0057731..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/StringProcessVariableDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f52aa24482450f540aec94dd983c95e6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/VRBuilder.Editor.CoreReference.asmref b/Source/Basic-Conditions-And-Behaviors/Editor/VRBuilder.Editor.CoreReference.asmref deleted file mode 100644 index d88585434..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/VRBuilder.Editor.CoreReference.asmref +++ /dev/null @@ -1,3 +0,0 @@ -{ - "reference": "GUID:e476a81b6ef7b824686666349a591a9a" -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/VRBuilder.Editor.CoreReference.asmref.meta b/Source/Basic-Conditions-And-Behaviors/Editor/VRBuilder.Editor.CoreReference.asmref.meta deleted file mode 100644 index fdd48db7a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Editor/VRBuilder.Editor.CoreReference.asmref.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 267b7b6cc79b7b7459ea029559632f1b -AssemblyDefinitionReferenceImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime.meta b/Source/Basic-Conditions-And-Behaviors/Runtime.meta deleted file mode 100644 index 9548d5a0a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 22d14ec0cf8ee77498bd5e0766086a00 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/DisableGameObjectBehavior.cs b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/DisableGameObjectBehavior.cs deleted file mode 100644 index 1f1eb3c9a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/DisableGameObjectBehavior.cs +++ /dev/null @@ -1,84 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Runtime.Serialization; -using UnityEngine.Scripting; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Utils; - -namespace VRBuilder.Core.Behaviors -{ - /// - /// Disables gameObject of target ISceneObject. - /// - [Obsolete("Use SetObjectsEnabledBehavior instead. This behavior is obsolete and will be removed in the next major version.")] - [DataContract(IsReference = true)] - [HelpLink("https://www.mindport.co/vr-builder/manual/default-behaviors/disable-object")] - public class DisableGameObjectBehavior : Behavior - { - /// - /// "Disable game object" behavior's data. - /// - [DisplayName("Disable Object")] - [DataContract(IsReference = true)] - public class EntityData : IBehaviorData - { - /// - /// Object to disable. - /// - [DataMember] - [DisplayName("Object")] - public SceneObjectReference Target { get; set; } - - /// - public Metadata Metadata { get; set; } - - /// - [IgnoreDataMember] - public string Name - { - get - { - string target = Target.IsEmpty() ? "[NULL]" : Target.Value.GameObject.name; - return $"Disable {target}"; - } - } - } - - private class ActivatingProcess : InstantProcess - { - public ActivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetSceneObjectActive(Data.Target.Value, false); - } - } - - /// - public override IStageProcess GetActivatingProcess() - { - return new ActivatingProcess(Data); - } - - [JsonConstructor, Preserve] - public DisableGameObjectBehavior() : this("") - { - } - - /// scene object to disable. - public DisableGameObjectBehavior(ISceneObject targetObject) : this(ProcessReferenceUtils.GetNameFrom(targetObject)) - { - } - - /// Unique name of target scene object. - public DisableGameObjectBehavior(string targetObject) - { - Data.Target = new SceneObjectReference(targetObject); - } - } -} diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/DisableGameObjectBehavior.cs.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/DisableGameObjectBehavior.cs.meta deleted file mode 100644 index 478350a3a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/DisableGameObjectBehavior.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f08fc810dc9ee234ab3b27e4ce47ee78 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/EnableGameObjectBehavior.cs b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/EnableGameObjectBehavior.cs deleted file mode 100644 index f6a1e8523..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/EnableGameObjectBehavior.cs +++ /dev/null @@ -1,109 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Runtime.Serialization; -using UnityEngine.Scripting; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Utils; - -namespace VRBuilder.Core.Behaviors -{ - /// - /// Enables gameObject of target ISceneObject. - /// - [Obsolete("Use SetObjectsEnabledBehavior instead. This behavior is obsolete and will be removed in the next major version.")] - [DataContract(IsReference = true)] - [HelpLink("https://www.mindport.co/vr-builder/manual/default-behaviors/enable-object")] - public class EnableGameObjectBehavior : Behavior - { - /// - /// "Enable game object" behavior's data. - /// - [DisplayName("Enable Object")] - [DataContract(IsReference = true)] - public class EntityData : IBehaviorData - { - /// - /// The object to enable. - /// - [DataMember] - [DisplayName("Object")] - public SceneObjectReference Target { get; set; } - - /// - public Metadata Metadata { get; set; } - - [DataMember] - [DisplayName("Disable Object after step is complete")] - public bool DisableOnDeactivating { get; set; } - - /// - [IgnoreDataMember] - public string Name - { - get - { - string target = Target.IsEmpty() ? "[NULL]" : Target.Value.GameObject.name; - return $"Enable {target}"; - } - } - } - - private class ActivatingProcess : InstantProcess - { - public ActivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetSceneObjectActive(Data.Target.Value, true); - } - } - - private class DeactivatingProcess : InstantProcess - { - public DeactivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - if (Data.DisableOnDeactivating) - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetSceneObjectActive(Data.Target.Value, false); - } - } - } - - [JsonConstructor, Preserve] - public EnableGameObjectBehavior() : this("") - { - } - - /// Object to enable. - public EnableGameObjectBehavior(ISceneObject targetObject) : this(ProcessReferenceUtils.GetNameFrom(targetObject)) - { - } - - /// Name of the object to enable. - public EnableGameObjectBehavior(string targetObject) - { - Data.Target = new SceneObjectReference(targetObject); - } - - /// - public override IStageProcess GetActivatingProcess() - { - return new ActivatingProcess(Data); - } - - public override IStageProcess GetDeactivatingProcess() - { - return new DeactivatingProcess(Data); - } - } -} diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/EnableGameObjectBehavior.cs.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/EnableGameObjectBehavior.cs.meta deleted file mode 100644 index 025f2377a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/EnableGameObjectBehavior.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0d718261fade5b846926c3f226b20243 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetComponentEnabledByTagBehavior.cs b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetComponentEnabledByTagBehavior.cs deleted file mode 100644 index be5aea81b..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetComponentEnabledByTagBehavior.cs +++ /dev/null @@ -1,139 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Runtime.Serialization; -using UnityEngine.Scripting; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Core.Behaviors -{ - /// - /// Enables/disables all components of a given type on a given game object. - /// - [DataContract(IsReference = true)] - [HelpLink("https://www.mindport.co/vr-builder/manual/default-behaviors/enable-object")] - [Obsolete("Use SetComponentEnabledBehavior instead.")] - public class SetComponentEnabledByTagBehavior : Behavior - { - /// - /// The behavior's data. - /// - [DisplayName("Set Component Enabled (Tag)")] - [DataContract(IsReference = true)] - public class EntityData : IBehaviorData - { - /// - /// Object the target component is on. - /// - [DataMember] - [HideInProcessInspector] - public MultipleSceneObjectReference TargetObjects { get; set; } - - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetObjects instead.")] - [LegacyProperty(nameof(TargetObjects))] - public SceneObjectTag TargetTag { get; set; } - - /// - /// Type of components to interact with. - /// - [DataMember] - [HideInProcessInspector] - public string ComponentType { get; set; } - - /// - /// If true, the component will be enabled, otherwise it will disabled. - /// - [DataMember] - [HideInProcessInspector] - public bool SetEnabled { get; set; } - - /// - /// If true, the component will revert to its original state when the behavior deactivates. - /// - [DataMember] - [HideInProcessInspector] - public bool RevertOnDeactivation { get; set; } - - /// - public Metadata Metadata { get; set; } - - /// - [IgnoreDataMember] - public string Name - { - get - { - string setEnabled = SetEnabled ? "Enable" : "Disable"; - string componentType = string.IsNullOrEmpty(ComponentType) ? "" : ComponentType; - return $"{setEnabled} {componentType} for {TargetObjects}"; - } - } - } - - private class ActivatingProcess : InstantProcess - { - public ActivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - foreach (ISceneObject sceneObject in Data.TargetObjects.Values) - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetComponentActive(sceneObject, Data.ComponentType, Data.SetEnabled); - } - } - } - - private class DeactivatingProcess : InstantProcess - { - public DeactivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - if (Data.RevertOnDeactivation) - { - foreach (ISceneObject sceneObject in Data.TargetObjects.Values) - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetComponentActive(sceneObject, Data.ComponentType, !Data.SetEnabled); - } - } - } - } - - [JsonConstructor, Preserve] - public SetComponentEnabledByTagBehavior() : this(Guid.Empty, "", false, false) - { - } - - public SetComponentEnabledByTagBehavior(bool setEnabled, string name = "Set Component Enabled") : this(Guid.Empty, "", setEnabled, false) - { - } - - public SetComponentEnabledByTagBehavior(Guid objectId, string componentType, bool setEnabled, bool revertOnDeactivate) - { - Data.TargetObjects = new MultipleSceneObjectReference(objectId); - Data.ComponentType = componentType; - Data.SetEnabled = setEnabled; - Data.RevertOnDeactivation = revertOnDeactivate; - } - - /// - public override IStageProcess GetActivatingProcess() - { - return new ActivatingProcess(Data); - } - - public override IStageProcess GetDeactivatingProcess() - { - return new DeactivatingProcess(Data); - } - } -} diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetComponentEnabledByTagBehavior.cs.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetComponentEnabledByTagBehavior.cs.meta deleted file mode 100644 index 4aff0b60f..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetComponentEnabledByTagBehavior.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5c10a7d2d040dbd4aa76fe9c86a413a3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetObjectsWithTagEnabledBehavior.cs b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetObjectsWithTagEnabledBehavior.cs deleted file mode 100644 index 64590f073..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetObjectsWithTagEnabledBehavior.cs +++ /dev/null @@ -1,123 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Runtime.Serialization; -using UnityEngine.Scripting; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Core.Behaviors -{ - /// - /// Sets enabled or disabled all objects with a given tag. - /// - [DataContract(IsReference = true)] - [Obsolete("Use SetObjectsEnabledBehavior instead.")] - public class SetObjectsWithTagEnabledBehavior : Behavior - { - /// - /// Behavior data for . - /// - [DisplayName("Enable Objects by Tag")] - [DataContract(IsReference = true)] - public class EntityData : IBehaviorData - { - /// - /// The objects to enable or disable. - /// - [DataMember] - [DisplayName("Objects")] - public MultipleSceneObjectReference TargetObjects { get; set; } - - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetObjects instead.")] - [LegacyProperty(nameof(TargetObjects))] - public SceneObjectTag Tag { get; set; } - - [DataMember] - [HideInProcessInspector] - public bool SetEnabled { get; set; } - - /// - public Metadata Metadata { get; set; } - - [DataMember] - [DisplayName("Revert after step is complete")] - public bool RevertOnDeactivation { get; set; } - - /// - [IgnoreDataMember] - public string Name - { - get - { - string setEnabled = SetEnabled ? "Enable" : "Disable"; - return $"{setEnabled} {TargetObjects}"; - } - } - } - - private class ActivatingProcess : InstantProcess - { - public ActivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - foreach (ISceneObject sceneObject in Data.TargetObjects.Values) - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetSceneObjectActive(sceneObject, Data.SetEnabled); - } - } - } - - private class DeactivatingProcess : InstantProcess - { - public DeactivatingProcess(EntityData data) : base(data) - { - } - - /// - public override void Start() - { - if (Data.RevertOnDeactivation) - { - foreach (ISceneObject sceneObject in Data.TargetObjects.Values) - { - RuntimeConfigurator.Configuration.SceneObjectManager.SetSceneObjectActive(sceneObject, !Data.SetEnabled); - } - } - } - } - - [JsonConstructor, Preserve] - public SetObjectsWithTagEnabledBehavior() : this(Guid.Empty, false) - { - } - - public SetObjectsWithTagEnabledBehavior(bool setEnabled) : this(Guid.Empty, setEnabled, false) - { - } - - public SetObjectsWithTagEnabledBehavior(Guid objectId, bool setEnabled, bool revertOnDeactivate = false) - { - Data.TargetObjects = new MultipleSceneObjectReference(objectId); - Data.SetEnabled = setEnabled; - Data.RevertOnDeactivation = revertOnDeactivate; - } - - /// - public override IStageProcess GetActivatingProcess() - { - return new ActivatingProcess(Data); - } - - public override IStageProcess GetDeactivatingProcess() - { - return new DeactivatingProcess(Data); - } - } -} diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetObjectsWithTagEnabledBehavior.cs.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetObjectsWithTagEnabledBehavior.cs.meta deleted file mode 100644 index ce95bf28c..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors/SetObjectsWithTagEnabledBehavior.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 36c16ab6be115064ca1758013479b54d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Conditions/PositionalConditions.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Conditions/PositionalConditions.meta deleted file mode 100644 index d7a217a2a..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Conditions/PositionalConditions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3ee002fbf1ff9844e8fb29350aa62162 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties.meta deleted file mode 100644 index bc8dd1fda..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 79d0eda0352d4904fb8eec8e463d86d6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties/ProcessVariable.cs b/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties/ProcessVariable.cs deleted file mode 100644 index 5429e5a87..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties/ProcessVariable.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.Serialization; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Core.ProcessUtils -{ - /// - /// Struct for a process variable. Accommodates the value coming from a , or being a constant value set e.g. in the Step Inspector. - /// - [DataContract(IsReference = true)] - public struct ProcessVariable - { - /// - /// Constant value. - /// - [DataMember] - public T ConstValue { get; set; } - - /// - /// Property reference for the variable. - /// - [DataMember] - public SingleScenePropertyReference> Property { get; set; } - - [DataMember] - [Obsolete("Use Property instead.")] - [LegacyProperty(nameof(Property))] - public ScenePropertyReference> PropertyReference { get; set; } - - /// - /// If true, is used. Else the value will be fetched from the . - /// - [DataMember] - public bool IsConst { get; set; } - - public ProcessVariable(T constValue, Guid referenceId, bool isConst) - { - ConstValue = constValue; - Property = new SingleScenePropertyReference>(referenceId); - IsConst = isConst; - -#pragma warning disable CS0618 // Type or member is obsolete - We want remove all calls to deprecated code but this needs to stay for compatibility reasons - PropertyReference = new ScenePropertyReference>(referenceId.ToString()); -#pragma warning restore CS0618 // Type or member is obsolete - } - - public ProcessVariable(T constValue, IEnumerable referenceIds, bool isConst) - { - ConstValue = constValue; - Property = new SingleScenePropertyReference>(referenceIds); - IsConst = isConst; - -#pragma warning disable CS0618 // Type or member is obsolete - We want remove all calls to deprecated code but this needs to stay for compatibility reasons - PropertyReference = new ScenePropertyReference>(); -#pragma warning restore CS0618 // Type or member is obsolete - } - - /// - /// Returns the current value of this variable. - /// - public T Value => IsConst ? ConstValue : Property.Value.GetValue(); - - public override string ToString() - { - if (IsConst && ConstValue != null) - { - return ConstValue.ToString(); - } - else if (IsConst == false && Property.HasValue()) - { - return Property.Value.ToString(); - } - - return "[NULL]"; - } - } -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties/ProcessVariable.cs.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties/ProcessVariable.cs.meta deleted file mode 100644 index b49c181c0..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/DataProperties/ProcessVariable.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1922a45aa2102964c93fd4f6c9a5a6fe -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/ProcessUtilities.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/ProcessUtilities.meta deleted file mode 100644 index 9df31aa03..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/ProcessUtilities.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68a271e5465ed8c4093f8cca0834f335 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Properties.meta deleted file mode 100644 index 61fd8c060..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b45c7e49a11d4ad4db879bfca73cf2ea -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Data.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Data.meta deleted file mode 100644 index f7f042aff..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Data.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 67fd9f7bea98b3f4e88b17e8e9b059c7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Highlighting.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Highlighting.meta deleted file mode 100644 index 8ff888957..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Highlighting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 197bf21fe3c8e7b45a9ec528e57589c7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Particles.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Particles.meta deleted file mode 100644 index 66576a6e8..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Particles.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f23fa5f3eb6e9524cab1005e68142bdd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Path.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Path.meta deleted file mode 100644 index 06bcc9fea..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Properties/Path.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6aae26ba752d35944b3db503e5a00d89 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/VRBuilder.CoreReference.asmref b/Source/Basic-Conditions-And-Behaviors/Runtime/VRBuilder.CoreReference.asmref deleted file mode 100644 index a0155ae8f..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/VRBuilder.CoreReference.asmref +++ /dev/null @@ -1,3 +0,0 @@ -{ - "reference": "GUID:c8561f9de838ac04d8feeda695bc572d" -} \ No newline at end of file diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/VRBuilder.CoreReference.asmref.meta b/Source/Basic-Conditions-And-Behaviors/Runtime/VRBuilder.CoreReference.asmref.meta deleted file mode 100644 index 04a3e5ce5..000000000 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/VRBuilder.CoreReference.asmref.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c31101c33895dc34aab12220ea33968d -AssemblyDefinitionReferenceImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/.azure-pipelines.yml b/Source/Basic-Interaction-Component/.azure-pipelines.yml deleted file mode 100644 index b5d5fd04e..000000000 --- a/Source/Basic-Interaction-Component/.azure-pipelines.yml +++ /dev/null @@ -1,207 +0,0 @@ -resources: - repositories: - - repository: Creator - type: github - endpoint: Innoactive - name: Innoactive/Creator - ref: develop - - repository: UnityProject - type: github - endpoint: Innoactive - name: Innoactive/Empty-Unity-Project-2019 - ref: develop - - repository: BehaviorsAndConditions - type: github - endpoint: Innoactive - name: Innoactive/Basic-Conditions-And-Behaviors - ref: develop - -trigger: - - master - - develop - -pr: - branches: - include: - - develop - -pool: Unity - -variables: - - group: basic-unity - -stages: - - stage: Lint - displayName: Lint - jobs: - - job: CommitMessageCheck - displayName: Commit Message Check - steps: - - script: npm install @commitlint/cli commitlint-azure-pipelines-cli @commitlint/config-conventional - - script: > - npx - -p @commitlint/cli - -p commitlint-azure-pipelines-cli - -p @commitlint/config-conventional - commitlint-azure-pipelines --config .commitlintrc.json - - - stage: Build - displayName: 'Build & Test' - condition: succeeded() - jobs: - - job: build - workspace: - clean: all - steps: - - checkout: UnityProject - lfs: true - - checkout: Creator - lfs: true - - checkout: BehaviorsAndConditions - lfs: true - - checkout: self - lfs: true - - - task: UseNode@1 - - - task: PowerShell@2 - displayName: "Run Semantic release" - condition: eq(variables['Build.SourceBranchName'], 'master') - inputs: - targetType: 'inline' - script: | - npx -p semantic-release-ado semantic-release - workingDirectory: "Basic-Interaction-Component/" - env: - GH_TOKEN: "$(GITHUB_TOKEN)" - - - task: PowerShell@2 - displayName: Fetch version from git - condition: ne(variables['Build.SourceBranchName'], 'master') - inputs: - targetType: 'inline' - script: | - $TAG = (git tag -l "v*" --sort=committerdate | Select -last 1) - if(!$TAG) { $TAG = "v0.0.0" } - $TAG = $TAG.TrimStart("v") + "-" + (git log -1 --pretty=format:%h) - Write-Host "##vso[task.setvariable variable=Version]$TAG" - workingDirectory: "Basic-Interaction-Component/" - - - task: PowerShell@2 - displayName: Publish variables - inputs: - targetType: 'inline' - script: | - echo "##vso[task.setvariable variable=Version;isOutput=true]v$(Version)" - name: ExportedVariables - - - task: CopyFiles@2 - displayName: Copy base Project - inputs: - SourceFolder: "Empty-Unity-Project-2019/" - Contents: "**" - TargetFolder: "$(Path.Project)" - - - task: CopyFiles@2 - displayName: Copy Creator Core - inputs: - SourceFolder: "Creator/" - Contents: "**" - TargetFolder: "$(Path.Creator)/Core" - - - task: CopyFiles@2 - displayName: Copy Basic Conditions and Behaviors - inputs: - SourceFolder: "Basic-Conditions-And-Behaviors/" - Contents: "**" - TargetFolder: "$(Path.Creator)/Components/Basic-Conditions-And-Behaviors" - - - task: CopyFiles@2 - displayName: Copy Basic-Interaction Component - inputs: - SourceFolder: "Basic-Interaction-Component/" - Contents: "**" - TargetFolder: "$(Path.Creator)/Components/Basic-Interaction" - - - task: DeleteFiles@1 - displayName: Clean Up - inputs: - Contents: "!(Project)" - - - task: PowerShell@2 - displayName: Build Project - inputs: - targetType: 'inline' - script: | - u3d available -f - u3d install $(UnityVersion) - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor-build.log -nographics -quit -batchmode -buildWindows64Player Build\\TestBuild\\TestBuild.exe - - - task: PowerShell@2 - displayName: Run Tests - inputs: - targetType: 'inline' - script: | - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_editmode_tests.log -batchmode -runTests -testPlatform editmode -testResults $(System.DefaultWorkingDirectory)\TEST-EditMode.xml - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_playmode_tests.log -batchmode -runTests -testPlatform playmode -testResults $(System.DefaultWorkingDirectory)\TEST-PlayMode.xml - - - task: PublishTestResults@2 - inputs: - testResultsFormat: "NUnit" - testResultsFiles: "TEST-*.xml" - - - task: PowerShell@2 - displayName: Export Unity package - inputs: - targetType: 'inline' - script: | - echo 'Exporting version $(Version)' - ((Get-Content -path $(Path.ExportConfig)/$(ExportConfigName) -Raw) -replace '{version}','v$(Version)') | Set-Content -Path $(Path.Project)/export-config.json - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_export.log -batchmode -quit -executeMethod Innoactive.CreatorEditor.PackageExporter.Export --export-config export-config.json - Start-Sleep -s 5 - - - task: PublishPipelineArtifact@1 - displayName: "Publish Unity Package" - inputs: - targetPath: "$(Build.ArtifactStagingDirectory)/packages/" - artifact: "creator-basic-interaction-unitypackage" - publishLocation: "pipeline" - - - task: PublishPipelineArtifact@1 - displayName: "Publish Logs" - condition: always() - inputs: - targetPath: "$(Build.ArtifactStagingDirectory)/logs/" - artifact: "creator-basic-interaction-logs-$(System.JobId)" - publishLocation: "pipeline" - - - stage: Release - displayName: Release - dependsOn: - - Lint - - Build - condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master')) - jobs: - - job: - workspace: - clean: all - variables: - Version: $[stageDependencies.Build.build.outputs['ExportedVariables.Version']] - steps: - - task: DownloadPipelineArtifact@2 - displayName: 'Download exported package' - inputs: - buildType: 'current' - artifactName: 'creator-basic-interaction-unitypackage' - targetPath: '$(Build.ArtifactStagingDirectory)/packages/' - - - task: GitHubRelease@1 - inputs: - gitHubConnection: 'Github.com - Jenkins / CI User' - repositoryName: 'Innoactive/Basic-Interaction-Component' - action: 'edit' - target: '$(Build.SourceVersion)' - tag: '$(Version)' - assetUploadMode: "replace" - assets: "$(Build.ArtifactStagingDirectory)/packages/*" - addChangeLog: false \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/.commitlintrc.json b/Source/Basic-Interaction-Component/.commitlintrc.json deleted file mode 100644 index 14473e999..000000000 --- a/Source/Basic-Interaction-Component/.commitlintrc.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": ["@commitlint/config-conventional"] } \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/.gitattributes b/Source/Basic-Interaction-Component/.gitattributes deleted file mode 100644 index f02d6ffc6..000000000 --- a/Source/Basic-Interaction-Component/.gitattributes +++ /dev/null @@ -1,129 +0,0 @@ -# Kindly borrowed (and extended) -# from https://gist.github.com/nemotoo/b8a1c3a0f1225bb9231979f389fd4f3f - -# Set the default behavior, in case people don't have core.autocrlf set. -* text=auto - -## Unity ## - -*.cs diff=csharp text -*.cginc text -*.shader text - -# linguist-generated leads to diffs not being shown on github -# see https://github.com/github/linguist#generated-code and -# https://stackoverflow.com/a/24382933/1142028 -*.mat binary merge=unityyamlmerge linguist-generated=true -*.anim binary merge=unityyamlmerge linguist-generated=true -*.unity binary merge=unityyamlmerge linguist-generated=true -*.prefab binary merge=unityyamlmerge linguist-generated=true -*.physicsMaterial2D binary merge=unityyamlmerge linguist-generated=true -*.physicsMaterial binary merge=unityyamlmerge linguist-generated=true -#*.asset binary merge=unityyamlmerge linguist-generated=true -*.meta binary merge=unityyamlmerge linguist-generated=true -*.controller binary merge=unityyamlmerge linguist-generated=true - -## git-lfs ## - -# Graphics -*.jpg filter=lfs diff=lfs merge=lfs -text -*.JPG filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text -*.JPEG filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.PNG filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.PSD filter=lfs diff=lfs merge=lfs -text -*.ai filter=lfs diff=lfs merge=lfs -text -*.AI filter=lfs diff=lfs merge=lfs -text -*.bmp filter=lfs diff=lfs merge=lfs -text -*.BMP filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.GIF filter=lfs diff=lfs merge=lfs -text -*.img filter=lfs diff=lfs merge=lfs -text -*.IMG filter=lfs diff=lfs merge=lfs -text -*.tif filter=lfs diff=lfs merge=lfs -text -*.TIF filter=lfs diff=lfs merge=lfs -text -*.xcf filter=lfs diff=lfs merge=lfs -text -*.XCV filter=lfs diff=lfs merge=lfs -text -*.tga filter=lfs diff=lfs merge=lfs -text -*.TGA filter=lfs diff=lfs merge=lfs -text - -# Videos -*.mpg filter=lfs diff=lfs merge=lfs -text -*.MPG filter=lfs diff=lfs merge=lfs -text -*.mpeg filter=lfs diff=lfs merge=lfs -text -*.MPEG filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.MP4 filter=lfs diff=lfs merge=lfs -text -*.avi filter=lfs diff=lfs merge=lfs -text -*.AVI filter=lfs diff=lfs merge=lfs -text -*.asf filter=lfs diff=lfs merge=lfs -text -*.ASF filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.MP4 filter=lfs diff=lfs merge=lfs -text -*.mov filter=lfs diff=lfs merge=lfs -text -*.MOV filter=lfs diff=lfs merge=lfs -text - -# Audio -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.MP3 filter=lfs diff=lfs merge=lfs -text -*.ogg filter=lfs diff=lfs merge=lfs -text -*.OGG filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.WAV filter=lfs diff=lfs merge=lfs -text - -# Models -*.obj filter=lfs diff=lfs merge=lfs -text -*.OBJ filter=lfs diff=lfs merge=lfs -text -*.fbx filter=lfs diff=lfs merge=lfs -text -*.FBX filter=lfs diff=lfs merge=lfs -text -*.ply filter=lfs diff=lfs merge=lfs -text -*.PLY filter=lfs diff=lfs merge=lfs -text -*.raw filter=lfs diff=lfs merge=lfs -text -*.RAW filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.BLEND filter=lfs diff=lfs merge=lfs -text -*.3ds filter=lfs diff=lfs merge=lfs -text -*.3DS filter=lfs diff=lfs merge=lfs -text -*.stl filter=lfs diff=lfs merge=lfs -text -*.STL filter=lfs diff=lfs merge=lfs -text -*.pmd filter=lfs diff=lfs merge=lfs -text -*.PMD filter=lfs diff=lfs merge=lfs -text -*.mesh filter=lfs diff=lfs merge=lfs -text -*.MESH filter=lfs diff=lfs merge=lfs -text - -# Libs -*.dll filter=lfs diff=lfs merge=lfs -text -*.DLL filter=lfs diff=lfs merge=lfs -text -*.a filter=lfs diff=lfs merge=lfs -text -*.A filter=lfs diff=lfs merge=lfs -text -*.so filter=lfs diff=lfs merge=lfs -text -*.SO filter=lfs diff=lfs merge=lfs -text -*.lib filter=lfs diff=lfs merge=lfs -text -*.LIB filter=lfs diff=lfs merge=lfs -text -*.jar filter=lfs diff=lfs merge=lfs -text -*.JAR filter=lfs diff=lfs merge=lfs -text - -# Unity Light Build -*.exr filter=lfs diff=lfs merge=lfs -text -*.EXR filter=lfs diff=lfs merge=lfs -text -LightingData.asset filter=lfs diff=lfs merge=lfs -text - -# Others -*.pdf filter=lfs diff=lfs merge=lfs -text -*.PDF filter=lfs diff=lfs merge=lfs -text -*.r16 filter=lfs diff=lfs merge=lfs -text -*.R16 filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.unitypackage filter=lfs diff=lfs merge=lfs -text -*.aif filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text -*.TTF filter=lfs diff=lfs merge=lfs -text -*.rns filter=lfs diff=lfs merge=lfs -text -*.reason filter=lfs diff=lfs merge=lfs -text -*.lxo filter=lfs diff=lfs merge=lfs -text - -# 3D Modelling tools -*.sbs filter=lfs diff=lfs merge=lfs -text -*.max filter=lfs diff=lfs merge=lfs -text diff --git a/Source/Basic-Interaction-Component/.github/CODE_OF_CONDUCT.md b/Source/Basic-Interaction-Component/.github/CODE_OF_CONDUCT.md deleted file mode 100644 index 9716a0ad6..000000000 --- a/Source/Basic-Interaction-Component/.github/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,85 +0,0 @@ -# Contributor Code of Conduct - -**Table of Contents:** - -* [Summary](#summary) -* [Our Standards](#our-standards) -* [Our Responsibilities](#our-responsibilities) -* [Scope](#scope) -* [Enforcement](#enforcement) -* [Attribution](#attribution) - -**Version**: 1.0.0 - -## Summary - -In order to keep the Open Source Innoactive community a warm, welcoming, and a safe place we ask that all participants read and adhere to the following code of conduct. - -* **Be friendly and patient:** Remember you might not be communicating in someone else's primary spoken or programming language, and others may not have your level of understanding. - -* **Be welcoming and inclusive:** Our communities welcome and support people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. - -* **Be considerate:** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language. - -* **Be respectful:** We are a world-wide community of professionals, and we conduct ourselves professionally. Disagreement is no excuse for poor behavior and poor manners. Disrespectful and unacceptable behavior includes, but is not limited to: - * Violent threats or language. - * Discriminatory or derogatory jokes and language. - * Posting sexually explicit or violent material. - * Posting, or threatening to post, people's personally identifying information ("doxing"). - * Insults, especially those using discriminatory terms or slurs. - * Behavior that could be perceived as sexual attention. - * Advocating for or encouraging any of the above behaviors. - -* **Understand disagreements:** Disagreements, both social and technical, are useful learning opportunities. Seek to understand the other viewpoints and resolve differences constructively. - -* **This code is not exhaustive or complete.** It serves to capture our common understanding of a productive, collaborative environment. We expect the code to be followed in spirit as much as in the letter. - -We expect all contributors to uphold our standards of conduct. If any member of the community violates this code of conduct, the Innoactive team and project maintainers will take action. We reserve the right to remove issues, comments, and PRs that do not comply with our conduct standards. Repeated or significant offenses will result in blocked accounts and disassociation with our projects and the Innoactive community. - -If you are subject to or witness unacceptable behavior, or have any other concerns, please communicate with any of our [maintainers](CONTRIBUTING.md#maintainers). - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling -* Insults or other derogatory comments -* Personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, discussions in a public or private Innoactive channel, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise, unacceptable behavior may be reported by contacting any of our [maintainers](CONTRIBUTING.md#maintainers). - -All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. We are obligated to maintain confidentiality concerning the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This code of conduct is based on the template established by the [TODO Group](https://todogroup.org/) and used by numerous other large communities (e.g., Microsoft, Facebook, Twitter, GitHub and the Scope section from the [Contributor Covenant](https://www.contributor-covenant.org), [version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html). - -For answers to common questions about this code of conduct, see [Contributor Covenant's F.A.Q.](https://www.contributor-covenant.org/faq). diff --git a/Source/Basic-Interaction-Component/.github/CODING_CONVENTIONS.md b/Source/Basic-Interaction-Component/.github/CODING_CONVENTIONS.md deleted file mode 100644 index 8846c9f95..000000000 --- a/Source/Basic-Interaction-Component/.github/CODING_CONVENTIONS.md +++ /dev/null @@ -1,509 +0,0 @@ -# Coding Conventions - -Unless otherwise specified, the Innoactive projects adhere to the MSDN C# [Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions) and [Design Guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/). -In the following, the most important guidelines and custom decisions are listed. - -## Language -* Code, documentation, and comments are to be written in English. - -## Naming Conventions - -### Name -* Use meaningful but concise names. -* Do not use special characters in any names. -* Do not use abbreviations. - -```cs -public class RuntimeStatistics -{ - // very bad: - private int n; - // bad: - private int numFrms; - private int frameCnt; - // good: - private int numberOfFrames; - private int frameCount; - // too verbose: - private int numberOfElapsedFramesSinceApplicationStart; -} -``` - -* Keep the most specific descriptor left, e.g. pauseButton not buttonPause. -* Boolean variables and Properties should start with Is or Has, e.g. isActive. - -### Formatting -* Classes, properties, and public fields are written in PascalCase. -* Private fields are written in camelCase. -* Static and const fields (public, protected, or private) are formatted like non-const/static fields. - -```cs -public class MyClass -{ - public float MyProperty { get; private set; } - public bool MyPublicVariable; - private string myPrivateVariable; - public static string MyStaticVariable = "someValue"; - protected const string MyConstVariable = "someOtherValue"; - private const string myPrivateConstVariable = "yetAnotherValue"; -} -``` - -* Functions are written in PascalCase. -* Function parameters are written in camelCase. -* Local variables are written in camelCase. - -```cs -public bool MyFunction(bool myFunctionParameter) -{ - float myLocalVariable = 0; -} -``` - -* Interfaces are written in PascalCase, but start with an *I*. - -```cs -public interface IMyInterface -{ -} -``` - -* Enums are written in PascalCase. -* Enum Values are written in PascalCase. - -```cs -public enum MyEnum -{ - FirstEnumValue, - SecondEnumValue, - ThirdEnumValue, -} -``` - -## Bracing and Indentation -* Each opening and closing brace is placed in a separate line. -* Braces start at the indentation level of the outlying scope. -* Add Braces even for short single-line scopes. - -```cs -// Do -if (condition == true) -{ - return; -} -// Don't -if (condition == true) - return; -if (condition == true) return; -``` - -* Exception: Default properties are implemented in a single line. - Encapsulating properties and properties with simple single-statement accessors place accessors on a single line together with the respective implementation. - Complex accessors with multiple statements follow the general rule of placing braces and statements on separate lines. - -```cs -public bool DefaultProperty { get; protected set; } - -public bool EncapsulatingProperty -{ - get { return wrappedValue; } - protected set { wrappedValue = value; } -} - -public bool SimpleProperty -{ - get { return entry == "MagicValue"; } - set { entry = string.Format("Bla{0}", value); } -} - -public bool ComplexProperty -{ - get - { - if(wrappedValue == null) - { - throw new OperationException(); - } - - wrappedValue; - } - protected set - { - wrappedValue = value; - - if (implementation != null) - { - implementation.ForwardValue(value); - } - } -} - -public bool MixedProperty -{ - get - { - return wrappedValue; - } - protected set - { - wrappedValue = value; - - if (implementation != null) - { - implementation.ForwardValue(value); - } - } -} -``` - -* Content of the braced scope is indented an additional level. -* Indent by 4 spaces. -* Indent every scope (namespaces, classes, loops, ...). - -```cs -public class ClassInTopScope -{ - public bool PropertyInClassScope { get; set; } - - public float FunctionInClassScope() - { - public float functionVariable; - - { - float scopedVariable = 3; - } - - for (int i = 0; i < 100; ++i) - { - float scopedVariable = i; - } - } -} -``` - -* Do not indent compile `#if` and `#pragma`. -* Indent `#region` specifications. -* Do not further indent code inside compile directives like `#if` or `#region`s. - -```cs -namespace MyNamespace -{ - public class MyClass1 - { - public bool FirstFunction(); - -#pragma warning disable 0618 // temporarily disable obsolete usage warning - CallObsoleteFunction(); -#pragma warning restore 0618 - - #region First Region - public bool SecondFunction(); - #endregion - - #region Second Region - public bool ThirdFunction(); - #endregion - } - -#if COMPILE_DEFINE - public class MyClass2 - { - } -#endif -} -``` - -* When splitting a statement or declaration, indent the split line by one level. -* When defining local delegates, do not indent the opening and closing braces. - -```cs -public float FunctionWithManyParameters() -{ - bool expression = CheckConditionOne() - && CheckConditionTwo() - && CheckConditionThree() - && CheckConditionFour(); - - Action localTask = () => - { - // [...] - } - - new AsyncTask(localTask).Execute(); - - new AsyncTask(() => - { - // [...] - }) - .Execute(); -} -``` - -## Code comments -* Enrich your code with meaningful comments. -* Use `//` for inline code comments, and `///` for API docs. -* Add xml API docs to all elements of the public API: classes, functions, properties, fields, and events. -* Comments should always start with a capital letter, be separated from the comment symbol by a space, and end with a period. -* All sentence-like parts of a comment (e.g. ` and ` texts) should end with a period. - - -```cs -/// -/// Explain the general intent and typical usage of the class here. -/// -public class ExampleClass -{ - /// - /// Provide additional detail here. - /// - public float ExampleProperty { get; private set; } - - /// - /// Provide details about what the function does. - /// - /// Explain parameter here. - /// Explain return type here. - /// When is this exception thrown. - public int ExampleFunction(float exampleParameter) - { - // [...] - } -} -``` - -* Avoid empty xml tags components like `param` or `return`. Either add a valuable descriptions, or remove the tag. - -```cs -public class ExampleClass -{ - //Do - - /// - /// This function computes the square root of a value. - /// - public float SquareRoot(float value) - { - // [...] - } - - // Don't - - /// - /// This function computes the square root of a value. - /// - /// - /// - public float SquareRoot(float value) - { - // [...] - } -} -``` - -## Whitespaces -* Use empty lines to separate classes/class members/blocks of statements. -* Do not use two or more consecutive empty lines (use regions instead to group blocks). -* Add a whitespace to separate a condition/iteration keyword (`if`, `while`, `for`, ...) and its braces. -* Do not use a whitespace to separate a function name and its brace. - -```cs -if (CheckParameters(param1, param2) && param3) -{ - // [...] -} - -while (pi == 3) -{ - // [...] -} - -SomeFunction(param); -``` - -* Add whitespaces after commas and around operators. - -```cs -if (CheckParameters(param1, param2) && param3) -{ - return param1 + (param2 * param3); -} -``` - -## Events - -* Use C# events - avoid UnityEvents, Actions, or similar. -* Use EventArgs classes instead of delegates or actions for event definitions. -* Use immutable `EventArgs` classes, which provide public readonly fields. Initialize these fields from a constructor. - -```cs -public class MyButton -{ - // Do - public class ClickedEventArgs : System.EventArgs - { - public readonly string SomeData; - public ClickedEventArgs(string data) - { - SomeData = data; - } - } - - public event EventHandler Clicked; - - // Don't - public delegate void ClickedEvent(string someData); - public event ClickedEvent Clicked; - - // Don't - public event Action Clicked; -} -``` - -* EventArgs classes end with `EventArgs`, and are derived from `System.EventArgs`. -* Name Events with a verb describing the event (without pre- or suffix), Loaded, Finished. -* Event handling functions start with `On`, followed by the scope and the event name. -* If an event can be triggered by a child class, provide a function called `EmitEVENTNAME`. - -```cs -public class MyButton -{ - public class ClickedEventArgs : System.EventArgs - { - public readonly string someData; - public ClickedEventArgs(string data) - { - someData = data; - } - } - - public event EventHandler Clicked; - - protected void EmitClicked(string data) - { - Clicked.Invoke(this, new ClickedEventArgs() { someData = data }); - } -} - -public class ButtonObserver -{ - public void Observe - { - new MyButton().Clicked += OnButtonClicked; - } - - private void OnButtonClicked(object sender, MyButton.ClickedEventArgs args) -} -``` - -## Logging - -* Prefer format syntax over explicit string concatenation. - -```cs -private void SomeFunction() -{ - int numberOfThings = 42; - - // Do - Debug.Log($"I know {numberOfThings} things"); - - // Or - Debug.LogFormat("I know {0} things", numberOfThings); - - // Don't - Debug.Log("I know " + numberOfThings + " things"); -} -``` - -## Exceptions - -* Exception names end with `Exception`. -* If exceptions are to be thrown by only one class, define them inside this class. -* Exceptions thrown by multiple sources are defined in a separate file, in the matching namespace (no Exceptions sub-namespace). - -## Access Modifiers - -* Only use public variables or Properties with public setters for data objects. -* Always specify an Access Modifier. - -```cs -public class MyClass -{ - // Do - private float myPrivateVariable1; - // Don't - float myPrivateVariable2; -} -``` - -## Unity-specific - -* Prefer private variables marked with `[SerializeField]` over public variables for Inspector fields. -* When using a public variable in a MonoBehaviour, still add `[SerializeField]` to ease detection of Inspector fields. -* Use the `[Tooltip("...")}` attribute in Inspector fields for documentation / usage hints. -* Always initialize Inspector fields (to prevent never-assigned-warnings). -* Avoid the automatic conversion from `UnityEngine.Object` to bool. -* When using Enum-typed Inspector fields, consider hard-wiring the enum values to prevent serialization errors when changing available enum values. - -```cs -// Do -if (gameObject != null) -{ - // [...] -} - -// Don't -if (gameObject) -{ - // [...] -} -``` - -## Lambdas - -* Prefer lambda-style expressions over delegate-style. - -```cs -// Do -(float param1, string param2) => {} - -// Don't -delegate(float param1, string param2) {} -``` - -* Prefer named functions over lambdas. -* Assign longer or more complex lambdas to named local `Action`/`Func`. -* If nested lambdas are required, assign each one to named local `Action`/`Func`. -* Avoid defining long lambdas directly as parameter of a function call. - -## Obsoletion - -* Avoid changes in code that break existing APIs (i.e. Class Names, Function Argument types, Renaming of public members / properties, return types). -* Use `System.Obsolete` to mark outdated code that will be removed in newer versions. -* When re-naming classes/properties/methods, try to maintain the old version tagged as obsolete. -* Obsolete code will be maintained for one (major) release, and is deleted afterwards. - -## Misc - -* Define class-specific Exceptions, Enums, EventArgs, ... inside the corresponding class. -* For Interfaces, define Exceptions, Enums, EventArgs, ... in the same file as the interface. -* Do not use `var`, always specify the full type name. -* Use `Invoke` to trigger actions or events. -* Only use `this.` before members where absolutely necessary. -* Decide whether or not to design for inheritance. - * If not intended to be derived from, make all non-public entities `private`. - * If intended to be derived from, take care to mark necessary entities `protected` and/or `virtual`. -* Consider using early returns in functions to prevent deeply nested scopes. -* Use parentheses to group parts of complex statements. - Especially, always group sub-clauses when combining different boolean operators. -* Do not omit the array type specifier when using array initialization lists. - -```cs -// Do -string[] myList = new string[] { "a", "b", "c", "d" }; - -// Don't -string[] myList = new [] { "a", "b", "c", "d" }; -``` - -* Do not prefix static method defined in the same or parent class with the class scope. \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/.github/CONTRIBUTING.md b/Source/Basic-Interaction-Component/.github/CONTRIBUTING.md deleted file mode 100644 index c17dabdb6..000000000 --- a/Source/Basic-Interaction-Component/.github/CONTRIBUTING.md +++ /dev/null @@ -1,174 +0,0 @@ -# How to contribute - -At Innoactive we want to thank you for being part of this community and helping us to improve the Creator. - -There are many ways to contribute, it could be by suggesting new features and ideas, reporting bugs, extending and modifying functionalities, and even from just using the Creator and developing amazing VR training applications. - -In this guide, we summarize how you can do all those actions. - -### Table of Contents: - -1. [Getting Started](#getting-started) -1. [Code of Conduct](#code-of-conduct) -1. [Feature Request](#feature-request) -1. [Bug Report](#bug-report) -1. [Submitting Changes](#submitting-changes) -1. [Maintainers](#maintainers) -1. [Coding Conventions](#coding-conventions) -1. [Source Control Commit Guidelines](#source-control-commit-guidelines) -1. [Contributors](#contributors) - -## Getting Started - -The easiest and simplest way to get started and try out the Creator is by downloading the latest version from our [resources site](http://developers.innoactive.de/creator/). - -Make sure to read the [documentation](http://developers.innoactive.de/documentation/creator/) for a deeper understanding of how the tool works. - -## Code of Conduct - -This project and everyone participating in it are governed by the [Innoactive Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to our [maintainers](#maintainers). - -## Feature Request - -We are keen to listen to your feature requests. - -To request a feature, please go to the `Issues` section of this repository and create a new issue using the `Feature request` template. Be as detailed as possible, if possible, try to include references, and explain what is the benefit of the feature. - -Make sure your idea is unique using the search functionality. If a similar feature request already exists, try providing additional information instead of creating a new issue. - -In the case that a similar feature request already exits but is closed without being resolved, you are welcome to create a new one if you think it makes sense. - -## Bug Report - -If you find an error in the source code, or experience one when using the Creator, you can help us by submitting a bug report issue to our GitHub issue tracker. - -Before submitting a new bug report, make sure there has not been reported already by using the search functionality in the issues section of this repository. - -To report a new bug, please go to the `Issues` section of this repository and create a new issue using the `Bug report` template. Be as detailed as possible, explain how to reproduce it, if possible, try to include references and rate of reproducibility. - -You can also [submit a Pull Request](#submitting-changes) with a fix! - -Creating comprehensive bug reports helps the community to quickly understand the problem and the severity. - -If you find a security vulnerability, do NOT open an issue. Contact a [maintainer](#maintainers) instead. - -Alternatively, customers can contact us directly using our [support channel](https://jira.innoactive.de/servicedesk/customer/portal/3). - -## Submitting Changes - -By default, this repository is protected, the only way to submit changes is by merging via [creating a pull request from a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork), this is only intending to provide the best quality and add a security layer, we could detect and prevent new bugs, breaking functionalities and avoid violations to our [code convention](#coding-conventions). - -Use the [pull request template](PULL_REQUEST_TEMPLATE.md) for detail as much as possible all the changes included in the pull request, this way it is easier for everyone to review. - -Make sure to also follow the [Source Control Commit Guidelines](#source-control-commit-guidelines). - -See more about [Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) and [how to fork a repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo). - -## Maintainers - -Meet out maintainers: - -[tomwim](https://github.com/tomwim) | [SimonTheSourcerer](https://github.com/SimonTheSourcerer) | -:---: | :---: | -[Thomas W.](mailto:thomas.wimmer@innoactive.de) | [Simon L](mailto:simon.lerch@innoactive.de) - -Maintainers are responsible for this repository and its community. - -## Coding Conventions - -By encouraging coding conventions we ensure: - -* The code to having a consistent look, so that readers can focus on content, not layout. -* Enabling readers to understand the code more quickly by making assumptions based on previous experience. -* Facilitating copying, changing, and maintaining the code. -* Sticking to C# best practices. - -Please follow our [Coding Conventions](CODING_CONVENTIONS.md). - -## Source Control Commit Guidelines - -When committing to an Innoactive git project, please adhere to the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). This leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to generate automated release notes. - -### Commit Message Format -Every commit message consists of a **header** (mandatory), a **body**, and a **footer**. -The header has a special format that includes a **type** and **subject**: - -``` -: - -[optional body] - -[optional footer(s)] -``` - -Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier -to read on GitHub as well as in various git tools. - -The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any. - - -### Revert -If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit .`, where the hash is the SHA of the commit being reverted. - -### Type -Must be one of the following: - -* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm) -* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs) -* **docs**: Documentation only changes -* **feat**: A new feature -* **fix**: A bug fix -* **perf**: A code change that improves performance -* **refactor**: A code change that neither fixes a bug nor adds a feature -* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) -* **test**: Adding missing tests or correcting existing tests - -### Subject -The subject contains a succinct description of the change: - -* use the imperative, present tense: "change" not "changed" nor "changes" -* don't capitalize the first letter -* no dot (.) at the end - -### Body -Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes". -The body should include the motivation for the change and contrast this with previous behavior. - -### Footer -The footer should contain any information about **Breaking Changes** and is also the place to -reference GitHub issues that this commit **Closes**. - -**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this. - -### Examples: - -#### Commit message with no body - -``` -docs: update changelog to beta.5 -``` - -#### Commit message with both -``` -fix: need to depend on latest rxjs and zone.js - -The version in our package.json gets copied to the one we publish, and users need the latest of these. -``` - -#### Commit message with multi-paragraph body and multiple footers -``` -fix: correct minor typos in code - -see the issue for details - -on typos fixed. - -Reviewed-by: Z -Refs #133 -``` - -See more [Conventional Commits Examples](https://www.conventionalcommits.org/en/v1.0.0/#examples) - -## Contributors - -Thank you all for your help, we appreciate all your [contributions](https://github.com/Innoactive/Creator/graphs/contributors). diff --git a/Source/Basic-Interaction-Component/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/Source/Basic-Interaction-Component/.github/ISSUE_TEMPLATE/BUG_REPORT.md deleted file mode 100644 index 37c0fd1ad..000000000 --- a/Source/Basic-Interaction-Component/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -### Describe the bug - - -### Steps to Reproduce - - -1. -1. -1. -1. -1. - - -### Expected behavior - - -### Current behavior - - -### Screenshots - - -### Context (Environment) - - -### Possible Solution - \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/Source/Basic-Interaction-Component/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md deleted file mode 100644 index 55f231cb8..000000000 --- a/Source/Basic-Interaction-Component/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -### Is the feature request related to a problem? - - -### Proposal - - -### Alternatives - - -### Additional context - \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/.github/PULL_REQUEST_TEMPLATE.md b/Source/Basic-Interaction-Component/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 18ad54ac0..000000000 --- a/Source/Basic-Interaction-Component/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,38 +0,0 @@ -### Description - - -**Fixes**: # (issue) - -### Type of change - - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] This change requires a documentation update - -### How Has This Been Tested? - - - -**Test Configuration**: - - -### Aditional Notes - - -### Checklist - - -- [ ] My code follows the [Coding Conventions](#coding-conventions) -- [ ] I have performed a self-review of my code -- [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have made corresponding changes to the documentation -- [ ] My changes generate no new warnings -- [ ] I have added tests that prove my fix is effective or that my feature works -- [ ] New and existing unit tests pass locally with my changes -- [ ] Any dependent changes have been merged and published in downstream modules \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/.gitignore b/Source/Basic-Interaction-Component/.gitignore deleted file mode 100644 index 287da7c1e..000000000 --- a/Source/Basic-Interaction-Component/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/Assets/AssetStoreTools* - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd - - -# Unity3D generated meta files -*.pidb.meta - -# Unity3D Generated File On Crash Reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage -site/ - -################# -# DocFx Ignores # -################# -/**/DROP/ -/**/TEMP/ -/**/packages/ -/**/bin/ -/**/obj/ -/**/obj.meta -.Documentation/_site -.Documentation/api diff --git a/Source/Basic-Interaction-Component/.releaserc.json b/Source/Basic-Interaction-Component/.releaserc.json deleted file mode 100644 index 7d34d68d6..000000000 --- a/Source/Basic-Interaction-Component/.releaserc.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "branch": "master", - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", - "@semantic-release/github", - ["semantic-release-ado", { - "varName": "Version", - "setOnlyOnRelease": false - }] - ] - } \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/Editor/Converters.meta b/Source/Basic-Interaction-Component/Editor/Converters.meta deleted file mode 100644 index 014939e0c..000000000 --- a/Source/Basic-Interaction-Component/Editor/Converters.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc47edcf1688ebe4fa092ff68191c374 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/Editor/Converters/GrabbedObjectWithTagConditionConverter.cs b/Source/Basic-Interaction-Component/Editor/Converters/GrabbedObjectWithTagConditionConverter.cs deleted file mode 100644 index 5868b9854..000000000 --- a/Source/Basic-Interaction-Component/Editor/Converters/GrabbedObjectWithTagConditionConverter.cs +++ /dev/null @@ -1,34 +0,0 @@ -using VRBuilder.BasicInteraction.Conditions; -using VRBuilder.BasicInteraction.Properties; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Replaces an obsolete with a - /// with the same configuration. - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class GrabbedObjectWithTagConditionConverter : Converter - { - /// - protected override GrabbedCondition PerformConversion(GrabbedObjectWithTagCondition oldCondition) -#pragma warning restore CS0618 // Type or member is obsolete - { - GrabbedCondition newCondition = new GrabbedCondition(); - - if (oldCondition.Data.Targets.HasValue()) - { - newCondition.Data.Targets = oldCondition.Data.Targets; - } - else - { -#pragma warning disable CS0618 // Type or member is obsolete - newCondition.Data.Targets = new MultipleScenePropertyReference(oldCondition.Data.Tag.Guid); -#pragma warning restore CS0618 // Type or member is obsolete - } - - return newCondition; - } - } -} diff --git a/Source/Basic-Interaction-Component/Editor/Converters/GrabbedObjectWithTagConditionConverter.cs.meta b/Source/Basic-Interaction-Component/Editor/Converters/GrabbedObjectWithTagConditionConverter.cs.meta deleted file mode 100644 index 25571f4c3..000000000 --- a/Source/Basic-Interaction-Component/Editor/Converters/GrabbedObjectWithTagConditionConverter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0f3eda11b70eec941955afeab89f22f0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/Editor/Converters/SnappedObjectWithTagConditionConverter.cs b/Source/Basic-Interaction-Component/Editor/Converters/SnappedObjectWithTagConditionConverter.cs deleted file mode 100644 index 09ba83a74..000000000 --- a/Source/Basic-Interaction-Component/Editor/Converters/SnappedObjectWithTagConditionConverter.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System.Linq; -using VRBuilder.BasicInteraction.Conditions; -using VRBuilder.BasicInteraction.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Unity; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Replaces an obsolete with a - /// with the same configuration. - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class SnappedObjectWithTagConditionConverter : Converter - { - /// - protected override SnappedCondition PerformConversion(SnappedObjectWithTagCondition oldCondition) -#pragma warning restore CS0618 // Type or member is obsolete - { - SnappedCondition newCondition = new SnappedCondition(); - - if (oldCondition.Data.TargetObjects.HasValue()) - { - newCondition.Data.TargetObjects = oldCondition.Data.TargetObjects; - } - else - { -#pragma warning disable CS0618 // Type or member is obsolete - newCondition.Data.TargetObjects = new MultipleScenePropertyReference(oldCondition.Data.Tag.Guid); -#pragma warning restore CS0618 // Type or member is obsolete - } - - if (oldCondition.Data.TargetSnapZone.HasValue()) - { - newCondition.Data.TargetSnapZone = oldCondition.Data.TargetSnapZone; - } -#pragma warning disable CS0618 // Type or member is obsolete - else if (string.IsNullOrEmpty(oldCondition.Data.ZoneToSnapInto.UniqueName) == false) - { - { - ProcessSceneObject referencedObject = SceneUtils.GetActiveAndInactiveComponents().FirstOrDefault(sceneObject => sceneObject.UniqueName == oldCondition.Data.ZoneToSnapInto.UniqueName); -#pragma warning restore CS0618 // Type or member is obsolete - - if (referencedObject != null) - { - newCondition.Data.TargetSnapZone = new SingleScenePropertyReference(referencedObject.Guid); - } - } - } - - return newCondition; - } - } -} \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/Editor/Converters/SnappedObjectWithTagConditionConverter.cs.meta b/Source/Basic-Interaction-Component/Editor/Converters/SnappedObjectWithTagConditionConverter.cs.meta deleted file mode 100644 index 8be3e591c..000000000 --- a/Source/Basic-Interaction-Component/Editor/Converters/SnappedObjectWithTagConditionConverter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2660e6263dd31df47b02734fb1db6948 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup.meta b/Source/Basic-Interaction-Component/Editor/RigSetup.meta deleted file mode 100644 index 017ef6cbf..000000000 --- a/Source/Basic-Interaction-Component/Editor/RigSetup.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1a04a2384d10d934bb7c479bd4c46e71 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedObjectWithTagCondition.cs b/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedObjectWithTagCondition.cs deleted file mode 100644 index 177069413..000000000 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedObjectWithTagCondition.cs +++ /dev/null @@ -1,110 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using UnityEngine.Scripting; -using VRBuilder.BasicInteraction.Properties; -using VRBuilder.Core; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Conditions; -using VRBuilder.Core.RestrictiveEnvironment; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.BasicInteraction.Conditions -{ - /// - /// Condition which is completed when a with the given tag is grabbed. - /// - [DataContract(IsReference = true)] - [Obsolete("Use GrabbedCondition instead.")] - public class GrabbedObjectWithTagCondition : Condition - { - [DisplayName("Grab Object with Tag")] - public class EntityData : IConditionData - { - [DataMember] - [DisplayName("Grabbable objects")] - public MultipleScenePropertyReference Targets { get; set; } - - [DataMember] - [HideInProcessInspector] - [Obsolete("Use Targets instead.")] - [LegacyProperty(nameof(Targets))] - public SceneObjectTag Tag { get; set; } - - public bool IsCompleted { get; set; } - - [IgnoreDataMember] - [HideInProcessInspector] - public string Name => $"Grab {Targets}"; - - [DataMember] - [DisplayName("Keep objects grabbable after step")] - public bool KeepUnlocked = true; - - public Metadata Metadata { get; set; } - } - - private class EntityAutocompleter : Autocompleter - { - public EntityAutocompleter(EntityData data) : base(data) - { - } - - /// - public override void Complete() - { - IGrabbableProperty grabbableProperty = Data.Targets.Values.FirstOrDefault(); - - if (grabbableProperty != null) - { - grabbableProperty.FastForwardGrab(); - } - } - } - - private class ActiveProcess : BaseActiveProcessOverCompletable - { - protected override bool CheckIfCompleted() - { - return Data.Targets.Values.Any(property => property.IsGrabbed); - } - - public ActiveProcess(EntityData data) : base(data) - { - } - } - - [JsonConstructor, Preserve] - public GrabbedObjectWithTagCondition() : this(Guid.Empty) - { - } - - public GrabbedObjectWithTagCondition(Guid guid) - { - Data.Targets = new MultipleScenePropertyReference(guid); - } - - public override IEnumerable GetLockableProperties() - { - IEnumerable references = base.GetLockableProperties(); - foreach (LockablePropertyData propertyData in references) - { - propertyData.EndStepLocked = !Data.KeepUnlocked; - } - - return references; - } - - public override IStageProcess GetActiveProcess() - { - return new ActiveProcess(Data); - } - - protected override IAutocompleter GetAutocompleter() - { - return new EntityAutocompleter(Data); - } - } -} \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedObjectWithTagCondition.cs.meta b/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedObjectWithTagCondition.cs.meta deleted file mode 100644 index b5a8edb11..000000000 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedObjectWithTagCondition.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0479db9ec98e6934ab871bc01d01e4d2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedObjectWithTagCondition.cs b/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedObjectWithTagCondition.cs deleted file mode 100644 index 1e78e9f59..000000000 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedObjectWithTagCondition.cs +++ /dev/null @@ -1,128 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Linq; -using System.Runtime.Serialization; -using UnityEngine.Scripting; -using VRBuilder.BasicInteraction.Properties; -using VRBuilder.Core; -using VRBuilder.Core.Attributes; -using VRBuilder.Core.Conditions; -using VRBuilder.Core.Configuration.Modes; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Utils; - -namespace VRBuilder.BasicInteraction.Conditions -{ - /// - /// Condition which is completed when an object from a given pool is snapped into a target snap zone. - /// - [DataContract(IsReference = true)] - [HelpLink("https://www.mindport.co/vr-builder/manual/default-conditions/snap-object")] - [Obsolete("Use SnappedCondition instead.")] - public class SnappedObjectWithTagCondition : Condition - { - [DisplayName("Snap Object (Tag)")] - [DataContract(IsReference = true)] - public class EntityData : IConditionData - { - [DataMember] - [DisplayName("Snappable Objects")] - public MultipleScenePropertyReference TargetObjects { get; set; } - - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetObjects instead.")] - [LegacyProperty(nameof(TargetObjects))] - public SceneObjectTag Tag { get; set; } - - [DataMember] - [DisplayName("Zone to snap into")] - public SingleScenePropertyReference TargetSnapZone { get; set; } - - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetSnapZone instead.")] - [LegacyProperty(nameof(TargetSnapZone))] - public ScenePropertyReference ZoneToSnapInto { get; set; } - - public bool IsCompleted { get; set; } - - [IgnoreDataMember] - [HideInProcessInspector] - public string Name => $"Snap {TargetObjects} in {TargetSnapZone}"; - - public Metadata Metadata { get; set; } - } - - private class ActiveProcess : BaseActiveProcessOverCompletable - { - public ActiveProcess(EntityData data) : base(data) - { - } - - protected override bool CheckIfCompleted() - { - return Data.TargetObjects.Values.Any(snappable => snappable.IsSnapped && snappable.SnappedZone == Data.TargetSnapZone.Value); - } - } - - private class EntityAutocompleter : Autocompleter - { - public EntityAutocompleter(EntityData data) : base(data) - { - } - - public override void Complete() - { - ISnappableProperty snappable = Data.TargetObjects.Values.FirstOrDefault(snappable => snappable.IsSnapped == false); - - if (snappable != null && Data.TargetSnapZone.Value.IsObjectSnapped == false) - { - snappable.FastForwardSnapInto(Data.TargetSnapZone.Value); - } - } - } - - private class EntityConfigurator : Configurator - { - public EntityConfigurator(EntityData data) : base(data) - { - } - - public override void Configure(IMode mode, Stage stage) - { - Data.TargetSnapZone.Value.Configure(mode); - } - } - - [JsonConstructor, Preserve] - public SnappedObjectWithTagCondition() : this(Guid.Empty, Guid.Empty) - { - } - - public SnappedObjectWithTagCondition(Guid targets, Guid snapZone) - { - Data.TargetObjects = new MultipleScenePropertyReference(targets); - Data.TargetSnapZone = new SingleScenePropertyReference(snapZone); - } - - public SnappedObjectWithTagCondition(ISnappableProperty target, ISnapZoneProperty snapZone) : this(ProcessReferenceUtils.GetUniqueIdFrom(target), ProcessReferenceUtils.GetUniqueIdFrom(snapZone)) - { - } - - public override IStageProcess GetActiveProcess() - { - return new ActiveProcess(Data); - } - - protected override IConfigurator GetConfigurator() - { - return new EntityConfigurator(Data); - } - - protected override IAutocompleter GetAutocompleter() - { - return new EntityAutocompleter(Data); - } - } -} \ No newline at end of file diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedObjectWithTagCondition.cs.meta b/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedObjectWithTagCondition.cs.meta deleted file mode 100644 index 3d45837ff..000000000 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedObjectWithTagCondition.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cfa03acca74fa3d418c16538a74a17d8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/ControllerMaterial.mat b/Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/ControllerMaterial.mat deleted file mode 100644 index 19da09927..000000000 --- a/Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/ControllerMaterial.mat +++ /dev/null @@ -1,77 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ControllerMaterial - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 0.517 - - _Glossiness: 0.641 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 1 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Models/controller.fbx b/Source/Basic-Interaction-Component/Runtime/Static Assets/Models/controller.fbx deleted file mode 100644 index 69b11e3dd..000000000 --- a/Source/Basic-Interaction-Component/Runtime/Static Assets/Models/controller.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:871567ffbad3056b03a3247f479e982bbe16c5436982850f3d7886b5c7288b79 -size 89920 diff --git a/Source/Basic-Interaction-Component.meta b/Source/BasicInteraction.meta similarity index 100% rename from Source/Basic-Interaction-Component.meta rename to Source/BasicInteraction.meta diff --git a/Source/Basic-Interaction-Component/Editor.meta b/Source/BasicInteraction/Editor.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor.meta rename to Source/BasicInteraction/Editor.meta diff --git a/Demo/Runtime/Scripts.meta b/Source/BasicInteraction/Editor/Setup.meta similarity index 77% rename from Demo/Runtime/Scripts.meta rename to Source/BasicInteraction/Editor/Setup.meta index 200d3b59d..e2a3d4685 100644 --- a/Demo/Runtime/Scripts.meta +++ b/Source/BasicInteraction/Editor/Setup.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ca8ef0c3eed8ba4b80f5f82b4ad03bc +guid: 80186d8f669f45842b8b1a409862a8c9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup/DefaultRigSceneSetup.cs b/Source/BasicInteraction/Editor/Setup/DefaultRigSceneSetup.cs similarity index 93% rename from Source/Basic-Interaction-Component/Editor/RigSetup/DefaultRigSceneSetup.cs rename to Source/BasicInteraction/Editor/Setup/DefaultRigSceneSetup.cs index 9ce5c84ec..17ac5ac3f 100644 --- a/Source/Basic-Interaction-Component/Editor/RigSetup/DefaultRigSceneSetup.cs +++ b/Source/BasicInteraction/Editor/Setup/DefaultRigSceneSetup.cs @@ -3,11 +3,11 @@ using System.Linq; using UnityEngine; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.Setup; using VRBuilder.Core.Setup; using VRBuilder.Core.Utils; -using VRBuilder.Editor.Setup; -namespace VRBuilder.Editor.BasicInteraction.RigSetup +namespace VRBuilder.BasicInteraction.Editor.Setup { /// /// Setups the default rig for the active interaction component. @@ -46,7 +46,7 @@ public override void Setup(ISceneSetupConfiguration configuration) switch (layerConfigurator.LayerSet) { case LayerSet.Teleportation: - layerConfigurator.ConfigureLayers("XR Teleport", "XR Teleport"); + layerConfigurator.ConfigureLayers("Teleport", "Teleport"); break; default: break; diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup/DefaultRigSceneSetup.cs.meta b/Source/BasicInteraction/Editor/Setup/DefaultRigSceneSetup.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/RigSetup/DefaultRigSceneSetup.cs.meta rename to Source/BasicInteraction/Editor/Setup/DefaultRigSceneSetup.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/InteractionFrameworkSceneSetup.cs b/Source/BasicInteraction/Editor/Setup/InteractionFrameworkSceneSetup.cs similarity index 90% rename from Source/Basic-Interaction-Component/Editor/InteractionFrameworkSceneSetup.cs rename to Source/BasicInteraction/Editor/Setup/InteractionFrameworkSceneSetup.cs index a3ceb8d14..d3997c381 100644 --- a/Source/Basic-Interaction-Component/Editor/InteractionFrameworkSceneSetup.cs +++ b/Source/BasicInteraction/Editor/Setup/InteractionFrameworkSceneSetup.cs @@ -1,6 +1,7 @@ using UnityEngine; +using VRBuilder.Core.Editor.Setup; -namespace VRBuilder.Editor.BasicInteraction +namespace VRBuilder.BasicInteraction.Editor.Setup { /// /// This base class is supposed to be implemented by classes which will be called to setup the scene, @@ -13,7 +14,7 @@ public abstract class InteractionFrameworkSceneSetup : SceneSetup /// public override string Key { get; } = "InteractionFrameworkSetup"; - + /// /// Removes current MainCamera. /// diff --git a/Source/Basic-Interaction-Component/Editor/InteractionFrameworkSceneSetup.cs.meta b/Source/BasicInteraction/Editor/Setup/InteractionFrameworkSceneSetup.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/InteractionFrameworkSceneSetup.cs.meta rename to Source/BasicInteraction/Editor/Setup/InteractionFrameworkSceneSetup.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup/RigLoaderSceneSetup.cs b/Source/BasicInteraction/Editor/Setup/RigLoaderSceneSetup.cs similarity index 73% rename from Source/Basic-Interaction-Component/Editor/RigSetup/RigLoaderSceneSetup.cs rename to Source/BasicInteraction/Editor/Setup/RigLoaderSceneSetup.cs index 6336fd0c6..0d1abc64e 100644 --- a/Source/Basic-Interaction-Component/Editor/RigSetup/RigLoaderSceneSetup.cs +++ b/Source/BasicInteraction/Editor/Setup/RigLoaderSceneSetup.cs @@ -1,9 +1,9 @@ -using VRBuilder.BasicInteraction.RigSetup; -using VRBuilder.Core.Properties; -using UnityEngine; -using VRBuilder.Editor.Setup; +using UnityEngine; +using VRBuilder.BasicInteraction.RigSetup; +using VRBuilder.Core.Editor.Setup; +using VRBuilder.Core.SceneObjects; -namespace VRBuilder.Editor.BasicInteraction.RigSetup +namespace VRBuilder.BasicInteraction.Editor.Setup { /// /// Setups the rig loader, cleans up the scene and creates a dummy user. @@ -21,15 +21,15 @@ public override void Setup(ISceneSetupConfiguration configuration) { RemoveMainCamera(); - InteractionRigSetup setup = Object.FindObjectOfType(); + InteractionRigSetup setup = Object.FindFirstObjectByType(); if (setup == null) { SetupPrefab("INTERACTION_RIG_LOADER"); - setup = Object.FindObjectOfType(); + setup = Object.FindFirstObjectByType(); setup.UpdateRigList(); } - UserSceneObject user = Object.FindObjectOfType(); + UserSceneObject user = Object.FindFirstObjectByType(); if (user == null) { SetupPrefab("USER_DUMMY"); diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup/RigLoaderSceneSetup.cs.meta b/Source/BasicInteraction/Editor/Setup/RigLoaderSceneSetup.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/RigSetup/RigLoaderSceneSetup.cs.meta rename to Source/BasicInteraction/Editor/Setup/RigLoaderSceneSetup.cs.meta diff --git a/Source/Core/Editor/ProcessController/UI.meta b/Source/BasicInteraction/Editor/UI.meta similarity index 77% rename from Source/Core/Editor/ProcessController/UI.meta rename to Source/BasicInteraction/Editor/UI.meta index cc3cc6df2..2cd3248a4 100644 --- a/Source/Core/Editor/ProcessController/UI.meta +++ b/Source/BasicInteraction/Editor/UI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cfc33e0fcef2b7d4a932819c6d0fba75 +guid: efb4fdac75889c94eae48833ce93eb29 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Source/Basic-Interaction-Component/Editor/Inspector.meta b/Source/BasicInteraction/Editor/UI/Inspector.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/Inspector.meta rename to Source/BasicInteraction/Editor/UI/Inspector.meta diff --git a/Source/Basic-Interaction-Component/Editor/Inspector/HasGuidValidationEditor.cs b/Source/BasicInteraction/Editor/UI/Inspector/HasGuidValidationEditor.cs similarity index 98% rename from Source/Basic-Interaction-Component/Editor/Inspector/HasGuidValidationEditor.cs rename to Source/BasicInteraction/Editor/UI/Inspector/HasGuidValidationEditor.cs index 2d27208a2..59f4ea8fc 100644 --- a/Source/Basic-Interaction-Component/Editor/Inspector/HasGuidValidationEditor.cs +++ b/Source/BasicInteraction/Editor/UI/Inspector/HasGuidValidationEditor.cs @@ -6,12 +6,12 @@ using UnityEngine.UIElements; using VRBuilder.BasicInteraction.Validation; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI; +using VRBuilder.Core.Editor.UI.GraphView.Windows; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UI.Windows; -namespace VRBuilder.Editor.BasicInteraction.Inspector +namespace VRBuilder.BasicInteraction.Editor.UI.Inspector { /// Notes: /// The class has lots of code duplication with ProcessSceneReferenceDrawer but creating a common code base will not be useful. diff --git a/Source/Basic-Interaction-Component/Editor/Inspector/HasGuidValidationEditor.cs.meta b/Source/BasicInteraction/Editor/UI/Inspector/HasGuidValidationEditor.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/Inspector/HasGuidValidationEditor.cs.meta rename to Source/BasicInteraction/Editor/UI/Inspector/HasGuidValidationEditor.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup/InteractionRigSetupDrawer.cs b/Source/BasicInteraction/Editor/UI/Inspector/InteractionRigSetupDrawer.cs similarity index 92% rename from Source/Basic-Interaction-Component/Editor/RigSetup/InteractionRigSetupDrawer.cs rename to Source/BasicInteraction/Editor/UI/Inspector/InteractionRigSetupDrawer.cs index ee30d2348..e498c9029 100644 --- a/Source/Basic-Interaction-Component/Editor/RigSetup/InteractionRigSetupDrawer.cs +++ b/Source/BasicInteraction/Editor/UI/Inspector/InteractionRigSetupDrawer.cs @@ -1,30 +1,28 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using VRBuilder.BasicInteraction.RigSetup; -using VRBuilder.Core.Utils; using UnityEditor; using UnityEditorInternal; using UnityEngine; +using VRBuilder.BasicInteraction.RigSetup; -namespace VRBuilder.Editor.BasicInteraction.RigSetup +namespace VRBuilder.BasicInteraction.Editor.UI.Inspector { - + [CustomEditor(typeof(InteractionRigSetup))] internal class InteractionRigSetupDrawer : UnityEditor.Editor { private readonly float lineHeight = EditorGUIUtility.singleLineHeight; - + private ReorderableList list; private List foundProvider = new List(); - + private GUIContent warningIcon; - + private void OnEnable() { - InteractionRigSetup rigSetup = (InteractionRigSetup) target; - + InteractionRigSetup rigSetup = (InteractionRigSetup)target; + if (Application.isPlaying == false) { foundProvider = rigSetup.UpdateRigList(); @@ -44,7 +42,7 @@ private void OnEnable() } InteractionRigProvider provider = FindProvider(rigSetup.PossibleInteractionRigs[index].Name); - + Rect labelRect = new Rect(rect.x, rect.y, rect.width - 2 * lineHeight - 4, lineHeight); if (provider != null) { @@ -55,14 +53,14 @@ private void OnEnable() Rect toggleRect = new Rect(rect.x + rect.width - 2 * lineHeight, rect.y, lineHeight, lineHeight); rigSetup.PossibleInteractionRigs[index].Enabled = EditorGUI.Toggle(toggleRect, rigSetup.PossibleInteractionRigs[index].Enabled); - + if (canBeUsed == false) { Rect warningRect = new Rect(rect.x + rect.width - lineHeight, rect.y, lineHeight, lineHeight); GUIContent labelContent = new GUIContent("", warningIcon.image, provider.GetSetupTooltip()); EditorGUI.LabelField(warningRect, labelContent); } - + } else { @@ -75,7 +73,7 @@ private void OnEnable() list.onReorderCallback = reorderableList => { foundProvider = rigSetup.UpdateRigList(); - }; + }; list.drawFooterCallback = rect => { }; } @@ -91,12 +89,12 @@ public override void OnInspectorGUI() { warningIcon = EditorGUIUtility.IconContent("Warning@2x"); } - + GUILayout.Box( "Enable/Disable available interaction Rigs, you are also able to prioritize them by changing the position in the array. Top most has the highest priority. The interaction Rig will be spawned at the USER GameObject."); serializedObject.Update(); list.DoLayoutList(); - + EditorGUILayout.PropertyField(serializedObject.FindProperty("DummyUser")); serializedObject.ApplyModifiedProperties(); } diff --git a/Source/Basic-Interaction-Component/Editor/RigSetup/InteractionRigSetupDrawer.cs.meta b/Source/BasicInteraction/Editor/UI/Inspector/InteractionRigSetupDrawer.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/RigSetup/InteractionRigSetupDrawer.cs.meta rename to Source/BasicInteraction/Editor/UI/Inspector/InteractionRigSetupDrawer.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/Inspector/IsObjectWithTagValidationEditor.cs b/Source/BasicInteraction/Editor/UI/Inspector/IsObjectWithTagValidationEditor.cs similarity index 97% rename from Source/Basic-Interaction-Component/Editor/Inspector/IsObjectWithTagValidationEditor.cs rename to Source/BasicInteraction/Editor/UI/Inspector/IsObjectWithTagValidationEditor.cs index 6ef17c2b5..3c57bb4f0 100644 --- a/Source/Basic-Interaction-Component/Editor/Inspector/IsObjectWithTagValidationEditor.cs +++ b/Source/BasicInteraction/Editor/UI/Inspector/IsObjectWithTagValidationEditor.cs @@ -1,15 +1,15 @@ +using System; using System.Collections.Generic; using System.Linq; -using System; using UnityEditor; using UnityEngine; +using VRBuilder.BasicInteraction.Validation; +using VRBuilder.Core.Editor.UI; +using VRBuilder.Core.Editor.UndoRedo; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UndoRedo; -using VRBuilder.BasicInteraction.Validation; -namespace VRBuilder.Editor.BasicInteraction.Inspector +namespace VRBuilder.BasicInteraction.Editor.UI.Inspector { [CustomEditor(typeof(IsObjectWithTagValidation))] [CanEditMultipleObjects] diff --git a/Source/Basic-Interaction-Component/Editor/Inspector/IsObjectWithTagValidationEditor.cs.meta b/Source/BasicInteraction/Editor/UI/Inspector/IsObjectWithTagValidationEditor.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/Inspector/IsObjectWithTagValidationEditor.cs.meta rename to Source/BasicInteraction/Editor/UI/Inspector/IsObjectWithTagValidationEditor.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems.meta b/Source/BasicInteraction/Editor/UI/MenuItems.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems.meta rename to Source/BasicInteraction/Editor/UI/MenuItems.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/GrabbedMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/GrabbedMenuItem.cs similarity index 76% rename from Source/Basic-Interaction-Component/Editor/MenuItems/GrabbedMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/GrabbedMenuItem.cs index 48d4ffa51..5db880840 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/GrabbedMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/GrabbedMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Conditions; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Conditions +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { public class GrabbedMenuItem : MenuItem { diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/GrabbedMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/GrabbedMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/GrabbedMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/GrabbedMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/ReleasedMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/ReleasedMenuItem.cs similarity index 76% rename from Source/Basic-Interaction-Component/Editor/MenuItems/ReleasedMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/ReleasedMenuItem.cs index 5eb534a51..1108b2b7b 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/ReleasedMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/ReleasedMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Conditions; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Conditions +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { public class ReleasedMenuItem : MenuItem { diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/ReleasedMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/ReleasedMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/ReleasedMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/ReleasedMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/SnappedMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/SnappedMenuItem.cs similarity index 76% rename from Source/Basic-Interaction-Component/Editor/MenuItems/SnappedMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/SnappedMenuItem.cs index 81279772e..04f181bf9 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/SnappedMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/SnappedMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Conditions; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Conditions +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { public class SnappedMenuItem : MenuItem { diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/SnappedMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/SnappedMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/SnappedMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/SnappedMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/TeleportMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/TeleportMenuItem.cs similarity index 79% rename from Source/Basic-Interaction-Component/Editor/MenuItems/TeleportMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/TeleportMenuItem.cs index 2e6412468..022248e9e 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/TeleportMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/TeleportMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Conditions; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Conditions +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { /// public class TeleportMenuItem : MenuItem diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/TeleportMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/TeleportMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/TeleportMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/TeleportMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/TouchedMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/TouchedMenuItem.cs similarity index 76% rename from Source/Basic-Interaction-Component/Editor/MenuItems/TouchedMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/TouchedMenuItem.cs index c36eb4609..3666c1d65 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/TouchedMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/TouchedMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Conditions; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Conditions +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { public class TouchedMenuItem : MenuItem { diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/TouchedMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/TouchedMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/TouchedMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/TouchedMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/UnsnapMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/UnsnapMenuItem.cs similarity index 77% rename from Source/Basic-Interaction-Component/Editor/MenuItems/UnsnapMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/UnsnapMenuItem.cs index 28c7d526f..71000d51f 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/UnsnapMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/UnsnapMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Behaviors; using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Behaviors +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { /// public class UnsnapMenuItem : MenuItem diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/UnsnapMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/UnsnapMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/UnsnapMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/UnsnapMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/UsedMenuItem.cs b/Source/BasicInteraction/Editor/UI/MenuItems/UsedMenuItem.cs similarity index 75% rename from Source/Basic-Interaction-Component/Editor/MenuItems/UsedMenuItem.cs rename to Source/BasicInteraction/Editor/UI/MenuItems/UsedMenuItem.cs index 776c57073..693bce44f 100644 --- a/Source/Basic-Interaction-Component/Editor/MenuItems/UsedMenuItem.cs +++ b/Source/BasicInteraction/Editor/UI/MenuItems/UsedMenuItem.cs @@ -1,8 +1,8 @@ using VRBuilder.BasicInteraction.Conditions; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.BasicInteraction.UI.Conditions +namespace VRBuilder.BasicInteraction.Editor.UI.MenuItems { public class UsedMenuItem : MenuItem { diff --git a/Source/Basic-Interaction-Component/Editor/MenuItems/UsedMenuItem.cs.meta b/Source/BasicInteraction/Editor/UI/MenuItems/UsedMenuItem.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/MenuItems/UsedMenuItem.cs.meta rename to Source/BasicInteraction/Editor/UI/MenuItems/UsedMenuItem.cs.meta diff --git a/Source/Basic-Interaction-Component/Editor/VRBuilder.Editor.BasicInteraction.asmdef b/Source/BasicInteraction/Editor/VRBuilder.BasicInteraction.Editor.asmdef similarity index 84% rename from Source/Basic-Interaction-Component/Editor/VRBuilder.Editor.BasicInteraction.asmdef rename to Source/BasicInteraction/Editor/VRBuilder.BasicInteraction.Editor.asmdef index 27feb6c93..df265a011 100644 --- a/Source/Basic-Interaction-Component/Editor/VRBuilder.Editor.BasicInteraction.asmdef +++ b/Source/BasicInteraction/Editor/VRBuilder.BasicInteraction.Editor.asmdef @@ -1,9 +1,9 @@ { - "name": "VRBuilder.Editor.BasicInteraction", + "name": "VRBuilder.BasicInteraction.Editor", "rootNamespace": "", "references": [ "VRBuilder.BasicInteraction", - "VRBuilder.Editor", + "VRBuilder.Core.Editor", "VRBuilder.Core" ], "includePlatforms": [ diff --git a/Source/Basic-Interaction-Component/Editor/VRBuilder.Editor.BasicInteraction.asmdef.meta b/Source/BasicInteraction/Editor/VRBuilder.BasicInteraction.Editor.asmdef.meta similarity index 100% rename from Source/Basic-Interaction-Component/Editor/VRBuilder.Editor.BasicInteraction.asmdef.meta rename to Source/BasicInteraction/Editor/VRBuilder.BasicInteraction.Editor.asmdef.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources.meta b/Source/BasicInteraction/Resources.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources.meta rename to Source/BasicInteraction/Resources.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/INTERACTION_RIG_LOADER.prefab b/Source/BasicInteraction/Resources/INTERACTION_RIG_LOADER.prefab similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/INTERACTION_RIG_LOADER.prefab rename to Source/BasicInteraction/Resources/INTERACTION_RIG_LOADER.prefab diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/INTERACTION_RIG_LOADER.prefab.meta b/Source/BasicInteraction/Resources/INTERACTION_RIG_LOADER.prefab.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/INTERACTION_RIG_LOADER.prefab.meta rename to Source/BasicInteraction/Resources/INTERACTION_RIG_LOADER.prefab.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/Materials.meta b/Source/BasicInteraction/Resources/Materials.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/Materials.meta rename to Source/BasicInteraction/Resources/Materials.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialSRP.mat b/Source/BasicInteraction/Resources/Materials/AnchorMaterialSRP.mat similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialSRP.mat rename to Source/BasicInteraction/Resources/Materials/AnchorMaterialSRP.mat diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialSRP.mat.meta b/Source/BasicInteraction/Resources/Materials/AnchorMaterialSRP.mat.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialSRP.mat.meta rename to Source/BasicInteraction/Resources/Materials/AnchorMaterialSRP.mat.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialURP.mat b/Source/BasicInteraction/Resources/Materials/AnchorMaterialURP.mat similarity index 98% rename from Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialURP.mat rename to Source/BasicInteraction/Resources/Materials/AnchorMaterialURP.mat index 9ccc234aa..0ccab8877 100644 --- a/Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialURP.mat +++ b/Source/BasicInteraction/Resources/Materials/AnchorMaterialURP.mat @@ -25,6 +25,7 @@ Material: disabledShaderPasses: - DepthOnly - SHADOWCASTER + - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -125,6 +126,7 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &2651022132593954100 MonoBehaviour: m_ObjectHideFlags: 11 @@ -137,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 9 diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialURP.mat.meta b/Source/BasicInteraction/Resources/Materials/AnchorMaterialURP.mat.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/Materials/AnchorMaterialURP.mat.meta rename to Source/BasicInteraction/Resources/Materials/AnchorMaterialURP.mat.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/TeleportReticle.prefab b/Source/BasicInteraction/Resources/TeleportReticle.prefab similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/TeleportReticle.prefab rename to Source/BasicInteraction/Resources/TeleportReticle.prefab diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/TeleportReticle.prefab.meta b/Source/BasicInteraction/Resources/TeleportReticle.prefab.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/TeleportReticle.prefab.meta rename to Source/BasicInteraction/Resources/TeleportReticle.prefab.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/USER_DUMMY.prefab b/Source/BasicInteraction/Resources/USER_DUMMY.prefab similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/USER_DUMMY.prefab rename to Source/BasicInteraction/Resources/USER_DUMMY.prefab diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/USER_DUMMY.prefab.meta b/Source/BasicInteraction/Resources/USER_DUMMY.prefab.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/USER_DUMMY.prefab.meta rename to Source/BasicInteraction/Resources/USER_DUMMY.prefab.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/VRBuilderAnchorPrefab.prefab b/Source/BasicInteraction/Resources/VRBuilderAnchorPrefab.prefab similarity index 95% rename from Source/Basic-Interaction-Component/Runtime/Resources/VRBuilderAnchorPrefab.prefab rename to Source/BasicInteraction/Resources/VRBuilderAnchorPrefab.prefab index d2b293447..2081f1165 100644 --- a/Source/Basic-Interaction-Component/Runtime/Resources/VRBuilderAnchorPrefab.prefab +++ b/Source/BasicInteraction/Resources/VRBuilderAnchorPrefab.prefab @@ -58,6 +58,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -142,10 +145,13 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5984489a6c8753743953c8d64d3265fb, type: 2} + - {fileID: 2100000, guid: ab885650ca87af54d8a0e2e50e88b644, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Source/Basic-Interaction-Component/Runtime/Resources/VRBuilderAnchorPrefab.prefab.meta b/Source/BasicInteraction/Resources/VRBuilderAnchorPrefab.prefab.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Resources/VRBuilderAnchorPrefab.prefab.meta rename to Source/BasicInteraction/Resources/VRBuilderAnchorPrefab.prefab.meta diff --git a/Source/Basic-Interaction-Component/Runtime.meta b/Source/BasicInteraction/Runtime.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime.meta rename to Source/BasicInteraction/Runtime.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Behaviors.meta b/Source/BasicInteraction/Runtime/Behaviors.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Behaviors.meta rename to Source/BasicInteraction/Runtime/Behaviors.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Behaviors/UnsnapBehavior.cs b/Source/BasicInteraction/Runtime/Behaviors/UnsnapBehavior.cs similarity index 89% rename from Source/Basic-Interaction-Component/Runtime/Behaviors/UnsnapBehavior.cs rename to Source/BasicInteraction/Runtime/Behaviors/UnsnapBehavior.cs index a8e8b1448..b86ed6894 100644 --- a/Source/Basic-Interaction-Component/Runtime/Behaviors/UnsnapBehavior.cs +++ b/Source/BasicInteraction/Runtime/Behaviors/UnsnapBehavior.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Runtime.Serialization; using UnityEngine.Scripting; +using VRBuilder.BasicInteraction.Interaction; using VRBuilder.BasicInteraction.Properties; using VRBuilder.Core; using VRBuilder.Core.Attributes; @@ -27,22 +28,10 @@ public class EntityData : IBehaviorData [DisplayName("Object to unsnap")] public SingleScenePropertyReference TargetObject { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetObject instead.")] - [LegacyProperty(nameof(TargetObject))] - public ScenePropertyReference SnappedObject { get; set; } - [DataMember] [DisplayName("Snap zone to unsnap")] public SingleScenePropertyReference TargetSnapZone { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetSnapzone instead.")] - [LegacyProperty(nameof(TargetSnapZone))] - public ScenePropertyReference SnapZone { get; set; } - public Metadata Metadata { get; set; } /// diff --git a/Source/Basic-Interaction-Component/Runtime/Behaviors/UnsnapBehavior.cs.meta b/Source/BasicInteraction/Runtime/Behaviors/UnsnapBehavior.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Behaviors/UnsnapBehavior.cs.meta rename to Source/BasicInteraction/Runtime/Behaviors/UnsnapBehavior.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions.meta b/Source/BasicInteraction/Runtime/Conditions.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions.meta rename to Source/BasicInteraction/Runtime/Conditions.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedCondition.cs b/Source/BasicInteraction/Runtime/Conditions/GrabbedCondition.cs similarity index 92% rename from Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedCondition.cs rename to Source/BasicInteraction/Runtime/Conditions/GrabbedCondition.cs index e1d7b5370..54f4a357c 100644 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedCondition.cs +++ b/Source/BasicInteraction/Runtime/Conditions/GrabbedCondition.cs @@ -26,12 +26,6 @@ public class EntityData : IConditionData [DisplayName("Grabbable objects")] public MultipleScenePropertyReference Targets { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use Targets instead.")] - [LegacyProperty(nameof(Targets))] - public ScenePropertyReference GrabbableProperty { get; set; } - public bool IsCompleted { get; set; } [IgnoreDataMember] diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedCondition.cs.meta b/Source/BasicInteraction/Runtime/Conditions/GrabbedCondition.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions/GrabbedCondition.cs.meta rename to Source/BasicInteraction/Runtime/Conditions/GrabbedCondition.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/ReleasedCondition.cs b/Source/BasicInteraction/Runtime/Conditions/ReleasedCondition.cs similarity index 91% rename from Source/Basic-Interaction-Component/Runtime/Conditions/ReleasedCondition.cs rename to Source/BasicInteraction/Runtime/Conditions/ReleasedCondition.cs index 64b33fa96..6dd944aea 100644 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/ReleasedCondition.cs +++ b/Source/BasicInteraction/Runtime/Conditions/ReleasedCondition.cs @@ -26,12 +26,6 @@ public class EntityData : IConditionData [DisplayName("Grabbable objects")] public MultipleScenePropertyReference GrabbableProperties { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use GrabbableProperties instead.")] - [LegacyProperty(nameof(GrabbableProperties))] - public ScenePropertyReference GrabbableProperty { get; set; } - public bool IsCompleted { get; set; } [IgnoreDataMember] diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/ReleasedCondition.cs.meta b/Source/BasicInteraction/Runtime/Conditions/ReleasedCondition.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions/ReleasedCondition.cs.meta rename to Source/BasicInteraction/Runtime/Conditions/ReleasedCondition.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedCondition.cs b/Source/BasicInteraction/Runtime/Conditions/SnappedCondition.cs similarity index 88% rename from Source/Basic-Interaction-Component/Runtime/Conditions/SnappedCondition.cs rename to Source/BasicInteraction/Runtime/Conditions/SnappedCondition.cs index 6873d5d9e..23357f55a 100644 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedCondition.cs +++ b/Source/BasicInteraction/Runtime/Conditions/SnappedCondition.cs @@ -28,22 +28,10 @@ public class EntityData : IConditionData [DisplayName("Snappable Objects")] public MultipleScenePropertyReference TargetObjects { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetObjects instead.")] - [LegacyProperty(nameof(TargetObjects))] - public ScenePropertyReference Target { get; set; } - [DataMember] [DisplayName("Zone to snap into")] public SingleScenePropertyReference TargetSnapZone { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TargetSnapZone instead.")] - [LegacyProperty(nameof(TargetSnapZone))] - public ScenePropertyReference ZoneToSnapInto { get; set; } - public bool IsCompleted { get; set; } [IgnoreDataMember] diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/SnappedCondition.cs.meta b/Source/BasicInteraction/Runtime/Conditions/SnappedCondition.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions/SnappedCondition.cs.meta rename to Source/BasicInteraction/Runtime/Conditions/SnappedCondition.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/TeleportCondition.cs b/Source/BasicInteraction/Runtime/Conditions/TeleportCondition.cs similarity index 92% rename from Source/Basic-Interaction-Component/Runtime/Conditions/TeleportCondition.cs rename to Source/BasicInteraction/Runtime/Conditions/TeleportCondition.cs index ebb9609fe..e6fac921c 100644 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/TeleportCondition.cs +++ b/Source/BasicInteraction/Runtime/Conditions/TeleportCondition.cs @@ -28,12 +28,6 @@ public class EntityData : IConditionData public MultipleScenePropertyReference TeleportationPoints { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TeleportationPoints instead.")] - [LegacyProperty(nameof(TeleportationPoints))] - public ScenePropertyReference TeleportationPoint { get; set; } - /// public bool IsCompleted { get; set; } diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/TeleportCondition.cs.meta b/Source/BasicInteraction/Runtime/Conditions/TeleportCondition.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions/TeleportCondition.cs.meta rename to Source/BasicInteraction/Runtime/Conditions/TeleportCondition.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/TouchedCondition.cs b/Source/BasicInteraction/Runtime/Conditions/TouchedCondition.cs similarity index 85% rename from Source/Basic-Interaction-Component/Runtime/Conditions/TouchedCondition.cs rename to Source/BasicInteraction/Runtime/Conditions/TouchedCondition.cs index 42f729100..69fd55989 100644 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/TouchedCondition.cs +++ b/Source/BasicInteraction/Runtime/Conditions/TouchedCondition.cs @@ -26,12 +26,6 @@ public class EntityData : IConditionData [DisplayName("Touchable objects")] public MultipleScenePropertyReference TouchableProperties { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use TouchableProperties instead.")] - [LegacyProperty(nameof(TouchableProperties))] - public ScenePropertyReference TouchableProperty { get; set; } - public bool IsCompleted { get; set; } [IgnoreDataMember] @@ -85,11 +79,6 @@ public TouchedCondition(Guid uniqueId) Data.TouchableProperties = new MultipleScenePropertyReference(uniqueId); } - [Obsolete("This constructor only supports guids and will be removed in the next major version.")] - public TouchedCondition(string uniqueId) : this(Guid.Parse(uniqueId)) - { - } - public override IStageProcess GetActiveProcess() { return new ActiveProcess(Data); diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/TouchedCondition.cs.meta b/Source/BasicInteraction/Runtime/Conditions/TouchedCondition.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions/TouchedCondition.cs.meta rename to Source/BasicInteraction/Runtime/Conditions/TouchedCondition.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/UsedCondition.cs b/Source/BasicInteraction/Runtime/Conditions/UsedCondition.cs similarity index 85% rename from Source/Basic-Interaction-Component/Runtime/Conditions/UsedCondition.cs rename to Source/BasicInteraction/Runtime/Conditions/UsedCondition.cs index c4d7e227c..4331a04bc 100644 --- a/Source/Basic-Interaction-Component/Runtime/Conditions/UsedCondition.cs +++ b/Source/BasicInteraction/Runtime/Conditions/UsedCondition.cs @@ -28,12 +28,6 @@ public class EntityData : IConditionData [DisplayName("Objects")] public MultipleScenePropertyReference UsableObjects { get; set; } - [DataMember] - [HideInProcessInspector] - [Obsolete("Use UsableObjects instead.")] - [LegacyProperty(nameof(UsableObjects))] - public ScenePropertyReference UsableProperty { get; set; } - public bool IsCompleted { get; set; } [IgnoreDataMember] @@ -76,14 +70,6 @@ public UsedCondition(IUsableProperty target) : this(ProcessReferenceUtils.GetUni { } - [Obsolete("This constructor will be removed in the next major version.")] - public UsedCondition(string target) - { - Guid guid = Guid.Empty; - Guid.TryParse(target, out guid); - Data.UsableObjects = new MultipleScenePropertyReference(guid); - } - public UsedCondition(Guid target) { Data.UsableObjects = new MultipleScenePropertyReference(target); diff --git a/Source/Basic-Interaction-Component/Runtime/Conditions/UsedCondition.cs.meta b/Source/BasicInteraction/Runtime/Conditions/UsedCondition.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Conditions/UsedCondition.cs.meta rename to Source/BasicInteraction/Runtime/Conditions/UsedCondition.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction.meta b/Source/BasicInteraction/Runtime/Interaction.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Interaction.meta rename to Source/BasicInteraction/Runtime/Interaction.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/BaseInteractionSimulator.cs b/Source/BasicInteraction/Runtime/Interaction/BaseInteractionSimulator.cs similarity index 98% rename from Source/Basic-Interaction-Component/Runtime/Interaction/BaseInteractionSimulator.cs rename to Source/BasicInteraction/Runtime/Interaction/BaseInteractionSimulator.cs index 4d104aeb2..d680fad78 100644 --- a/Source/Basic-Interaction-Component/Runtime/Interaction/BaseInteractionSimulator.cs +++ b/Source/BasicInteraction/Runtime/Interaction/BaseInteractionSimulator.cs @@ -1,10 +1,10 @@ using System; using System.Linq; using UnityEngine; -using VRBuilder.Core.Utils; using UnityEngine.SceneManagement; +using VRBuilder.Core.Utils; -namespace VRBuilder.BasicInteraction +namespace VRBuilder.BasicInteraction.Interaction { /// /// Base interaction simulator, only have one concrete simulator implementation in your project. @@ -13,7 +13,7 @@ namespace VRBuilder.BasicInteraction public abstract class BaseInteractionSimulator { private static BaseInteractionSimulator instance; - + /// /// Current instance of the interaction simulator. /// @@ -80,12 +80,12 @@ private static void OnSceneLoad(Scene scene) /// Simulates a hover over a SnapZone. /// public abstract void HoverSnapZone(ISnapZone snapZone, IInteractableObject interactable); - + /// /// Simulates a unhover over a SnapZone. /// public abstract void UnhoverSnapZone(ISnapZone snapZone, IInteractableObject interactable); - + /// /// Returns the base class used for teleportation in your VR framework. /// diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/BaseInteractionSimulator.cs.meta b/Source/BasicInteraction/Runtime/Interaction/BaseInteractionSimulator.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Interaction/BaseInteractionSimulator.cs.meta rename to Source/BasicInteraction/Runtime/Interaction/BaseInteractionSimulator.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/IInteractableObject.cs b/Source/BasicInteraction/Runtime/Interaction/IInteractableObject.cs similarity index 93% rename from Source/Basic-Interaction-Component/Runtime/Interaction/IInteractableObject.cs rename to Source/BasicInteraction/Runtime/Interaction/IInteractableObject.cs index f3e5b9046..d9835d500 100644 --- a/Source/Basic-Interaction-Component/Runtime/Interaction/IInteractableObject.cs +++ b/Source/BasicInteraction/Runtime/Interaction/IInteractableObject.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRBuilder.BasicInteraction +namespace VRBuilder.BasicInteraction.Interaction { /// /// Base interface to determine that the given class is an interactable object. @@ -11,7 +11,7 @@ public interface IInteractableObject /// GameObject this interactable object is attached to. /// GameObject GameObject { get; } - + /// /// Determines if this interactable object can be touched. /// diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/IInteractableObject.cs.meta b/Source/BasicInteraction/Runtime/Interaction/IInteractableObject.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Interaction/IInteractableObject.cs.meta rename to Source/BasicInteraction/Runtime/Interaction/IInteractableObject.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/ISnapZone.cs b/Source/BasicInteraction/Runtime/Interaction/ISnapZone.cs similarity index 88% rename from Source/Basic-Interaction-Component/Runtime/Interaction/ISnapZone.cs rename to Source/BasicInteraction/Runtime/Interaction/ISnapZone.cs index f1180cf65..081c9c3e7 100644 --- a/Source/Basic-Interaction-Component/Runtime/Interaction/ISnapZone.cs +++ b/Source/BasicInteraction/Runtime/Interaction/ISnapZone.cs @@ -1,7 +1,7 @@ -using VRBuilder.BasicInteraction.Properties; -using UnityEngine; +using UnityEngine; +using VRBuilder.BasicInteraction.Properties; -namespace VRBuilder.BasicInteraction +namespace VRBuilder.BasicInteraction.Interaction { /// /// Base interface for SnapZone, if you add an custom interaction framework add this interface to your SnapZone implementation. @@ -12,27 +12,27 @@ public interface ISnapZone /// Returns if the SnapZone is empty. /// bool IsEmpty { get; } - + /// /// Returns the snapped object, can be null. /// ISnappableProperty SnappedObject { get; } - + /// /// Position where the object is snapped. /// Transform Anchor { get; } - + /// /// Returns if the object can be snapped at all. /// bool CanSnap(ISnappableProperty target); - + /// /// Forces the object to be snapped, returns true when it was snapped successfully. /// bool ForceSnap(ISnappableProperty target); - + /// /// Forces release the snapped object, will return false when there is no object. /// diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/ISnapZone.cs.meta b/Source/BasicInteraction/Runtime/Interaction/ISnapZone.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Interaction/ISnapZone.cs.meta rename to Source/BasicInteraction/Runtime/Interaction/ISnapZone.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/InteractionSimulatorDummy.cs b/Source/BasicInteraction/Runtime/Interaction/InteractionSimulatorDummy.cs similarity index 97% rename from Source/Basic-Interaction-Component/Runtime/Interaction/InteractionSimulatorDummy.cs rename to Source/BasicInteraction/Runtime/Interaction/InteractionSimulatorDummy.cs index 1b9487bcb..765f14d83 100644 --- a/Source/Basic-Interaction-Component/Runtime/Interaction/InteractionSimulatorDummy.cs +++ b/Source/BasicInteraction/Runtime/Interaction/InteractionSimulatorDummy.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRBuilder.BasicInteraction +namespace VRBuilder.BasicInteraction.Interaction { /// /// Interaction simulator dummy, does nothing beside of warning to there is no concrete implementation of a simulator. @@ -9,7 +9,7 @@ namespace VRBuilder.BasicInteraction public class BaseInteractionSimulatorDummy : BaseInteractionSimulator { private const string ErrorMessage = "You are using the interaction simulator without providing a concrete implementation for your VR interaction framework."; - + /// public override void Touch(IInteractableObject interactable) { diff --git a/Source/Basic-Interaction-Component/Runtime/Interaction/InteractionSimulatorDummy.cs.meta b/Source/BasicInteraction/Runtime/Interaction/InteractionSimulatorDummy.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Interaction/InteractionSimulatorDummy.cs.meta rename to Source/BasicInteraction/Runtime/Interaction/InteractionSimulatorDummy.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Locomotion.meta b/Source/BasicInteraction/Runtime/Locomotion.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Locomotion.meta rename to Source/BasicInteraction/Runtime/Locomotion.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Locomotion/BaseLocomotionHandler.cs b/Source/BasicInteraction/Runtime/Locomotion/BaseLocomotionHandler.cs similarity index 94% rename from Source/Basic-Interaction-Component/Runtime/Locomotion/BaseLocomotionHandler.cs rename to Source/BasicInteraction/Runtime/Locomotion/BaseLocomotionHandler.cs index 7d1512a25..5eaf95a8b 100644 --- a/Source/Basic-Interaction-Component/Runtime/Locomotion/BaseLocomotionHandler.cs +++ b/Source/BasicInteraction/Runtime/Locomotion/BaseLocomotionHandler.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRBuilder.BasicInteraction +namespace VRBuilder.BasicInteraction.Locomotion { /// /// Handles basic locomotion for e.g. rigs and provides an abstract locomotion layer. @@ -11,12 +11,12 @@ public abstract class BaseLocomotionHandler : MonoBehaviour /// Current rotation of the rig or camera. /// public abstract Quaternion CurrentRotation { get; } - + /// /// Current position of the rig or camera. /// public abstract Vector3 CurrentPosition { get; } - + /// /// Sets a new position and rotation for the rig or camera. /// diff --git a/Source/Basic-Interaction-Component/Runtime/Locomotion/BaseLocomotionHandler.cs.meta b/Source/BasicInteraction/Runtime/Locomotion/BaseLocomotionHandler.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Locomotion/BaseLocomotionHandler.cs.meta rename to Source/BasicInteraction/Runtime/Locomotion/BaseLocomotionHandler.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties.meta b/Source/BasicInteraction/Runtime/Properties.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties.meta rename to Source/BasicInteraction/Runtime/Properties.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/IGrabbableProperty.cs b/Source/BasicInteraction/Runtime/Properties/IGrabbableProperty.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/IGrabbableProperty.cs rename to Source/BasicInteraction/Runtime/Properties/IGrabbableProperty.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/IGrabbableProperty.cs.meta b/Source/BasicInteraction/Runtime/Properties/IGrabbableProperty.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/IGrabbableProperty.cs.meta rename to Source/BasicInteraction/Runtime/Properties/IGrabbableProperty.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ISnapZoneProperty.cs b/Source/BasicInteraction/Runtime/Properties/ISnapZoneProperty.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ISnapZoneProperty.cs rename to Source/BasicInteraction/Runtime/Properties/ISnapZoneProperty.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ISnapZoneProperty.cs.meta b/Source/BasicInteraction/Runtime/Properties/ISnapZoneProperty.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ISnapZoneProperty.cs.meta rename to Source/BasicInteraction/Runtime/Properties/ISnapZoneProperty.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ISnappableProperty.cs b/Source/BasicInteraction/Runtime/Properties/ISnappableProperty.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ISnappableProperty.cs rename to Source/BasicInteraction/Runtime/Properties/ISnappableProperty.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ISnappableProperty.cs.meta b/Source/BasicInteraction/Runtime/Properties/ISnappableProperty.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ISnappableProperty.cs.meta rename to Source/BasicInteraction/Runtime/Properties/ISnappableProperty.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ITeleportationProperty.cs b/Source/BasicInteraction/Runtime/Properties/ITeleportationProperty.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ITeleportationProperty.cs rename to Source/BasicInteraction/Runtime/Properties/ITeleportationProperty.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ITeleportationProperty.cs.meta b/Source/BasicInteraction/Runtime/Properties/ITeleportationProperty.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ITeleportationProperty.cs.meta rename to Source/BasicInteraction/Runtime/Properties/ITeleportationProperty.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ITouchableProperty.cs b/Source/BasicInteraction/Runtime/Properties/ITouchableProperty.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ITouchableProperty.cs rename to Source/BasicInteraction/Runtime/Properties/ITouchableProperty.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/ITouchableProperty.cs.meta b/Source/BasicInteraction/Runtime/Properties/ITouchableProperty.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/ITouchableProperty.cs.meta rename to Source/BasicInteraction/Runtime/Properties/ITouchableProperty.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/IUsableProperty.cs b/Source/BasicInteraction/Runtime/Properties/IUsableProperty.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/IUsableProperty.cs rename to Source/BasicInteraction/Runtime/Properties/IUsableProperty.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Properties/IUsableProperty.cs.meta b/Source/BasicInteraction/Runtime/Properties/IUsableProperty.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Properties/IUsableProperty.cs.meta rename to Source/BasicInteraction/Runtime/Properties/IUsableProperty.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup.meta b/Source/BasicInteraction/Runtime/RigSetup.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup.meta rename to Source/BasicInteraction/Runtime/RigSetup.meta diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigProvider.cs b/Source/BasicInteraction/Runtime/RigSetup/InteractionRigProvider.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigProvider.cs rename to Source/BasicInteraction/Runtime/RigSetup/InteractionRigProvider.cs diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigProvider.cs.meta b/Source/BasicInteraction/Runtime/RigSetup/InteractionRigProvider.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigProvider.cs.meta rename to Source/BasicInteraction/Runtime/RigSetup/InteractionRigProvider.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigSetup.cs b/Source/BasicInteraction/Runtime/RigSetup/InteractionRigSetup.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigSetup.cs rename to Source/BasicInteraction/Runtime/RigSetup/InteractionRigSetup.cs diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigSetup.cs.meta b/Source/BasicInteraction/Runtime/RigSetup/InteractionRigSetup.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup/InteractionRigSetup.cs.meta rename to Source/BasicInteraction/Runtime/RigSetup/InteractionRigSetup.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup/NoRigSetup.cs b/Source/BasicInteraction/Runtime/RigSetup/NoRigSetup.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup/NoRigSetup.cs rename to Source/BasicInteraction/Runtime/RigSetup/NoRigSetup.cs diff --git a/Source/Basic-Interaction-Component/Runtime/RigSetup/NoRigSetup.cs.meta b/Source/BasicInteraction/Runtime/RigSetup/NoRigSetup.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/RigSetup/NoRigSetup.cs.meta rename to Source/BasicInteraction/Runtime/RigSetup/NoRigSetup.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/VRBuilder.BasicInteraction.asmdef b/Source/BasicInteraction/Runtime/VRBuilder.BasicInteraction.asmdef similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/VRBuilder.BasicInteraction.asmdef rename to Source/BasicInteraction/Runtime/VRBuilder.BasicInteraction.asmdef diff --git a/Source/Basic-Interaction-Component/Runtime/VRBuilder.BasicInteraction.asmdef.meta b/Source/BasicInteraction/Runtime/VRBuilder.BasicInteraction.asmdef.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/VRBuilder.BasicInteraction.asmdef.meta rename to Source/BasicInteraction/Runtime/VRBuilder.BasicInteraction.asmdef.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Validation.meta b/Source/BasicInteraction/Runtime/Validation.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation.meta rename to Source/BasicInteraction/Runtime/Validation.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/HasGuidValidation.cs b/Source/BasicInteraction/Runtime/Validation/HasGuidValidation.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/HasGuidValidation.cs rename to Source/BasicInteraction/Runtime/Validation/HasGuidValidation.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/HasGuidValidation.cs.meta b/Source/BasicInteraction/Runtime/Validation/HasGuidValidation.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/HasGuidValidation.cs.meta rename to Source/BasicInteraction/Runtime/Validation/HasGuidValidation.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/IsObjectWithTagValidation.cs b/Source/BasicInteraction/Runtime/Validation/IsObjectWithTagValidation.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/IsObjectWithTagValidation.cs rename to Source/BasicInteraction/Runtime/Validation/IsObjectWithTagValidation.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/IsObjectWithTagValidation.cs.meta b/Source/BasicInteraction/Runtime/Validation/IsObjectWithTagValidation.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/IsObjectWithTagValidation.cs.meta rename to Source/BasicInteraction/Runtime/Validation/IsObjectWithTagValidation.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/IsProcessSceneObjectValidation.cs b/Source/BasicInteraction/Runtime/Validation/IsProcessSceneObjectValidation.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/IsProcessSceneObjectValidation.cs rename to Source/BasicInteraction/Runtime/Validation/IsProcessSceneObjectValidation.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/IsProcessSceneObjectValidation.cs.meta b/Source/BasicInteraction/Runtime/Validation/IsProcessSceneObjectValidation.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/IsProcessSceneObjectValidation.cs.meta rename to Source/BasicInteraction/Runtime/Validation/IsProcessSceneObjectValidation.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/Validator.cs b/Source/BasicInteraction/Runtime/Validation/Validator.cs similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/Validator.cs rename to Source/BasicInteraction/Runtime/Validation/Validator.cs diff --git a/Source/Basic-Interaction-Component/Runtime/Validation/Validator.cs.meta b/Source/BasicInteraction/Runtime/Validation/Validator.cs.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Validation/Validator.cs.meta rename to Source/BasicInteraction/Runtime/Validation/Validator.cs.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets.meta b/Source/BasicInteraction/StaticAssets.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets.meta rename to Source/BasicInteraction/StaticAssets.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Materials.meta b/Source/BasicInteraction/StaticAssets/Materials.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets/Materials.meta rename to Source/BasicInteraction/StaticAssets/Materials.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/Opaque-Queue-Line.mat b/Source/BasicInteraction/StaticAssets/Materials/Opaque-Queue-Line.mat similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/Opaque-Queue-Line.mat rename to Source/BasicInteraction/StaticAssets/Materials/Opaque-Queue-Line.mat diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/Opaque-Queue-Line.mat.meta b/Source/BasicInteraction/StaticAssets/Materials/Opaque-Queue-Line.mat.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets/Materials/Opaque-Queue-Line.mat.meta rename to Source/BasicInteraction/StaticAssets/Materials/Opaque-Queue-Line.mat.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Shaders.meta b/Source/BasicInteraction/StaticAssets/Shaders.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets/Shaders.meta rename to Source/BasicInteraction/StaticAssets/Shaders.meta diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Shaders/Unlit-Line-Opaque.shader b/Source/BasicInteraction/StaticAssets/Shaders/Unlit-Line-Opaque.shader similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets/Shaders/Unlit-Line-Opaque.shader rename to Source/BasicInteraction/StaticAssets/Shaders/Unlit-Line-Opaque.shader diff --git a/Source/Basic-Interaction-Component/Runtime/Static Assets/Shaders/Unlit-Line-Opaque.shader.meta b/Source/BasicInteraction/StaticAssets/Shaders/Unlit-Line-Opaque.shader.meta similarity index 100% rename from Source/Basic-Interaction-Component/Runtime/Static Assets/Shaders/Unlit-Line-Opaque.shader.meta rename to Source/BasicInteraction/StaticAssets/Shaders/Unlit-Line-Opaque.shader.meta diff --git a/Source/Core/.azure-documentation-release.yml b/Source/Core/.azure-documentation-release.yml deleted file mode 100644 index b3b6123cc..000000000 --- a/Source/Core/.azure-documentation-release.yml +++ /dev/null @@ -1,79 +0,0 @@ -resources: - repositories: - - repository: DocuTheme - type: github - endpoint: Innoactive - name: Innoactive/Hub-Documentation-DocFx-Theme - -trigger: - branches: - include: - - master - - develop - paths: - include: - - '.Documentation/*' - -pr: none - -parameters: -- name: release - type: boolean - default: false - -pool: Unity - -jobs: - - job: - displayName: "Build and Publish Documentation" - workspace: - clean: all - - steps: - - checkout: DocuTheme - lfs: true - - checkout: self - lfs: true - - - powershell: | - $TAG = (git describe --all --match "v*").Split("-")[0].Replace("tags/", "").TrimStart("v") - Write-Host "##vso[task.setvariable variable=Version]$TAG" - workingDirectory: 'Creator' - displayName: 'Parse build Tag' - - - task: CopyFiles@2 - inputs: - SourceFolder: 'Hub-Documentation-DocFx-Theme/' - Contents: '**' - TargetFolder: 'Creator/.Documentation/theme' - displayName: Copy Theme - - - task: Npm@1 - inputs: - command: 'custom' - workingDir: 'Creator/.Documentation/theme' - customCommand: 'install' - displayName: Prepare Theme - - - task: Npm@1 - inputs: - command: 'custom' - workingDir: 'Creator/.Documentation/theme' - customCommand: 'run build' - displayName: Build Theme - - - task: NuGetCommand@2 - inputs: - command: 'custom' - arguments: 'install docfx.console -Version 2.54.0' - displayName: Installing DocFx - - - script: docfx --globalMetadata "{_gaTrackingId:\"$(gaTrackingId)\",_version:\"v$(Version)\"}" Creator\.Documentation\docfx.json - displayName: "Building Documentation" - - - task: PublishPipelineArtifact@1 - inputs: - targetPath: 'Creator/.Documentation/_site' - artifact: 'documentation' - publishLocation: 'pipeline' - displayName: Store Documentation \ No newline at end of file diff --git a/Source/Core/.azure-pipelines.yml b/Source/Core/.azure-pipelines.yml deleted file mode 100644 index 1ed63219f..000000000 --- a/Source/Core/.azure-pipelines.yml +++ /dev/null @@ -1,187 +0,0 @@ -resources: - repositories: - - repository: UnityProject - type: github - endpoint: Innoactive - name: Innoactive/Empty-Unity-Project-2019 - ref: develop - - repository: Templates - type: github - endpoint: Innoactive - name: Innoactive/Creator-Azure-Templates - ref: master - -trigger: - - master - - develop - -pr: - branches: - include: - - develop - -pool: Unity - -variables: - - group: basic-unity - -stages: - - stage: Lint - displayName: Lint - jobs: - - job: CommitMessageCheck - displayName: Commit Message Check - steps: - - script: npm install @commitlint/cli commitlint-azure-pipelines-cli @commitlint/config-conventional - - script: > - npx - -p @commitlint/cli - -p commitlint-azure-pipelines-cli - -p @commitlint/config-conventional - commitlint-azure-pipelines --config .commitlintrc.json - - - stage: Build - displayName: 'Build & Test' - condition: succeeded() - jobs: - - job: build - workspace: - clean: all - steps: - - checkout: UnityProject - lfs: true - - checkout: self - lfs: true - - - task: CopyFiles@2 - inputs: - SourceFolder: 'Empty-Unity-Project-2019/' - Contents: '**' - TargetFolder: '$(Path.Project)' - displayName: Copy base Project - - - task: CopyFiles@2 - inputs: - SourceFolder: 'Creator/' - Contents: '**' - TargetFolder: '$(Path.Creator)/Core' - displayName: Copy Creator Core - - - task: PowerShell@2 - displayName: Build Project - inputs: - targetType: 'inline' - script: | - u3d available -f - u3d install $(UnityVersion) - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor-build.log -nographics -quit -batchmode -buildWindows64Player Build\\TestBuild\\TestBuild.exe - - - task: PowerShell@2 - displayName: Run Tests - inputs: - targetType: 'inline' - script: | - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_editmode_tests.log -batchmode -runTests -testPlatform editmode -testResults $(System.DefaultWorkingDirectory)\TEST-EditMode.xml - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_playmode_tests.log -batchmode -runTests -testPlatform playmode -testResults $(System.DefaultWorkingDirectory)\TEST-PlayMode.xml - - - task: PublishTestResults@2 - inputs: - testResultsFormat: "NUnit" - testResultsFiles: "TEST-*.xml" - - - task: UseNode@1 - - - task: PowerShell@2 - displayName: "Run Semantic release" - condition: eq(variables['Build.SourceBranchName'], 'master') - inputs: - targetType: 'inline' - script: | - npx -p semantic-release-ado semantic-release - workingDirectory: "Creator/" - env: - GH_TOKEN: "$(GITHUB_TOKEN)" - - - template: replace-string.yml@Templates - parameters: - FilePathInCreator: 'Core/Editor/Analytics/GoogleTracker.cs' - OldString: '$(DEV_TRACKING_ID)' - NewString: '$(LIVE_TRACKING_ID)' - Condition: eq(variables['Build.SourceBranchName'], 'master') - - - task: PowerShell@2 - displayName: Fetch version from git - condition: ne(variables['Build.SourceBranchName'], 'master') - inputs: - targetType: 'inline' - script: | - $TAG = (git tag -l "v*" --sort=committerdate | Select -last 1) - if(!$TAG) { $TAG = "v0.0.0" } - $TAG = $TAG.TrimStart("v") + "-" + (git log -1 --pretty=format:%h) - Write-Host "##vso[task.setvariable variable=Version]$TAG" - workingDirectory: "Creator/" - - - task: PowerShell@2 - displayName: Publish variables - inputs: - targetType: 'inline' - script: | - echo "##vso[task.setvariable variable=Version;isOutput=true]v$(Version)" - name: ExportedVariables - - - task: PowerShell@2 - displayName: Export Unity package - inputs: - targetType: 'inline' - script: | - echo 'Exporting version $(Version)' - ((Get-Content -path $(Path.ExportConfig)/$(ExportConfigName) -Raw) -replace '{version}','v$(Version)') | Set-Content -Path $(Path.Project)/export-config.json - u3d run -u $(UnityVersion) -- -projectPath '$(Path.Project)' -logFile $(Build.ArtifactStagingDirectory)/logs/editor_export.log -batchmode -quit -executeMethod Innoactive.CreatorEditor.PackageExporter.Export --export-config export-config.json - Start-Sleep -s 5 - - - task: PublishPipelineArtifact@1 - displayName: "Publish Unity Package" - inputs: - targetPath: "$(Build.ArtifactStagingDirectory)/packages/" - artifact: "creator-core-unitypackage" - publishLocation: "pipeline" - - - task: PublishPipelineArtifact@1 - displayName: "Publish Logs" - condition: always() - continueOnError: true - inputs: - targetPath: "$(Build.ArtifactStagingDirectory)/logs/" - artifact: "creator-core-logs-$(System.JobId)" - publishLocation: "pipeline" - - - stage: Release - displayName: Release - dependsOn: - - Lint - - Build - condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'master')) - jobs: - - job: - workspace: - clean: all - variables: - Version: $[stageDependencies.Build.build.outputs['ExportedVariables.Version']] - steps: - - task: DownloadPipelineArtifact@2 - displayName: 'Download exported package' - inputs: - buildType: 'current' - artifactName: 'creator-core-unitypackage' - targetPath: '$(Build.ArtifactStagingDirectory)/packages/' - - - task: GitHubRelease@1 - inputs: - gitHubConnection: 'Github.com - Jenkins / CI User' - repositoryName: 'Innoactive/Creator' - action: 'edit' - target: '$(Build.SourceVersion)' - tag: '$(Version)' - assetUploadMode: "replace" - assets: "$(Build.ArtifactStagingDirectory)/packages/*" - addChangeLog: false diff --git a/Source/Core/.commitlintrc.json b/Source/Core/.commitlintrc.json deleted file mode 100644 index 14473e999..000000000 --- a/Source/Core/.commitlintrc.json +++ /dev/null @@ -1 +0,0 @@ -{ "extends": ["@commitlint/config-conventional"] } \ No newline at end of file diff --git a/Source/Core/.editorconfig b/Source/Core/.editorconfig deleted file mode 100644 index b9ee9a93d..000000000 --- a/Source/Core/.editorconfig +++ /dev/null @@ -1,16 +0,0 @@ -# see http://editorconfig.org/ for docs on this file - -[*] -indent_style = space -indent_size = 4 -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -# trailing whitespace is significant in markdown (bad choice, bad!) -[*.{md,markdown}] -trim_trailing_whitespace = false - -# keep these and the VS stuff below in sync with .hgeol's CRLF extensions -[*.{vcproj,bat,cmd,xaml,tt,t4,ttinclude}] -end_of_line = crlf diff --git a/Source/Core/.gitattributes b/Source/Core/.gitattributes deleted file mode 100644 index f02d6ffc6..000000000 --- a/Source/Core/.gitattributes +++ /dev/null @@ -1,129 +0,0 @@ -# Kindly borrowed (and extended) -# from https://gist.github.com/nemotoo/b8a1c3a0f1225bb9231979f389fd4f3f - -# Set the default behavior, in case people don't have core.autocrlf set. -* text=auto - -## Unity ## - -*.cs diff=csharp text -*.cginc text -*.shader text - -# linguist-generated leads to diffs not being shown on github -# see https://github.com/github/linguist#generated-code and -# https://stackoverflow.com/a/24382933/1142028 -*.mat binary merge=unityyamlmerge linguist-generated=true -*.anim binary merge=unityyamlmerge linguist-generated=true -*.unity binary merge=unityyamlmerge linguist-generated=true -*.prefab binary merge=unityyamlmerge linguist-generated=true -*.physicsMaterial2D binary merge=unityyamlmerge linguist-generated=true -*.physicsMaterial binary merge=unityyamlmerge linguist-generated=true -#*.asset binary merge=unityyamlmerge linguist-generated=true -*.meta binary merge=unityyamlmerge linguist-generated=true -*.controller binary merge=unityyamlmerge linguist-generated=true - -## git-lfs ## - -# Graphics -*.jpg filter=lfs diff=lfs merge=lfs -text -*.JPG filter=lfs diff=lfs merge=lfs -text -*.jpeg filter=lfs diff=lfs merge=lfs -text -*.JPEG filter=lfs diff=lfs merge=lfs -text -*.png filter=lfs diff=lfs merge=lfs -text -*.PNG filter=lfs diff=lfs merge=lfs -text -*.psd filter=lfs diff=lfs merge=lfs -text -*.PSD filter=lfs diff=lfs merge=lfs -text -*.ai filter=lfs diff=lfs merge=lfs -text -*.AI filter=lfs diff=lfs merge=lfs -text -*.bmp filter=lfs diff=lfs merge=lfs -text -*.BMP filter=lfs diff=lfs merge=lfs -text -*.gif filter=lfs diff=lfs merge=lfs -text -*.GIF filter=lfs diff=lfs merge=lfs -text -*.img filter=lfs diff=lfs merge=lfs -text -*.IMG filter=lfs diff=lfs merge=lfs -text -*.tif filter=lfs diff=lfs merge=lfs -text -*.TIF filter=lfs diff=lfs merge=lfs -text -*.xcf filter=lfs diff=lfs merge=lfs -text -*.XCV filter=lfs diff=lfs merge=lfs -text -*.tga filter=lfs diff=lfs merge=lfs -text -*.TGA filter=lfs diff=lfs merge=lfs -text - -# Videos -*.mpg filter=lfs diff=lfs merge=lfs -text -*.MPG filter=lfs diff=lfs merge=lfs -text -*.mpeg filter=lfs diff=lfs merge=lfs -text -*.MPEG filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.MP4 filter=lfs diff=lfs merge=lfs -text -*.avi filter=lfs diff=lfs merge=lfs -text -*.AVI filter=lfs diff=lfs merge=lfs -text -*.asf filter=lfs diff=lfs merge=lfs -text -*.ASF filter=lfs diff=lfs merge=lfs -text -*.mp4 filter=lfs diff=lfs merge=lfs -text -*.MP4 filter=lfs diff=lfs merge=lfs -text -*.mov filter=lfs diff=lfs merge=lfs -text -*.MOV filter=lfs diff=lfs merge=lfs -text - -# Audio -*.mp3 filter=lfs diff=lfs merge=lfs -text -*.MP3 filter=lfs diff=lfs merge=lfs -text -*.ogg filter=lfs diff=lfs merge=lfs -text -*.OGG filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text -*.WAV filter=lfs diff=lfs merge=lfs -text - -# Models -*.obj filter=lfs diff=lfs merge=lfs -text -*.OBJ filter=lfs diff=lfs merge=lfs -text -*.fbx filter=lfs diff=lfs merge=lfs -text -*.FBX filter=lfs diff=lfs merge=lfs -text -*.ply filter=lfs diff=lfs merge=lfs -text -*.PLY filter=lfs diff=lfs merge=lfs -text -*.raw filter=lfs diff=lfs merge=lfs -text -*.RAW filter=lfs diff=lfs merge=lfs -text -*.blend filter=lfs diff=lfs merge=lfs -text -*.BLEND filter=lfs diff=lfs merge=lfs -text -*.3ds filter=lfs diff=lfs merge=lfs -text -*.3DS filter=lfs diff=lfs merge=lfs -text -*.stl filter=lfs diff=lfs merge=lfs -text -*.STL filter=lfs diff=lfs merge=lfs -text -*.pmd filter=lfs diff=lfs merge=lfs -text -*.PMD filter=lfs diff=lfs merge=lfs -text -*.mesh filter=lfs diff=lfs merge=lfs -text -*.MESH filter=lfs diff=lfs merge=lfs -text - -# Libs -*.dll filter=lfs diff=lfs merge=lfs -text -*.DLL filter=lfs diff=lfs merge=lfs -text -*.a filter=lfs diff=lfs merge=lfs -text -*.A filter=lfs diff=lfs merge=lfs -text -*.so filter=lfs diff=lfs merge=lfs -text -*.SO filter=lfs diff=lfs merge=lfs -text -*.lib filter=lfs diff=lfs merge=lfs -text -*.LIB filter=lfs diff=lfs merge=lfs -text -*.jar filter=lfs diff=lfs merge=lfs -text -*.JAR filter=lfs diff=lfs merge=lfs -text - -# Unity Light Build -*.exr filter=lfs diff=lfs merge=lfs -text -*.EXR filter=lfs diff=lfs merge=lfs -text -LightingData.asset filter=lfs diff=lfs merge=lfs -text - -# Others -*.pdf filter=lfs diff=lfs merge=lfs -text -*.PDF filter=lfs diff=lfs merge=lfs -text -*.r16 filter=lfs diff=lfs merge=lfs -text -*.R16 filter=lfs diff=lfs merge=lfs -text -*.zip filter=lfs diff=lfs merge=lfs -text -*.unitypackage filter=lfs diff=lfs merge=lfs -text -*.aif filter=lfs diff=lfs merge=lfs -text -*.ttf filter=lfs diff=lfs merge=lfs -text -*.TTF filter=lfs diff=lfs merge=lfs -text -*.rns filter=lfs diff=lfs merge=lfs -text -*.reason filter=lfs diff=lfs merge=lfs -text -*.lxo filter=lfs diff=lfs merge=lfs -text - -# 3D Modelling tools -*.sbs filter=lfs diff=lfs merge=lfs -text -*.max filter=lfs diff=lfs merge=lfs -text diff --git a/Source/Core/.github/CODE_OF_CONDUCT.md b/Source/Core/.github/CODE_OF_CONDUCT.md deleted file mode 100644 index 9716a0ad6..000000000 --- a/Source/Core/.github/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,85 +0,0 @@ -# Contributor Code of Conduct - -**Table of Contents:** - -* [Summary](#summary) -* [Our Standards](#our-standards) -* [Our Responsibilities](#our-responsibilities) -* [Scope](#scope) -* [Enforcement](#enforcement) -* [Attribution](#attribution) - -**Version**: 1.0.0 - -## Summary - -In order to keep the Open Source Innoactive community a warm, welcoming, and a safe place we ask that all participants read and adhere to the following code of conduct. - -* **Be friendly and patient:** Remember you might not be communicating in someone else's primary spoken or programming language, and others may not have your level of understanding. - -* **Be welcoming and inclusive:** Our communities welcome and support people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability. - -* **Be considerate:** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language. - -* **Be respectful:** We are a world-wide community of professionals, and we conduct ourselves professionally. Disagreement is no excuse for poor behavior and poor manners. Disrespectful and unacceptable behavior includes, but is not limited to: - * Violent threats or language. - * Discriminatory or derogatory jokes and language. - * Posting sexually explicit or violent material. - * Posting, or threatening to post, people's personally identifying information ("doxing"). - * Insults, especially those using discriminatory terms or slurs. - * Behavior that could be perceived as sexual attention. - * Advocating for or encouraging any of the above behaviors. - -* **Understand disagreements:** Disagreements, both social and technical, are useful learning opportunities. Seek to understand the other viewpoints and resolve differences constructively. - -* **This code is not exhaustive or complete.** It serves to capture our common understanding of a productive, collaborative environment. We expect the code to be followed in spirit as much as in the letter. - -We expect all contributors to uphold our standards of conduct. If any member of the community violates this code of conduct, the Innoactive team and project maintainers will take action. We reserve the right to remove issues, comments, and PRs that do not comply with our conduct standards. Repeated or significant offenses will result in blocked accounts and disassociation with our projects and the Innoactive community. - -If you are subject to or witness unacceptable behavior, or have any other concerns, please communicate with any of our [maintainers](CONTRIBUTING.md#maintainers). - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling -* Insults or other derogatory comments -* Personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, discussions in a public or private Innoactive channel, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise, unacceptable behavior may be reported by contacting any of our [maintainers](CONTRIBUTING.md#maintainers). - -All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. We are obligated to maintain confidentiality concerning the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This code of conduct is based on the template established by the [TODO Group](https://todogroup.org/) and used by numerous other large communities (e.g., Microsoft, Facebook, Twitter, GitHub and the Scope section from the [Contributor Covenant](https://www.contributor-covenant.org), [version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html). - -For answers to common questions about this code of conduct, see [Contributor Covenant's F.A.Q.](https://www.contributor-covenant.org/faq). diff --git a/Source/Core/.github/CODING_CONVENTIONS.md b/Source/Core/.github/CODING_CONVENTIONS.md deleted file mode 100644 index 8846c9f95..000000000 --- a/Source/Core/.github/CODING_CONVENTIONS.md +++ /dev/null @@ -1,509 +0,0 @@ -# Coding Conventions - -Unless otherwise specified, the Innoactive projects adhere to the MSDN C# [Coding Conventions](https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/inside-a-program/coding-conventions) and [Design Guidelines](https://docs.microsoft.com/en-us/dotnet/standard/design-guidelines/). -In the following, the most important guidelines and custom decisions are listed. - -## Language -* Code, documentation, and comments are to be written in English. - -## Naming Conventions - -### Name -* Use meaningful but concise names. -* Do not use special characters in any names. -* Do not use abbreviations. - -```cs -public class RuntimeStatistics -{ - // very bad: - private int n; - // bad: - private int numFrms; - private int frameCnt; - // good: - private int numberOfFrames; - private int frameCount; - // too verbose: - private int numberOfElapsedFramesSinceApplicationStart; -} -``` - -* Keep the most specific descriptor left, e.g. pauseButton not buttonPause. -* Boolean variables and Properties should start with Is or Has, e.g. isActive. - -### Formatting -* Classes, properties, and public fields are written in PascalCase. -* Private fields are written in camelCase. -* Static and const fields (public, protected, or private) are formatted like non-const/static fields. - -```cs -public class MyClass -{ - public float MyProperty { get; private set; } - public bool MyPublicVariable; - private string myPrivateVariable; - public static string MyStaticVariable = "someValue"; - protected const string MyConstVariable = "someOtherValue"; - private const string myPrivateConstVariable = "yetAnotherValue"; -} -``` - -* Functions are written in PascalCase. -* Function parameters are written in camelCase. -* Local variables are written in camelCase. - -```cs -public bool MyFunction(bool myFunctionParameter) -{ - float myLocalVariable = 0; -} -``` - -* Interfaces are written in PascalCase, but start with an *I*. - -```cs -public interface IMyInterface -{ -} -``` - -* Enums are written in PascalCase. -* Enum Values are written in PascalCase. - -```cs -public enum MyEnum -{ - FirstEnumValue, - SecondEnumValue, - ThirdEnumValue, -} -``` - -## Bracing and Indentation -* Each opening and closing brace is placed in a separate line. -* Braces start at the indentation level of the outlying scope. -* Add Braces even for short single-line scopes. - -```cs -// Do -if (condition == true) -{ - return; -} -// Don't -if (condition == true) - return; -if (condition == true) return; -``` - -* Exception: Default properties are implemented in a single line. - Encapsulating properties and properties with simple single-statement accessors place accessors on a single line together with the respective implementation. - Complex accessors with multiple statements follow the general rule of placing braces and statements on separate lines. - -```cs -public bool DefaultProperty { get; protected set; } - -public bool EncapsulatingProperty -{ - get { return wrappedValue; } - protected set { wrappedValue = value; } -} - -public bool SimpleProperty -{ - get { return entry == "MagicValue"; } - set { entry = string.Format("Bla{0}", value); } -} - -public bool ComplexProperty -{ - get - { - if(wrappedValue == null) - { - throw new OperationException(); - } - - wrappedValue; - } - protected set - { - wrappedValue = value; - - if (implementation != null) - { - implementation.ForwardValue(value); - } - } -} - -public bool MixedProperty -{ - get - { - return wrappedValue; - } - protected set - { - wrappedValue = value; - - if (implementation != null) - { - implementation.ForwardValue(value); - } - } -} -``` - -* Content of the braced scope is indented an additional level. -* Indent by 4 spaces. -* Indent every scope (namespaces, classes, loops, ...). - -```cs -public class ClassInTopScope -{ - public bool PropertyInClassScope { get; set; } - - public float FunctionInClassScope() - { - public float functionVariable; - - { - float scopedVariable = 3; - } - - for (int i = 0; i < 100; ++i) - { - float scopedVariable = i; - } - } -} -``` - -* Do not indent compile `#if` and `#pragma`. -* Indent `#region` specifications. -* Do not further indent code inside compile directives like `#if` or `#region`s. - -```cs -namespace MyNamespace -{ - public class MyClass1 - { - public bool FirstFunction(); - -#pragma warning disable 0618 // temporarily disable obsolete usage warning - CallObsoleteFunction(); -#pragma warning restore 0618 - - #region First Region - public bool SecondFunction(); - #endregion - - #region Second Region - public bool ThirdFunction(); - #endregion - } - -#if COMPILE_DEFINE - public class MyClass2 - { - } -#endif -} -``` - -* When splitting a statement or declaration, indent the split line by one level. -* When defining local delegates, do not indent the opening and closing braces. - -```cs -public float FunctionWithManyParameters() -{ - bool expression = CheckConditionOne() - && CheckConditionTwo() - && CheckConditionThree() - && CheckConditionFour(); - - Action localTask = () => - { - // [...] - } - - new AsyncTask(localTask).Execute(); - - new AsyncTask(() => - { - // [...] - }) - .Execute(); -} -``` - -## Code comments -* Enrich your code with meaningful comments. -* Use `//` for inline code comments, and `///` for API docs. -* Add xml API docs to all elements of the public API: classes, functions, properties, fields, and events. -* Comments should always start with a capital letter, be separated from the comment symbol by a space, and end with a period. -* All sentence-like parts of a comment (e.g. ` and ` texts) should end with a period. - - -```cs -/// -/// Explain the general intent and typical usage of the class here. -/// -public class ExampleClass -{ - /// - /// Provide additional detail here. - /// - public float ExampleProperty { get; private set; } - - /// - /// Provide details about what the function does. - /// - /// Explain parameter here. - /// Explain return type here. - /// When is this exception thrown. - public int ExampleFunction(float exampleParameter) - { - // [...] - } -} -``` - -* Avoid empty xml tags components like `param` or `return`. Either add a valuable descriptions, or remove the tag. - -```cs -public class ExampleClass -{ - //Do - - /// - /// This function computes the square root of a value. - /// - public float SquareRoot(float value) - { - // [...] - } - - // Don't - - /// - /// This function computes the square root of a value. - /// - /// - /// - public float SquareRoot(float value) - { - // [...] - } -} -``` - -## Whitespaces -* Use empty lines to separate classes/class members/blocks of statements. -* Do not use two or more consecutive empty lines (use regions instead to group blocks). -* Add a whitespace to separate a condition/iteration keyword (`if`, `while`, `for`, ...) and its braces. -* Do not use a whitespace to separate a function name and its brace. - -```cs -if (CheckParameters(param1, param2) && param3) -{ - // [...] -} - -while (pi == 3) -{ - // [...] -} - -SomeFunction(param); -``` - -* Add whitespaces after commas and around operators. - -```cs -if (CheckParameters(param1, param2) && param3) -{ - return param1 + (param2 * param3); -} -``` - -## Events - -* Use C# events - avoid UnityEvents, Actions, or similar. -* Use EventArgs classes instead of delegates or actions for event definitions. -* Use immutable `EventArgs` classes, which provide public readonly fields. Initialize these fields from a constructor. - -```cs -public class MyButton -{ - // Do - public class ClickedEventArgs : System.EventArgs - { - public readonly string SomeData; - public ClickedEventArgs(string data) - { - SomeData = data; - } - } - - public event EventHandler Clicked; - - // Don't - public delegate void ClickedEvent(string someData); - public event ClickedEvent Clicked; - - // Don't - public event Action Clicked; -} -``` - -* EventArgs classes end with `EventArgs`, and are derived from `System.EventArgs`. -* Name Events with a verb describing the event (without pre- or suffix), Loaded, Finished. -* Event handling functions start with `On`, followed by the scope and the event name. -* If an event can be triggered by a child class, provide a function called `EmitEVENTNAME`. - -```cs -public class MyButton -{ - public class ClickedEventArgs : System.EventArgs - { - public readonly string someData; - public ClickedEventArgs(string data) - { - someData = data; - } - } - - public event EventHandler Clicked; - - protected void EmitClicked(string data) - { - Clicked.Invoke(this, new ClickedEventArgs() { someData = data }); - } -} - -public class ButtonObserver -{ - public void Observe - { - new MyButton().Clicked += OnButtonClicked; - } - - private void OnButtonClicked(object sender, MyButton.ClickedEventArgs args) -} -``` - -## Logging - -* Prefer format syntax over explicit string concatenation. - -```cs -private void SomeFunction() -{ - int numberOfThings = 42; - - // Do - Debug.Log($"I know {numberOfThings} things"); - - // Or - Debug.LogFormat("I know {0} things", numberOfThings); - - // Don't - Debug.Log("I know " + numberOfThings + " things"); -} -``` - -## Exceptions - -* Exception names end with `Exception`. -* If exceptions are to be thrown by only one class, define them inside this class. -* Exceptions thrown by multiple sources are defined in a separate file, in the matching namespace (no Exceptions sub-namespace). - -## Access Modifiers - -* Only use public variables or Properties with public setters for data objects. -* Always specify an Access Modifier. - -```cs -public class MyClass -{ - // Do - private float myPrivateVariable1; - // Don't - float myPrivateVariable2; -} -``` - -## Unity-specific - -* Prefer private variables marked with `[SerializeField]` over public variables for Inspector fields. -* When using a public variable in a MonoBehaviour, still add `[SerializeField]` to ease detection of Inspector fields. -* Use the `[Tooltip("...")}` attribute in Inspector fields for documentation / usage hints. -* Always initialize Inspector fields (to prevent never-assigned-warnings). -* Avoid the automatic conversion from `UnityEngine.Object` to bool. -* When using Enum-typed Inspector fields, consider hard-wiring the enum values to prevent serialization errors when changing available enum values. - -```cs -// Do -if (gameObject != null) -{ - // [...] -} - -// Don't -if (gameObject) -{ - // [...] -} -``` - -## Lambdas - -* Prefer lambda-style expressions over delegate-style. - -```cs -// Do -(float param1, string param2) => {} - -// Don't -delegate(float param1, string param2) {} -``` - -* Prefer named functions over lambdas. -* Assign longer or more complex lambdas to named local `Action`/`Func`. -* If nested lambdas are required, assign each one to named local `Action`/`Func`. -* Avoid defining long lambdas directly as parameter of a function call. - -## Obsoletion - -* Avoid changes in code that break existing APIs (i.e. Class Names, Function Argument types, Renaming of public members / properties, return types). -* Use `System.Obsolete` to mark outdated code that will be removed in newer versions. -* When re-naming classes/properties/methods, try to maintain the old version tagged as obsolete. -* Obsolete code will be maintained for one (major) release, and is deleted afterwards. - -## Misc - -* Define class-specific Exceptions, Enums, EventArgs, ... inside the corresponding class. -* For Interfaces, define Exceptions, Enums, EventArgs, ... in the same file as the interface. -* Do not use `var`, always specify the full type name. -* Use `Invoke` to trigger actions or events. -* Only use `this.` before members where absolutely necessary. -* Decide whether or not to design for inheritance. - * If not intended to be derived from, make all non-public entities `private`. - * If intended to be derived from, take care to mark necessary entities `protected` and/or `virtual`. -* Consider using early returns in functions to prevent deeply nested scopes. -* Use parentheses to group parts of complex statements. - Especially, always group sub-clauses when combining different boolean operators. -* Do not omit the array type specifier when using array initialization lists. - -```cs -// Do -string[] myList = new string[] { "a", "b", "c", "d" }; - -// Don't -string[] myList = new [] { "a", "b", "c", "d" }; -``` - -* Do not prefix static method defined in the same or parent class with the class scope. \ No newline at end of file diff --git a/Source/Core/.github/CONTRIBUTING.md b/Source/Core/.github/CONTRIBUTING.md deleted file mode 100644 index 2105b24e1..000000000 --- a/Source/Core/.github/CONTRIBUTING.md +++ /dev/null @@ -1,178 +0,0 @@ -# How to contribute - -At Innoactive we want to thank you for being part of this community and helping us to improve the Creator. - -There are many ways to contribute, it could be by suggesting new features and ideas, reporting bugs, extending and modifying functionalities, and even from just using the Creator and developing amazing VR training applications. - -In this guide, we summarize how you can do all those actions. - -### Table of Contents: - -1. [Getting Started](#getting-started) -1. [Code of Conduct](#code-of-conduct) -1. [Feature Request](#feature-request) -1. [Bug Report](#bug-report) -1. [Submitting Changes](#submitting-changes) -1. [Maintainers](#maintainers) -1. [Coding Conventions](#coding-conventions) -1. [Source Control Commit Guidelines](#source-control-commit-guidelines) -1. [Contributors](#contributors) - -## Getting Started - -The easiest and simplest way to get started and try out the Creator is by downloading the latest version from our [resources site](http://developers.innoactive.de/creator/). - -Make sure to read the [documentation](http://developers.innoactive.de/documentation/creator/) for a deeper understanding of how the tool works. - -## Code of Conduct - -This project and everyone participating in it are governed by the [Innoactive Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to our [maintainers](#maintainers). - -## Feature Request - -We are keen to listen to your feature requests. - -To request a feature, please go to the `Issues` section of this repository and create a new issue using the `Feature request` template. Be as detailed as possible, if possible, try to include references, and explain what is the benefit of the feature. - -Make sure your idea is unique using the search functionality. If a similar feature request already exists, try providing additional information instead of creating a new issue. - -In the case that a similar feature request already exits but is closed without being resolved, you are welcome to create a new one if you think it makes sense. - -## Bug Report - -If you find an error in the source code, or experience one when using the Creator, you can help us by submitting a bug report issue to our GitHub issue tracker. - -Before submitting a new bug report, make sure there has not been reported already by using the search functionality in the issues section of this repository. - -To report a new bug, please go to the `Issues` section of this repository and create a new issue using the `Bug report` template. Be as detailed as possible, explain how to reproduce it, if possible, try to include references and rate of reproducibility. - -You can also [submit a Pull Request](#submitting-changes) with a fix! - -Creating comprehensive bug reports helps the community to quickly understand the problem and the severity. - -If you find a security vulnerability, do NOT open an issue. Contact a [maintainer](#maintainers) instead. - -Alternatively, customers can contact us directly using our [support channel](https://jira.innoactive.de/servicedesk/customer/portal/3). - -## Submitting Changes - -By default, this repository is protected, the only way to submit changes is by merging via [creating a pull request from a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork), this is only intending to provide the best quality and add a security layer, we could detect and prevent new bugs, breaking functionalities and avoid violations to our [code convention](#coding-conventions). - -Use the [pull request template](PULL_REQUEST_TEMPLATE.md) for detail as much as possible all the changes included in the pull request, this way it is easier for everyone to review. - -Make sure to also follow the [Source Control Commit Guidelines](#source-control-commit-guidelines). - -See more about [Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests) and [how to fork a repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo). - -## Maintainers - -Meet our maintainers: - -[SimonTheSourcerer](https://github.com/SimonTheSourcerer) | [Tomwim](https://github.com/Tomwim) -:---: | :---: | -[Simon L](mailto:simon.lerch@innoactive.de) | [Thomas W](mailto:thomas.wimmer@innoactive.de) - - -Maintainers are responsible for this repository and its community. - -### Former Maintainers -[Aleksei Korolev](https://github.com/aleksei-korolev) - -## Coding Conventions - -By encouraging coding conventions we ensure: - -* The code to having a consistent look, so that readers can focus on content, not layout. -* Enabling readers to understand the code more quickly by making assumptions based on previous experience. -* Facilitating copying, changing, and maintaining the code. -* Sticking to C# best practices. - -Please follow our [Coding Conventions](CODING_CONVENTIONS.md). - -## Source Control Commit Guidelines - -When committing to an Innoactive git project, please adhere to the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). This leads to more readable messages that are easy to follow when looking through the project history. But also, we use the git commit messages to generate automated release notes. - -### Commit Message Format -Every commit message consists of a **header** (mandatory), a **body**, and a **footer**. -The header has a special format that includes a **type** and **subject**: - -``` -: - -[optional body] - -[optional footer(s)] -``` - -Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier -to read on GitHub as well as in various git tools. - -The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any. - - -### Revert -If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit .`, where the hash is the SHA of the commit being reverted. - -### Type -Must be one of the following: - -* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm) -* **ci**: Changes to our CI configuration files and scripts (example scopes: Circle, BrowserStack, SauceLabs) -* **docs**: Documentation only changes -* **feat**: A new feature -* **fix**: A bug fix -* **perf**: A code change that improves performance -* **refactor**: A code change that neither fixes a bug nor adds a feature -* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc) -* **test**: Adding missing tests or correcting existing tests - -### Subject -The subject contains a succinct description of the change: - -* use the imperative, present tense: "change" not "changed" nor "changes" -* don't capitalize the first letter -* no dot (.) at the end - -### Body -Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes". -The body should include the motivation for the change and contrast this with previous behavior. - -### Footer -The footer should contain any information about **Breaking Changes** and is also the place to -reference GitHub issues that this commit **Closes**. - -**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this. - -### Examples: - -#### Commit message with no body - -``` -docs: update changelog to beta.5 -``` - -#### Commit message with both -``` -fix: need to depend on latest rxjs and zone.js - -The version in our package.json gets copied to the one we publish, and users need the latest of these. -``` - -#### Commit message with multi-paragraph body and multiple footers -``` -fix: correct minor typos in code - -see the issue for details - -on typos fixed. - -Reviewed-by: Z -Refs #133 -``` - -See more [Conventional Commits Examples](https://www.conventionalcommits.org/en/v1.0.0/#examples) - -## Contributors - -Thank you all for your help, we appreciate all your [contributions](https://github.com/Innoactive/Creator/graphs/contributors). diff --git a/Source/Core/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/Source/Core/.github/ISSUE_TEMPLATE/BUG_REPORT.md deleted file mode 100644 index 37c0fd1ad..000000000 --- a/Source/Core/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ /dev/null @@ -1,47 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -### Describe the bug - - -### Steps to Reproduce - - -1. -1. -1. -1. -1. - - -### Expected behavior - - -### Current behavior - - -### Screenshots - - -### Context (Environment) - - -### Possible Solution - \ No newline at end of file diff --git a/Source/Core/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/Source/Core/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md deleted file mode 100644 index 55f231cb8..000000000 --- a/Source/Core/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -### Is the feature request related to a problem? - - -### Proposal - - -### Alternatives - - -### Additional context - \ No newline at end of file diff --git a/Source/Core/.github/PULL_REQUEST_TEMPLATE.md b/Source/Core/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 18ad54ac0..000000000 --- a/Source/Core/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,38 +0,0 @@ -### Description - - -**Fixes**: # (issue) - -### Type of change - - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] This change requires a documentation update - -### How Has This Been Tested? - - - -**Test Configuration**: - - -### Aditional Notes - - -### Checklist - - -- [ ] My code follows the [Coding Conventions](#coding-conventions) -- [ ] I have performed a self-review of my code -- [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have made corresponding changes to the documentation -- [ ] My changes generate no new warnings -- [ ] I have added tests that prove my fix is effective or that my feature works -- [ ] New and existing unit tests pass locally with my changes -- [ ] Any dependent changes have been merged and published in downstream modules \ No newline at end of file diff --git a/Source/Core/.gitignore b/Source/Core/.gitignore deleted file mode 100644 index 287da7c1e..000000000 --- a/Source/Core/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -/[Ll]ibrary/ -/[Tt]emp/ -/[Oo]bj/ -/[Bb]uild/ -/[Bb]uilds/ -/Assets/AssetStoreTools* - -# Autogenerated VS/MD/Consulo solution and project files -ExportedObj/ -.consulo/ -*.csproj -*.unityproj -*.sln -*.suo -*.tmp -*.user -*.userprefs -*.pidb -*.booproj -*.svd - - -# Unity3D generated meta files -*.pidb.meta - -# Unity3D Generated File On Crash Reports -sysinfo.txt - -# Builds -*.apk -*.unitypackage -site/ - -################# -# DocFx Ignores # -################# -/**/DROP/ -/**/TEMP/ -/**/packages/ -/**/bin/ -/**/obj/ -/**/obj.meta -.Documentation/_site -.Documentation/api diff --git a/Source/Core/.gitmodules b/Source/Core/.gitmodules deleted file mode 100644 index e69de29bb..000000000 diff --git a/Source/Core/.releaserc.json b/Source/Core/.releaserc.json deleted file mode 100644 index 7d34d68d6..000000000 --- a/Source/Core/.releaserc.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "branch": "master", - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", - "@semantic-release/github", - ["semantic-release-ado", { - "varName": "Version", - "setOnlyOnRelease": false - }] - ] - } \ No newline at end of file diff --git a/Source/Core/Editor/AssemblyAttributes.cs b/Source/Core/Editor/AssemblyAttributes.cs index b4711fa2a..921840b00 100644 --- a/Source/Core/Editor/AssemblyAttributes.cs +++ b/Source/Core/Editor/AssemblyAttributes.cs @@ -6,4 +6,4 @@ [assembly: InternalsVisibleTo("VRBuilder.Core.Tests.PlayMode")] [assembly: InternalsVisibleTo("VRBuilder.Core.Tests.EditMode")] -[assembly: InternalsVisibleTo("VRBuilder.Editor.TextToSpeech")] +[assembly: InternalsVisibleTo("VRBuilder.TextToSpeech.Editor")] diff --git a/Source/Core/Editor/AssemblyUnloadDetector.cs b/Source/Core/Editor/AssemblyUnloadDetector.cs index c0a78705d..c82d648cb 100644 --- a/Source/Core/Editor/AssemblyUnloadDetector.cs +++ b/Source/Core/Editor/AssemblyUnloadDetector.cs @@ -5,7 +5,7 @@ using System; using UnityEditor; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// Tracks when the project is going to be unloaded (when assemblies are unloaded, when user starts or stop runtime, when scripts were modified). diff --git a/Source/Core/Editor/BuilderProjectSettings.cs b/Source/Core/Editor/BuilderProjectSettings.cs index df09eee6c..c2eb4ddfb 100644 --- a/Source/Core/Editor/BuilderProjectSettings.cs +++ b/Source/Core/Editor/BuilderProjectSettings.cs @@ -6,9 +6,9 @@ using System.IO; using UnityEditor; using UnityEngine; -using VRBuilder.Editor.XRUtils; +using VRBuilder.Core.Editor.XRUtils; -namespace VRBuilder.Editor.Settings +namespace VRBuilder.Core.Editor.Settings { /// /// Settings for a VR Builder Unity project. diff --git a/Source/Core/Editor/Configuration/AllowedMenuItemsSettings.cs b/Source/Core/Editor/Configuration/AllowedMenuItemsSettings.cs index 48a2865cd..05434f5c9 100644 --- a/Source/Core/Editor/Configuration/AllowedMenuItemsSettings.cs +++ b/Source/Core/Editor/Configuration/AllowedMenuItemsSettings.cs @@ -10,14 +10,14 @@ using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; using VRBuilder.Core.Utils; -using VRBuilder.Editor.Serialization; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.Serialization; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; using Newtonsoft.Json; using UnityEditor; using UnityEngine; using System.Threading.Tasks; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Configuration class for menu items. @@ -98,7 +98,7 @@ public static bool Save(AllowedMenuItemsSettings settings) { if (string.IsNullOrEmpty(EditorConfigurator.Instance.AllowedMenuItemsSettingsAssetPath)) { - Debug.LogFormat("The property \"AllowedMenuItemsSettingsAssetPath\" of the " + + UnityEngine.Debug.LogFormat("The property \"AllowedMenuItemsSettingsAssetPath\" of the " + "current editor configuration is not set. Thus, the AllowedMenuItemsSettings cannot be saved."); return false; } @@ -108,7 +108,7 @@ public static bool Save(AllowedMenuItemsSettings settings) if (path.StartsWith(assets) == false) { - Debug.LogErrorFormat("The property \"AllowedMenuItemsSettingsAssetPath\" of the current editor configuration" + + UnityEngine.Debug.LogErrorFormat("The property \"AllowedMenuItemsSettingsAssetPath\" of the current editor configuration" + " is invalid. It has to start with \"{0}\". Current value: \"{1}\"", assets, path); return false; } @@ -128,7 +128,7 @@ public static bool Save(AllowedMenuItemsSettings settings) if (string.IsNullOrEmpty(directoryPath)) { - Debug.LogErrorFormat("No valid directory path found in path \"{0}\". The property \"AllowedMenuItemSettingsAssetPath\"" + + UnityEngine.Debug.LogErrorFormat("No valid directory path found in path \"{0}\". The property \"AllowedMenuItemSettingsAssetPath\"" + " of the current editor configuration is invalid. Current value: \"{1}\"", fullPath, path); return false; } @@ -148,7 +148,7 @@ public static bool Save(AllowedMenuItemsSettings settings) } catch (Exception e) { - Debug.LogError(e); + UnityEngine.Debug.LogError(e); return false; } } @@ -163,7 +163,7 @@ public static AllowedMenuItemsSettings Load() string path = EditorConfigurator.Instance.AllowedMenuItemsSettingsAssetPath; if (string.IsNullOrEmpty(path)) { - Debug.Log("The property \"AllowedMenuItemsSettingsAssetPath\" of the current editor " + + UnityEngine.Debug.Log("The property \"AllowedMenuItemsSettingsAssetPath\" of the current editor " + "configuration is not set. Therefore, it cannot be loaded. A new \"AllowedMenuItemsSettings\" " + "object with all found conditions and behaviors was returned."); return new AllowedMenuItemsSettings(); diff --git a/Source/Core/Editor/Configuration/DefaultEditorConfiguration.cs b/Source/Core/Editor/Configuration/DefaultEditorConfiguration.cs index 2e92f4bfb..ff3bb813f 100644 --- a/Source/Core/Editor/Configuration/DefaultEditorConfiguration.cs +++ b/Source/Core/Editor/Configuration/DefaultEditorConfiguration.cs @@ -8,10 +8,10 @@ using VRBuilder.Core.Conditions; using VRBuilder.Core.IO; using VRBuilder.Core.Serialization; -using VRBuilder.Editor.ProcessValidation; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.ProcessValidation; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Default editor configuration definition which is used if no other was implemented. diff --git a/Source/Core/Editor/Configuration/EditorConfigWrapper.cs b/Source/Core/Editor/Configuration/EditorConfigWrapper.cs index 4c04d4df8..6d2d3ec7e 100644 --- a/Source/Core/Editor/Configuration/EditorConfigWrapper.cs +++ b/Source/Core/Editor/Configuration/EditorConfigWrapper.cs @@ -6,9 +6,9 @@ using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; using VRBuilder.Core.Serialization; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { internal class EditorConfigWrapper : DefaultEditorConfiguration { diff --git a/Source/Core/Editor/Configuration/EditorConfigurator.cs b/Source/Core/Editor/Configuration/EditorConfigurator.cs index 242cd03f4..ab76eb97f 100644 --- a/Source/Core/Editor/Configuration/EditorConfigurator.cs +++ b/Source/Core/Editor/Configuration/EditorConfigurator.cs @@ -8,12 +8,12 @@ using UnityEngine; using UnityEditor.Callbacks; using System.Collections.Generic; -using VRBuilder.Editor.UI.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.MenuItems.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Configurator to set the process editor configuration which is used by the process creation editor tools (like Step Inspector). @@ -40,7 +40,7 @@ public static void Init() if (definitions.Except(lowestPriorityTypes).Count() > 1) { string listOfDefinitions = string.Join("', '", definitions.Select(definition => definition.FullName).ToArray()); - Debug.LogErrorFormat( + UnityEngine.Debug.LogErrorFormat( "There is more than one final implementation of process editor configurations in this Unity project: '{0}'." + " Remove all editor configurations except for '{1}' and the one you want to use." + " '{2}' was selected as current editor configuration.", @@ -97,7 +97,7 @@ private static void ApplyConfigurationExtensions() if (conflicts > 0) { - Debug.LogWarningFormat("Conflicts in editor configuration extensions: {0} items were both required and disabled by different extensions. They have been enabled.", conflicts); + UnityEngine.Debug.LogWarningFormat("Conflicts in editor configuration extensions: {0} items were both required and disabled by different extensions. They have been enabled.", conflicts); } foreach (Type menuItem in disabledMenuItems) diff --git a/Source/Core/Editor/Configuration/IEditorConfiguration.cs b/Source/Core/Editor/Configuration/IEditorConfiguration.cs index 4a0853471..366c07a52 100644 --- a/Source/Core/Editor/Configuration/IEditorConfiguration.cs +++ b/Source/Core/Editor/Configuration/IEditorConfiguration.cs @@ -7,9 +7,9 @@ using VRBuilder.Core.Conditions; using VRBuilder.Core.IO; using VRBuilder.Core.Serialization; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Interface for editor configuration definition. Implement it to create your own. diff --git a/Source/Core/Editor/Configuration/IEditorConfigurationExtension.cs b/Source/Core/Editor/Configuration/IEditorConfigurationExtension.cs index 107215568..3f0a79a6a 100644 --- a/Source/Core/Editor/Configuration/IEditorConfigurationExtension.cs +++ b/Source/Core/Editor/Configuration/IEditorConfigurationExtension.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Interface for editor configuration extension definition. diff --git a/Source/Core/Editor/Configuration/LoggingConfigCreationTrigger.cs b/Source/Core/Editor/Configuration/LoggingConfigCreationTrigger.cs index 49a309868..33de6c3fe 100644 --- a/Source/Core/Editor/Configuration/LoggingConfigCreationTrigger.cs +++ b/Source/Core/Editor/Configuration/LoggingConfigCreationTrigger.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEngine.UI; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Checks on editor initialization if there is a logging config. Will add one if it's missing. diff --git a/Source/Core/Editor/Configuration/RuntimeConfiguratorEditor.cs b/Source/Core/Editor/Configuration/RuntimeConfiguratorEditor.cs index 98f2c4ee5..9f5561dee 100644 --- a/Source/Core/Editor/Configuration/RuntimeConfiguratorEditor.cs +++ b/Source/Core/Editor/Configuration/RuntimeConfiguratorEditor.cs @@ -10,13 +10,13 @@ using UnityEditor.Localization; using UnityEngine; using UnityEngine.Localization.Settings; -using VRBuilder.Core; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.ProcessAssets; +using VRBuilder.Core.Editor.UI.GraphView.Windows; +using VRBuilder.Core.Editor.UI.Windows; using VRBuilder.Core.Utils; -using VRBuilder.Editor.UI.Graphics; -using VRBuilder.Editor.UI.Windows; -namespace VRBuilder.Editor.Configuration +namespace VRBuilder.Core.Editor.Configuration { /// /// Custom editor for choosing the process configuration in the Unity game object inspector. @@ -206,7 +206,7 @@ private void DrawProcessSelectionDropDown() { if (processDisplayNames[0] == dummyProcessName) { - Debug.LogError("No processes found. Did you delete or manually rename them?"); + UnityEngine.Debug.LogError("No processes found. Did you delete or manually rename them?"); EditorGUILayout.Popup("Selected Process", 0, processDisplayNames.ToArray()); return; } @@ -233,7 +233,7 @@ private bool CheckForMissingProcess(ref int index) } string processName = ProcessAssetUtils.GetProcessNameFromPath(configurator.GetSelectedProcess()); - Debug.LogError($"The stored process '{ProcessAssetUtils.GetProcessAssetPath(processName)}' was not found. Did you delete or manually rename it?"); + UnityEngine.Debug.LogError($"The stored process '{ProcessAssetUtils.GetProcessAssetPath(processName)}' was not found. Did you delete or manually rename it?"); processDisplayNames.Add(missingProcessName); index = processDisplayNames.Count - 1; return true; diff --git a/Source/Core/Editor/Debug/SceneObjectRegistryV2EditorWindow.cs b/Source/Core/Editor/Debug/GuidBasedSceneObjectRegistryEditorWindow.cs similarity index 92% rename from Source/Core/Editor/Debug/SceneObjectRegistryV2EditorWindow.cs rename to Source/Core/Editor/Debug/GuidBasedSceneObjectRegistryEditorWindow.cs index 273e3c858..6b55f6d62 100644 --- a/Source/Core/Editor/Debug/SceneObjectRegistryV2EditorWindow.cs +++ b/Source/Core/Editor/Debug/GuidBasedSceneObjectRegistryEditorWindow.cs @@ -4,13 +4,13 @@ using UnityEditor; using UnityEngine; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI; -namespace VRBuilder.Editor.Debugging +namespace VRBuilder.Core.Editor.Debug { - public class SceneObjectRegistryV2EditorWindow : EditorWindow + public class GuidBasedSceneObjectRegistryEditorWindow : EditorWindow { private Dictionary foldoutStatus = new Dictionary(); @@ -22,7 +22,7 @@ private void OnEnable() private void OnGUI() { - SceneObjectRegistryV2 sceneObjectRegistry = RuntimeConfigurator.Configuration.SceneObjectRegistry as SceneObjectRegistryV2; + GuidBasedSceneObjectRegistry sceneObjectRegistry = RuntimeConfigurator.Configuration.SceneObjectRegistry as GuidBasedSceneObjectRegistry; if (sceneObjectRegistry == null) { diff --git a/Source/Core/Editor/Debug/SceneObjectRegistryV2EditorWindow.cs.meta b/Source/Core/Editor/Debug/GuidBasedSceneObjectRegistryEditorWindow.cs.meta similarity index 100% rename from Source/Core/Editor/Debug/SceneObjectRegistryV2EditorWindow.cs.meta rename to Source/Core/Editor/Debug/GuidBasedSceneObjectRegistryEditorWindow.cs.meta diff --git a/Source/Core/Editor/DefaultEditingStrategy.cs b/Source/Core/Editor/DefaultEditingStrategy.cs deleted file mode 100644 index 815d36b7c..000000000 --- a/Source/Core/Editor/DefaultEditingStrategy.cs +++ /dev/null @@ -1,205 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using UnityEditor; -using UnityEngine; -using VRBuilder.Core; -using VRBuilder.Editor.Configuration; -using VRBuilder.Editor.UI.Windows; - -namespace VRBuilder.Editor -{ - /// - /// Legacy VR Builder editing strategy. - /// - [Obsolete("This class is not used anymore and will be removed in the next major version.")] - internal class DefaultEditingStrategy : IEditingStrategy - { - private ProcessEditorWindow processWindow; - private IStepView stepWindow; - - public IProcess CurrentProcess { get; protected set; } - public IChapter CurrentChapter { get; protected set; } - - /// - public void HandleNewProcessWindow(ProcessEditorWindow window) - { - processWindow = window; - processWindow.SetProcess(CurrentProcess); - } - - /// - public void HandleNewStepWindow(IStepView window) - { - stepWindow = window; - if (processWindow == null || processWindow.Equals(null)) - { - HandleCurrentStepChanged(null); - } - else - { - HandleCurrentStepChanged(processWindow.GetChapter().ChapterMetadata.LastSelectedStep); - } - } - - /// - public void HandleCurrentProcessModified() - { - } - - /// - public void HandleProcessWindowClosed(ProcessEditorWindow window) - { - if (processWindow != window) - { - return; - } - - if (CurrentProcess != null) - { - ProcessAssetManager.Save(CurrentProcess); - } - } - - /// - public void HandleStepWindowClosed(IStepView window) - { - if (CurrentProcess != null) - { - ProcessAssetManager.Save(CurrentProcess); - } - - stepWindow = null; - } - - /// - public void HandleStartEditingProcess() - { - if (processWindow == null) - { - processWindow = EditorWindow.GetWindow(); - processWindow.minSize = new Vector2(400f, 100f); - } - else - { - processWindow.Focus(); - } - } - - /// - public void HandleCurrentProcessChanged(string processName) - { - if (CurrentProcess != null) - { - ProcessAssetManager.Save(CurrentProcess); - } - - EditorPrefs.SetString(GlobalEditorHandler.LastEditedProcessNameKey, processName); - LoadProcess(ProcessAssetManager.Load(processName)); - } - - private void LoadProcess(IProcess newProcess) - { - CurrentProcess = newProcess; - CurrentChapter = null; - - if (newProcess != null && EditorConfigurator.Instance.Validation.IsAllowedToValidate()) - { - EditorConfigurator.Instance.Validation.Validate(newProcess.Data, newProcess); - } - - if (processWindow != null) - { - processWindow.SetProcess(CurrentProcess); - if (stepWindow != null) - { - stepWindow.SetStep(processWindow.GetChapter()?.ChapterMetadata.LastSelectedStep); - } - } - else if (stepWindow != null) - { - stepWindow.SetStep(null); - } - } - - /// - public void HandleCurrentStepModified(IStep step) - { - processWindow.GetChapter().ChapterMetadata.LastSelectedStep = step; - - if (EditorConfigurator.Instance.Validation.IsAllowedToValidate()) - { - EditorConfigurator.Instance.Validation.Validate(step.Data, CurrentProcess); - } - - processWindow.RefreshChapterRepresentation(); - } - - /// - public void HandleCurrentStepChanged(IStep step) - { - if (stepWindow != null) - { - if (step != null && EditorConfigurator.Instance.Validation.IsAllowedToValidate()) - { - EditorConfigurator.Instance.Validation.Validate(step.Data, CurrentProcess); - } - stepWindow.SetStep(step); - } - } - - /// - public void HandleStartEditingStep() - { - if (stepWindow == null) - { - StepWindow.ShowInspector(); - } - } - - public void HandleCurrentChapterChanged(IChapter chapter) - { - CurrentChapter = chapter; - } - - /// - public void HandleProjectIsGoingToUnload() - { - if (CurrentProcess != null) - { - ProcessAssetManager.Save(CurrentProcess); - } - } - - /// - public void HandleProjectIsGoingToSave() - { - if (CurrentProcess != null) - { - ProcessAssetManager.Save(CurrentProcess); - } - } - - /// - public void HandleExitingPlayMode() - { - if (stepWindow != null) - { - stepWindow.ResetStepView(); - } - } - - /// - public void HandleEnterPlayMode() - { - } - - /// - public void HandleChapterChangeRequest(IChapter chapter) - { - throw new System.NotImplementedException(); - } - } -} diff --git a/Source/Core/Editor/DefaultEditingStrategy.cs.meta b/Source/Core/Editor/DefaultEditingStrategy.cs.meta deleted file mode 100644 index dc3c15199..000000000 --- a/Source/Core/Editor/DefaultEditingStrategy.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 359b50f03bd04832b6be7d90a8bc5c66 -timeCreated: 1588125312 \ No newline at end of file diff --git a/Source/Core/Editor/EditorPrefExtensions.cs b/Source/Core/Editor/EditorPrefExtensions.cs index c5585943b..7853a8545 100644 --- a/Source/Core/Editor/EditorPrefExtensions.cs +++ b/Source/Core/Editor/EditorPrefExtensions.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.Analytics +namespace VRBuilder.Core.Editor.Analytics { internal static class EditorPrefExtensions { diff --git a/Source/Core/Editor/EditorReflectionUtils.cs b/Source/Core/Editor/EditorReflectionUtils.cs index 01b097be0..79a585538 100644 --- a/Source/Core/Editor/EditorReflectionUtils.cs +++ b/Source/Core/Editor/EditorReflectionUtils.cs @@ -11,9 +11,9 @@ using VRBuilder.Core; using VRBuilder.Core.Attributes; using VRBuilder.Core.EntityOwners; -using VRBuilder.Editor.UI.Drawers; +using VRBuilder.Core.Editor.UI.Drawers; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// Helper class for reflection. diff --git a/Source/Core/Editor/EditorUtils.cs b/Source/Core/Editor/EditorUtils.cs index 7a17a98f2..f593ca73b 100644 --- a/Source/Core/Editor/EditorUtils.cs +++ b/Source/Core/Editor/EditorUtils.cs @@ -8,14 +8,16 @@ using System.Linq; using System.Reflection; using UnityEditor; +using UnityEditor.Build; using UnityEditor.Callbacks; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Editor.PackageManager; +using VRBuilder.PackageManager.Editor; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// + /// Retrieves the current named build target based on the active build target settings in the Unity Editor. /// Utility helper to ease up working with Unity Editor. /// [InitializeOnLoad] @@ -52,7 +54,7 @@ private static void DisableImguiTests() private static void SetImguiTestsState(bool enabled) { - List symbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone).Split(';').ToList(); + List symbols = PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.Standalone).Split(';').ToList(); bool wasEnabled = symbols.Contains(ignoreEditorImguiTestsDefineSymbol) == false; @@ -67,7 +69,7 @@ private static void SetImguiTestsState(bool enabled) symbols.Add(ignoreEditorImguiTestsDefineSymbol); } - PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, string.Join(";", symbols.ToArray())); + PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.Standalone, string.Join(";", symbols.ToArray())); AssetDatabase.SaveAssets(); AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport); } @@ -121,14 +123,25 @@ internal static string GetCoreVersion() return string.IsNullOrEmpty(version) ? "unknown" : version; } + /// + /// Retrieves the current named build target based on the active build target settings in the Unity Editor. + /// + /// + /// A object representing the current build target group. + /// + internal static NamedBuildTarget GetCurrentNamedBuildTarget() + { + BuildTarget activeBuildTarget = EditorUserBuildSettings.activeBuildTarget; + BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(activeBuildTarget); + return NamedBuildTarget.FromBuildTargetGroup(targetGroup); + } + /// /// Gets .NET API compatibility level for current BuildTargetGroup. /// internal static ApiCompatibilityLevel GetCurrentCompatibilityLevel() { - BuildTarget buildTarget = EditorUserBuildSettings.activeBuildTarget; - BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget); - return PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup); + return PlayerSettings.GetApiCompatibilityLevel(GetCurrentNamedBuildTarget()); } /// diff --git a/Source/Core/Editor/GlobalEditorHandler.cs b/Source/Core/Editor/GlobalEditorHandler.cs index 6537f5446..2d23e6815 100644 --- a/Source/Core/Editor/GlobalEditorHandler.cs +++ b/Source/Core/Editor/GlobalEditorHandler.cs @@ -3,22 +3,21 @@ // Modifications copyright (c) 2021-2024 MindPort GmbH using UnityEditor; -using UnityEngine; using UnityEditor.SceneManagement; using UnityEngine.SceneManagement; -using VRBuilder.Core; -using VRBuilder.Editor.UI.Windows; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI.GraphView.Windows; +using VRBuilder.Core.Editor.UI.Windows; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// A class that handles interactions between Builder windows and process assets by using selected strategy. /// [InitializeOnLoad] - internal static class GlobalEditorHandler + public static class GlobalEditorHandler { - internal const string LastEditedProcessNameKey = "VRBuilder.Editors.LastEditedProcessName"; + public const string LastEditedProcessNameKey = "VRBuilder.Core.Editors.LastEditedProcessName"; private static IEditingStrategy strategy; @@ -35,7 +34,7 @@ static GlobalEditorHandler() /// /// Sets as current strategy. /// - internal static void SetDefaultStrategy() + public static void SetDefaultStrategy() { SetStrategy(new GraphViewEditingStrategy()); } @@ -43,13 +42,13 @@ internal static void SetDefaultStrategy() /// /// Sets given as current strategy. /// - internal static void SetStrategy(IEditingStrategy newStrategy) + public static void SetStrategy(IEditingStrategy newStrategy) { strategy = newStrategy; if (newStrategy == null) { - Debug.LogError("An editing strategy cannot be null, set to default instead."); + UnityEngine.Debug.LogError("An editing strategy cannot be null, set to default instead."); SetDefaultStrategy(); } } @@ -57,7 +56,7 @@ internal static void SetStrategy(IEditingStrategy newStrategy) /// /// Returns the current active process, can be null. /// - internal static IProcess GetCurrentProcess() + public static IProcess GetCurrentProcess() { return strategy.CurrentProcess; } @@ -65,7 +64,7 @@ internal static IProcess GetCurrentProcess() /// /// Returns the current active chapter, can be null. /// - internal static IChapter GetCurrentChapter() + public static IChapter GetCurrentChapter() { return strategy.CurrentChapter; } @@ -73,7 +72,7 @@ internal static IChapter GetCurrentChapter() /// /// Notifies selected when a new was just opened. /// - internal static void ProcessWindowOpened(ProcessEditorWindow window) + public static void ProcessWindowOpened(ProcessEditorWindow window) { strategy.HandleNewProcessWindow(window); } @@ -81,7 +80,7 @@ internal static void ProcessWindowOpened(ProcessEditorWindow window) /// /// Notifies selected when a was closed. /// - internal static void ProcessWindowClosed(ProcessEditorWindow window) + public static void ProcessWindowClosed(ProcessEditorWindow window) { strategy.HandleProcessWindowClosed(window); } @@ -89,7 +88,7 @@ internal static void ProcessWindowClosed(ProcessEditorWindow window) /// /// Notifies selected when a new was just opened. /// - internal static void StepWindowOpened(StepWindow window) + public static void StepWindowOpened(StepWindow window) { strategy.HandleNewStepWindow(window); } @@ -97,7 +96,7 @@ internal static void StepWindowOpened(StepWindow window) /// /// Notifies selected when a was closed. /// - internal static void StepWindowClosed(StepWindow window) + public static void StepWindowClosed(StepWindow window) { strategy.HandleStepWindowClosed(window); } @@ -105,17 +104,17 @@ internal static void StepWindowClosed(StepWindow window) /// /// Notifies selected when the currently edited process was changed to a different one. /// - internal static void SetCurrentProcess(string processName) + public static void SetCurrentProcess(string processName) { strategy.HandleCurrentProcessChanged(processName); } - internal static void SetCurrentChapter(IChapter chapter) + public static void SetCurrentChapter(IChapter chapter) { strategy.HandleCurrentChapterChanged(chapter); } - internal static void RequestNewChapter(IChapter chapter) + public static void RequestNewChapter(IChapter chapter) { strategy.HandleChapterChangeRequest(chapter); } @@ -123,7 +122,7 @@ internal static void RequestNewChapter(IChapter chapter) /// /// Notifies selected when user wants to start working on the current process. /// - internal static void StartEditingProcess() + public static void StartEditingProcess() { strategy.HandleStartEditingProcess(); } @@ -131,7 +130,7 @@ internal static void StartEditingProcess() /// /// Notifies selected when a designer has just modified the process in the editor. /// - internal static void CurrentProcessModified() + public static void CurrentProcessModified() { strategy.HandleCurrentProcessModified(); } @@ -139,7 +138,7 @@ internal static void CurrentProcessModified() /// /// Notifies selected when the currently edited was modified. /// - internal static void CurrentStepModified(IStep step) + public static void CurrentStepModified(IStep step) { strategy.HandleCurrentStepModified(step); } @@ -147,7 +146,7 @@ internal static void CurrentStepModified(IStep step) /// /// Notifies selected when a designer chooses a to edit. /// - internal static void ChangeCurrentStep(IStep step) + public static void ChangeCurrentStep(IStep step) { strategy.HandleCurrentStepChanged(step); } @@ -155,7 +154,7 @@ internal static void ChangeCurrentStep(IStep step) /// /// Notifies selected when a designer wants to start working on a step. /// - internal static void StartEditingStep() + public static void StartEditingStep() { strategy.HandleStartEditingStep(); } @@ -163,7 +162,7 @@ internal static void StartEditingStep() /// /// Notifies selected when the project is going to be unloaded (when assemblies are unloaded, when user starts or stop runtime, when scripts were modified). /// - internal static void ProjectIsGoingToUnload() + public static void ProjectIsGoingToUnload() { strategy.HandleProjectIsGoingToUnload(); } @@ -171,17 +170,17 @@ internal static void ProjectIsGoingToUnload() /// /// Notifies selected before Unity saves the project (either during the normal exit of the Editor application or when the designer clicks `Save Project`). /// - internal static void ProjectIsGoingToSave() + public static void ProjectIsGoingToSave() { strategy.HandleProjectIsGoingToSave(); } - internal static void EnterPlayMode() + public static void EnterPlayMode() { strategy.HandleEnterPlayMode(); } - internal static void ExitPlayMode() + public static void ExitPlayMode() { strategy.HandleExitingPlayMode(); } diff --git a/Source/Core/Editor/GraphViewEditingStrategy.cs b/Source/Core/Editor/GraphViewEditingStrategy.cs index c31a3773b..cc0b39e56 100644 --- a/Source/Core/Editor/GraphViewEditingStrategy.cs +++ b/Source/Core/Editor/GraphViewEditingStrategy.cs @@ -4,12 +4,13 @@ using UnityEditor; using UnityEngine; -using VRBuilder.Core; -using VRBuilder.Editor.UI.Windows; -using VRBuilder.Editor.Configuration; -using VRBuilder.Editor.UI.Graphics; +using VRBuilder.Core.Editor.Configuration; +using VRBuilder.Core.Editor.ProcessAssets; +using VRBuilder.Core.Editor.UI.GraphView; +using VRBuilder.Core.Editor.UI.GraphView.Windows; +using VRBuilder.Core.Editor.UI.Windows; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// This strategy is used by default and it handles interaction between process assets and various Builder windows. diff --git a/Source/Core/Editor/IEditingStrategy.cs b/Source/Core/Editor/IEditingStrategy.cs index ab40ef414..2db6ff69a 100644 --- a/Source/Core/Editor/IEditingStrategy.cs +++ b/Source/Core/Editor/IEditingStrategy.cs @@ -2,15 +2,15 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -using VRBuilder.Core; -using VRBuilder.Editor.UI.Windows; +using VRBuilder.Core.Editor.UI.GraphView; +using VRBuilder.Core.Editor.UI.GraphView.Windows; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// An interface for a strategy that defines how various events should be handled by the VR Builder editor. /// - internal interface IEditingStrategy + public interface IEditingStrategy { /// /// Returns the current process. diff --git a/Source/Core/Editor/Input/InputEditorUtils.cs b/Source/Core/Editor/Input/InputEditorUtils.cs index a673a77a1..570e7e0aa 100644 --- a/Source/Core/Editor/Input/InputEditorUtils.cs +++ b/Source/Core/Editor/Input/InputEditorUtils.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.Input +namespace VRBuilder.Core.Editor.Input { /// /// Static utility class which provides methods to help managing assets and functionalities of the new input system. diff --git a/Source/Core/Editor/InputSystemChecker.cs b/Source/Core/Editor/InputSystemChecker.cs index b298c0a9c..bf3facf5b 100644 --- a/Source/Core/Editor/InputSystemChecker.cs +++ b/Source/Core/Editor/InputSystemChecker.cs @@ -3,9 +3,9 @@ // Modifications copyright (c) 2021-2024 MindPort GmbH using UnityEditor; -using VRBuilder.Editor.Settings; +using VRBuilder.Core.Editor.Settings; -namespace VRBuilder.Editor.Setup +namespace VRBuilder.Core.Editor.Setup { [InitializeOnLoad] public static class InputSystemChecker diff --git a/Source/Core/Editor/MetadataWrapper.cs b/Source/Core/Editor/MetadataWrapper.cs index 4c276505f..806d02950 100644 --- a/Source/Core/Editor/MetadataWrapper.cs +++ b/Source/Core/Editor/MetadataWrapper.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// Data structure used to draw properties in the 'Step Inspector'. diff --git a/Source/Core/Editor/PackageExporter.cs b/Source/Core/Editor/PackageExporter.cs index 3060d7d56..7fb8b3849 100644 --- a/Source/Core/Editor/PackageExporter.cs +++ b/Source/Core/Editor/PackageExporter.cs @@ -12,7 +12,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { internal static class PackageExporter { @@ -41,7 +41,7 @@ public static void Export() } catch (Exception ex) { - Debug.LogError(ex); + UnityEngine.Debug.LogError(ex); if (Application.isBatchMode) { EditorApplication.Exit(1); @@ -64,11 +64,11 @@ public static void Export(string configPath) string jsonFile = File.ReadAllText(configPath); config = JsonConvert.DeserializeObject(jsonFile); - Debug.Log("Config file successfully loaded"); + UnityEngine.Debug.Log("Config file successfully loaded"); } catch (Exception e) { - Debug.LogWarningFormat("Config file at {0} found, but could not be read. Using default configuration. Exception occuring: '{1}'", configPath, e.GetType().Name); + UnityEngine.Debug.LogWarningFormat("Config file at {0} found, but could not be read. Using default configuration. Exception occuring: '{1}'", configPath, e.GetType().Name); } if (string.IsNullOrEmpty(config.VersionFilename) == false) @@ -85,9 +85,9 @@ public static void Export(string configPath) } string[] exportedPaths = GetAssetPathsToExport(config); - Debug.LogFormat("Exporting {0} paths to {1}", exportedPaths.Length, outputDirectory); + UnityEngine.Debug.LogFormat("Exporting {0} paths to {1}", exportedPaths.Length, outputDirectory); AssetDatabase.ExportPackage(exportedPaths, config.OutputPath.Replace('/', '\\'), ExportPackageOptions.Default); - Debug.Log("Export completed"); + UnityEngine.Debug.Log("Export completed"); } private static string[] GetAssetPathsToExport(ExportConfig config) diff --git a/Source/Core/Editor/PlatformCompatibilityChecker.cs b/Source/Core/Editor/PlatformCompatibilityChecker.cs index 132aa6fcf..2a8d7791b 100644 --- a/Source/Core/Editor/PlatformCompatibilityChecker.cs +++ b/Source/Core/Editor/PlatformCompatibilityChecker.cs @@ -9,7 +9,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { /// /// Validates that full .Net dependencies are referenced by Unity. @@ -63,7 +63,7 @@ private static void CreateReferenceFile(string filePath, IEnumerable dep { File.WriteAllLines(filePath, dependencyList); - Debug.LogWarningFormat("Required compatibility file was created at path {0}", filePath); + UnityEngine.Debug.LogWarningFormat("Required compatibility file was created at path {0}", filePath); } } } diff --git a/Source/Core/Editor/ProcessAssets/ProcessAssetManager.cs b/Source/Core/Editor/ProcessAssets/ProcessAssetManager.cs index f422d50fc..ae1952570 100644 --- a/Source/Core/Editor/ProcessAssets/ProcessAssetManager.cs +++ b/Source/Core/Editor/ProcessAssets/ProcessAssetManager.cs @@ -7,20 +7,18 @@ using System.IO; using System.Linq; using UnityEditor; -using UnityEngine; -using VRBuilder.Core; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.Configuration; using VRBuilder.Core.IO; using VRBuilder.Core.Serialization; using VRBuilder.Core.Utils; -using VRBuilder.Editor.Configuration; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.ProcessAssets { /// /// A static class that handles the process assets. It lets you to save, load, delete, and import processes and provides multiple related utility methods. /// - internal static class ProcessAssetManager + public static class ProcessAssetManager { private static FileSystemWatcher watcher; private static bool isSaving; @@ -29,12 +27,12 @@ internal static class ProcessAssetManager /// /// Called when an external change to the process file is detected. /// - internal static event EventHandler ExternalFileChange; + public static event EventHandler ExternalFileChange; /// /// Deletes the process with . /// - internal static void Delete(string processName) + public static void Delete(string processName) { if (ProcessAssetUtils.DoesProcessAssetExist(processName)) { @@ -46,7 +44,7 @@ internal static void Delete(string processName) /// /// Imports the given by saving it to the proper directory. If there is a name collision, this process will be renamed. /// - internal static void Import(IProcess process) + public static void Import(IProcess process) { int counter = 0; string oldName = process.Data.Name; @@ -63,7 +61,7 @@ internal static void Import(IProcess process) if (oldName != process.Data.Name) { - Debug.LogWarning($"We detected a name collision while importing process \"{oldName}\". We have renamed it to \"{process.Data.Name}\" before importing."); + UnityEngine.Debug.LogWarning($"We detected a name collision while importing process \"{oldName}\". We have renamed it to \"{process.Data.Name}\" before importing."); } Save(process); @@ -72,13 +70,13 @@ internal static void Import(IProcess process) /// /// Imports the process from file at given file if the file extensions matches the . /// - internal static void Import(string path, IProcessSerializer serializer) + public static void Import(string path, IProcessSerializer serializer) { IProcess process; if (Path.GetExtension(path) != $".{serializer.FileFormat}") { - Debug.LogError($"The file extension of {path} does not match the expected file extension of {serializer.FileFormat} of the current serializer."); + UnityEngine.Debug.LogError($"The file extension of {path} does not match the expected file extension of {serializer.FileFormat} of the current serializer."); } try @@ -88,7 +86,7 @@ internal static void Import(string path, IProcessSerializer serializer) } catch (Exception e) { - Debug.LogError($"{e.GetType().Name} occured while trying to import file '{path}' with serializer '{serializer.GetType().Name}'\n\n{e.StackTrace}"); + UnityEngine.Debug.LogError($"{e.GetType().Name} occured while trying to import file '{path}' with serializer '{serializer.GetType().Name}'\n\n{e.StackTrace}"); return; } @@ -98,7 +96,7 @@ internal static void Import(string path, IProcessSerializer serializer) /// /// Save the to the file system. /// - internal static void Save(IProcess process) + public static void Save(IProcess process) { try { @@ -135,7 +133,7 @@ internal static void Save(IProcess process) } catch (Exception ex) { - Debug.LogError(ex); + UnityEngine.Debug.LogError(ex); } } @@ -143,7 +141,7 @@ private static void DeleteFiles(IEnumerable filesToDelete) { foreach (string file in filesToDelete) { - Debug.Log($"File deleted: {file}"); + UnityEngine.Debug.Log($"File deleted: {file}"); File.Delete(file); } } @@ -175,11 +173,11 @@ private static void WriteFileIfChanged(byte[] data, string path) if (AssetDatabase.MakeEditable(path)) { WriteProcessFile(path, data); - Debug.Log($"File saved: \"{path}\""); + UnityEngine.Debug.Log($"File saved: \"{path}\""); } else { - Debug.LogError($"Saving of \"{path}\" failed! Could not make it editable."); + UnityEngine.Debug.LogError($"Saving of \"{path}\" failed! Could not make it editable."); } } } @@ -204,7 +202,7 @@ private static void WriteProcessFile(string path, byte[] processData) } catch (Exception ex) { - Debug.LogError(ex); + UnityEngine.Debug.LogError(ex); } finally { @@ -221,7 +219,7 @@ private static void WriteProcessFile(string path, byte[] processData) /// Sets up a file system watcher to monitor changes in the directory of the process. /// /// The name of the process to load or if the scene dos not contain a process. - internal static IProcess Load(string processName) + public static IProcess Load(string processName) { if (ProcessAssetUtils.DoesProcessAssetExist(processName)) { @@ -242,8 +240,8 @@ internal static IProcess Load(string processName) } catch (Exception ex) { - Debug.LogError($"Failed to load the process '{processName}' from '{processAssetPath}' because of: \n{ex.Message}"); - Debug.LogError(ex); + UnityEngine.Debug.LogError($"Failed to load the process '{processName}' from '{processAssetPath}' because of: \n{ex.Message}"); + UnityEngine.Debug.LogError(ex); } } else @@ -256,11 +254,11 @@ internal static IProcess Load(string processName) /// /// Renames the to the and moves it to the appropriate directory. Check if you can rename before with the method. /// - internal static void RenameProcess(IProcess process, string newName) + public static void RenameProcess(IProcess process, string newName) { if (ProcessAssetUtils.CanRename(process, newName, out string errorMessage) == false) { - Debug.LogError($"Process {process.Data.Name} was not renamed because:\n\n{errorMessage}"); + UnityEngine.Debug.LogError($"Process {process.Data.Name} was not renamed because:\n\n{errorMessage}"); return; } @@ -282,7 +280,7 @@ internal static void RenameProcess(IProcess process, string newName) if (newAsset.EndsWith(streamingAssetPath) == false) { - Debug.LogError($"Process {process.Data.Name} is stored in an invalid path."); + UnityEngine.Debug.LogError($"Process {process.Data.Name} is stored in an invalid path."); } RuntimeConfigurator.Instance.SetSelectedProcess(streamingAssetPath); @@ -336,7 +334,7 @@ private static List LoadAdditionalDataFromManifest(string processName, I } else { - Debug.Log($"Error loading process. File not found: {path}"); + UnityEngine.Debug.Log($"Error loading process. File not found: {path}"); } } diff --git a/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessor.cs b/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessor.cs index 8f877c9fb..35fa9a8d7 100644 --- a/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessor.cs +++ b/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessor.cs @@ -6,7 +6,7 @@ using System.Linq; using UnityEditor; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.ProcessAssets { /// /// Monitors process files added or removed from the project. diff --git a/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessorEventArgs.cs b/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessorEventArgs.cs index 354189fa0..c50bd2d6d 100644 --- a/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessorEventArgs.cs +++ b/Source/Core/Editor/ProcessAssets/ProcessAssetPostprocessorEventArgs.cs @@ -4,7 +4,7 @@ using System; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.ProcessAssets { /// /// Event args for events. diff --git a/Source/Core/Editor/ProcessAssets/ProcessAssetProcessor.cs b/Source/Core/Editor/ProcessAssets/ProcessAssetProcessor.cs index ff34ba0d6..f0b07efe4 100644 --- a/Source/Core/Editor/ProcessAssets/ProcessAssetProcessor.cs +++ b/Source/Core/Editor/ProcessAssets/ProcessAssetProcessor.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.ProcessAssets { /// /// A class which detects if the project is going to be saved and informs the about it. diff --git a/Source/Core/Editor/ProcessAssets/ProcessAssetUtils.cs b/Source/Core/Editor/ProcessAssets/ProcessAssetUtils.cs index dde1267cf..bb91082d4 100644 --- a/Source/Core/Editor/ProcessAssets/ProcessAssetUtils.cs +++ b/Source/Core/Editor/ProcessAssets/ProcessAssetUtils.cs @@ -5,21 +5,20 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using VRBuilder.Core; -using VRBuilder.Editor.Configuration; using UnityEngine; +using VRBuilder.Core.Editor.Configuration; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.ProcessAssets { /// /// A collection of helper functions which are related to process asset handling. /// - internal static class ProcessAssetUtils + public static class ProcessAssetUtils { /// /// Extracts the file name from the . Works with both relative and full paths. /// - internal static string GetProcessNameFromPath(string processPath) + public static string GetProcessNameFromPath(string processPath) { return Path.GetFileNameWithoutExtension(processPath); } @@ -27,7 +26,7 @@ internal static string GetProcessNameFromPath(string processPath) /// /// Returns the asset path to the process with the . /// - internal static string GetProcessAssetPath(string processName) + public static string GetProcessAssetPath(string processName) { return $"{GetProcessAssetDirectory(processName)}/{processName}.{EditorConfigurator.Instance.Serializer.FileFormat}"; } @@ -35,7 +34,7 @@ internal static string GetProcessAssetPath(string processName) /// /// Returns the relative path from the streaming assets directory to the process with the . /// - internal static string GetProcessStreamingAssetPath(string processName) + public static string GetProcessStreamingAssetPath(string processName) { return $"{GetProcessStreamingAssetsSubdirectory(processName)}/{processName}.{EditorConfigurator.Instance.Serializer.FileFormat}"; } @@ -43,7 +42,7 @@ internal static string GetProcessStreamingAssetPath(string processName) /// /// Returns true if the file at given is a process. It does not check the validity of the file's contents. /// - internal static bool IsValidProcessAssetPath(string assetPath) + public static bool IsValidProcessAssetPath(string assetPath) { string filePath = Path.Combine(Application.dataPath.Remove(Application.dataPath.LastIndexOf('/')), assetPath).Replace('/', Path.DirectorySeparatorChar); string processFolderPath = Path.Combine(Application.streamingAssetsPath, EditorConfigurator.Instance.ProcessStreamingAssetsSubdirectory).Replace('/', Path.DirectorySeparatorChar); @@ -59,7 +58,7 @@ internal static bool IsValidProcessAssetPath(string assetPath) /// /// Returns a list of names of all processes in the project. /// - internal static IEnumerable GetAllProcesses() + public static IEnumerable GetAllProcesses() { DirectoryInfo processesDirectory = new DirectoryInfo($"{Application.streamingAssetsPath}/{EditorConfigurator.Instance.ProcessStreamingAssetsSubdirectory}"); return processesDirectory.GetDirectories() @@ -71,7 +70,7 @@ internal static IEnumerable GetAllProcesses() /// /// Checks if any process exists. /// - internal static bool DoesAnyProcessExist() + public static bool DoesAnyProcessExist() { DirectoryInfo processesDirectory = new DirectoryInfo($"{Application.streamingAssetsPath}/{EditorConfigurator.Instance.ProcessStreamingAssetsSubdirectory}"); if (processesDirectory.Exists == false) @@ -86,7 +85,7 @@ internal static bool DoesAnyProcessExist() /// Checks if you can create a process with the given . /// /// Empty if you can create the process or must fail silently. - internal static bool CanCreate(string processName, out string errorMessage) + public static bool CanCreate(string processName, out string errorMessage) { errorMessage = string.Empty; @@ -116,7 +115,7 @@ internal static bool CanCreate(string processName, out string errorMessage) /// Checks if you can rename the to the . /// /// Empty if you can create the process or must fail silently. - internal static bool CanRename(IProcess process, string newName, out string errorMessage) + public static bool CanRename(IProcess process, string newName, out string errorMessage) { errorMessage = string.Empty; @@ -126,7 +125,7 @@ internal static bool CanRename(IProcess process, string newName, out string erro /// /// Returns true if there is a process asset for the . /// - internal static bool DoesProcessAssetExist(string processName) + public static bool DoesProcessAssetExist(string processName) { return File.Exists(GetProcessAssetPath(processName)); } @@ -134,12 +133,12 @@ internal static bool DoesProcessAssetExist(string processName) /// /// Returns the directory of the process relative to the project root folder (Assets/StreamingAssets/...). /// - internal static string GetProcessAssetDirectory(string processName) + public static string GetProcessAssetDirectory(string processName) { return $"{Application.streamingAssetsPath}/{GetProcessStreamingAssetsSubdirectory(processName)}"; } - private static string GetProcessStreamingAssetsSubdirectory(string processName) + public static string GetProcessStreamingAssetsSubdirectory(string processName) { return $"{EditorConfigurator.Instance.ProcessStreamingAssetsSubdirectory}/{processName}"; } diff --git a/Source/Core/Editor/ProcessController.meta b/Source/Core/Editor/ProcessController.meta deleted file mode 100644 index a8d727027..000000000 --- a/Source/Core/Editor/ProcessController.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec2574f57f8fa2d46a7bc260a3b64d58 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/Converter.cs b/Source/Core/Editor/ProcessUpgradeTool/Converters/Converter.cs index 81847d721..2ada1000e 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/Converter.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Converters/Converter.cs @@ -1,8 +1,6 @@ using System; -using UnityEngine; -using VRBuilder.Core; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Converters { /// /// Generic implementation of . @@ -21,7 +19,7 @@ public abstract class Converter : IConverter where TIn : class where public object Convert(object oldObject) { TOut newObject = PerformConversion((TIn)oldObject); - Debug.Log($"Replaced obsolete {typeof(TIn).Name} '{GetObjectName(oldObject)}' with {typeof(TOut).Name} '{GetObjectName(newObject)}'."); + UnityEngine.Debug.Log($"Replaced obsolete {typeof(TIn).Name} '{GetObjectName(oldObject)}' with {typeof(TOut).Name} '{GetObjectName(newObject)}'."); return newObject; } diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/DisableGameObjectBehaviorConverter.cs b/Source/Core/Editor/ProcessUpgradeTool/Converters/DisableGameObjectBehaviorConverter.cs deleted file mode 100644 index 9ddc3e228..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/DisableGameObjectBehaviorConverter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Linq; -using VRBuilder.Core.Behaviors; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Unity; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Replaces an obsolete with a - /// with the same configuration. - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class DisableGameObjectBehaviorConverter : Converter - { - /// - protected override SetObjectsEnabledBehavior PerformConversion(DisableGameObjectBehavior oldBehavior) -#pragma warning restore CS0618 // Type or member is obsolete - { - SetObjectsEnabledBehavior newBehavior = new SetObjectsEnabledBehavior(); - newBehavior.Data.SetEnabled = false; - newBehavior.Data.RevertOnDeactivation = false; - - if (string.IsNullOrEmpty(oldBehavior.Data.Target.UniqueName) == false) - { -#pragma warning disable CS0618 // Type or member is obsolete - ProcessSceneObject referencedObject = SceneUtils.GetActiveAndInactiveComponents().FirstOrDefault(sceneObject => sceneObject.UniqueName == oldBehavior.Data.Target.UniqueName); -#pragma warning restore CS0618 // Type or member is obsolete - - if (referencedObject != null) - { - newBehavior.Data.TargetObjects = new MultipleSceneObjectReference(referencedObject.Guid); - } - } - - return newBehavior; - } - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/DisableGameObjectBehaviorConverter.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Converters/DisableGameObjectBehaviorConverter.cs.meta deleted file mode 100644 index 8d26a3832..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/DisableGameObjectBehaviorConverter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 03185594103211c4299bd6f7da70996c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/EnableGameObjectBehaviorConverter.cs b/Source/Core/Editor/ProcessUpgradeTool/Converters/EnableGameObjectBehaviorConverter.cs deleted file mode 100644 index 4283a6549..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/EnableGameObjectBehaviorConverter.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Linq; -using VRBuilder.Core.Behaviors; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Unity; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Replaces an obsolete with a - /// with the same configuration. - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class EnableGameObjectBehaviorConverter : Converter - { - /// - protected override SetObjectsEnabledBehavior PerformConversion(EnableGameObjectBehavior oldBehavior) -#pragma warning restore CS0618 // Type or member is obsolete - { - SetObjectsEnabledBehavior newBehavior = new SetObjectsEnabledBehavior(); - newBehavior.Data.SetEnabled = true; - newBehavior.Data.RevertOnDeactivation = oldBehavior.Data.DisableOnDeactivating; - - if (string.IsNullOrEmpty(oldBehavior.Data.Target.UniqueName) == false) - { -#pragma warning disable CS0618 // Type or member is obsolete - ProcessSceneObject referencedObject = SceneUtils.GetActiveAndInactiveComponents().FirstOrDefault(sceneObject => sceneObject.UniqueName == oldBehavior.Data.Target.UniqueName); -#pragma warning restore CS0618 // Type or member is obsolete - - if (referencedObject != null) - { - newBehavior.Data.TargetObjects = new MultipleSceneObjectReference(referencedObject.Guid); - } - } - - return newBehavior; - } - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/EnableGameObjectBehaviorConverter.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Converters/EnableGameObjectBehaviorConverter.cs.meta deleted file mode 100644 index 6be2db4a3..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/EnableGameObjectBehaviorConverter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c81fd468d6281244daae0637c14fe1c8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/IConverter.cs b/Source/Core/Editor/ProcessUpgradeTool/Converters/IConverter.cs index b9d8d8480..56d2af120 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/IConverter.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Converters/IConverter.cs @@ -1,6 +1,6 @@ using System; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Converters { /// /// Replaces an object with another up to date object with comparable functionality. diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetComponentEnabledByTagBehaviorConverter.cs b/Source/Core/Editor/ProcessUpgradeTool/Converters/SetComponentEnabledByTagBehaviorConverter.cs deleted file mode 100644 index fd0c905da..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetComponentEnabledByTagBehaviorConverter.cs +++ /dev/null @@ -1,37 +0,0 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Replaces an obsolete with a - /// with the same configuration. - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class SetComponentEnabledByTagBehaviorConverter : Converter - { - /// - protected override SetComponentEnabledBehavior PerformConversion(SetComponentEnabledByTagBehavior oldBehavior) -#pragma warning restore CS0618 // Type or member is obsolete - { - SetComponentEnabledBehavior newBehavior = new SetComponentEnabledBehavior(); - - if (oldBehavior.Data.TargetObjects.HasValue()) - { - newBehavior.Data.TargetObjects = oldBehavior.Data.TargetObjects; - } - else - { -#pragma warning disable CS0618 // Type or member is obsolete - newBehavior.Data.TargetObjects = new MultipleSceneObjectReference(oldBehavior.Data.TargetTag.Guid); -#pragma warning restore CS0618 // Type or member is obsolete - } - - newBehavior.Data.SetEnabled = oldBehavior.Data.SetEnabled; - newBehavior.Data.RevertOnDeactivation = oldBehavior.Data.RevertOnDeactivation; - newBehavior.Data.ComponentType = oldBehavior.Data.ComponentType; - - return newBehavior; - } - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetComponentEnabledByTagBehaviorConverter.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Converters/SetComponentEnabledByTagBehaviorConverter.cs.meta deleted file mode 100644 index 3f03bf0c4..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetComponentEnabledByTagBehaviorConverter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1d0ddcc45e4eaa643a84ac876e855518 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetObjectsWithTagEnabledBehaviorConverter.cs b/Source/Core/Editor/ProcessUpgradeTool/Converters/SetObjectsWithTagEnabledBehaviorConverter.cs deleted file mode 100644 index 65e33852d..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetObjectsWithTagEnabledBehaviorConverter.cs +++ /dev/null @@ -1,35 +0,0 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Replaces an obsolete with a - /// with the same configuration. - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class SetObjectsWithTagEnabledBehaviorConverter : Converter - { - /// - protected override SetObjectsEnabledBehavior PerformConversion(SetObjectsWithTagEnabledBehavior oldBehavior) - { -#pragma warning restore CS0618 // Type or member is obsolete - - SetObjectsEnabledBehavior newBehavior = new SetObjectsEnabledBehavior(); - newBehavior.Data.SetEnabled = oldBehavior.Data.SetEnabled; - if (oldBehavior.Data.TargetObjects.HasValue()) - { - newBehavior.Data.TargetObjects = oldBehavior.Data.TargetObjects; - } - else - { -#pragma warning disable CS0618 // Type or member is obsolete - newBehavior.Data.TargetObjects = new MultipleSceneObjectReference(oldBehavior.Data.Tag.Guid); -#pragma warning restore CS0618 // Type or member is obsolete - } - newBehavior.Data.RevertOnDeactivation = oldBehavior.Data.RevertOnDeactivation; - - return newBehavior; - } - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetObjectsWithTagEnabledBehaviorConverter.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Converters/SetObjectsWithTagEnabledBehaviorConverter.cs.meta deleted file mode 100644 index b57e3efe0..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Converters/SetObjectsWithTagEnabledBehaviorConverter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0cf6d2163f2fe9d4a9ea07fdfa576e47 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/ProcessUpgradeTool.cs b/Source/Core/Editor/ProcessUpgradeTool/ProcessUpgradeTool.cs index 610d2778d..2585c478e 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/ProcessUpgradeTool.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/ProcessUpgradeTool.cs @@ -3,17 +3,18 @@ using System.Linq; using System.Reflection; using UnityEditor; -using UnityEngine; using UnityEngine.SceneManagement; -using VRBuilder.Core; +using VRBuilder.Core.Behaviors; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.ProcessAssets; +using VRBuilder.Core.Editor.ProcessUpgradeTool.Converters; +using VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters; using VRBuilder.Core.EntityOwners; using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Settings; using VRBuilder.Core.Utils; using VRBuilder.Unity; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool { /// /// Tool for upgrading an old process loaded in a scene to be compatible with the latest version of VR Builder. @@ -59,44 +60,52 @@ public static IEnumerable Converters } } - [MenuItem("Tools/VR Builder/Developer/Update Object Groups", false, 75)] - private static void UpdateObjectGroupsMenuEntry() + //[MenuItem("Tools/VR Builder/Developer/Fix Groups", false, 70)] + // Used to fix GroupsToUnlock == null errors. + private static void FixGroups() { - if (EditorUtility.DisplayDialog("Update Object Groups", "If this project contains any legacy tags, these will be added to the list of object groups.\n" + - "Proceed?", "Yes", "No")) + IProcess process = GlobalEditorHandler.GetCurrentProcess(); + + foreach (IChapter chapter in process.Data.Chapters) { - UpdateObjectGroups(); + foreach (IStep step in chapter.Data.Steps) + { + FixGroupsToUnlockInStep(step); + } } + + ProcessAssetManager.Save(process); } - private static void UpdateObjectGroups() + private static void FixGroupsToUnlockInStep(IStep step) { - int counter = 0; -#pragma warning disable CS0618 // Type or member is obsolete - foreach (SceneObjectTags.Tag tag in SceneObjectTags.Instance.Tags) + if (((Step)step).Data.GroupsToUnlock == null) { - if (SceneObjectGroups.Instance.GroupExists(tag.Guid) == false) - { - SceneObjectGroups.Instance.CreateGroup(tag.Label, tag.Guid); - counter++; - } + ((Step)step).Data.GroupsToUnlock = new Dictionary>(); } -#pragma warning restore CS0618 // Type or member is obsolete - if (counter > 0) + foreach (IBehavior behavior in step.Data.Behaviors.Data.Behaviors) { - EditorUtility.SetDirty(SceneObjectGroups.Instance); + if (behavior is IDataOwner dataOwner && dataOwner.Data is EntityCollectionData nestedData) + { + foreach (IChapter chapter in nestedData.GetChildren()) + { + foreach (IStep nestedStep in chapter.Data.Steps) + { + FixGroupsToUnlockInStep(nestedStep); + } + } + } } - - Debug.Log($"Converted {counter} tags to object groups."); } - [MenuItem("Tools/VR Builder/Developer/Update Process in Scene", false, 70)] + // [MenuItem("Tools/VR Builder/Developer/Update Process in Scene", false, 70)] + // Was used for updating from VR Builder 3 to VR Builder 4. private static void UpdateProcessMenuEntry() { if (RuntimeConfigurator.Exists == false) { - Debug.LogError("This is not a VR Builder scene"); + UnityEngine.Debug.LogError("This is not a VR Builder scene"); return; } @@ -104,7 +113,7 @@ private static void UpdateProcessMenuEntry() if (process == null) { - Debug.LogError("No active process found."); + UnityEngine.Debug.LogError("No active process found."); return; } @@ -118,19 +127,10 @@ private static void UpdateProcessMenuEntry() return; } - UpdateObjectGroups(); - IEnumerable processSceneObjects = SceneUtils.GetActiveAndInactiveComponents(); foreach (ProcessSceneObject sceneObject in processSceneObjects) { sceneObject.ResetUniqueId(); -#pragma warning disable CS0618 // Type or member is obsolete - foreach (Guid guid in sceneObject.Tags) - { - sceneObject.AddGuid(guid); - } -#pragma warning restore CS0618 // Type or member is obsolete - EditorUtility.SetDirty(sceneObject); } diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/BehaviorListUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/BehaviorListUpdater.cs index 9842b4b27..1de066032 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/BehaviorListUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/BehaviorListUpdater.cs @@ -1,6 +1,6 @@ using VRBuilder.Core.Behaviors; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Concrete implementation of . diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ConditionListUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ConditionListUpdater.cs index 6be04947f..0647f0ced 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ConditionListUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ConditionListUpdater.cs @@ -1,6 +1,6 @@ using VRBuilder.Core.Conditions; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Concrete implementation of . diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/DataUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/DataUpdater.cs index 2da2e3a62..f6a69d509 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/DataUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/DataUpdater.cs @@ -1,6 +1,4 @@ -using VRBuilder.Core; - -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Concrete implementation of . diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/IUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/IUpdater.cs index 6d8b4ec3b..fa052024b 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/IUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/IUpdater.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Updates the value in a field or property according to a newer standard. diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ListUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ListUpdater.cs index a8c0ff07c..dd572def1 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ListUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ListUpdater.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using VRBuilder.Core.Editor.ProcessUpgradeTool.Converters; using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Iterates through elements of a and replaces them with an up to date diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/LockablePropertyReferenceUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/LockablePropertyReferenceUpdater.cs index a222ce1a3..90319531f 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/LockablePropertyReferenceUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/LockablePropertyReferenceUpdater.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Reflection; -using VRBuilder.Core.Behaviors; +using VRBuilder.Core.RestrictiveEnvironment; using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Iterates through a collection of s and updates them if a suitable updater exists. diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/NestedUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/NestedUpdater.cs index 8969cb890..d634425c1 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/NestedUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/NestedUpdater.cs @@ -3,7 +3,7 @@ using System.Reflection; using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Generic that iterates through the fields and properties of the provided object and diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessSceneReferencePropertyUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessSceneReferencePropertyUpdater.cs deleted file mode 100644 index ba2c5f910..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessSceneReferencePropertyUpdater.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Unity; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Assigns a value to a property from an obsolete - /// or . - /// -#pragma warning disable CS0618 // Type or member is obsolete - public class ProcessSceneReferencePropertyUpdater : PropertyUpdater - { - /// - protected override bool PerformUpgrade(ref ProcessSceneReferenceBase newProperty, ref object oldProperty) - { - if (oldProperty is UniqueNameReference uniqueNameReference) - { - return UpgradeUniqueReference(ref newProperty, ref uniqueNameReference); - } - else if (oldProperty is SceneObjectTagBase sceneObjectTag) - { - return UpgradeSceneObjectTag(ref newProperty, ref sceneObjectTag); - } - - return false; - } - - private bool UpgradeSceneObjectTag(ref ProcessSceneReferenceBase newProperty, ref SceneObjectTagBase sceneObjectTag) - { - newProperty.ResetGuids(new List { sceneObjectTag.Guid }); - return true; - } - - private bool UpgradeUniqueReference(ref ProcessSceneReferenceBase newProperty, ref UniqueNameReference oldProperty) - { - if (string.IsNullOrEmpty(oldProperty.UniqueName)) - { - return true; - } - - // Attempt to find an object with the given unique name in the scene. - string uniqueName = oldProperty.UniqueName; - ProcessSceneObject referencedObject = SceneUtils.GetActiveAndInactiveComponents().FirstOrDefault(sceneObject => sceneObject.UniqueName == uniqueName); -#pragma warning restore CS0618 // Type or member is obsolete - - if (referencedObject == null) - { - return false; - } - - newProperty.ResetGuids(new List() { referencedObject.Guid }); - return true; - } - - /// - protected override bool ShouldBeUpdated(ProcessSceneReferenceBase property) - { - return property == null || property.IsEmpty(); - } - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessSceneReferencePropertyUpdater.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessSceneReferencePropertyUpdater.cs.meta deleted file mode 100644 index fe9d37d2b..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessSceneReferencePropertyUpdater.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 432e101d21072ff49b3edb30a402afee -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableBoolUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableBoolUpdater.cs deleted file mode 100644 index 04534898d..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableBoolUpdater.cs +++ /dev/null @@ -1,11 +0,0 @@ -using VRBuilder.Core.ProcessUtils; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Concrete implementation of . - /// - public class ProcessVariableBoolUpdater : NestedUpdater> - { - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableBoolUpdater.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableBoolUpdater.cs.meta deleted file mode 100644 index 683fca3ea..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableBoolUpdater.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 849ad6cab04779542a2f64ee039c2037 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableFloatUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableFloatUpdater.cs deleted file mode 100644 index 9f0316866..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableFloatUpdater.cs +++ /dev/null @@ -1,11 +0,0 @@ -using VRBuilder.Core.ProcessUtils; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Concrete implementation of . - /// - public class ProcessVariableFloatUpdater : NestedUpdater> - { - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableFloatUpdater.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableFloatUpdater.cs.meta deleted file mode 100644 index d58eedce0..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableFloatUpdater.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 691c6529dc8d70043a0c508b4eb240da -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableStringUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableStringUpdater.cs deleted file mode 100644 index 881e40a6e..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableStringUpdater.cs +++ /dev/null @@ -1,11 +0,0 @@ -using VRBuilder.Core.ProcessUtils; - -namespace VRBuilder.Editor.ProcessUpgradeTool -{ - /// - /// Concrete implementation of . - /// - public class ProcessVariableStringUpdater : NestedUpdater> - { - } -} diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableStringUpdater.cs.meta b/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableStringUpdater.cs.meta deleted file mode 100644 index e509d3895..000000000 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/ProcessVariableStringUpdater.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 11618b27184bdb24aab72381bde88cdf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/PropertyUpdater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/PropertyUpdater.cs index 87fb99a69..d057a1e78 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/PropertyUpdater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/PropertyUpdater.cs @@ -1,12 +1,10 @@ using System; using System.Linq; using System.Reflection; -using UnityEngine; -using VRBuilder.Core; using VRBuilder.Core.Attributes; using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Generic implementation of specific for properties that supersede obsolete properties of a different type. @@ -36,18 +34,18 @@ public void Update(MemberInfo memberInfo, object owner) if (ShouldBeUpdated(propertyValue) == false) { - Debug.Log($"Skipped {memberInfo.Name} in {ownerName}: does not need updating."); + UnityEngine.Debug.Log($"Skipped {memberInfo.Name} in {ownerName}: does not need updating."); return; } if (AttemptToUpdateProperty(memberInfo, owner)) { TNew updatedValue = (TNew)ReflectionUtils.GetValueFromPropertyOrField(owner, memberInfo); - Debug.Log($"Successfully updated {memberInfo.Name} to {updatedValue} in {ownerName}."); + UnityEngine.Debug.Log($"Successfully updated {memberInfo.Name} to {updatedValue} in {ownerName}."); } else { - Debug.LogWarning($"Failed to update {memberInfo.Name} in {ownerName}."); + UnityEngine.Debug.LogWarning($"Failed to update {memberInfo.Name} in {ownerName}."); } } diff --git a/Source/Core/Editor/ProcessUpgradeTool/Updaters/Updater.cs b/Source/Core/Editor/ProcessUpgradeTool/Updaters/Updater.cs index 358cf5454..be03ce00b 100644 --- a/Source/Core/Editor/ProcessUpgradeTool/Updaters/Updater.cs +++ b/Source/Core/Editor/ProcessUpgradeTool/Updaters/Updater.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace VRBuilder.Editor.ProcessUpgradeTool +namespace VRBuilder.Core.Editor.ProcessUpgradeTool.Updaters { /// /// Generic implementation of . diff --git a/Source/Core/Editor/ProcessValidation/DisabledValidationHandler.cs b/Source/Core/Editor/ProcessValidation/DisabledValidationHandler.cs index 72d2bcf9d..9325f53d3 100644 --- a/Source/Core/Editor/ProcessValidation/DisabledValidationHandler.cs +++ b/Source/Core/Editor/ProcessValidation/DisabledValidationHandler.cs @@ -4,7 +4,7 @@ using VRBuilder.Core; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// Does not validate, used to disabled the validation system. diff --git a/Source/Core/Editor/ProcessValidation/EditorReportEntry.cs b/Source/Core/Editor/ProcessValidation/EditorReportEntry.cs index 397eed78f..c19881ba6 100644 --- a/Source/Core/Editor/ProcessValidation/EditorReportEntry.cs +++ b/Source/Core/Editor/ProcessValidation/EditorReportEntry.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -using VRBuilder.Core.Validation; +using VRBuilder.Core.ProcessValidation; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// Report generated from validations of objects. diff --git a/Source/Core/Editor/ProcessValidation/IContext.cs b/Source/Core/Editor/ProcessValidation/IContext.cs index e651e54b5..30b850a4e 100644 --- a/Source/Core/Editor/ProcessValidation/IContext.cs +++ b/Source/Core/Editor/ProcessValidation/IContext.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// Context is used to indicate the position in the process structure. diff --git a/Source/Core/Editor/ProcessValidation/IContextResolver.cs b/Source/Core/Editor/ProcessValidation/IContextResolver.cs index 1a288ca99..53a83c21b 100644 --- a/Source/Core/Editor/ProcessValidation/IContextResolver.cs +++ b/Source/Core/Editor/ProcessValidation/IContextResolver.cs @@ -4,7 +4,7 @@ using VRBuilder.Core; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// Retrieves from any provided . diff --git a/Source/Core/Editor/ProcessValidation/IValidationHandler.cs b/Source/Core/Editor/ProcessValidation/IValidationHandler.cs index 524f7658f..a94277bb9 100644 --- a/Source/Core/Editor/ProcessValidation/IValidationHandler.cs +++ b/Source/Core/Editor/ProcessValidation/IValidationHandler.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using VRBuilder.Core; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// ValidationHandler validates data objects, e.g. steps or conditions, of a given process and reports whether diff --git a/Source/Core/Editor/ProcessValidation/IValidationReport.cs b/Source/Core/Editor/ProcessValidation/IValidationReport.cs index 3ec504385..8ed7d469e 100644 --- a/Source/Core/Editor/ProcessValidation/IValidationReport.cs +++ b/Source/Core/Editor/ProcessValidation/IValidationReport.cs @@ -8,7 +8,7 @@ using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// Report about the last validation done by the validation system. diff --git a/Source/Core/Editor/ProcessValidation/IValidationScope.cs b/Source/Core/Editor/ProcessValidation/IValidationScope.cs index ce1508c38..e90bf2115 100644 --- a/Source/Core/Editor/ProcessValidation/IValidationScope.cs +++ b/Source/Core/Editor/ProcessValidation/IValidationScope.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// ValidationScope limits the scope of the validation done. For example scopes are: diff --git a/Source/Core/Editor/ProcessValidation/IValidator.cs b/Source/Core/Editor/ProcessValidation/IValidator.cs index d252e88a8..76a4b517c 100644 --- a/Source/Core/Editor/ProcessValidation/IValidator.cs +++ b/Source/Core/Editor/ProcessValidation/IValidator.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { /// /// Validator provides validation for a specific Type. diff --git a/Source/Core/Editor/ProcessValidation/ValidationTooltipGenerator.cs b/Source/Core/Editor/ProcessValidation/ValidationTooltipGenerator.cs index bf74ea7f6..ebd2929b3 100644 --- a/Source/Core/Editor/ProcessValidation/ValidationTooltipGenerator.cs +++ b/Source/Core/Editor/ProcessValidation/ValidationTooltipGenerator.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace VRBuilder.Editor.ProcessValidation +namespace VRBuilder.Core.Editor.ProcessValidation { internal class ValidationTooltipGenerator { diff --git a/Source/Core/Editor/Serialization/JsonEditorConfigurationSerializer.cs b/Source/Core/Editor/Serialization/JsonEditorConfigurationSerializer.cs index bb43a731a..c59127362 100644 --- a/Source/Core/Editor/Serialization/JsonEditorConfigurationSerializer.cs +++ b/Source/Core/Editor/Serialization/JsonEditorConfigurationSerializer.cs @@ -3,11 +3,11 @@ // Modifications copyright (c) 2021-2024 MindPort GmbH using System.Collections.Generic; -using VRBuilder.Editor.Configuration; +using VRBuilder.Core.Editor.Configuration; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace VRBuilder.Editor.Serialization +namespace VRBuilder.Core.Editor.Serialization { public static class JsonEditorConfigurationSerializer { diff --git a/Source/Core/Editor/Setup/DefaultSceneSetupConfiguration.cs b/Source/Core/Editor/Setup/DefaultSceneSetupConfiguration.cs index 81bd3bc77..fbde3eb7c 100644 --- a/Source/Core/Editor/Setup/DefaultSceneSetupConfiguration.cs +++ b/Source/Core/Editor/Setup/DefaultSceneSetupConfiguration.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using VRBuilder.Core.Configuration; -using VRBuilder.UX; +using VRBuilder.ProcessController; -namespace VRBuilder.Editor.Setup +namespace VRBuilder.Core.Editor.Setup { /// /// Default configuration. @@ -36,10 +36,9 @@ public IEnumerable GetSetupNames() { return new string[] { - "VRBuilder.Editor.RuntimeConfigurationSetup", - "VRBuilder.Editor.BasicInteraction.RigSetup.DefaultRigSceneSetup", - "VRBuilder.Editor.UX.ProcessControllerSceneSetup", - "VRBuilder.Editor.XRInteraction.XRInteractionSceneSetup" + "VRBuilder.Core.Editor.Setup.RuntimeConfigurationSetup", + "VRBuilder.BasicInteraction.Editor.Setup.DefaultRigSceneSetup", + "VRBuilder.Core.Editor.Setup.ProcessControllerSceneSetup", }; } } diff --git a/Source/Core/Editor/Setup/ISceneSetupConfiguration.cs b/Source/Core/Editor/Setup/ISceneSetupConfiguration.cs index 149bf4aff..9b982abf9 100644 --- a/Source/Core/Editor/Setup/ISceneSetupConfiguration.cs +++ b/Source/Core/Editor/Setup/ISceneSetupConfiguration.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace VRBuilder.Editor.Setup +namespace VRBuilder.Core.Editor.Setup { /// /// Defines the configuration for a particular scene setup. diff --git a/Source/Core/Editor/ProcessController/ProcessControllerSceneSetup.cs b/Source/Core/Editor/Setup/ProcessControllerSceneSetup.cs similarity index 90% rename from Source/Core/Editor/ProcessController/ProcessControllerSceneSetup.cs rename to Source/Core/Editor/Setup/ProcessControllerSceneSetup.cs index 8782d7e01..77115c8b1 100644 --- a/Source/Core/Editor/ProcessController/ProcessControllerSceneSetup.cs +++ b/Source/Core/Editor/Setup/ProcessControllerSceneSetup.cs @@ -1,9 +1,8 @@ -using VRBuilder.Unity; -using VRBuilder.UX; using UnityEngine; -using VRBuilder.Editor.Setup; +using VRBuilder.ProcessController; +using VRBuilder.Unity; -namespace VRBuilder.Editor.UX +namespace VRBuilder.Core.Editor.Setup { /// /// Will be called on OnSceneSetup to add the process controller menu. @@ -12,10 +11,10 @@ public class ProcessControllerSceneSetup : SceneSetup { /// public override int Priority { get; } = 20; - + /// public override string Key { get; } = "ProcessControllerSetup"; - + /// public override void Setup(ISceneSetupConfiguration configuration) { diff --git a/Source/Core/Editor/ProcessController/ProcessControllerSceneSetup.cs.meta b/Source/Core/Editor/Setup/ProcessControllerSceneSetup.cs.meta similarity index 100% rename from Source/Core/Editor/ProcessController/ProcessControllerSceneSetup.cs.meta rename to Source/Core/Editor/Setup/ProcessControllerSceneSetup.cs.meta diff --git a/Source/Core/Editor/Setup/ProcessSceneSetup.cs b/Source/Core/Editor/Setup/ProcessSceneSetup.cs index 9ae5342b7..7b53fd7af 100644 --- a/Source/Core/Editor/Setup/ProcessSceneSetup.cs +++ b/Source/Core/Editor/Setup/ProcessSceneSetup.cs @@ -3,15 +3,13 @@ // Modifications copyright (c) 2021-2024 MindPort GmbH using System; +using System.Collections.Generic; using System.IO; using System.Linq; -using System.Collections.Generic; -using VRBuilder.Editor.Configuration; -using UnityEngine; -using VRBuilder.Editor.Setup; +using VRBuilder.Core.Editor.Configuration; using VRBuilder.Core.Utils; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.Setup { /// /// Can be run to setup the current scene as a process scene. @@ -35,7 +33,7 @@ public static void Run(ISceneSetupConfiguration configuration) foreach (Type onSceneSetupType in types) { - if(setupNames.Contains(onSceneSetupType.FullName) == false) + if (setupNames.Contains(onSceneSetupType.FullName) == false) { continue; } @@ -50,13 +48,13 @@ public static void Run(ISceneSetupConfiguration configuration) if (sceneSetup.Key != null && initializedKeys.Add(sceneSetup.Key) == false) { - Debug.LogWarningFormat("Multiple scene setups with key {0} found during Scene setup. This might cause problems and you might consider using only one.", sceneSetup.Key); + UnityEngine.Debug.LogWarningFormat("Multiple scene setups with key {0} found during Scene setup. This might cause problems and you might consider using only one.", sceneSetup.Key); } } } catch (Exception exception) { - Debug.LogErrorFormat("{0} while initializing SceneSetup object of type {1}.\n{2}", exception.GetType().Name, onSceneSetupType.Name, exception.StackTrace); + UnityEngine.Debug.LogErrorFormat("{0} while initializing SceneSetup object of type {1}.\n{2}", exception.GetType().Name, onSceneSetupType.Name, exception.StackTrace); } } @@ -67,15 +65,15 @@ public static void Run(ISceneSetupConfiguration configuration) try { onSceneSetup.Setup(configuration); - Debug.LogFormat("Scene Setup done for {0}", onSceneSetup); + UnityEngine.Debug.LogFormat("Scene Setup done for {0}", onSceneSetup); } catch (Exception exception) { - Debug.LogErrorFormat("{0} while initializing SceneSetup object of type {1}.\n{2}", exception.GetType().Name, onSceneSetup.GetType().Name, exception.StackTrace); + UnityEngine.Debug.LogErrorFormat("{0} while initializing SceneSetup object of type {1}.\n{2}", exception.GetType().Name, onSceneSetup.GetType().Name, exception.StackTrace); } } - Debug.Log("Scene setup is complete."); + UnityEngine.Debug.Log("Scene setup is complete."); } } } diff --git a/Source/Core/Editor/Setup/RigLoaderSceneSetupConfiguration.cs b/Source/Core/Editor/Setup/RigLoaderSceneSetupConfiguration.cs index 856c2b5b4..fa5e7c282 100644 --- a/Source/Core/Editor/Setup/RigLoaderSceneSetupConfiguration.cs +++ b/Source/Core/Editor/Setup/RigLoaderSceneSetupConfiguration.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using VRBuilder.Core.Configuration; -using VRBuilder.UX; +using VRBuilder.ProcessController; -namespace VRBuilder.Editor.Setup +namespace VRBuilder.Core.Editor.Setup { /// /// Basic configuration with rig loader. @@ -37,10 +37,9 @@ public IEnumerable GetSetupNames() { return new string[] { - "VRBuilder.Editor.RuntimeConfigurationSetup", - "VRBuilder.Editor.BasicInteraction.RigSetup.RigLoaderSceneSetup", - "VRBuilder.Editor.UX.ProcessControllerSceneSetup", - "VRBuilder.Editor.XRInteraction.XRInteractionSceneSetup" + "VRBuilder.Core.Editor.Setup.RuntimeConfigurationSetup", + "VRBuilder.Core.Editor.Setup.ProcessControllerSceneSetup", + "VRBuilder.BasicInteraction.Editor.Setup.RigLoaderSceneSetup", }; } } diff --git a/Source/Core/Editor/Setup/RuntimeConfigurationSetup.cs b/Source/Core/Editor/Setup/RuntimeConfigurationSetup.cs index 119810047..4f16d0ebd 100644 --- a/Source/Core/Editor/Setup/RuntimeConfigurationSetup.cs +++ b/Source/Core/Editor/Setup/RuntimeConfigurationSetup.cs @@ -5,9 +5,8 @@ using UnityEditor; using UnityEngine; using VRBuilder.Core.Configuration; -using VRBuilder.Editor.Setup; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.Setup { /// /// Will setup a when none is existent in scene. diff --git a/Source/Core/Editor/Setup/SceneSetup.cs b/Source/Core/Editor/Setup/SceneSetup.cs index 165d146a8..60a8dc3d3 100644 --- a/Source/Core/Editor/Setup/SceneSetup.cs +++ b/Source/Core/Editor/Setup/SceneSetup.cs @@ -7,10 +7,9 @@ using System.Text.RegularExpressions; using UnityEditor; using UnityEngine; -using VRBuilder.Editor.Setup; using Object = UnityEngine.Object; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor.Setup { /// /// This base class is supposed to be implemented by classes which will be called to setup the scene. diff --git a/Source/Core/Editor/Setup/SceneSetupUtils.cs b/Source/Core/Editor/Setup/SceneSetupUtils.cs index dec0c9d38..4abcd4838 100644 --- a/Source/Core/Editor/Setup/SceneSetupUtils.cs +++ b/Source/Core/Editor/Setup/SceneSetupUtils.cs @@ -4,16 +4,14 @@ using System; using System.IO; -using VRBuilder.Core; -using VRBuilder.Core.Configuration; using UnityEditor; -using UnityEngine; -using UnityEngine.SceneManagement; using UnityEditor.SceneManagement; -using VRBuilder.Core.Utils; -using System.Runtime.CompilerServices; +using UnityEngine.SceneManagement; +using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.ProcessAssets; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Editor.Setup +namespace VRBuilder.Core.Editor.Setup { /// /// Helper class to setup scenes and processes. @@ -71,7 +69,7 @@ public static void SetupProcess(string processName) if (string.IsNullOrEmpty(errorMessage) == false) { - Debug.LogError(errorMessage); + UnityEngine.Debug.LogError(errorMessage); } try @@ -80,7 +78,7 @@ public static void SetupProcess(string processName) } catch (Exception ex) { - Debug.LogError(ex); + UnityEngine.Debug.LogError(ex); } } diff --git a/Source/Core/Editor/SystemClipboard.cs b/Source/Core/Editor/SystemClipboard.cs index 8151835a5..aba410279 100644 --- a/Source/Core/Editor/SystemClipboard.cs +++ b/Source/Core/Editor/SystemClipboard.cs @@ -5,9 +5,9 @@ using System.Text; using UnityEditor; using VRBuilder.Core; -using VRBuilder.Editor.Configuration; +using VRBuilder.Core.Editor.Configuration; -namespace VRBuilder.Editor.Utils +namespace VRBuilder.Core.Editor.Utils { /// /// A utility class that converts a step from/to UTF-8 string using the serializer from the current diff --git a/Source/Basic-Conditions-And-Behaviors/Editor.meta b/Source/Core/Editor/TextToSpeech.meta similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Editor.meta rename to Source/Core/Editor/TextToSpeech.meta index 769dd80f7..cbe65fbcc 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor.meta +++ b/Source/Core/Editor/TextToSpeech.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 28c839245244a2042971f0d86d2102dc +guid: 2dc8ff79db63bd145b9b43f0d4bfb37e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Source/Core/Editor/TextToSpeech/DefaultTextToSpeechConfiguration.cs b/Source/Core/Editor/TextToSpeech/DefaultTextToSpeechConfiguration.cs new file mode 100644 index 000000000..d48fe23bd --- /dev/null +++ b/Source/Core/Editor/TextToSpeech/DefaultTextToSpeechConfiguration.cs @@ -0,0 +1,9 @@ +using VRBuilder.Core.Settings; + +namespace VRBuilder.Core.Editor.TextToSpeech +{ + public class DefaultTextToSpeechConfiguration : SettingsObject + { + + } +} diff --git a/Source/TextToSpeech-Component/Editor/DefaultTextToSpeechConfiguration.cs.meta b/Source/Core/Editor/TextToSpeech/DefaultTextToSpeechConfiguration.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/DefaultTextToSpeechConfiguration.cs.meta rename to Source/Core/Editor/TextToSpeech/DefaultTextToSpeechConfiguration.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/NAudioConverter.cs b/Source/Core/Editor/TextToSpeech/NAudioConverter.cs similarity index 92% rename from Source/TextToSpeech-Component/Editor/NAudioConverter.cs rename to Source/Core/Editor/TextToSpeech/NAudioConverter.cs index a7db8a98f..12215b076 100644 --- a/Source/TextToSpeech-Component/Editor/NAudioConverter.cs +++ b/Source/Core/Editor/TextToSpeech/NAudioConverter.cs @@ -1,11 +1,12 @@ -using System; -using System.IO; using NAudio.Wave; using NAudio.Wave.SampleProviders; +using System; +using System.IO; using UnityEngine; +using VRBuilder.Core.TextToSpeech; using VRBuilder.TextToSpeech; -namespace VRBuilder.Editor.TextToSpeech +namespace VRBuilder.Core.Editor.TextToSpeech { /// /// This AudioConverter uses NAudio to convert audios. @@ -84,14 +85,14 @@ public bool TryWriteAudioClipToFile(AudioClip audio, string filePath) } catch (UnauthorizedAccessException ex) { - Debug.LogErrorFormat("Could not write to disk, not authorized\n{0}", ex.Message); + UnityEngine.Debug.LogErrorFormat("Could not write to disk, not authorized\n{0}", ex.Message); } catch (Exception ex) { - Debug.LogErrorFormat("Unknown exception occurred: '{0}'", ex.Message); + UnityEngine.Debug.LogErrorFormat("Unknown exception occurred: '{0}'", ex.Message); } return false; } } -} \ No newline at end of file +} diff --git a/Source/TextToSpeech-Component/Editor/NAudioConverter.cs.meta b/Source/Core/Editor/TextToSpeech/NAudioConverter.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/NAudioConverter.cs.meta rename to Source/Core/Editor/TextToSpeech/NAudioConverter.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/Providers.meta b/Source/Core/Editor/TextToSpeech/Providers.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/Providers.meta rename to Source/Core/Editor/TextToSpeech/Providers.meta diff --git a/Source/TextToSpeech-Component/Editor/Providers/DummyTextToSpeechProvider.cs b/Source/Core/Editor/TextToSpeech/Providers/DummyTextToSpeechProvider.cs similarity index 80% rename from Source/TextToSpeech-Component/Editor/Providers/DummyTextToSpeechProvider.cs rename to Source/Core/Editor/TextToSpeech/Providers/DummyTextToSpeechProvider.cs index dcfe53183..cbac392a4 100644 --- a/Source/TextToSpeech-Component/Editor/Providers/DummyTextToSpeechProvider.cs +++ b/Source/Core/Editor/TextToSpeech/Providers/DummyTextToSpeechProvider.cs @@ -1,10 +1,10 @@ using System.Threading.Tasks; -using Source.TextToSpeech_Component.Runtime; using UnityEngine; -using VRBuilder.TextToSpeech; -using UnityEngine.Localization; +using UnityEngine.Localization; +using VRBuilder.Core.TextToSpeech.Configuration; +using VRBuilder.Core.TextToSpeech.Providers; -namespace VRBuilder.Editor.TextToSpeech +namespace VRBuilder.Core.Editor.TextToSpeech.Providers { /// /// Dummy provider that creates empty files, useful in case of compatibility issues. @@ -29,4 +29,4 @@ public void SetConfig(ITextToSpeechConfiguration configuration) { } } -} \ No newline at end of file +} diff --git a/Source/TextToSpeech-Component/Editor/Providers/DummyTextToSpeechProvider.cs.meta b/Source/Core/Editor/TextToSpeech/Providers/DummyTextToSpeechProvider.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/Providers/DummyTextToSpeechProvider.cs.meta rename to Source/Core/Editor/TextToSpeech/Providers/DummyTextToSpeechProvider.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/Providers/MicrosoftSapiTextToSpeechProvider.cs b/Source/Core/Editor/TextToSpeech/Providers/MicrosoftSapiTextToSpeechProvider.cs similarity index 96% rename from Source/TextToSpeech-Component/Editor/Providers/MicrosoftSapiTextToSpeechProvider.cs rename to Source/Core/Editor/TextToSpeech/Providers/MicrosoftSapiTextToSpeechProvider.cs index 568f1d0f2..5e501086f 100644 --- a/Source/TextToSpeech-Component/Editor/Providers/MicrosoftSapiTextToSpeechProvider.cs +++ b/Source/Core/Editor/TextToSpeech/Providers/MicrosoftSapiTextToSpeechProvider.cs @@ -1,15 +1,15 @@ +using SpeechLib; using System; using System.IO; -using SpeechLib; -using UnityEngine; using System.Threading.Tasks; -using Source.TextToSpeech_Component.Runtime; -using VRBuilder.Core.Localization; -using VRBuilder.TextToSpeech; +using UnityEngine; using UnityEngine.Localization; using VRBuilder.Core.Configuration; +using VRBuilder.Core.TextToSpeech.Configuration; +using VRBuilder.Core.TextToSpeech.Providers; +using VRBuilder.Core.TextToSpeech.Utils; -namespace VRBuilder.Editor.TextToSpeech +namespace VRBuilder.Core.Editor.TextToSpeech.Providers { /// /// TTS provider which uses Microsoft SAPI to generate audio. @@ -87,13 +87,13 @@ public void SetConfig(ITextToSpeechConfiguration configuration) { this.configuration = configuration; } - + /// public ITextToSpeechConfiguration LoadConfig() { return MicrosoftTextToSpeechConfiguration.Instance; } - + /// public Task ConvertTextToSpeech(string text, Locale locale) { @@ -114,13 +114,13 @@ public Task ConvertTextToSpeech(string text, Locale locale) voice = "neutral"; break; } - + string filePath = PrepareFilepathForText(text, locale); float[] sampleData = Synthesize(text, filePath, locale.Identifier.Code, voice); AudioClip audioClip = AudioClip.Create(text, channels: 1, frequency: 48000, lengthSamples: sampleData.Length, stream: false); audioClip.SetData(sampleData, 0); - + return Task.FromResult(audioClip); #else throw new PlatformNotSupportedException($"TTS audio '{text}' could not be generated due that {GetType().Name} is not supported in {Application.platform}"); @@ -133,18 +133,18 @@ private float[] Synthesize(string text, string outputPath, string language, stri // the single type of a stream that is actually working is a SpFileStream. SpFileStream stream = PrepareFileStreamToWrite(outputPath); SpVoice synthesizer = new SpVoice { AudioOutputStream = stream }; - + string ssmlText = string.Format(ssmlTemplate, language, voice, text); synthesizer.Speak(ssmlText, SpeechVoiceSpeakFlags.SVSFIsXML); synthesizer.WaitUntilDone(-1); stream.Close(); - + byte[] data = File.ReadAllBytes(outputPath); float[] sampleData = TextToSpeechUtils.ShortsInByteArrayToFloats(data); float[] cleanData = RemoveArtifacts(sampleData); - + ClearCache(outputPath); - + return cleanData; } diff --git a/Source/TextToSpeech-Component/Editor/Providers/MicrosoftSapiTextToSpeechProvider.cs.meta b/Source/Core/Editor/TextToSpeech/Providers/MicrosoftSapiTextToSpeechProvider.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/Providers/MicrosoftSapiTextToSpeechProvider.cs.meta rename to Source/Core/Editor/TextToSpeech/Providers/MicrosoftSapiTextToSpeechProvider.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/Providers/WebTextToSpeechProvider.cs b/Source/Core/Editor/TextToSpeech/Providers/WebTextToSpeechProvider.cs similarity index 96% rename from Source/TextToSpeech-Component/Editor/Providers/WebTextToSpeechProvider.cs rename to Source/Core/Editor/TextToSpeech/Providers/WebTextToSpeechProvider.cs index 045585c14..883bcca77 100644 --- a/Source/TextToSpeech-Component/Editor/Providers/WebTextToSpeechProvider.cs +++ b/Source/Core/Editor/TextToSpeech/Providers/WebTextToSpeechProvider.cs @@ -1,14 +1,15 @@ using System; using System.Collections; using System.Threading.Tasks; -using Source.TextToSpeech_Component.Runtime; -using VRBuilder.Unity; using UnityEngine; +using UnityEngine.Localization; using UnityEngine.Networking; +using VRBuilder.Core.TextToSpeech.Configuration; +using VRBuilder.Core.TextToSpeech.Providers; using VRBuilder.TextToSpeech; -using UnityEngine.Localization; +using VRBuilder.Unity; -namespace VRBuilder.Editor.TextToSpeech +namespace VRBuilder.Core.Editor.TextToSpeech.Providers { /// /// Abstract WebTextToSpeechProvider which can be used for web based provider. @@ -20,7 +21,7 @@ public abstract class WebTextToSpeechProvider : ITextToSpeechProvider protected readonly UnityWebRequest UnityWebRequest; protected readonly IAudioConverter AudioConverter; - + private AudioType audioType = AudioType.MPEG; /// @@ -51,7 +52,7 @@ public void SetConfig(ITextToSpeechConfiguration configuration) } /// - public async Task ConvertTextToSpeech(string text,Locale locale) + public async Task ConvertTextToSpeech(string text, Locale locale) { TaskCompletionSource taskCompletion = new TaskCompletionSource(); CoroutineDispatcher.Instance.StartCoroutine(DownloadAudio(text, locale, taskCompletion)); @@ -92,12 +93,12 @@ protected virtual IEnumerator DownloadAudio(string text, Locale locale, TaskComp #endif { byte[] data = request.downloadHandler.data; - + if (data == null || data.Length == 0) { throw new DownloadFailedException($"Error while retrieving audio: '{request.error}'"); } - + AudioClip clip = DownloadHandlerAudioClip.GetContent(request); task.SetResult(clip); } @@ -116,7 +117,7 @@ protected virtual UnityWebRequest CreateRequest(string url, string text) { string escapedText = UnityWebRequest.EscapeURL(text); Uri uri = new Uri(string.Format(url, escapedText)); - + return UnityWebRequestMultimedia.GetAudioClip(uri, audioType); } @@ -128,13 +129,13 @@ protected virtual AudioClip CreateAudioClip(byte[] data) { return AudioConverter.CreateAudioClipFromMp3(data); } -#endregion + #endregion public class DownloadFailedException : Exception { public DownloadFailedException(string msg) : base(msg) { } - + public DownloadFailedException(string msg, Exception ex) : base(msg, ex) { } } } -} \ No newline at end of file +} diff --git a/Source/TextToSpeech-Component/Editor/Providers/WebTextToSpeechProvider.cs.meta b/Source/Core/Editor/TextToSpeech/Providers/WebTextToSpeechProvider.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/Providers/WebTextToSpeechProvider.cs.meta rename to Source/Core/Editor/TextToSpeech/Providers/WebTextToSpeechProvider.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/TextToSpeechBuildPreprocessor.cs b/Source/Core/Editor/TextToSpeech/TextToSpeechBuildPreprocessor.cs similarity index 85% rename from Source/TextToSpeech-Component/Editor/TextToSpeechBuildPreprocessor.cs rename to Source/Core/Editor/TextToSpeech/TextToSpeechBuildPreprocessor.cs index ffdf257eb..a19069bc0 100644 --- a/Source/TextToSpeech-Component/Editor/TextToSpeechBuildPreprocessor.cs +++ b/Source/Core/Editor/TextToSpeech/TextToSpeechBuildPreprocessor.cs @@ -1,8 +1,8 @@ -using System.Threading.Tasks; using UnityEditor.Build; using UnityEditor.Build.Reporting; +using VRBuilder.Core.Editor.TextToSpeech.Utils; -namespace VRBuilder.Editor.TextToSpeech +namespace VRBuilder.Core.Editor.TextToSpeech { /// /// Generates TTS files for all processes before a build. @@ -19,4 +19,4 @@ public void OnPreprocessBuild(BuildReport report) TextToSpeechEditorUtils.GenerateTextToSpeechForAllProcesses(); } } -} \ No newline at end of file +} diff --git a/Source/TextToSpeech-Component/Editor/TextToSpeechBuildPreprocessor.cs.meta b/Source/Core/Editor/TextToSpeech/TextToSpeechBuildPreprocessor.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/TextToSpeechBuildPreprocessor.cs.meta rename to Source/Core/Editor/TextToSpeech/TextToSpeechBuildPreprocessor.cs.meta diff --git a/Tests/Core/EditMode/Editor/Utils.meta b/Source/Core/Editor/TextToSpeech/Utils.meta similarity index 77% rename from Tests/Core/EditMode/Editor/Utils.meta rename to Source/Core/Editor/TextToSpeech/Utils.meta index ae72bdfc0..4c6213b51 100644 --- a/Tests/Core/EditMode/Editor/Utils.meta +++ b/Source/Core/Editor/TextToSpeech/Utils.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e9083a546ec47143a5c202c3a3537c7 +guid: bcd6400b8da50b44a8a09dc847988bca folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Source/TextToSpeech-Component/Editor/TextToSpeechEditorUtils.cs b/Source/Core/Editor/TextToSpeech/Utils/TextToSpeechEditorUtils.cs similarity index 88% rename from Source/TextToSpeech-Component/Editor/TextToSpeechEditorUtils.cs rename to Source/Core/Editor/TextToSpeech/Utils/TextToSpeechEditorUtils.cs index 52e77f2c0..3c95cfcd8 100644 --- a/Source/TextToSpeech-Component/Editor/TextToSpeechEditorUtils.cs +++ b/Source/Core/Editor/TextToSpeech/Utils/TextToSpeechEditorUtils.cs @@ -3,18 +3,21 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using Source.TextToSpeech_Component.Runtime; using UnityEditor; using UnityEngine; using UnityEngine.Localization; using UnityEngine.Localization.Settings; -using VRBuilder.Core; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.ProcessAssets; using VRBuilder.Core.Localization; +using VRBuilder.Core.Settings; +using VRBuilder.Core.TextToSpeech; +using VRBuilder.Core.TextToSpeech.Configuration; +using VRBuilder.Core.TextToSpeech.Providers; +using VRBuilder.Core.TextToSpeech.Utils; using VRBuilder.TextToSpeech; -using VRBuilder.TextToSpeech.Audio; -namespace VRBuilder.Editor.TextToSpeech +namespace VRBuilder.Core.Editor.TextToSpeech.Utils { public static class TextToSpeechEditorUtils { @@ -82,7 +85,7 @@ public static async Task CacheTextToSpeechClips(IEnumerable /// Layout extension for VR Builder. @@ -29,11 +27,11 @@ public static void DrawLink(string text, string url, int indent = BuilderEditorS { try { - Process.Start(url); + System.Diagnostics.Process.Start(url); } catch (Exception ex) { - Debug.LogError(ex); + UnityEngine.Debug.LogError(ex); } }, indent); } @@ -125,7 +123,7 @@ public static IEnumerable DrawCheckBoxList(IEnumerable selection, List< isSelected = GUILayout.Toggle(isSelected, content[i], BuilderEditorStyles.Toggle); EditorGUI.EndDisabledGroup(); - if(isSelected) + if (isSelected) { selectedEntries.Add(entries[i]); } diff --git a/Source/Core/Editor/UI/Drawers/AbstractDrawer.cs b/Source/Core/Editor/UI/Drawers/AbstractDrawer.cs index ff97dc85a..5282e66cb 100644 --- a/Source/Core/Editor/UI/Drawers/AbstractDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/AbstractDrawer.cs @@ -8,10 +8,10 @@ using VRBuilder.Core; using VRBuilder.Core.Attributes; using VRBuilder.Core.Utils; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.UndoRedo; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Simple base drawer class. diff --git a/Source/Core/Editor/UI/Drawers/AbstractInstantiatorDrawer.cs b/Source/Core/Editor/UI/Drawers/AbstractInstantiatorDrawer.cs index 4d8f44afe..41fd1695d 100644 --- a/Source/Core/Editor/UI/Drawers/AbstractInstantiatorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/AbstractInstantiatorDrawer.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Generic; using System.Linq; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// An abstract drawer for Step Inspector UI elements that create new instances of objects. diff --git a/Source/Core/Editor/UI/Drawers/AnimationClipResourceDrawer.cs b/Source/Core/Editor/UI/Drawers/AnimationClipResourceDrawer.cs index a82346c56..ec7a7bc0c 100644 --- a/Source/Core/Editor/UI/Drawers/AnimationClipResourceDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/AnimationClipResourceDrawer.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Implementation of asset path drawer for assets. diff --git a/Source/Core/Editor/UI/Drawers/AnimationCurveDrawer.cs b/Source/Core/Editor/UI/Drawers/AnimationCurveDrawer.cs index cfce69485..bf2bf7131 100644 --- a/Source/Core/Editor/UI/Drawers/AnimationCurveDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/AnimationCurveDrawer.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Drawer for diff --git a/Source/Core/Editor/UI/Drawers/BehaviorCollectionDrawer.cs b/Source/Core/Editor/UI/Drawers/BehaviorCollectionDrawer.cs index 11fe0f655..4f3550e53 100644 --- a/Source/Core/Editor/UI/Drawers/BehaviorCollectionDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/BehaviorCollectionDrawer.cs @@ -7,7 +7,7 @@ using VRBuilder.Core; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [DefaultProcessDrawer(typeof(BehaviorCollection))] internal class BehaviorCollectionDrawer : DataOwnerDrawer diff --git a/Source/Core/Editor/UI/Drawers/BehaviorExecutionStagesDrawer.cs b/Source/Core/Editor/UI/Drawers/BehaviorExecutionStagesDrawer.cs index afce7af87..57ef15e5e 100644 --- a/Source/Core/Editor/UI/Drawers/BehaviorExecutionStagesDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/BehaviorExecutionStagesDrawer.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for members. diff --git a/Source/Core/Editor/UI/Drawers/BehaviorInstantiatiorDrawer.cs b/Source/Core/Editor/UI/Drawers/BehaviorInstantiatiorDrawer.cs index cfe086383..c93b773c5 100644 --- a/Source/Core/Editor/UI/Drawers/BehaviorInstantiatiorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/BehaviorInstantiatiorDrawer.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using System.Linq; using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.Configuration; +using VRBuilder.Core.Editor.Configuration; using UnityEditor; using UnityEngine; using VRBuilder.Core; -using VRBuilder.Editor.Utils; +using VRBuilder.Core.Editor.Utils; using VRBuilder.Core.Utils; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.UndoRedo; using VRBuilder.Core.Conditions; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Draws a dropdown button with all in the project, and creates a new instance of choosen behavior on click. @@ -33,7 +33,7 @@ public override Rect Draw(Rect rect, object currentValue, Action changeV TestableEditorElements.DisplayContextMenu(options); if (currentValue != null) { - Debug.Log("Current value is not null"); + UnityEngine.Debug.Log("Current value is not null"); } } EditorGUI.EndDisabledGroup(); diff --git a/Source/Core/Editor/UI/Drawers/BoolDrawer.cs b/Source/Core/Editor/UI/Drawers/BoolDrawer.cs index 092d87614..2d60a135a 100644 --- a/Source/Core/Editor/UI/Drawers/BoolDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/BoolDrawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for boolean members. diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareBooleansDrawer.cs b/Source/Core/Editor/UI/Drawers/CompareBooleansDrawer.cs similarity index 96% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareBooleansDrawer.cs rename to Source/Core/Editor/UI/Drawers/CompareBooleansDrawer.cs index 5a2c3917f..df011c39b 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareBooleansDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/CompareBooleansDrawer.cs @@ -1,10 +1,9 @@ using System; using UnityEngine; using VRBuilder.Core.Conditions; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; +using VRBuilder.Core.Properties.Operations; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Implementation of for comparing bools. diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareBooleansDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/CompareBooleansDrawer.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareBooleansDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/CompareBooleansDrawer.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareNumbersDrawer.cs b/Source/Core/Editor/UI/Drawers/CompareNumbersDrawer.cs similarity index 97% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareNumbersDrawer.cs rename to Source/Core/Editor/UI/Drawers/CompareNumbersDrawer.cs index 004a38a65..cce69c52b 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareNumbersDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/CompareNumbersDrawer.cs @@ -1,10 +1,9 @@ using System; using UnityEngine; using VRBuilder.Core.Conditions; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; +using VRBuilder.Core.Properties.Operations; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Implementation of for comparing floats. diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareNumbersDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/CompareNumbersDrawer.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareNumbersDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/CompareNumbersDrawer.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareTextDrawer.cs b/Source/Core/Editor/UI/Drawers/CompareTextDrawer.cs similarity index 95% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareTextDrawer.cs rename to Source/Core/Editor/UI/Drawers/CompareTextDrawer.cs index ed458082d..2a1f2d5a3 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareTextDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/CompareTextDrawer.cs @@ -1,10 +1,9 @@ using System; using UnityEngine; using VRBuilder.Core.Conditions; -using VRBuilder.Core.ProcessUtils; -using VRBuilder.Editor.UI.Drawers; +using VRBuilder.Core.Properties.Operations; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Implementation of for comparing strings. diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareTextDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/CompareTextDrawer.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareTextDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/CompareTextDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/CompareValueToConstDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/CompareValueToConstDrawer.cs.meta deleted file mode 100644 index 6501c883d..000000000 --- a/Source/Core/Editor/UI/Drawers/CompareValueToConstDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c8ee0584a07b25142985696e484977d6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Drawers/CompareValueToConstDrawer.cs b/Source/Core/Editor/UI/Drawers/CompareValuesDrawer.cs similarity index 56% rename from Source/Core/Editor/UI/Drawers/CompareValueToConstDrawer.cs rename to Source/Core/Editor/UI/Drawers/CompareValuesDrawer.cs index 00d0b819c..dfdd88b7d 100644 --- a/Source/Core/Editor/UI/Drawers/CompareValueToConstDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/CompareValuesDrawer.cs @@ -1,26 +1,17 @@ using System; using UnityEngine; using VRBuilder.Core.Conditions; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UI.Drawers; +using VRBuilder.Core.UI.SelectableValues; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// - /// Custom drawer for . This drawer omits the reference/const selectors in order - /// to improve performance and optimize layout. - /// - /// - /// If you only ever need to compare data properties to constant values, you can replace the default drawer with this one - /// for increased editor performance. To do so, modify the implementations of so that - /// they inherit from this class instead. - /// - public abstract class CompareValueToConstDrawer : NameableDrawer where T : IEquatable, IComparable + /// Custom drawer for . + /// + public abstract class CompareValuesDrawer : NameableDrawer where T : IEquatable, IComparable { /// - /// Draws the dropdown for selecting the operator depending on the operands' type. + /// Draws the dropdown for selecting the operator depending on the operands' type /// protected abstract Rect DrawOperatorDropdown(Action changeValueCallback, Rect nextPosition, CompareValuesCondition.EntityData data); @@ -35,7 +26,7 @@ public override Rect Draw(Rect rect, object currentValue, Action changeV CompareValuesCondition.EntityData data = currentValue as CompareValuesCondition.EntityData; - nextPosition = DrawerLocator.GetDrawerForValue(data.LeftProperty, typeof(SingleScenePropertyReference>)).Draw(nextPosition, data.LeftProperty, (value) => { data.LeftProperty = (SingleScenePropertyReference>)value; }, "Left Operand"); + nextPosition = DrawerLocator.GetDrawerForValue(data.Left, typeof(ProcessVariableSelectableValue)).Draw(nextPosition, data.Left, (value) => UpdateLeftOperand(value, data, changeValueCallback), "Left Operand"); height += nextPosition.height; height += EditorDrawingHelper.VerticalSpacing; nextPosition.y = rect.y + height; @@ -45,19 +36,34 @@ public override Rect Draw(Rect rect, object currentValue, Action changeV height += EditorDrawingHelper.VerticalSpacing; nextPosition.y = rect.y + height; - nextPosition = DrawerLocator.GetDrawerForValue(data.RightValue, typeof(T)).Draw(nextPosition, data.RightValue, (value) => data.RightValue = (T)value, "Right Operand"); + nextPosition = DrawerLocator.GetDrawerForValue(data.Right, typeof(ProcessVariableSelectableValue)).Draw(nextPosition, data.Right, (value) => UpdateRightOperand(value, data, changeValueCallback), "Right Operand"); height += nextPosition.height; nextPosition.y = rect.y + height; - if (data.IsLeftConst || data.IsRightConst == false) + rect.height = height; + return rect; + } + + private void UpdateLeftOperand(object value, CompareValuesCondition.EntityData data, Action changeValueCallback) + { + ProcessVariableSelectableValue newOperand = (ProcessVariableSelectableValue)value; + + if (newOperand != data.Left) { - data.IsLeftConst = false; - data.IsRightConst = true; + data.Left = newOperand; changeValueCallback(data); } + } - rect.height = height; - return rect; + private void UpdateRightOperand(object value, CompareValuesCondition.EntityData data, Action changeValueCallback) + { + ProcessVariableSelectableValue newOperand = (ProcessVariableSelectableValue)value; + + if (newOperand != data.Right) + { + data.Right = newOperand; + changeValueCallback(data); + } } } } diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareValuesDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/CompareValuesDrawer.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Data Property Drawers/CompareValuesDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/CompareValuesDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/ConditionInstantiatorDrawer.cs b/Source/Core/Editor/UI/Drawers/ConditionInstantiatorDrawer.cs index ec117ca74..3a2365d53 100644 --- a/Source/Core/Editor/UI/Drawers/ConditionInstantiatorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ConditionInstantiatorDrawer.cs @@ -6,13 +6,13 @@ using System.Collections.Generic; using System.Linq; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.Configuration; +using VRBuilder.Core.Editor.Configuration; using UnityEditor; using UnityEngine; -using VRBuilder.Editor.Utils; +using VRBuilder.Core.Editor.Utils; using VRBuilder.Core; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Draws a dropdown button with all in the project, and creates a new instance of choosen condition on click. diff --git a/Source/Core/Editor/UI/Drawers/DataOwnerDrawer.cs b/Source/Core/Editor/UI/Drawers/DataOwnerDrawer.cs index 98568c9e1..21ef0e3fc 100644 --- a/Source/Core/Editor/UI/Drawers/DataOwnerDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/DataOwnerDrawer.cs @@ -7,7 +7,7 @@ using VRBuilder.Core; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [DefaultProcessDrawer(typeof(IDataOwner))] internal class DataOwnerDrawer : AbstractDrawer diff --git a/Source/Core/Editor/UI/Drawers/DefaultProcessDrawerAttribute.cs b/Source/Core/Editor/UI/Drawers/DefaultProcessDrawerAttribute.cs index 0d76352ed..765495948 100644 --- a/Source/Core/Editor/UI/Drawers/DefaultProcessDrawerAttribute.cs +++ b/Source/Core/Editor/UI/Drawers/DefaultProcessDrawerAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Marks a Process drawer as a default drawer for a given type. diff --git a/Source/Core/Editor/UI/Drawers/DrawerLocator.cs b/Source/Core/Editor/UI/Drawers/DrawerLocator.cs index 6a6cbff3e..b7ffeb030 100644 --- a/Source/Core/Editor/UI/Drawers/DrawerLocator.cs +++ b/Source/Core/Editor/UI/Drawers/DrawerLocator.cs @@ -10,7 +10,7 @@ using VRBuilder.Core.Attributes; using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [InitializeOnLoad] public static class DrawerLocator diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers/DropDownElement.cs b/Source/Core/Editor/UI/Drawers/DropDownElement.cs similarity index 95% rename from Source/Core/Editor/UI/Drawers/DropdownDrawers/DropDownElement.cs rename to Source/Core/Editor/UI/Drawers/DropDownElement.cs index a76b04abb..10f5948db 100644 --- a/Source/Core/Editor/UI/Drawers/DropdownDrawers/DropDownElement.cs +++ b/Source/Core/Editor/UI/Drawers/DropDownElement.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// An element in a dropdown. diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers/DropDownElement.cs.meta b/Source/Core/Editor/UI/Drawers/DropDownElement.cs.meta similarity index 100% rename from Source/Core/Editor/UI/Drawers/DropdownDrawers/DropDownElement.cs.meta rename to Source/Core/Editor/UI/Drawers/DropDownElement.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers/DropdownDrawer.cs b/Source/Core/Editor/UI/Drawers/DropdownDrawer.cs similarity index 98% rename from Source/Core/Editor/UI/Drawers/DropdownDrawers/DropdownDrawer.cs rename to Source/Core/Editor/UI/Drawers/DropdownDrawer.cs index c1a77d8ee..5cc965df1 100644 --- a/Source/Core/Editor/UI/Drawers/DropdownDrawers/DropdownDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/DropdownDrawer.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Generic drawer for dropdowns. Implement by providing your possible options. diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers/DropdownDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/DropdownDrawer.cs.meta similarity index 100% rename from Source/Core/Editor/UI/Drawers/DropdownDrawers/DropdownDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/DropdownDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers.meta b/Source/Core/Editor/UI/Drawers/DropdownDrawers.meta deleted file mode 100644 index 672b475d1..000000000 --- a/Source/Core/Editor/UI/Drawers/DropdownDrawers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 23dadec95ed8adc40a917b640696736a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Drawers/EnumDrawer.cs b/Source/Core/Editor/UI/Drawers/EnumDrawer.cs index 81e26671d..e4b73b05d 100644 --- a/Source/Core/Editor/UI/Drawers/EnumDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/EnumDrawer.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for `System.Enum` members. diff --git a/Source/Core/Editor/UI/Drawers/FloatDrawer.cs b/Source/Core/Editor/UI/Drawers/FloatDrawer.cs index 74655c725..428a46b22 100644 --- a/Source/Core/Editor/UI/Drawers/FloatDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/FloatDrawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for float members. diff --git a/Source/Core/Editor/UI/Drawers/IProcessDrawer.cs b/Source/Core/Editor/UI/Drawers/IProcessDrawer.cs index f1ce451ba..c70d02670 100644 --- a/Source/Core/Editor/UI/Drawers/IProcessDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/IProcessDrawer.cs @@ -6,7 +6,7 @@ using System.Reflection; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Interface of a drawer for process members. diff --git a/Source/Core/Editor/UI/Drawers/InstantiatorProcessDrawerAttribute.cs b/Source/Core/Editor/UI/Drawers/InstantiatorProcessDrawerAttribute.cs index ca5b9508b..3652a8d8b 100644 --- a/Source/Core/Editor/UI/Drawers/InstantiatorProcessDrawerAttribute.cs +++ b/Source/Core/Editor/UI/Drawers/InstantiatorProcessDrawerAttribute.cs @@ -4,7 +4,7 @@ using System; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [AttributeUsage(AttributeTargets.Class)] internal class InstantiatorProcessDrawerAttribute : Attribute diff --git a/Source/Core/Editor/UI/Drawers/IntDrawer.cs b/Source/Core/Editor/UI/Drawers/IntDrawer.cs index c72c9760b..a1016a436 100644 --- a/Source/Core/Editor/UI/Drawers/IntDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/IntDrawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for int values. diff --git a/Source/Core/Editor/UI/Drawers/ListDrawer.cs b/Source/Core/Editor/UI/Drawers/ListDrawer.cs index b99dcd4cc..35b0b1d75 100644 --- a/Source/Core/Editor/UI/Drawers/ListDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ListDrawer.cs @@ -8,7 +8,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// A default Process drawer for types implementing `IList`. diff --git a/Source/Core/Editor/UI/Drawers/ListFloatColorDrawer.cs b/Source/Core/Editor/UI/Drawers/ListFloatColorDrawer.cs index 8947b2e5f..b5e411c03 100644 --- a/Source/Core/Editor/UI/Drawers/ListFloatColorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ListFloatColorDrawer.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Custom color drawer for the case when color is stored as a list of four floats. diff --git a/Source/TextToSpeech-Component/Editor/Drawers/LocalizationTableDrawer.cs b/Source/Core/Editor/UI/Drawers/LocalizationTableDrawer.cs similarity index 96% rename from Source/TextToSpeech-Component/Editor/Drawers/LocalizationTableDrawer.cs rename to Source/Core/Editor/UI/Drawers/LocalizationTableDrawer.cs index 0fa454cf0..d12c190fa 100644 --- a/Source/TextToSpeech-Component/Editor/Drawers/LocalizationTableDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/LocalizationTableDrawer.cs @@ -3,9 +3,9 @@ using UnityEditor; using UnityEditor.Localization; using UnityEngine; -using VRBuilder.Editor.UI.Drawers; +using VRBuilder.Core.Editor.UI.Drawers; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Draws a drop-down for localization tables. diff --git a/Source/TextToSpeech-Component/Editor/Drawers/LocalizationTableDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/LocalizationTableDrawer.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/Drawers/LocalizationTableDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/LocalizationTableDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/LockableObjectsDrawer.cs b/Source/Core/Editor/UI/Drawers/LockableObjectsDrawer.cs index 464ab47d1..1999f1ed6 100644 --- a/Source/Core/Editor/UI/Drawers/LockableObjectsDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/LockableObjectsDrawer.cs @@ -8,14 +8,14 @@ using UnityEditor; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; +using VRBuilder.Core.Editor.UI.GraphView.Windows; +using VRBuilder.Core.Editor.UI.Views; using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI.Views; -using VRBuilder.Editor.UI.Windows; +using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [DefaultProcessDrawer(typeof(LockableObjectsCollection))] internal class LockableObjectsDrawer : DataOwnerDrawer diff --git a/Source/Core/Editor/UI/Drawers/MetadataWrapperDrawer.cs b/Source/Core/Editor/UI/Drawers/MetadataWrapperDrawer.cs index 44f93e6a8..79a60379e 100644 --- a/Source/Core/Editor/UI/Drawers/MetadataWrapperDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/MetadataWrapperDrawer.cs @@ -9,16 +9,15 @@ using System.Reflection; using UnityEditor; using UnityEngine; -using VRBuilder.Core; using VRBuilder.Core.Attributes; using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; +using VRBuilder.Core.Editor.UndoRedo; +using VRBuilder.Core.Editor.Utils; using VRBuilder.Core.UI.Drawers.Metadata; using VRBuilder.Core.Utils; -using VRBuilder.Editor.UndoRedo; -using VRBuilder.Editor.Utils; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// This drawer receives a data structure which contains an actual object to draw and additional drawing information. @@ -355,7 +354,7 @@ private Rect DrawIsBlockingToggle(Rect rect, MetadataWrapper wrapper, Action changeValueCallback) private void Paste(MetadataWrapper wrapper, Action changeValueCallback) { IEntity entity = SystemClipboard.PasteEntity(); - IEntity parent = ProcessUtils.GetParentEntity((IEntity)wrapper.Value, GlobalEditorHandler.GetCurrentProcess()); + IEntity parent = VRBuilder.Core.Utils.ProcessUtils.GetParentEntity((IEntity)wrapper.Value, GlobalEditorHandler.GetCurrentProcess()); RevertableChangesHandler.Do(new ProcessCommand(() => { @@ -754,8 +753,9 @@ private bool CanPaste(MetadataWrapper wrapper) return false; } + IEntity pastedEntity = SystemClipboard.PasteEntity(); - IEntity parentEntity = ProcessUtils.GetParentEntity((IEntity)wrapper.Value, GlobalEditorHandler.GetCurrentProcess()); + IEntity parentEntity = VRBuilder.Core.Utils.ProcessUtils.GetParentEntity((IEntity)wrapper.Value, GlobalEditorHandler.GetCurrentProcess()); return (pastedEntity is ICondition && parentEntity is ITransition) || (pastedEntity is IBehavior && parentEntity is IBehaviorCollection); } diff --git a/Source/Core/Editor/UI/Drawers/MultiLineStringDrawer.cs b/Source/Core/Editor/UI/Drawers/MultiLineStringDrawer.cs index fee1fa1da..7cc43d11e 100644 --- a/Source/Core/Editor/UI/Drawers/MultiLineStringDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/MultiLineStringDrawer.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for string members. diff --git a/Source/Core/Editor/UI/Drawers/NameableDrawer.cs b/Source/Core/Editor/UI/Drawers/NameableDrawer.cs index 3254efef1..a4a8bd7f9 100644 --- a/Source/Core/Editor/UI/Drawers/NameableDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/NameableDrawer.cs @@ -7,14 +7,14 @@ using VRBuilder.Core; using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; -using VRBuilder.Editor.ProcessValidation; +using VRBuilder.Core.Editor.ProcessValidation; using UnityEditor; using UnityEngine; using VRBuilder.Core.Attributes; using System.Linq; using System.Reflection; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Drawer for values implementing INameable interface. diff --git a/Source/Core/Editor/UI/Drawers/NormalizedFloatDrawer.cs b/Source/Core/Editor/UI/Drawers/NormalizedFloatDrawer.cs index e7bd2669d..608f47c2a 100644 --- a/Source/Core/Editor/UI/Drawers/NormalizedFloatDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/NormalizedFloatDrawer.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for a 0-1 float slider. diff --git a/Source/Core/Editor/UI/Drawers/ObjectDrawer.cs b/Source/Core/Editor/UI/Drawers/ObjectDrawer.cs index e686d46e0..e7ac257d4 100644 --- a/Source/Core/Editor/UI/Drawers/ObjectDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ObjectDrawer.cs @@ -11,12 +11,12 @@ using VRBuilder.Core.Behaviors; using VRBuilder.Core.Conditions; using VRBuilder.Core.Utils; -using VRBuilder.Editor.Configuration; -using VRBuilder.Editor.ProcessValidation; +using VRBuilder.Core.Editor.Configuration; +using VRBuilder.Core.Editor.ProcessValidation; using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for object properties. Used when everything else does not fit. diff --git a/Source/Core/Editor/UI/Drawers/ParticleSystemPropertySelectableValueDrawer.cs b/Source/Core/Editor/UI/Drawers/ParticleSystemPropertySelectableValueDrawer.cs deleted file mode 100644 index 9aac61767..000000000 --- a/Source/Core/Editor/UI/Drawers/ParticleSystemPropertySelectableValueDrawer.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; - -namespace VRBuilder.Editor.UI.Drawers -{ - /// - /// Concrete implementation of for . - /// - [Obsolete("This drawer is obsolete and will be removed in the next major version.")] - [DefaultProcessDrawer(typeof(PropertyReferenceOrTagSelectableValue))] - public class ParticleSystemPropertySelectableValueDrawer : SelectableValueDrawer, SceneObjectTag> - { - } -} diff --git a/Source/Core/Editor/UI/Drawers/ParticleSystemPropertySelectableValueDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/ParticleSystemPropertySelectableValueDrawer.cs.meta deleted file mode 100644 index fdc5d409f..000000000 --- a/Source/Core/Editor/UI/Drawers/ParticleSystemPropertySelectableValueDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d2ada59f87c9f4f4caf8fb09f9a5858f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers/PlayAudioBehaviorDrawer.cs b/Source/Core/Editor/UI/Drawers/PlayAudioBehaviorDrawer.cs similarity index 95% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers/PlayAudioBehaviorDrawer.cs rename to Source/Core/Editor/UI/Drawers/PlayAudioBehaviorDrawer.cs index fd372981f..44114c9fc 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers/PlayAudioBehaviorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/PlayAudioBehaviorDrawer.cs @@ -1,15 +1,13 @@ using System; -using VRBuilder.Core.Audio; -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.Drawers; +using System.Linq; +using System.Reflection; +using UnityEditor; using UnityEngine; -using VRBuilder.Editor.UI; +using VRBuilder.Core.Behaviors; using VRBuilder.Core.Configuration; -using UnityEditor; -using System.Reflection; -using System.Linq; +using VRBuilder.Core.Utils.Audio; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Default drawer for . It sets displayed name to "Play Audio File". @@ -59,8 +57,8 @@ public override Rect Draw(Rect rect, object currentValue, Action changeV { audioSource = RuntimeConfigurator.Configuration.InstructionPlayer; } - catch - { + catch + { } EditorGUI.BeginDisabledGroup(audioSource == null); @@ -90,7 +88,7 @@ public override Rect Draw(Rect rect, object currentValue, Action changeV } EditorGUI.EndDisabledGroup(); - if (audioSource == null) + if (audioSource == null) { EditorGUI.HelpBox(nextPosition, "Audio preview not available.", MessageType.Info); } diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers/PlayAudioBehaviorDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/PlayAudioBehaviorDrawer.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Audio Data Drawers/PlayAudioBehaviorDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/PlayAudioBehaviorDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/ProcessSceneReferenceDrawer.cs b/Source/Core/Editor/UI/Drawers/ProcessSceneReferenceDrawer.cs index 44f164de9..4481857d9 100644 --- a/Source/Core/Editor/UI/Drawers/ProcessSceneReferenceDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ProcessSceneReferenceDrawer.cs @@ -6,14 +6,14 @@ using UnityEngine; using UnityEngine.UIElements; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI.GraphView.Windows; +using VRBuilder.Core.Editor.UI.Views; +using VRBuilder.Core.Editor.UndoRedo; using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI.Views; -using VRBuilder.Editor.UI.Windows; -using VRBuilder.Editor.UndoRedo; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Drawer for . diff --git a/Source/Core/Editor/UI/Drawers/ProcessVariableBoolSelectableValueDrawer.cs b/Source/Core/Editor/UI/Drawers/ProcessVariableBoolSelectableValueDrawer.cs index 311607e84..a627af16d 100644 --- a/Source/Core/Editor/UI/Drawers/ProcessVariableBoolSelectableValueDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ProcessVariableBoolSelectableValueDrawer.cs @@ -1,7 +1,8 @@ using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; +using VRBuilder.Core.UI.SelectableValues; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Concrete implementation of process variable selectable value drawer. diff --git a/Source/Core/Editor/UI/Drawers/ProcessVariableFloatSelectableValueDrawer.cs b/Source/Core/Editor/UI/Drawers/ProcessVariableFloatSelectableValueDrawer.cs index 36bfb93e2..9988dbab1 100644 --- a/Source/Core/Editor/UI/Drawers/ProcessVariableFloatSelectableValueDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ProcessVariableFloatSelectableValueDrawer.cs @@ -1,7 +1,8 @@ using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; +using VRBuilder.Core.UI.SelectableValues; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Concrete implementation of process variable selectable value drawer. diff --git a/Source/Core/Editor/UI/Drawers/ProcessVariableStringSelectableValueDrawer.cs b/Source/Core/Editor/UI/Drawers/ProcessVariableStringSelectableValueDrawer.cs index 1fe9895a8..f6b295845 100644 --- a/Source/Core/Editor/UI/Drawers/ProcessVariableStringSelectableValueDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ProcessVariableStringSelectableValueDrawer.cs @@ -1,7 +1,8 @@ using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; +using VRBuilder.Core.UI.SelectableValues; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Concrete implementation of process variable selectable value drawer. diff --git a/Source/Core/Editor/UI/Drawers/ResourcePathDrawer.cs b/Source/Core/Editor/UI/Drawers/ResourcePathDrawer.cs index 42ae4f591..3dda10746 100644 --- a/Source/Core/Editor/UI/Drawers/ResourcePathDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/ResourcePathDrawer.cs @@ -2,7 +2,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Draws an object field and sets the Resources path of the dragged object. @@ -26,7 +26,7 @@ public override Rect Draw(Rect rect, object currentValue, Action changeV } else { - Debug.LogError("The object is not in the path of a 'Resources' folder."); + UnityEngine.Debug.LogError("The object is not in the path of a 'Resources' folder."); newPath = ""; } diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers/SceneDropdownDrawer.cs b/Source/Core/Editor/UI/Drawers/SceneDropdownDrawer.cs similarity index 96% rename from Source/Core/Editor/UI/Drawers/DropdownDrawers/SceneDropdownDrawer.cs rename to Source/Core/Editor/UI/Drawers/SceneDropdownDrawer.cs index b11ba0134..bbc12d64f 100644 --- a/Source/Core/Editor/UI/Drawers/DropdownDrawers/SceneDropdownDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/SceneDropdownDrawer.cs @@ -2,7 +2,7 @@ using System.IO; using UnityEditor; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Drawer for a dropdown listing all the scenes in the build settings and allowing to select one by index. diff --git a/Source/Core/Editor/UI/Drawers/DropdownDrawers/SceneDropdownDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/SceneDropdownDrawer.cs.meta similarity index 100% rename from Source/Core/Editor/UI/Drawers/DropdownDrawers/SceneDropdownDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/SceneDropdownDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/SceneObjectTagDrawer.cs b/Source/Core/Editor/UI/Drawers/SceneObjectTagDrawer.cs deleted file mode 100644 index ec441a02b..000000000 --- a/Source/Core/Editor/UI/Drawers/SceneObjectTagDrawer.cs +++ /dev/null @@ -1,150 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEngine; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Settings; -using VRBuilder.Editor.UndoRedo; - -namespace VRBuilder.Editor.UI.Drawers -{ - /// - /// Drawer for . - /// - [DefaultProcessDrawer(typeof(SceneObjectTagBase))] - [Obsolete("This drawer is obsolete and will be removed in the next major version.")] - public class SceneObjectTagDrawer : AbstractDrawer - { - private const string noComponentSelected = ""; - protected bool isUndoOperation; - - public override Rect Draw(Rect rect, object currentValue, Action changeValueCallback, GUIContent label) - { - SceneObjectTagBase sceneObjectTag = (SceneObjectTagBase)currentValue; - Guid oldGuid = sceneObjectTag.Guid; - SceneObjectGroups.SceneObjectGroup[] tags = SceneObjectGroups.Instance.Groups.ToArray(); - List labels = tags.Select(tag => tag.Label).ToList(); - SceneObjectGroups.SceneObjectGroup currentTag = tags.FirstOrDefault(tag => tag.Guid == oldGuid); - Rect guiLineRect = rect; - - if (currentTag != null) - { - foreach (ISceneObject sceneObject in RuntimeConfigurator.Configuration.SceneObjectRegistry.GetObjects(currentTag.Guid)) - { - CheckForMisconfigurationIssues(sceneObject.GameObject, sceneObjectTag.GetReferenceType(), ref rect, ref guiLineRect); - } - } - - EditorGUI.BeginDisabledGroup(tags.Length == 0); - - int selectedTagIndex = Array.IndexOf(tags, currentTag); - bool isTagInvalid = false; - - if (selectedTagIndex == -1) - { - selectedTagIndex = 0; - labels.Insert(0, noComponentSelected); - isTagInvalid = true; - } - - selectedTagIndex = EditorGUI.Popup(guiLineRect, label.text, selectedTagIndex, labels.ToArray()); - EditorGUI.EndDisabledGroup(); - - if (isTagInvalid && selectedTagIndex == 0) - { - return rect; - } - else if (isTagInvalid) - { - selectedTagIndex--; - } - - Guid newGuid = tags[selectedTagIndex].Guid; - - if (oldGuid != newGuid) - { - ChangeValue( - () => - { - sceneObjectTag.Guid = newGuid; - return sceneObjectTag; - }, - () => - { - sceneObjectTag.Guid = oldGuid; - return sceneObjectTag; - }, - changeValueCallback); - } - - return rect; - } - - protected void CheckForMisconfigurationIssues(GameObject selectedSceneObject, Type valueType, ref Rect originalRect, ref Rect guiLineRect) - { - if (selectedSceneObject != null && selectedSceneObject.GetComponent(valueType) == null) - { - string warning = $"{selectedSceneObject.name} is not configured as {valueType.Name}"; - const string button = "Fix it"; - EditorGUI.HelpBox(guiLineRect, warning, MessageType.Warning); - guiLineRect = AddNewRectLine(ref originalRect); - - if (GUI.Button(guiLineRect, button)) - { - // Only relevant for Undoing a Process Property. - bool isAlreadySceneObject = selectedSceneObject.GetComponent() != null && typeof(ISceneObjectProperty).IsAssignableFrom(valueType); - Component[] alreadyAttachedProperties = selectedSceneObject.GetComponents(typeof(Component)); - - RevertableChangesHandler.Do( - new ProcessCommand( - () => SceneObjectAutomaticSetup(selectedSceneObject, valueType), - () => UndoSceneObjectAutomaticSetup(selectedSceneObject, valueType, isAlreadySceneObject, alreadyAttachedProperties))); - } - - guiLineRect = AddNewRectLine(ref originalRect); - } - } - - protected Rect AddNewRectLine(ref Rect currentRect) - { - Rect newRectLine = currentRect; - newRectLine.height = EditorDrawingHelper.SingleLineHeight; - newRectLine.y += currentRect.height + EditorDrawingHelper.VerticalSpacing; - - currentRect.height += EditorDrawingHelper.SingleLineHeight + EditorDrawingHelper.VerticalSpacing; - return newRectLine; - } - - protected void SceneObjectAutomaticSetup(GameObject selectedSceneObject, Type valueType) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent() ?? selectedSceneObject.AddComponent(); - - if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - sceneObject.AddProcessProperty(valueType); - } - - isUndoOperation = true; - } - - private void UndoSceneObjectAutomaticSetup(GameObject selectedSceneObject, Type valueType, bool hadProcessComponent, Component[] alreadyAttachedProperties) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent(); - - if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - sceneObject.RemoveProcessProperty(valueType, true, alreadyAttachedProperties); - } - - if (hadProcessComponent == false) - { - UnityEngine.Object.DestroyImmediate((ProcessSceneObject)sceneObject); - } - - isUndoOperation = true; - } - } -} diff --git a/Source/Core/Editor/UI/Drawers/SceneObjectTagDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/SceneObjectTagDrawer.cs.meta deleted file mode 100644 index 7fa425f40..000000000 --- a/Source/Core/Editor/UI/Drawers/SceneObjectTagDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 65cc4c5782127904c8194d8e698fa6f7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Drawers/SelectableValueDrawer.cs b/Source/Core/Editor/UI/Drawers/SelectableValueDrawer.cs index 81603ff77..856ee301e 100644 --- a/Source/Core/Editor/UI/Drawers/SelectableValueDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/SelectableValueDrawer.cs @@ -3,9 +3,9 @@ using System.Reflection; using UnityEngine; using VRBuilder.Core.Configuration; -using VRBuilder.Core.SceneObjects; +using VRBuilder.Core.UI.SelectableValues; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Template drawer for selectable values. A concrete implementation of this drawer is required for each use case. diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledBehaviorDrawer.cs b/Source/Core/Editor/UI/Drawers/SetComponentEnabledBehaviorDrawer.cs similarity index 97% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledBehaviorDrawer.cs rename to Source/Core/Editor/UI/Drawers/SetComponentEnabledBehaviorDrawer.cs index 3abd4fc20..6cc90b907 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledBehaviorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/SetComponentEnabledBehaviorDrawer.cs @@ -4,13 +4,11 @@ using UnityEditor; using UnityEngine; using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UndoRedo; using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; -using VRBuilder.Editor.UI; -using VRBuilder.Editor.UI.Drawers; -using VRBuilder.Editor.UndoRedo; -namespace VRBuilder.Editor.Core.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [DefaultProcessDrawer(typeof(SetComponentEnabledBehavior.EntityData))] public class SetComponentEnabledBehaviorDrawer : NameableDrawer @@ -143,4 +141,4 @@ private void UpdateRevertOnDeactivate(object value, SetComponentEnabledBehavior. } } } -} \ No newline at end of file +} diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledBehaviorDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/SetComponentEnabledBehaviorDrawer.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/Drawers/Component List Drawer/SetComponentEnabledBehaviorDrawer.cs.meta rename to Source/Core/Editor/UI/Drawers/SetComponentEnabledBehaviorDrawer.cs.meta diff --git a/Source/Core/Editor/UI/Drawers/StepDrawer.cs b/Source/Core/Editor/UI/Drawers/StepDrawer.cs index 186f47ae9..854632079 100644 --- a/Source/Core/Editor/UI/Drawers/StepDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/StepDrawer.cs @@ -6,10 +6,10 @@ using UnityEditor; using UnityEngine; using VRBuilder.Core; -using VRBuilder.Editor.Configuration; -using VRBuilder.Editor.Tabs; +using VRBuilder.Core.Editor.Configuration; +using VRBuilder.Core.Editor.Tabs; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Drawer for a step to skip NameableDrawer. diff --git a/Source/Core/Editor/UI/Drawers/StringDrawer.cs b/Source/Core/Editor/UI/Drawers/StringDrawer.cs index 3c0f97a5e..52d6c8261 100644 --- a/Source/Core/Editor/UI/Drawers/StringDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/StringDrawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for string members. diff --git a/Source/Core/Editor/UI/Drawers/StringsSelectableValueDrawer.cs b/Source/Core/Editor/UI/Drawers/StringsSelectableValueDrawer.cs index e7fab6b0e..348696085 100644 --- a/Source/Core/Editor/UI/Drawers/StringsSelectableValueDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/StringsSelectableValueDrawer.cs @@ -1,4 +1,4 @@ -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Selectable value drawer letting the user choose between two string values. diff --git a/Source/Core/Editor/UI/Drawers/SystemColorDrawer.cs b/Source/Core/Editor/UI/Drawers/SystemColorDrawer.cs index 943e43353..3f5472692 100644 --- a/Source/Core/Editor/UI/Drawers/SystemColorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/SystemColorDrawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for `System.Color` members. diff --git a/Source/Core/Editor/UI/Drawers/TabsGroupDrawer.cs b/Source/Core/Editor/UI/Drawers/TabsGroupDrawer.cs index 086393a6e..738b9ddc1 100644 --- a/Source/Core/Editor/UI/Drawers/TabsGroupDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/TabsGroupDrawer.cs @@ -4,11 +4,11 @@ using System; using System.Linq; -using VRBuilder.Editor.Tabs; +using VRBuilder.Core.Editor.Tabs; using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [DefaultProcessDrawer(typeof(ITabsGroup))] internal class TabsGroupDrawer : AbstractDrawer diff --git a/Source/Core/Editor/UI/Drawers/TransitionCollectionDrawer.cs b/Source/Core/Editor/UI/Drawers/TransitionCollectionDrawer.cs index ce2abce3d..a19fba85d 100644 --- a/Source/Core/Editor/UI/Drawers/TransitionCollectionDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/TransitionCollectionDrawer.cs @@ -7,7 +7,7 @@ using VRBuilder.Core; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { [DefaultProcessDrawer(typeof(TransitionCollection))] internal class TransitionCollectionDrawer : DataOwnerDrawer diff --git a/Source/Core/Editor/UI/Drawers/TransitionDrawer.cs b/Source/Core/Editor/UI/Drawers/TransitionDrawer.cs index 6ab25674f..2903fcae3 100644 --- a/Source/Core/Editor/UI/Drawers/TransitionDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/TransitionDrawer.cs @@ -8,7 +8,7 @@ using VRBuilder.Core.Attributes; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Drawer for a transition which displays name of the target step as part of its label. diff --git a/Source/Core/Editor/UI/Drawers/TransitionInstantiatiorDrawer.cs b/Source/Core/Editor/UI/Drawers/TransitionInstantiatiorDrawer.cs index 1f5c5284a..a350ae71f 100644 --- a/Source/Core/Editor/UI/Drawers/TransitionInstantiatiorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/TransitionInstantiatiorDrawer.cs @@ -3,12 +3,12 @@ // Modifications copyright (c) 2021-2024 MindPort GmbH using System; -using VRBuilder.Core; -using VRBuilder.Core.Behaviors; using UnityEditor; using UnityEngine; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Draws a dropdown button with all in the project, and creates a new instance of choosen behavior on click. diff --git a/Source/Core/Editor/UI/Drawers/UniqueNameReferenceDrawer.cs b/Source/Core/Editor/UI/Drawers/UniqueNameReferenceDrawer.cs deleted file mode 100644 index 9f911ea56..000000000 --- a/Source/Core/Editor/UI/Drawers/UniqueNameReferenceDrawer.cs +++ /dev/null @@ -1,248 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using System.Collections.Generic; -using System.Reflection; -using UnityEditor; -using UnityEngine; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Utils; -using VRBuilder.Editor.UndoRedo; -using Object = UnityEngine.Object; - -namespace VRBuilder.Editor.UI.Drawers -{ - /// - /// Process drawer for members. - /// - [Obsolete("This drawer is obsolete and will be removed in the next major version.")] - [DefaultProcessDrawer(typeof(UniqueNameReference))] - public class UniqueNameReferenceDrawer : AbstractDrawer - { - protected bool isUndoOperation; - protected const string undoGroupName = "brotcat"; - - protected readonly HashSet missingUniqueNames = new HashSet(); - - /// - public override Rect Draw(Rect rect, object currentValue, Action changeValueCallback, GUIContent label) - { - if (RuntimeConfigurator.Exists == false) - { - return rect; - } - - isUndoOperation = false; - UniqueNameReference uniqueNameReference = (UniqueNameReference)currentValue; - PropertyInfo valueProperty = currentValue.GetType().GetProperty("Value"); - Type valueType = ReflectionUtils.GetDeclaredTypeOfPropertyOrField(valueProperty); - - if (valueProperty == null) - { - throw new ArgumentException("Only ObjectReference<> implementations should inherit from the UniqueNameReference type."); - } - - Rect guiLineRect = rect; - string oldUniqueName = uniqueNameReference.UniqueName; - GameObject selectedSceneObject = GetGameObjectFromID(oldUniqueName); - - if (selectedSceneObject == null && string.IsNullOrEmpty(oldUniqueName) == false && missingUniqueNames.Contains(oldUniqueName) == false) - { - missingUniqueNames.Add(oldUniqueName); - Debug.LogError($"The process object with the unique name '{oldUniqueName}' cannot be found!"); - } - - CheckForMisconfigurationIssues(selectedSceneObject, valueType, ref rect, ref guiLineRect); - selectedSceneObject = EditorGUI.ObjectField(guiLineRect, label, selectedSceneObject, typeof(GameObject), true) as GameObject; - - string newUniqueName = GetIDFromSelectedObject(selectedSceneObject, valueType, oldUniqueName); - - if (oldUniqueName != newUniqueName) - { - RevertableChangesHandler.Do( - new ProcessCommand( - () => - { - uniqueNameReference.UniqueName = newUniqueName; - changeValueCallback(uniqueNameReference); - }, - () => - { - uniqueNameReference.UniqueName = oldUniqueName; - changeValueCallback(uniqueNameReference); - }), - isUndoOperation ? undoGroupName : string.Empty); - - if (isUndoOperation) - { - RevertableChangesHandler.CollapseUndoOperations(undoGroupName); - } - } - - return rect; - } - - protected GameObject GetGameObjectFromID(string objectUniqueName) - { - if (string.IsNullOrEmpty(objectUniqueName)) - { - return null; - } - - // If the Runtime Configurator exists, we try to retrieve the process object - try - { - if (RuntimeConfigurator.Configuration.SceneObjectRegistry.ContainsName(objectUniqueName) == false) - { - // If the saved unique name is not registered in the scene, perhaps is actually a GameObject's InstanceID - return GetGameObjectFromInstanceID(objectUniqueName); - } - - ISceneObject sceneObject = RuntimeConfigurator.Configuration.SceneObjectRegistry.GetByName(objectUniqueName); - return sceneObject.GameObject; - } - catch - { - return null; - } - } - - protected string GetIDFromSelectedObject(GameObject selectedSceneObject, Type valueType, string oldUniqueName) - { - string newUniqueName = string.Empty; - - if (selectedSceneObject != null) - { - if (selectedSceneObject.GetComponent(valueType) != null) - { - if (typeof(ISceneObject).IsAssignableFrom(valueType)) - { - newUniqueName = GetUniqueNameFromSceneObject(selectedSceneObject); - } - else if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - newUniqueName = GetUniqueNameFromProcessProperty(selectedSceneObject, valueType, oldUniqueName); - } - } - else - { - newUniqueName = selectedSceneObject.GetInstanceID().ToString(); - } - } - - return newUniqueName; - } - - private GameObject GetGameObjectFromInstanceID(string objectUniqueName) - { - GameObject gameObject = null; - - if (int.TryParse(objectUniqueName, out int instanceId)) - { - gameObject = EditorUtility.InstanceIDToObject(instanceId) as GameObject; - } - - return gameObject; - } - - private string GetUniqueNameFromSceneObject(GameObject selectedSceneObject) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent(); - - if (sceneObject != null) - { - return sceneObject.UniqueName; - } - - Debug.LogWarning($"Game Object \"{selectedSceneObject.name}\" does not have a Process Object component."); - return string.Empty; - } - - private string GetUniqueNameFromProcessProperty(GameObject selectedProcessPropertyObject, Type valueType, string oldUniqueName) - { - if (selectedProcessPropertyObject.GetComponent(valueType) is ISceneObjectProperty processProperty) - { - return processProperty.SceneObject.UniqueName; - } - - Debug.LogWarning($"Scene Object \"{selectedProcessPropertyObject.name}\" with Unique Name \"{oldUniqueName}\" does not have a {valueType.Name} component."); - return string.Empty; - } - - protected void CheckForMisconfigurationIssues(GameObject selectedSceneObject, Type valueType, ref Rect originalRect, ref Rect guiLineRect) - { - if (selectedSceneObject != null && selectedSceneObject.GetComponent(valueType) == null) - { - string warning = $"{selectedSceneObject.name} is not configured as {valueType.Name}"; - const string button = "Fix it"; - - EditorGUI.HelpBox(guiLineRect, warning, MessageType.Error); - guiLineRect = AddNewRectLine(ref originalRect); - - if (GUI.Button(guiLineRect, button)) - { - // Only relevant for Undoing a Process Property. - bool isAlreadySceneObject = selectedSceneObject.GetComponent() != null && typeof(ISceneObjectProperty).IsAssignableFrom(valueType); - Component[] alreadyAttachedProperties = selectedSceneObject.GetComponents(typeof(Component)); - - RevertableChangesHandler.Do( - new ProcessCommand( - () => SceneObjectAutomaticSetup(selectedSceneObject, valueType), - () => UndoSceneObjectAutomaticSetup(selectedSceneObject, valueType, isAlreadySceneObject, alreadyAttachedProperties)), - undoGroupName); - } - - guiLineRect = AddNewRectLine(ref originalRect); - } - } - - protected void SceneObjectAutomaticSetup(GameObject selectedSceneObject, Type valueType) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent() ?? selectedSceneObject.AddComponent(); - - if (RuntimeConfigurator.Configuration.SceneObjectRegistry.ContainsGuid(sceneObject.Guid) == false) - { - // Sets a UniqueName and then registers it. - sceneObject.SetSuitableName(); - } - - if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - sceneObject.AddProcessProperty(valueType); - } - - isUndoOperation = true; - } - - private void UndoSceneObjectAutomaticSetup(GameObject selectedSceneObject, Type valueType, bool hadProcessComponent, Component[] alreadyAttachedProperties) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent(); - - if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - sceneObject.RemoveProcessProperty(valueType, true, alreadyAttachedProperties); - } - - if (hadProcessComponent == false) - { - Object.DestroyImmediate((ProcessSceneObject)sceneObject); - } - - isUndoOperation = true; - } - - protected Rect AddNewRectLine(ref Rect currentRect) - { - Rect newRectLine = currentRect; - newRectLine.height = EditorDrawingHelper.SingleLineHeight; - newRectLine.y += currentRect.height + EditorDrawingHelper.VerticalSpacing; - - currentRect.height += EditorDrawingHelper.SingleLineHeight + EditorDrawingHelper.VerticalSpacing; - return newRectLine; - } - } -} diff --git a/Source/Core/Editor/UI/Drawers/UniqueNameReferenceDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/UniqueNameReferenceDrawer.cs.meta deleted file mode 100644 index d9978006e..000000000 --- a/Source/Core/Editor/UI/Drawers/UniqueNameReferenceDrawer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d476ddebc2124a9a9a028c6e083466e3 -timeCreated: 1542634393 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Drawers/UnityColor32Drawer.cs b/Source/Core/Editor/UI/Drawers/UnityColor32Drawer.cs index 0a74f3435..6b912c547 100644 --- a/Source/Core/Editor/UI/Drawers/UnityColor32Drawer.cs +++ b/Source/Core/Editor/UI/Drawers/UnityColor32Drawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for `UnityEngine.Color32` member. diff --git a/Source/Core/Editor/UI/Drawers/UnityColorDrawer.cs b/Source/Core/Editor/UI/Drawers/UnityColorDrawer.cs index 1373d6108..ad357aaee 100644 --- a/Source/Core/Editor/UI/Drawers/UnityColorDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/UnityColorDrawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for `UnityEngine.Color` diff --git a/Source/Core/Editor/UI/Drawers/UserTagDropdownDrawer.cs b/Source/Core/Editor/UI/Drawers/UserTagDropdownDrawer.cs deleted file mode 100644 index f42cf7a9a..000000000 --- a/Source/Core/Editor/UI/Drawers/UserTagDropdownDrawer.cs +++ /dev/null @@ -1,149 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEditor; -using UnityEngine; -using VRBuilder.Core.Configuration; -using VRBuilder.Core.Properties; -using VRBuilder.Core.SceneObjects; -using VRBuilder.Core.Settings; -using VRBuilder.Editor.UndoRedo; - -namespace VRBuilder.Editor.UI.Drawers -{ - /// - /// Drawer for . - /// - [Obsolete("This drawer is obsolete and will be removed in the next major version.")] - public class UserTagDropdownDrawer : AbstractDrawer - { - private const string noComponentSelected = ""; - protected bool isUndoOperation; - - public override Rect Draw(Rect rect, object currentValue, Action changeValueCallback, GUIContent label) - { - SceneObjectTagBase sceneObjectTag = (SceneObjectTagBase)currentValue; - Guid oldGuid = sceneObjectTag.Guid; - SceneObjectGroups.SceneObjectGroup[] tags = SceneObjectGroups.Instance.Groups.ToArray(); - List labels = tags.Select(tag => tag.Label).ToList(); - SceneObjectGroups.SceneObjectGroup currentTag = tags.FirstOrDefault(tag => tag.Guid == oldGuid); - Rect guiLineRect = rect; - - if (currentTag != null) - { - foreach (ISceneObject sceneObject in RuntimeConfigurator.Configuration.SceneObjectRegistry.GetObjects(currentTag.Guid)) - { - CheckForMisconfigurationIssues(sceneObject.GameObject, sceneObjectTag.GetReferenceType(), ref rect, ref guiLineRect); - } - } - - EditorGUI.BeginDisabledGroup(tags.Length == 0); - - int selectedTagIndex = Array.IndexOf(tags, currentTag); - bool isTagInvalid = false; - - if (selectedTagIndex == -1) - { - selectedTagIndex = 0; - labels.Insert(0, noComponentSelected); - isTagInvalid = true; - } - - selectedTagIndex = EditorGUI.Popup(guiLineRect, label.text, selectedTagIndex, labels.ToArray()); - EditorGUI.EndDisabledGroup(); - - if (isTagInvalid && selectedTagIndex == 0) - { - return rect; - } - else if (isTagInvalid) - { - selectedTagIndex--; - } - - Guid newGuid = tags[selectedTagIndex].Guid; - - if (oldGuid != newGuid) - { - ChangeValue( - () => - { - sceneObjectTag.Guid = newGuid; - return sceneObjectTag; - }, - () => - { - sceneObjectTag.Guid = oldGuid; - return sceneObjectTag; - }, - changeValueCallback); - } - - return rect; - } - - protected void CheckForMisconfigurationIssues(GameObject selectedSceneObject, Type valueType, ref Rect originalRect, ref Rect guiLineRect) - { - if (selectedSceneObject != null && selectedSceneObject.GetComponent(valueType) == null) - { - string warning = $"{selectedSceneObject.name} is not configured as {valueType.Name}"; - const string button = "Fix it"; - EditorGUI.HelpBox(guiLineRect, warning, MessageType.Warning); - guiLineRect = AddNewRectLine(ref originalRect); - - if (GUI.Button(guiLineRect, button)) - { - // Only relevant for Undoing a Process Property. - bool isAlreadySceneObject = selectedSceneObject.GetComponent() != null && typeof(ISceneObjectProperty).IsAssignableFrom(valueType); - Component[] alreadyAttachedProperties = selectedSceneObject.GetComponents(typeof(Component)); - - RevertableChangesHandler.Do( - new ProcessCommand( - () => SceneObjectAutomaticSetup(selectedSceneObject, valueType), - () => UndoSceneObjectAutomaticSetup(selectedSceneObject, valueType, isAlreadySceneObject, alreadyAttachedProperties))); - } - - guiLineRect = AddNewRectLine(ref originalRect); - } - } - - protected Rect AddNewRectLine(ref Rect currentRect) - { - Rect newRectLine = currentRect; - newRectLine.height = EditorDrawingHelper.SingleLineHeight; - newRectLine.y += currentRect.height + EditorDrawingHelper.VerticalSpacing; - - currentRect.height += EditorDrawingHelper.SingleLineHeight + EditorDrawingHelper.VerticalSpacing; - return newRectLine; - } - - protected void SceneObjectAutomaticSetup(GameObject selectedSceneObject, Type valueType) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent() ?? selectedSceneObject.AddComponent(); - - if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - sceneObject.AddProcessProperty(valueType); - } - - isUndoOperation = true; - } - - private void UndoSceneObjectAutomaticSetup(GameObject selectedSceneObject, Type valueType, bool hadProcessComponent, Component[] alreadyAttachedProperties) - { - ISceneObject sceneObject = selectedSceneObject.GetComponent(); - - if (typeof(ISceneObjectProperty).IsAssignableFrom(valueType)) - { - sceneObject.RemoveProcessProperty(valueType, true, alreadyAttachedProperties); - } - - if (hadProcessComponent == false) - { - UnityEngine.Object.DestroyImmediate((ProcessSceneObject)sceneObject); - } - - isUndoOperation = true; - } - } -} diff --git a/Source/Core/Editor/UI/Drawers/UserTagDropdownDrawer.cs.meta b/Source/Core/Editor/UI/Drawers/UserTagDropdownDrawer.cs.meta deleted file mode 100644 index 307daf845..000000000 --- a/Source/Core/Editor/UI/Drawers/UserTagDropdownDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: db761d8dba61edd428797feb3bc7310c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Drawers/Vector2Drawer.cs b/Source/Core/Editor/UI/Drawers/Vector2Drawer.cs index c08f0001c..0a9d08192 100644 --- a/Source/Core/Editor/UI/Drawers/Vector2Drawer.cs +++ b/Source/Core/Editor/UI/Drawers/Vector2Drawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for 'Vector2'. diff --git a/Source/Core/Editor/UI/Drawers/Vector3Drawer.cs b/Source/Core/Editor/UI/Drawers/Vector3Drawer.cs index a286b2df5..dc65b4373 100644 --- a/Source/Core/Editor/UI/Drawers/Vector3Drawer.cs +++ b/Source/Core/Editor/UI/Drawers/Vector3Drawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Default drawer for `Vector3`. diff --git a/Source/Core/Editor/UI/Drawers/Vector4Drawer.cs b/Source/Core/Editor/UI/Drawers/Vector4Drawer.cs index c668cb4ef..bc23df07e 100644 --- a/Source/Core/Editor/UI/Drawers/Vector4Drawer.cs +++ b/Source/Core/Editor/UI/Drawers/Vector4Drawer.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Process drawer for `Vector4`. diff --git a/Source/Core/Editor/UI/Drawers/VideoClipResourceDrawer.cs b/Source/Core/Editor/UI/Drawers/VideoClipResourceDrawer.cs index f35c34a36..49c9a8188 100644 --- a/Source/Core/Editor/UI/Drawers/VideoClipResourceDrawer.cs +++ b/Source/Core/Editor/UI/Drawers/VideoClipResourceDrawer.cs @@ -1,6 +1,6 @@ using UnityEngine.Video; -namespace VRBuilder.Editor.UI.Drawers +namespace VRBuilder.Core.Editor.UI.Drawers { /// /// Implementation of asset path drawer for assets. diff --git a/Source/Core/Editor/UI/EditorColorUtils.cs b/Source/Core/Editor/UI/EditorColorUtils.cs index 469fb419b..8feb096a7 100644 --- a/Source/Core/Editor/UI/EditorColorUtils.cs +++ b/Source/Core/Editor/UI/EditorColorUtils.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { [InitializeOnLoad] internal static class EditorColorUtils diff --git a/Source/Core/Editor/UI/EditorDrawingHelper.cs b/Source/Core/Editor/UI/EditorDrawingHelper.cs index 908e56858..410c95036 100644 --- a/Source/Core/Editor/UI/EditorDrawingHelper.cs +++ b/Source/Core/Editor/UI/EditorDrawingHelper.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { /// /// Helper class for drawing primitives in custom editors. diff --git a/Source/Core/Editor/UI/EditorGraphics.cs b/Source/Core/Editor/UI/EditorGraphics.cs deleted file mode 100644 index f9fd8ed00..000000000 --- a/Source/Core/Editor/UI/EditorGraphics.cs +++ /dev/null @@ -1,496 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using System.Collections.Generic; -using System.Linq; -using VRBuilder.Core.Utils; -using VRBuilder.Editor.UI.Graphics; -using UnityEngine; -using UnityEngine.UIElements; -using Edge = UnityEngine.RectTransform.Edge; - -namespace VRBuilder.Editor.UI -{ - /// - /// UI events handler and graphical elements drawer. - /// - internal class EditorGraphics - { - #region constants - private const float contentBorderThickness = 200f; - #endregion - - private readonly IList rootElements = new List(); - - private GraphicalEventHandler initiallyPressedHandler; - private GraphicalEventHandler initiallyContextPressedHandler; - private GraphicalEventHandler initiallyHoveredHandler; - - /// - /// Cached result of the last invocation of method. - /// - public Rect BoundingBox { get; private set; } - - /// - /// Defines colors used in the Process Editor. - /// - public WorkflowEditorColorPalette ColorPalette { get; set; } - - /// - /// The last element user clicked at. If user clicked at empty place, Selected is null. - /// - public GraphicalEventHandler Selected { get; private set; } - - public GraphicalEventHandler Canvas { get; private set; } - - private List additionalDrawer = new List(); - - public EditorGraphics(WorkflowEditorColorPalette workflowEditorColorPalette) - { - // Guarantees that at least default palette is assigned. - if (workflowEditorColorPalette == null) - { - ColorPalette = WorkflowEditorColorPalette.GetDefaultPalette(); - } - else - { - ColorPalette = workflowEditorColorPalette; - } - - Canvas = new GraphicalEventHandler(); - - additionalDrawer.Clear(); - ReflectionUtils.GetConcreteImplementationsOf().ToList().ForEach(type => - { - additionalDrawer.Add((IEditorGraphicDrawer)ReflectionUtils.CreateInstanceOfType(type)); - }); - additionalDrawer.Sort((drawer1, drawer2) => drawer1.Priority.CompareTo(drawer2.Priority)); - - Reset(); - } - - /// - /// Registers graphical element to enable UI events and drawing for it. - /// - public void Register(GraphicalElement element) - { - if (element.Parent == null) - { - rootElements.Add(element); - } - - element.HandleRegistration(); - - foreach (GraphicalElement child in element.Children) - { - Register(child); - } - } - - /// - /// Deregisters graphical element. - /// - public void Deregister(GraphicalElement element) - { - rootElements.Remove(element); - - element.HandleDeregistration(); - - foreach (GraphicalElement child in element.Children.ToList()) - { - Deregister(child); - } - } - - /// - /// Resets this instance to it's initial state. - /// - public void Reset() - { - foreach (GraphicalElement element in rootElements.ToList()) - { - Deregister(element); - - if (element.IsReceivingEvents) - { - element.GraphicalEventHandler.Reset(); - } - } - - initiallyPressedHandler = null; - initiallyContextPressedHandler = null; - - Canvas.Reset(); - - Selected = null; - } - - private IEnumerable GetOrderedElements() - { - IList> ordered = new List>(); - - foreach (GraphicalElement element in rootElements) - { - CollectElementsRecursively(element, ref ordered); - } - - return ordered.SelectMany(layer => layer); - } - - private void Draw(Rect windowRect) - { - foreach (GraphicalElement element in GetOrderedElements()) - { - if (element.CanBeDrawn && element.IsVisibleInRect(windowRect)) - { - element.Renderer.Draw(); - } - } - - additionalDrawer.ForEach(drawer => drawer.Draw(windowRect)); - } - - private void InsertElement(GraphicalElement element, ref IList> collection) - { - for (int i = 0; i < collection.Count; i++) - { - if (collection[i][0].Layer < element.Layer) - { - collection.Insert(i, new List { element }); - return; - } - - if (collection[i][0].Layer == element.Layer) - { - collection[i].Add(element); - return; - } - } - - collection.Add(new List { element }); - } - - private void CollectElementsRecursively(GraphicalElement element, ref IList> collection) - { - InsertElement(element, ref collection); - - foreach (GraphicalElement child in element.Children) - { - CollectElementsRecursively(child, ref collection); - } - } - - private bool ResolveContextPointerUpAndClick(Event currentEvent, GraphicalEventHandler handler) - { - bool used = false; - if (currentEvent.type == EventType.MouseUp && currentEvent.button == 1 && handler != null && handler == initiallyContextPressedHandler || (currentEvent.type == EventType.MouseLeaveWindow)) - { - if (initiallyContextPressedHandler != null) - { - if (handler == initiallyContextPressedHandler) - { - initiallyContextPressedHandler.InvokeContextPointerClick(currentEvent.mousePosition); - } - - initiallyContextPressedHandler.InvokeContextPointerUp(currentEvent.mousePosition); - - StartHovering(currentEvent, handler); - used = true; - } - - initiallyContextPressedHandler = null; - } - - return used; - } - - private bool ResolvePointerUpAndClick(Event currentEvent, GraphicalEventHandler handler) - { - bool used = false; - - // Left mouse button was released. If mouse had left the screen, we treat it as if left mouse button was released. - if ((currentEvent.type == EventType.MouseUp && currentEvent.button == 0) || (currentEvent.type == EventType.MouseLeaveWindow)) - { - if (initiallyPressedHandler != null) - { - // Also, it is a click if we clicked and released LMB over the same element. - if (handler == initiallyPressedHandler) - { - initiallyPressedHandler.InvokePointerClick(currentEvent.mousePosition); - } - - // Initially pressed element recieves the event in any case, - initiallyPressedHandler.InvokePointerUp(currentEvent.mousePosition); - - StartHovering(currentEvent, handler); - - used = true; - } - - Selected = null; - initiallyPressedHandler = null; - } - - return used; - } - - private bool ResolvePointerHover(Event currentEvent, GraphicalEventHandler handler) - { - if (initiallyHoveredHandler != null && initiallyHoveredHandler != handler) - { - StopHovering(currentEvent); - initiallyHoveredHandler = null; - return false; - } - - if (initiallyHoveredHandler != handler && handler != null) - { - StartHovering(currentEvent, handler); - return true; - } - - return false; - } - - private bool ResolvePointerDrag(Event currentEvent) - { - bool used = false; - - // If we are holding left mouse button and moving it, initially pressed elements receives drag event. - if (initiallyPressedHandler != null) - { - initiallyPressedHandler.InvokePointerDrag(currentEvent.mousePosition, currentEvent.delta); - used = true; - } - - return used; - } - - private bool ResolvePointerDown(Event currentEvent, GraphicalEventHandler handler) - { - bool used = false; - - // Left mouse button was pressed down. - if (currentEvent.type == EventType.MouseDown && currentEvent.button == 0) - { - initiallyPressedHandler = handler; - - if (handler != null) - { - Selected = handler; - handler.InvokePointerDown(currentEvent.mousePosition); - - StopHovering(currentEvent); - - used = true; - } - } - - return used; - } - - private bool ResolveContextPointerDown(Event currentEvent, GraphicalEventHandler handler) - { - bool used = false; - - // Left mouse button was pressed down. - if (currentEvent.type == EventType.MouseDown && currentEvent.button == 1) - { - initiallyContextPressedHandler = handler; - - if (handler != null) - { - handler.InvokeContextPointerDown(currentEvent.mousePosition); - - StopHovering(currentEvent); - - used = true; - } - } - - return used; - } - - private void StartHovering(Event currentEvent, GraphicalEventHandler handler) - { - if (initiallyHoveredHandler != null) - { - StopHovering(currentEvent); - } - - initiallyHoveredHandler = handler; - handler.InvokePointerHoverStart(currentEvent.mousePosition); - } - - private void StopHovering(Event currentEvent) - { - if (initiallyHoveredHandler == null) - { - return; - } - - initiallyHoveredHandler.InvokePointerHoverStop(currentEvent.mousePosition); - } - - /// - /// Process current event. - /// - /// Event that is currently being processed. - /// Current window rect. Elements outside the window rect are ignored. - public void HandleEvent(Event currentEvent, Rect windowRect) - { - if (currentEvent.type == EventType.Layout) - { - Layout(); - return; - } - - if (currentEvent.isMouse) - { - if (windowRect.Contains(currentEvent.mousePosition) == false) - { - if (initiallyPressedHandler != null) - { - // Initially pressed element recieves the event in any case, - initiallyPressedHandler.InvokePointerUp(currentEvent.mousePosition); - } - - Selected = null; - initiallyPressedHandler = null; - return; - } - - GraphicalElement element = GetGraphicalElementWithHandlerAtPoint(currentEvent.mousePosition).FirstOrDefault(); - - GraphicalEventHandler handler = Canvas; - - if (element != null) - { - handler = element.GraphicalEventHandler; - } - - if (currentEvent.type == EventType.MouseDrag) - { - if (ResolvePointerDrag(currentEvent)) - { - Event.current.Use(); - } - } - else if (ResolvePointerHover(currentEvent, handler) - // | is on purpose. - | ResolveContextPointerUpAndClick(currentEvent, handler) - | ResolvePointerUpAndClick(currentEvent, handler) - | ResolveContextPointerDown(currentEvent, handler) - | ResolvePointerDown(currentEvent, handler)) - { - Event.current.Use(); - } - } - - if (currentEvent.type == EventType.Repaint) - { - Draw(windowRect); - } - } - - public IEnumerable GetGraphicalElementWithHandlerAtPoint(Vector2 position) - { - IEnumerator enumerator = GetOrderedElements() - .Where(e => e.IsReceivingEvents) - .Where(e => e.IsPointInsideGeometry(position)) - .Reverse() - .GetEnumerator(); - - while (enumerator.MoveNext()) - { - yield return enumerator.Current; - } - - enumerator.Dispose(); - } - - private void Layout() - { - foreach (GraphicalElement element in rootElements) - { - LayoutRecursive(element); - } - } - - private void LayoutRecursive(GraphicalElement element) - { - element.Layout(); - - foreach (GraphicalElement child in element.Children) - { - LayoutRecursive(child); - } - } - - /// - /// Calculates smallest possible `Rect` which contains all graphical elements' bounding boxes and stores the result in property. - /// - /// - public void CalculateBoundingBox() - { - Dictionary mostOutlyingRects = Enum.GetValues(typeof(Edge)) - .Cast() - .ToDictionary(edge => edge, edge => GetOrderedElements().Aggregate((first, second) => CompareElementsByOutlyingness(first, second, edge)).BoundingBox); - - float x = -contentBorderThickness + mostOutlyingRects[Edge.Left].xMin; - float y = -contentBorderThickness + mostOutlyingRects[Edge.Top].yMin; - float width = contentBorderThickness * 2f + (mostOutlyingRects[Edge.Right].xMax - mostOutlyingRects[Edge.Left].xMin); - float height = contentBorderThickness * 2f + (mostOutlyingRects[Edge.Bottom].yMax - mostOutlyingRects[Edge.Top].yMin); - BoundingBox = new Rect(x, y, width, height); - } - - private static GraphicalElement CompareElementsByOutlyingness(GraphicalElement firstElement, GraphicalElement secondElement, Edge edge) - { - Rect first = firstElement.BoundingBox; - - Rect second = secondElement.BoundingBox; - switch (edge) - { - case Edge.Left: - if (first.xMin <= second.xMin) - { - return firstElement; - } - - break; - case Edge.Right: - if (first.xMax >= second.xMax) - { - return firstElement; - } - - break; - case Edge.Top: - if (first.yMin <= second.yMin) - { - return firstElement; - } - - break; - case Edge.Bottom: - if (first.yMax >= second.yMax) - { - return firstElement; - } - - break; - } - - return secondElement; - } - - public void BringToTop(GraphicalElement rootElement) - { - int elementIndex = rootElements.IndexOf(rootElement); - rootElements.Insert(rootElements.Count, rootElement); - rootElements.RemoveAt(elementIndex); - } - } -} diff --git a/Source/Core/Editor/UI/EditorGraphics.cs.meta b/Source/Core/Editor/UI/EditorGraphics.cs.meta deleted file mode 100644 index bdeb28ad6..000000000 --- a/Source/Core/Editor/UI/EditorGraphics.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0f90b91d94c74b0491f30fe35701604a -timeCreated: 1539872093 \ No newline at end of file diff --git a/Source/Core/Editor/UI/EditorIcon.cs b/Source/Core/Editor/UI/EditorIcon.cs index 411e60676..85f75f742 100644 --- a/Source/Core/Editor/UI/EditorIcon.cs +++ b/Source/Core/Editor/UI/EditorIcon.cs @@ -6,7 +6,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { /// /// Utility class to help with different unity color schemes (dark/light). Takes care about loading the given icon, @@ -56,7 +56,7 @@ private void Initialize() if (iconLight == null && iconDark == null) { string msg = string.Format("Texture with path: '{0}' couldn't be loaded. No {1} nor {2} version found!", path, LightTextureFileEnding, DarkTextureFileEnding); - Debug.LogError(msg); + UnityEngine.Debug.LogError(msg); throw new NullReferenceException(msg); } @@ -64,7 +64,7 @@ private void Initialize() { if (EditorGUIUtility.isProSkin) { - Debug.LogWarningFormat("No texture found for path: {0}", path + LightTextureFileEnding); + UnityEngine.Debug.LogWarningFormat("No texture found for path: {0}", path + LightTextureFileEnding); } iconLight = iconDark; } @@ -72,7 +72,7 @@ private void Initialize() { if (!EditorGUIUtility.isProSkin) { - Debug.LogWarningFormat("No texture found for path: {0}", path + DarkTextureFileEnding); + UnityEngine.Debug.LogWarningFormat("No texture found for path: {0}", path + DarkTextureFileEnding); } iconDark = iconLight; } diff --git a/Source/Core/Editor/UI/GraphView/IContextMenuActions.cs b/Source/Core/Editor/UI/GraphView/IContextMenuActions.cs index 57f5f0d67..175aedee1 100644 --- a/Source/Core/Editor/UI/GraphView/IContextMenuActions.cs +++ b/Source/Core/Editor/UI/GraphView/IContextMenuActions.cs @@ -1,6 +1,6 @@ using UnityEngine.UIElements; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView { /// /// Interface for a process graph object having custom context menu actions. diff --git a/Source/Core/Editor/UI/GraphView/IStepView.cs b/Source/Core/Editor/UI/GraphView/IStepView.cs index 1c148fc4f..8c2f7dd3b 100644 --- a/Source/Core/Editor/UI/GraphView/IStepView.cs +++ b/Source/Core/Editor/UI/GraphView/IStepView.cs @@ -1,6 +1,4 @@ -using VRBuilder.Core; - -namespace VRBuilder.Editor.UI.Windows +namespace VRBuilder.Core.Editor.UI.GraphView { /// /// Interface for GUI step view. diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators.meta b/Source/Core/Editor/UI/GraphView/Instantiators.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators.meta rename to Source/Core/Editor/UI/GraphView/Instantiators.meta diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/DefaultStepNodeInstantiator.cs b/Source/Core/Editor/UI/GraphView/Instantiators/DefaultStepNodeInstantiator.cs similarity index 88% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/DefaultStepNodeInstantiator.cs rename to Source/Core/Editor/UI/GraphView/Instantiators/DefaultStepNodeInstantiator.cs index e6d9a7370..f734db18c 100644 --- a/Source/Core/Editor/UI/GraphView/NodeInstantiators/DefaultStepNodeInstantiator.cs +++ b/Source/Core/Editor/UI/GraphView/Instantiators/DefaultStepNodeInstantiator.cs @@ -1,7 +1,7 @@ using UnityEngine.UIElements; -using VRBuilder.Core; +using VRBuilder.Core.Editor.UI.GraphView.Nodes; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Instantiators { /// /// Instantiator for a default node. diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/DefaultStepNodeInstantiator.cs.meta b/Source/Core/Editor/UI/GraphView/Instantiators/DefaultStepNodeInstantiator.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/DefaultStepNodeInstantiator.cs.meta rename to Source/Core/Editor/UI/GraphView/Instantiators/DefaultStepNodeInstantiator.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/EndChapterNodeInstantiator.cs b/Source/Core/Editor/UI/GraphView/Instantiators/EndChapterNodeInstantiator.cs similarity index 88% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/EndChapterNodeInstantiator.cs rename to Source/Core/Editor/UI/GraphView/Instantiators/EndChapterNodeInstantiator.cs index af3b95ff8..52e8136cf 100644 --- a/Source/Core/Editor/UI/GraphView/NodeInstantiators/EndChapterNodeInstantiator.cs +++ b/Source/Core/Editor/UI/GraphView/Instantiators/EndChapterNodeInstantiator.cs @@ -1,7 +1,7 @@ using UnityEngine.UIElements; -using VRBuilder.Core; +using VRBuilder.Core.Editor.UI.GraphView.Nodes; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Instantiators { /// /// Instantiator for the End Chapter node. diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/EndChapterNodeInstantiator.cs.meta b/Source/Core/Editor/UI/GraphView/Instantiators/EndChapterNodeInstantiator.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/EndChapterNodeInstantiator.cs.meta rename to Source/Core/Editor/UI/GraphView/Instantiators/EndChapterNodeInstantiator.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/IStepNodeInstantiator.cs b/Source/Core/Editor/UI/GraphView/Instantiators/IStepNodeInstantiator.cs similarity index 90% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/IStepNodeInstantiator.cs rename to Source/Core/Editor/UI/GraphView/Instantiators/IStepNodeInstantiator.cs index 701812ff8..1262fb46e 100644 --- a/Source/Core/Editor/UI/GraphView/NodeInstantiators/IStepNodeInstantiator.cs +++ b/Source/Core/Editor/UI/GraphView/Instantiators/IStepNodeInstantiator.cs @@ -1,7 +1,7 @@ using UnityEngine.UIElements; -using VRBuilder.Core; +using VRBuilder.Core.Editor.UI.GraphView.Nodes; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Instantiators { /// /// Instantiates a node matching the diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/IStepNodeInstantiator.cs.meta b/Source/Core/Editor/UI/GraphView/Instantiators/IStepNodeInstantiator.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/IStepNodeInstantiator.cs.meta rename to Source/Core/Editor/UI/GraphView/Instantiators/IStepNodeInstantiator.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/ParallelExecutionNodeInstantiator.cs b/Source/Core/Editor/UI/GraphView/Instantiators/ParallelExecutionNodeInstantiator.cs similarity index 88% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/ParallelExecutionNodeInstantiator.cs rename to Source/Core/Editor/UI/GraphView/Instantiators/ParallelExecutionNodeInstantiator.cs index 8949359db..941dd67fe 100644 --- a/Source/Core/Editor/UI/GraphView/NodeInstantiators/ParallelExecutionNodeInstantiator.cs +++ b/Source/Core/Editor/UI/GraphView/Instantiators/ParallelExecutionNodeInstantiator.cs @@ -1,7 +1,7 @@ using UnityEngine.UIElements; -using VRBuilder.Core; +using VRBuilder.Core.Editor.UI.GraphView.Nodes; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Instantiators { /// /// Instantiator for the Step Group node. diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/ParallelExecutionNodeInstantiator.cs.meta b/Source/Core/Editor/UI/GraphView/Instantiators/ParallelExecutionNodeInstantiator.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/ParallelExecutionNodeInstantiator.cs.meta rename to Source/Core/Editor/UI/GraphView/Instantiators/ParallelExecutionNodeInstantiator.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/StepGroupNodeInstantiator.cs b/Source/Core/Editor/UI/GraphView/Instantiators/StepGroupNodeInstantiator.cs similarity index 88% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/StepGroupNodeInstantiator.cs rename to Source/Core/Editor/UI/GraphView/Instantiators/StepGroupNodeInstantiator.cs index 1272dedc8..9e3bcf63a 100644 --- a/Source/Core/Editor/UI/GraphView/NodeInstantiators/StepGroupNodeInstantiator.cs +++ b/Source/Core/Editor/UI/GraphView/Instantiators/StepGroupNodeInstantiator.cs @@ -1,7 +1,7 @@ using UnityEngine.UIElements; -using VRBuilder.Core; +using VRBuilder.Core.Editor.UI.GraphView.Nodes; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Instantiators { /// /// Instantiator for the Step Group node. diff --git a/Source/Core/Editor/UI/GraphView/NodeInstantiators/StepGroupNodeInstantiator.cs.meta b/Source/Core/Editor/UI/GraphView/Instantiators/StepGroupNodeInstantiator.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/NodeInstantiators/StepGroupNodeInstantiator.cs.meta rename to Source/Core/Editor/UI/GraphView/Instantiators/StepGroupNodeInstantiator.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/Nodes.meta b/Source/Core/Editor/UI/GraphView/Nodes.meta new file mode 100644 index 000000000..3a7599956 --- /dev/null +++ b/Source/Core/Editor/UI/GraphView/Nodes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc4c89a640d852047bd9069569ae0d5b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Core/Editor/UI/GraphView/EndChapterNode.cs b/Source/Core/Editor/UI/GraphView/Nodes/EndChapterNode.cs similarity index 90% rename from Source/Core/Editor/UI/GraphView/EndChapterNode.cs rename to Source/Core/Editor/UI/GraphView/Nodes/EndChapterNode.cs index a67625e21..afe058530 100644 --- a/Source/Core/Editor/UI/GraphView/EndChapterNode.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/EndChapterNode.cs @@ -2,14 +2,12 @@ using System.Collections.Generic; using System.Linq; using UnityEditor.Experimental.GraphView; -using UnityEditor.UIElements; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.UndoRedo; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Node representation for the End Chapter node. @@ -25,7 +23,7 @@ protected GoToChapterBehavior Behavior { get { - if(behavior == null) + if (behavior == null) { behavior = (GoToChapterBehavior)step.Data.Behaviors.Data.Behaviors.FirstOrDefault(behavior => behavior is GoToChapterBehavior); } @@ -62,7 +60,7 @@ private void DrawChapterSelectionField() { Label label = new Label("Next chapter:"); label.style.paddingTop = DefaultPadding; - label.style.paddingLeft = DefaultPadding; + label.style.paddingLeft = DefaultPadding; extensionContainer.Add(label); List chapters = GlobalEditorHandler.GetCurrentProcess().Data.Chapters.ToList(); @@ -72,17 +70,17 @@ private void DrawChapterSelectionField() Guid selectedGuid = popupList.FirstOrDefault(guid => guid == Behavior.Data.ChapterGuid); int selectedIndex = 0; - if(selectedGuid != null && popupList.Contains(selectedGuid)) + if (selectedGuid != null && popupList.Contains(selectedGuid)) { selectedIndex = popupList.IndexOf(selectedGuid); } - PopupField chapterSelector = new PopupField("", popupList, selectedIndex, (guid) => FormatSelectedValue(guid, chapters), (guid) => FormatSelectedValue(guid, chapters)); + PopupField chapterSelector = new PopupField("", popupList, selectedIndex, (guid) => FormatSelectedValue(guid, chapters), (guid) => FormatSelectedValue(guid, chapters)); chapterSelector.RegisterValueChangedCallback((value) => OnChapterSelected(value)); chapterSelector.style.minWidth = ElementWidth; chapterSelector.style.maxWidth = ElementWidth; chapterSelector.style.paddingBottom = DefaultPadding; - chapterSelector.style.paddingLeft = DropDownPadding; + chapterSelector.style.paddingLeft = DropDownPadding; extensionContainer.Add(chapterSelector); @@ -91,7 +89,7 @@ private void DrawChapterSelectionField() private string FormatSelectedValue(Guid guid, IEnumerable chapters) { - if(guid == Guid.Empty) + if (guid == Guid.Empty) { return ""; } @@ -115,7 +113,7 @@ private void OnChapterSelected(ChangeEvent value) Behavior.Data.ChapterGuid = oldValue; chapterSelector.SetValueWithoutNotify(oldValue); } - )); + )); } } } diff --git a/Source/Core/Editor/UI/GraphView/EndChapterNode.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/EndChapterNode.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/EndChapterNode.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/EndChapterNode.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/EndChapterPostProcessing.cs b/Source/Core/Editor/UI/GraphView/Nodes/EndChapterPostProcessing.cs similarity index 87% rename from Source/Core/Editor/UI/GraphView/EndChapterPostProcessing.cs rename to Source/Core/Editor/UI/GraphView/Nodes/EndChapterPostProcessing.cs index 7315f678e..9ccc716bf 100644 --- a/Source/Core/Editor/UI/GraphView/EndChapterPostProcessing.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/EndChapterPostProcessing.cs @@ -1,6 +1,7 @@ using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Core +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// implementation of specific for "endChapter" steps. diff --git a/Source/Core/Editor/UI/GraphView/EndChapterPostProcessing.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/EndChapterPostProcessing.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/EndChapterPostProcessing.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/EndChapterPostProcessing.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/EntryPointNode.cs b/Source/Core/Editor/UI/GraphView/Nodes/EntryPointNode.cs similarity index 97% rename from Source/Core/Editor/UI/GraphView/EntryPointNode.cs rename to Source/Core/Editor/UI/GraphView/Nodes/EntryPointNode.cs index 0e1e8339e..e57057833 100644 --- a/Source/Core/Editor/UI/GraphView/EntryPointNode.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/EntryPointNode.cs @@ -1,8 +1,7 @@ using UnityEditor.Experimental.GraphView; using UnityEngine; -using VRBuilder.Core; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Entry point node in a graph view editor. diff --git a/Source/Core/Editor/UI/GraphView/EntryPointNode.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/EntryPointNode.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/EntryPointNode.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/EntryPointNode.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/ParallelExecutionNode.cs b/Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionNode.cs similarity index 98% rename from Source/Core/Editor/UI/GraphView/ParallelExecutionNode.cs rename to Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionNode.cs index 7059667ca..a13d9f762 100644 --- a/Source/Core/Editor/UI/GraphView/ParallelExecutionNode.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionNode.cs @@ -2,11 +2,11 @@ using System.Linq; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.UndoRedo; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Graphical representation of a Parallel Execution node. diff --git a/Source/Core/Editor/UI/GraphView/ParallelExecutionNode.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionNode.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/ParallelExecutionNode.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionNode.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/ParallelExecutionPostProcessing.cs b/Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionPostProcessing.cs similarity index 89% rename from Source/Core/Editor/UI/GraphView/ParallelExecutionPostProcessing.cs rename to Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionPostProcessing.cs index 9fcba9697..5b16b7aa8 100644 --- a/Source/Core/Editor/UI/GraphView/ParallelExecutionPostProcessing.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionPostProcessing.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.Graphics; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Core +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Postprocessing for a parallel execution node. diff --git a/Source/Core/Editor/UI/GraphView/ParallelExecutionPostProcessing.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionPostProcessing.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/ParallelExecutionPostProcessing.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/ParallelExecutionPostProcessing.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/ProcessGraphNode.cs b/Source/Core/Editor/UI/GraphView/Nodes/ProcessGraphNode.cs similarity index 98% rename from Source/Core/Editor/UI/GraphView/ProcessGraphNode.cs rename to Source/Core/Editor/UI/GraphView/Nodes/ProcessGraphNode.cs index 6f037fb91..5c5e0cabb 100644 --- a/Source/Core/Editor/UI/GraphView/ProcessGraphNode.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/ProcessGraphNode.cs @@ -3,9 +3,8 @@ using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Process node in a graph view editor. @@ -174,7 +173,7 @@ private void OnMouseDownEvent(MouseDownEvent e) if ((e.clickCount == 2) && e.button == (int)MouseButton.LeftMouse && IsRenamable()) { OpenTextEditor(); - e.PreventDefault(); + focusController.IgnoreEvent(e); e.StopImmediatePropagation(); } } diff --git a/Source/Core/Editor/UI/GraphView/ProcessGraphNode.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/ProcessGraphNode.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/ProcessGraphNode.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/ProcessGraphNode.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/StepGraphNode.cs b/Source/Core/Editor/UI/GraphView/Nodes/StepGraphNode.cs similarity index 97% rename from Source/Core/Editor/UI/GraphView/StepGraphNode.cs rename to Source/Core/Editor/UI/GraphView/Nodes/StepGraphNode.cs index 3b21c566e..1fa898c99 100644 --- a/Source/Core/Editor/UI/GraphView/StepGraphNode.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/StepGraphNode.cs @@ -2,10 +2,10 @@ using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.UndoRedo; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Step node in a graph view editor. diff --git a/Source/Core/Editor/UI/GraphView/StepGraphNode.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/StepGraphNode.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/StepGraphNode.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/StepGraphNode.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/StepGroupNode.cs b/Source/Core/Editor/UI/GraphView/Nodes/StepGroupNode.cs similarity index 92% rename from Source/Core/Editor/UI/GraphView/StepGroupNode.cs rename to Source/Core/Editor/UI/GraphView/Nodes/StepGroupNode.cs index 1b5a7f705..0630a0914 100644 --- a/Source/Core/Editor/UI/GraphView/StepGroupNode.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/StepGroupNode.cs @@ -2,11 +2,10 @@ using System.Linq; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.UndoRedo; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Graphical representation of a Step Group node. @@ -42,7 +41,7 @@ private void OnNodeClicked(MouseDownEvent e) if ((e.clickCount == 2) && e.button == (int)MouseButton.LeftMouse && IsRenamable()) { ExpandNode(); - e.PreventDefault(); + e.StopPropagation(); e.StopImmediatePropagation(); } } @@ -105,12 +104,12 @@ private void UndoExplodeGroup(IChapter currentChapter, IEnumerable transition.Data.TargetStep = step; } - if(Behavior.Data.Chapter.Data.Steps.Contains(currentChapter.Data.FirstStep)) + if (Behavior.Data.Chapter.Data.Steps.Contains(currentChapter.Data.FirstStep)) { currentChapter.Data.FirstStep = step; } - for(int i = 0; i < Behavior.Data.Chapter.Data.Steps.Count(); i++) + for (int i = 0; i < Behavior.Data.Chapter.Data.Steps.Count(); i++) { IStep step = Behavior.Data.Chapter.Data.Steps[i]; step.StepMetadata.Position = originalPositions[i]; @@ -149,7 +148,7 @@ public override void OnSelected() protected override void OnEditTextFinished(TextField textField) { Behavior.Data.Chapter.Data.SetName(textField.value); - base.OnEditTextFinished(textField); + base.OnEditTextFinished(textField); } public void AddContextMenuActions(DropdownMenu menu) @@ -161,8 +160,8 @@ public void AddContextMenuActions(DropdownMenu menu) menu.AppendAction($"Ungroup", (status) => { - ExplodeNode(); - }); + ExplodeNode(); + }); } } } diff --git a/Source/Core/Editor/UI/GraphView/StepGroupNode.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/StepGroupNode.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/StepGroupNode.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/StepGroupNode.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/StepGroupPostProcessing.cs b/Source/Core/Editor/UI/GraphView/Nodes/StepGroupPostProcessing.cs similarity index 87% rename from Source/Core/Editor/UI/GraphView/StepGroupPostProcessing.cs rename to Source/Core/Editor/UI/GraphView/Nodes/StepGroupPostProcessing.cs index 6775749ca..11c243530 100644 --- a/Source/Core/Editor/UI/GraphView/StepGroupPostProcessing.cs +++ b/Source/Core/Editor/UI/GraphView/Nodes/StepGroupPostProcessing.cs @@ -1,6 +1,7 @@ using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Entities.Factories; -namespace VRBuilder.Core +namespace VRBuilder.Core.Editor.UI.GraphView.Nodes { /// /// Postprocessing for a step group node. diff --git a/Source/Core/Editor/UI/GraphView/StepGroupPostProcessing.cs.meta b/Source/Core/Editor/UI/GraphView/Nodes/StepGroupPostProcessing.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/StepGroupPostProcessing.cs.meta rename to Source/Core/Editor/UI/GraphView/Nodes/StepGroupPostProcessing.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/ProcessExec.cs b/Source/Core/Editor/UI/GraphView/ProcessExec.cs index f0b997c0d..7fa20db6e 100644 --- a/Source/Core/Editor/UI/GraphView/ProcessExec.cs +++ b/Source/Core/Editor/UI/GraphView/ProcessExec.cs @@ -1,4 +1,4 @@ -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView { /// /// Type that connects step nodes in the graph view editor. diff --git a/Source/Core/Editor/UI/GraphView/ProcessGraphView.cs b/Source/Core/Editor/UI/GraphView/ProcessGraphView.cs index d1d19d161..06fe5c6d8 100644 --- a/Source/Core/Editor/UI/GraphView/ProcessGraphView.cs +++ b/Source/Core/Editor/UI/GraphView/ProcessGraphView.cs @@ -1,26 +1,27 @@ +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Newtonsoft.Json; using UnityEditor; using UnityEditor.Experimental.GraphView; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.Configuration; +using VRBuilder.Core.Editor.UI.GraphView.Instantiators; +using VRBuilder.Core.Editor.UI.GraphView.Nodes; +using VRBuilder.Core.Editor.UndoRedo; +using VRBuilder.Core.Entities.Factories; using VRBuilder.Core.Serialization; -using VRBuilder.Editor.Configuration; -using VRBuilder.Editor.UndoRedo; - using static UnityEditor.TypeCache; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView { /// /// Graphical representation of a process chapter. /// - public class ProcessGraphView : GraphView + public class ProcessGraphView : UnityEditor.Experimental.GraphView.GraphView { private Vector2 defaultViewTransform = new Vector2(400, 100); private IChapter currentChapter; @@ -567,7 +568,7 @@ private void CreateEdgeWithUndo(Edge edge) if (targetNode == null) { - Debug.LogError("Connected non-step node"); + UnityEngine.Debug.LogError("Connected non-step node"); return; } @@ -575,7 +576,7 @@ private void CreateEdgeWithUndo(Edge edge) if (startNode == null) { - Debug.LogError("Connected non-step node"); + UnityEngine.Debug.LogError("Connected non-step node"); return; } @@ -718,7 +719,7 @@ private ProcessGraphNode CreateStepNode(IStep step) if (instantiator == null) { - Debug.LogError($"Impossible to find correct visualization for type '{step.StepMetadata.StepType}' used in step '{step.Data.Name}'. Things might not look as expected."); + UnityEngine.Debug.LogError($"Impossible to find correct visualization for type '{step.StepMetadata.StepType}' used in step '{step.Data.Name}'. Things might not look as expected."); instantiator = instantiators.First(i => i.StepType == "default"); } diff --git a/Source/Core/Editor/UI/GraphView/Windows.meta b/Source/Core/Editor/UI/GraphView/Windows.meta new file mode 100644 index 000000000..f7b8c1fa7 --- /dev/null +++ b/Source/Core/Editor/UI/GraphView/Windows.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2be92e5d8f12bf540b93363320bb8387 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Source/Core/Editor/UI/GraphView/ProcessEditorWindow.cs b/Source/Core/Editor/UI/GraphView/Windows/ProcessEditorWindow.cs similarity index 93% rename from Source/Core/Editor/UI/GraphView/ProcessEditorWindow.cs rename to Source/Core/Editor/UI/GraphView/Windows/ProcessEditorWindow.cs index 34b98dddc..16a202fc4 100644 --- a/Source/Core/Editor/UI/GraphView/ProcessEditorWindow.cs +++ b/Source/Core/Editor/UI/GraphView/Windows/ProcessEditorWindow.cs @@ -1,7 +1,6 @@ using UnityEditor; -using VRBuilder.Core; -namespace VRBuilder.Editor.UI.Windows +namespace VRBuilder.Core.Editor.UI.GraphView.Windows { /// /// Base class for a process GUI editor window. diff --git a/Source/Core/Editor/UI/GraphView/ProcessEditorWindow.cs.meta b/Source/Core/Editor/UI/GraphView/Windows/ProcessEditorWindow.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/ProcessEditorWindow.cs.meta rename to Source/Core/Editor/UI/GraphView/Windows/ProcessEditorWindow.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/ProcessGraphViewWindow.cs b/Source/Core/Editor/UI/GraphView/Windows/ProcessGraphViewWindow.cs similarity index 98% rename from Source/Core/Editor/UI/GraphView/ProcessGraphViewWindow.cs rename to Source/Core/Editor/UI/GraphView/Windows/ProcessGraphViewWindow.cs index 225eaf1f4..0375609a3 100644 --- a/Source/Core/Editor/UI/GraphView/ProcessGraphViewWindow.cs +++ b/Source/Core/Editor/UI/GraphView/Windows/ProcessGraphViewWindow.cs @@ -4,11 +4,11 @@ using UnityEditor; using UnityEngine; using UnityEngine.UIElements; -using VRBuilder.Core; -using VRBuilder.Editor.UI.Windows; -using VRBuilder.Editor.UndoRedo; +using VRBuilder.Core.Editor.ProcessAssets; +using VRBuilder.Core.Editor.UI.Windows; +using VRBuilder.Core.Editor.UndoRedo; -namespace VRBuilder.Editor.UI.Graphics +namespace VRBuilder.Core.Editor.UI.GraphView.Windows { /// /// Editor windows that displays the process using a graphview. diff --git a/Source/Core/Editor/UI/GraphView/ProcessGraphViewWindow.cs.meta b/Source/Core/Editor/UI/GraphView/Windows/ProcessGraphViewWindow.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/ProcessGraphViewWindow.cs.meta rename to Source/Core/Editor/UI/GraphView/Windows/ProcessGraphViewWindow.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/SceneReferencesEditorPopup.cs b/Source/Core/Editor/UI/GraphView/Windows/SceneReferencesEditorPopup.cs similarity index 98% rename from Source/Core/Editor/UI/GraphView/SceneReferencesEditorPopup.cs rename to Source/Core/Editor/UI/GraphView/Windows/SceneReferencesEditorPopup.cs index c6216dc97..f5f201283 100644 --- a/Source/Core/Editor/UI/GraphView/SceneReferencesEditorPopup.cs +++ b/Source/Core/Editor/UI/GraphView/Windows/SceneReferencesEditorPopup.cs @@ -5,11 +5,11 @@ using UnityEngine; using UnityEngine.UIElements; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI.Views; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI.Views; -namespace VRBuilder.Editor.UI.Windows +namespace VRBuilder.Core.Editor.UI.GraphView.Windows { public class SceneReferencesEditorPopup : PopupWindowContent { diff --git a/Source/Core/Editor/UI/GraphView/SceneReferencesEditorPopup.cs.meta b/Source/Core/Editor/UI/GraphView/Windows/SceneReferencesEditorPopup.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/SceneReferencesEditorPopup.cs.meta rename to Source/Core/Editor/UI/GraphView/Windows/SceneReferencesEditorPopup.cs.meta diff --git a/Source/Core/Editor/UI/GraphView/SearchableGroupListPopup.cs b/Source/Core/Editor/UI/GraphView/Windows/SearchableGroupListPopup.cs similarity index 99% rename from Source/Core/Editor/UI/GraphView/SearchableGroupListPopup.cs rename to Source/Core/Editor/UI/GraphView/Windows/SearchableGroupListPopup.cs index d252b7873..12f61c528 100644 --- a/Source/Core/Editor/UI/GraphView/SearchableGroupListPopup.cs +++ b/Source/Core/Editor/UI/GraphView/Windows/SearchableGroupListPopup.cs @@ -6,10 +6,11 @@ using UnityEngine; using UnityEngine.UIElements; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI.Views; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI.Windows +namespace VRBuilder.Core.Editor.UI.GraphView.Windows { /// diff --git a/Source/Core/Editor/UI/GraphView/SearchableGroupListPopup.cs.meta b/Source/Core/Editor/UI/GraphView/Windows/SearchableGroupListPopup.cs.meta similarity index 100% rename from Source/Core/Editor/UI/GraphView/SearchableGroupListPopup.cs.meta rename to Source/Core/Editor/UI/GraphView/Windows/SearchableGroupListPopup.cs.meta diff --git a/Source/Core/Editor/UI/Graphics.meta b/Source/Core/Editor/UI/Graphics.meta deleted file mode 100644 index e9504131d..000000000 --- a/Source/Core/Editor/UI/Graphics.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b885e4582239931429240e42ccbfa196 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Graphics/AddStepButton.cs b/Source/Core/Editor/UI/Graphics/AddStepButton.cs deleted file mode 100644 index 0c4a8e0c1..000000000 --- a/Source/Core/Editor/UI/Graphics/AddStepButton.cs +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Represents "Add new step" button. It is rendered at the middle of its parent Transition and inserts a new step on click into the process workflow. - /// - internal class AddStepButton : GraphicalElement - { - private static readonly Vector2 size = new Vector2(20f, 20f); - - private readonly GraphicalElementRenderer renderer; - - /// - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - /// - public override Rect BoundingBox - { - get - { - return new Rect(Position - size / 2f, size); - } - } - - /// - public override int Layer - { - get - { - return 100; - } - } - - public AddStepButton(EditorGraphics editorGraphics, GraphicalElement parent = null) : base(editorGraphics, true, parent) - { - renderer = new AddStepButtonRenderer(this, editorGraphics.ColorPalette); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/AddStepButton.cs.meta b/Source/Core/Editor/UI/Graphics/AddStepButton.cs.meta deleted file mode 100644 index d3569e86c..000000000 --- a/Source/Core/Editor/UI/Graphics/AddStepButton.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 37822f14ee8e4038b1a28a7f84099aa7 -timeCreated: 1539872936 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/CreateTransitionButton.cs b/Source/Core/Editor/UI/Graphics/CreateTransitionButton.cs deleted file mode 100644 index b0928cd04..000000000 --- a/Source/Core/Editor/UI/Graphics/CreateTransitionButton.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class CreateTransitionButton : GraphicalElement - { - private readonly Vector2 size = new Vector2(16f, 16f); - - private readonly GraphicalElementRenderer renderer; - private Rect boundingBox; - private int layer; - - public CreateTransitionButton(EditorGraphics editorGraphics, GraphicalElement parent = null) : base(editorGraphics, true, parent) - { - renderer = new CreateTransitionButtonRenderer(this, editorGraphics.ColorPalette); - } - - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - public override Rect BoundingBox - { - get - { - return new Rect(Position - size / 2f, size); - } - } - - public override int Layer - { - get - { - return 0; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/CreateTransitionButton.cs.meta b/Source/Core/Editor/UI/Graphics/CreateTransitionButton.cs.meta deleted file mode 100644 index 7a3c35427..000000000 --- a/Source/Core/Editor/UI/Graphics/CreateTransitionButton.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0a386bf92bcc4273955c70eacf5f6a69 -timeCreated: 1563465890 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/EditorNode.cs b/Source/Core/Editor/UI/Graphics/EditorNode.cs deleted file mode 100644 index baf75e556..000000000 --- a/Source/Core/Editor/UI/Graphics/EditorNode.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System.Collections.Generic; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Base class for Entry and Exit nodes. - /// - internal abstract class EditorNode : GraphicalElement - { - /// - /// List of entry joints, to which incoming Transitions can connect. Since workflow is linear for now, there is only one joint per editor node. - /// - public List EntryJoints { get; private set; } - - /// - /// List of exit joints, to which outcoming Transitions can connect. Since workflow is linear for now, there is only one joint per editor node. - /// - public List ExitJoints { get; private set; } - - /// - public override int Layer - { - get - { - return 0; - } - } - - /// - protected EditorNode(EditorGraphics owner, bool isReceivingEvents) : base(owner, isReceivingEvents) - { - EntryJoints = new List(); - ExitJoints = new List(); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/EditorNode.cs.meta b/Source/Core/Editor/UI/Graphics/EditorNode.cs.meta deleted file mode 100644 index 8078d3ebe..000000000 --- a/Source/Core/Editor/UI/Graphics/EditorNode.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b082ddff33a249279ddd0af7491e7181 -timeCreated: 1539683435 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/EntryJoint.cs b/Source/Core/Editor/UI/Graphics/EntryJoint.cs deleted file mode 100644 index 16b09e968..000000000 --- a/Source/Core/Editor/UI/Graphics/EntryJoint.cs +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class EntryJoint : GraphicalElement - { - private readonly Vector2 size = new Vector2(16f, 16f); - private readonly EntryJointRenderer renderer; - - public EntryJoint(EditorGraphics editorGraphics, GraphicalElement parent = null) : base(editorGraphics, true, parent) - { - renderer = new EntryJointRenderer(this, editorGraphics.ColorPalette); - } - - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - public override Rect BoundingBox - { - get - { - return new Rect(Position - size, size * 2f); - } - } - - public override int Layer - { - get - { - return 0; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/EntryJoint.cs.meta b/Source/Core/Editor/UI/Graphics/EntryJoint.cs.meta deleted file mode 100644 index 7391b3191..000000000 --- a/Source/Core/Editor/UI/Graphics/EntryJoint.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5a865ca8114a43d9bc1865ae2d8193ca -timeCreated: 1563356922 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/EntryNode.cs b/Source/Core/Editor/UI/Graphics/EntryNode.cs deleted file mode 100644 index 49570ea62..000000000 --- a/Source/Core/Editor/UI/Graphics/EntryNode.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Represents the beginning of a process in the process workflow. - /// - internal class EntryNode : EditorNode - { - private static readonly Vector2 size = new Vector2(24f, 24f); - private readonly GraphicalElementRenderer renderer; - - private bool isDragging; - - public bool IsDragging - { - get - { - return isDragging; - } - set - { - if (value != isDragging) - { - isDragging = value; - } - } - } - - /// - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - /// - public override Rect BoundingBox - { - get - { - return new Rect(Position - size / 2f, size); - } - } - - public EntryNode(EditorGraphics owner) : base(owner, true) - { - renderer = new EntryNodeRenderer(this, owner.ColorPalette); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/EntryNode.cs.meta b/Source/Core/Editor/UI/Graphics/EntryNode.cs.meta deleted file mode 100644 index aa25fa1e7..000000000 --- a/Source/Core/Editor/UI/Graphics/EntryNode.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 83881433481c4e89a71d95a010ccd0dd -timeCreated: 1539872360 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/ExitJoint.cs b/Source/Core/Editor/UI/Graphics/ExitJoint.cs deleted file mode 100644 index 60be2714b..000000000 --- a/Source/Core/Editor/UI/Graphics/ExitJoint.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class ExitJoint : GraphicalElement - { - public Vector2 DragDelta { get; set; } - - private readonly Vector2 size = new Vector2(16f, 16f); - - private readonly GraphicalElementRenderer renderer; - private Rect boundingBox; - private int layer; - - public ExitJoint(EditorGraphics editorGraphics, GraphicalElement parent = null) : base(editorGraphics, true, parent) - { - renderer = new ExitJointRenderer(this, editorGraphics.ColorPalette); - } - - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - public override Rect BoundingBox - { - get - { - return new Rect(Position - size / 2f, size); - } - } - - public override int Layer - { - get - { - return 0; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/ExitJoint.cs.meta b/Source/Core/Editor/UI/Graphics/ExitJoint.cs.meta deleted file mode 100644 index bda1d9a4e..000000000 --- a/Source/Core/Editor/UI/Graphics/ExitJoint.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 8f0fc2a96e944384bc8685e36f6e06be -timeCreated: 1539683428 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/GraphicalElement.cs b/Source/Core/Editor/UI/Graphics/GraphicalElement.cs deleted file mode 100644 index c3a3e1fe1..000000000 --- a/Source/Core/Editor/UI/Graphics/GraphicalElement.cs +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Base class for all views in the Workflow window. - /// - internal abstract class GraphicalElement - { - private readonly List children = new List(); - private GraphicalElement parent; - private Vector2 relativePosition; - - public event EventHandler RelativePositionChanged; - - /// - /// Encapsulates rendering of this graphical element. - /// If this graphical element is not supposed to be drawn, Renderer is null. - /// - public abstract GraphicalElementRenderer Renderer { get; } - - /// - /// Encapsulates handling of UI events that are related to this graphical element. - /// If this graphical element is not supposed to receive any events, GraphicalEventHandler is null. - /// - public GraphicalEventHandler GraphicalEventHandler { get; private set; } - - /// - /// True if this graphical element receives UI events. - /// - public bool IsReceivingEvents { get; private set; } - - /// - /// True if this graphical element has a visual representation to be drawn. - /// - public bool CanBeDrawn - { - get - { - return Renderer != null; - } - } - - /// - /// Owner EditorGraphics object that relays UI events and manages rendering. - /// - protected EditorGraphics Graphics { get; private set; } - - /// - /// GraphicalElement position is calculated relative to Parent element. - /// - public GraphicalElement Parent - { - get - { - return parent; - } - set - { - Vector2 position = Position; - - if (parent != null) - { - parent.RemoveChild(this); - } - - parent = value; - - if (parent != null) - { - parent.AddChild(this); - } - - Position = position; - } - } - - /// - /// List of graphical elements for which this graphical element is parent. - /// - public ReadOnlyCollection Children - { - get - { - return children.AsReadOnly(); - } - } - - /// - /// Relative position from Parent. - /// - public Vector2 RelativePosition - { - get - { - return relativePosition; - } - set - { - relativePosition = value; - if (RelativePositionChanged != null) - { - RelativePositionChanged.Invoke(this, new GraphicalElementEventArgs()); - } - } - } - - /// - /// Position in the editor window (from top-left). - /// - public Vector2 Position - { - get - { - if (Parent == null) - { - return RelativePosition; - } - - return Parent.Position + RelativePosition; - } - set - { - if (Parent == null) - { - RelativePosition = value; - return; - } - - RelativePosition = value - Parent.Position; - } - } - - /// - /// Rect that bounds the graphical element in the containing window coordinates. - /// - public abstract Rect BoundingBox { get; } - - /// - /// Rect that bounds the graphical element in the coordinates relative to its position. - /// - public Rect LocalBoundingBox - { - get - { - return new Rect(BoundingBox.position - Position, BoundingBox.size); - } - } - - /// - /// Elements with higher Layer are checked for pointer events first and drawn last. - /// - public abstract int Layer { get; } - - /// Owner EditorGraphics object that relays UI events to this element and manages its rendering. - /// If true, new instance of GraphicalEventHandler is added to this graphical element. - /// GraphicalElement position is calculated relative to Parent element. Can be null. - protected GraphicalElement(EditorGraphics editorGraphics, bool isReceivingEvents, GraphicalElement parent = null) - { - IsReceivingEvents = isReceivingEvents; - if (isReceivingEvents) - { - GraphicalEventHandler = new GraphicalEventHandler(); - } - - Parent = parent; - Graphics = editorGraphics; - Graphics.Register(this); - } - - public void AddChild(GraphicalElement child) - { - children.Add(child); - } - - public bool RemoveChild(GraphicalElement child) - { - return children.Remove(child); - } - - /// - /// Check if point is inside the element. - /// - /// Position of the pointer - public virtual bool IsPointInsideGeometry(Vector2 position) - { - return BoundingBox.Contains(position, true); - } - - /// - /// Check if element is at least partially inside the rect (used to determine if we have to draw an element or we can ignore it). - /// - public virtual bool IsVisibleInRect(Rect rect) - { - return BoundingBox.Overlaps(rect, true); - } - - /// - /// Called when element is registered in a EditorGraphics object. - /// - public virtual void HandleRegistration() - { - } - - /// - /// Called when element is unregistered from its owner Graphics. - /// - public virtual void HandleDeregistration() - { - } - - // Called once per Unity Editor frame. - public virtual void Layout() - { - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/GraphicalElement.cs.meta b/Source/Core/Editor/UI/Graphics/GraphicalElement.cs.meta deleted file mode 100644 index c8b8a0dd0..000000000 --- a/Source/Core/Editor/UI/Graphics/GraphicalElement.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 52de8232a59f4faa838e816a8293830a -timeCreated: 1539862626 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/GraphicalElementEventArgs.cs b/Source/Core/Editor/UI/Graphics/GraphicalElementEventArgs.cs deleted file mode 100644 index af3c08c51..000000000 --- a/Source/Core/Editor/UI/Graphics/GraphicalElementEventArgs.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class GraphicalElementEventArgs : EventArgs - { - } -} diff --git a/Source/Core/Editor/UI/Graphics/GraphicalElementEventArgs.cs.meta b/Source/Core/Editor/UI/Graphics/GraphicalElementEventArgs.cs.meta deleted file mode 100644 index 1f844ef6a..000000000 --- a/Source/Core/Editor/UI/Graphics/GraphicalElementEventArgs.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: b2e02c98e6724a52aa953ce30cf9ea39 -timeCreated: 1540385182 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/GraphicalEventHandler.cs b/Source/Core/Editor/UI/Graphics/GraphicalEventHandler.cs deleted file mode 100644 index af013b9a0..000000000 --- a/Source/Core/Editor/UI/Graphics/GraphicalEventHandler.cs +++ /dev/null @@ -1,108 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class GraphicalEventHandler - { - public event EventHandler PointerDown; - public event EventHandler PointerUp; - public event EventHandler PointerClick; - - public event EventHandler PointerHoverStart; - public event EventHandler PointerHoverStop; - - public event EventHandler ContextPointerDown; - public event EventHandler ContextClick; - public event EventHandler ContextPointerUp; - - public event EventHandler PointerDrag; - - public void InvokeContextPointerDown(Vector2 pointerPosition) - { - if (ContextPointerDown != null) - { - ContextPointerDown.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokeContextPointerUp(Vector2 pointerPosition) - { - if (ContextPointerUp != null) - { - ContextPointerUp.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokePointerDown(Vector2 pointerPosition) - { - if (PointerDown != null) - { - PointerDown.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokePointerUp(Vector2 pointerPosition) - { - if (PointerUp != null) - { - PointerUp.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokePointerClick(Vector2 pointerPosition) - { - if (PointerClick != null) - { - PointerClick.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokePointerHoverStart(Vector2 pointerPosition) - { - if (PointerHoverStart != null) - { - PointerHoverStart.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokePointerHoverStop(Vector2 pointerPosition) - { - if (PointerHoverStop != null) - { - PointerHoverStop.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokeContextPointerClick(Vector2 pointerPosition) - { - if (ContextClick != null) - { - ContextClick.Invoke(this, new PointerGraphicalElementEventArgs(pointerPosition)); - } - } - - public void InvokePointerDrag(Vector2 pointerPosition, Vector2 delta) - { - if (PointerDrag != null) - { - PointerDrag.Invoke(this, new PointerDraggedGraphicalElementEventArgs(pointerPosition, delta)); - } - } - - public void Reset() - { - PointerDown = null; - PointerUp = null; - PointerClick = null; - PointerHoverStart = null; - PointerHoverStop = null; - ContextClick = null; - PointerDrag = null; - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/GraphicalEventHandler.cs.meta b/Source/Core/Editor/UI/Graphics/GraphicalEventHandler.cs.meta deleted file mode 100644 index 6b4f2d40b..000000000 --- a/Source/Core/Editor/UI/Graphics/GraphicalEventHandler.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 65e2c944bbf14368aca991029afaf5a8 -timeCreated: 1540385039 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Grid.cs b/Source/Core/Editor/UI/Graphics/Grid.cs deleted file mode 100644 index baf0a9296..000000000 --- a/Source/Core/Editor/UI/Graphics/Grid.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Base class for a grid which can be used as e.g. a background of the chapter view. - /// - internal abstract class Grid : GraphicalElement - { - public Grid(EditorGraphics editorGraphics, bool isReceivingEvents, GraphicalElement parent = null) : base(editorGraphics, isReceivingEvents, parent) - { - } - - /// - public override GraphicalElementRenderer Renderer { get; } - - /// - public override Rect BoundingBox { get; } - - /// - public override int Layer { get; } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Grid.cs.meta b/Source/Core/Editor/UI/Graphics/Grid.cs.meta deleted file mode 100644 index fa6840925..000000000 --- a/Source/Core/Editor/UI/Graphics/Grid.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bbdf30da23dba9c40975e531e291d72c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Graphics/PointerDraggedGraphicalElementEventArgs.cs b/Source/Core/Editor/UI/Graphics/PointerDraggedGraphicalElementEventArgs.cs deleted file mode 100644 index 3b775f88f..000000000 --- a/Source/Core/Editor/UI/Graphics/PointerDraggedGraphicalElementEventArgs.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class PointerDraggedGraphicalElementEventArgs : PointerGraphicalElementEventArgs - { - public Vector2 PointerDelta - { - get; - private set; - } - - public PointerDraggedGraphicalElementEventArgs(Vector2 pointerPosition, Vector2 pointerDelta) : base(pointerPosition) - { - PointerDelta = pointerDelta; - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/PointerDraggedGraphicalElementEventArgs.cs.meta b/Source/Core/Editor/UI/Graphics/PointerDraggedGraphicalElementEventArgs.cs.meta deleted file mode 100644 index c47187056..000000000 --- a/Source/Core/Editor/UI/Graphics/PointerDraggedGraphicalElementEventArgs.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 95fe32f4ee7c4f0c9266c7ea3828279e -timeCreated: 1540385187 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/PointerGraphicalElementEventArgs.cs b/Source/Core/Editor/UI/Graphics/PointerGraphicalElementEventArgs.cs deleted file mode 100644 index fa9e12801..000000000 --- a/Source/Core/Editor/UI/Graphics/PointerGraphicalElementEventArgs.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class PointerGraphicalElementEventArgs : GraphicalElementEventArgs - { - public Vector2 PointerPosition { get; private set; } - - public PointerGraphicalElementEventArgs(Vector2 pointerPosition) - { - PointerPosition = pointerPosition; - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/PointerGraphicalElementEventArgs.cs.meta b/Source/Core/Editor/UI/Graphics/PointerGraphicalElementEventArgs.cs.meta deleted file mode 100644 index c978b03a2..000000000 --- a/Source/Core/Editor/UI/Graphics/PointerGraphicalElementEventArgs.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5d6908a6b9bb4e26b464a33241fedd32 -timeCreated: 1563290568 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers.meta b/Source/Core/Editor/UI/Graphics/Renderers.meta deleted file mode 100644 index 20547efd7..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: efab2f9c72f08b944927eeaf6576cb09 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Graphics/Renderers/AddStepButtonRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/AddStepButtonRenderer.cs deleted file mode 100644 index b36011dff..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/AddStepButtonRenderer.cs +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Renderer for AddStepButton graphical elements. - /// - internal class AddStepButtonRenderer : MulticoloredGraphicalElementRenderer - { - /// - public override Color NormalColor - { - get - { - return ColorPalette.ElementBackground; - } - } - - /// - protected override Color PressedColor - { - get - { - return ColorPalette.Primary; - } - } - - /// - protected override Color HoveredColor - { - get - { - return ColorPalette.Secondary; - } - } - - /// - protected override Color TextColor - { - get - { - return ColorPalette.Text; - } - } - - public AddStepButtonRenderer(AddStepButton owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - - /// - public override void Draw() - { - Rect rect = Owner.BoundingBox; - rect.x = Mathf.Round(rect.x); - rect.y = Mathf.Round(rect.y); - rect.height = Mathf.Round(rect.height); - rect.width = Mathf.Round(rect.width); - - EditorDrawingHelper.DrawRoundedRect(rect, CurrentColor, 4f); - GUIStyle style = new GUIStyle() - { - alignment = TextAnchor.MiddleCenter, - normal = new GUIStyleState() { textColor = TextColor } - }; - GUI.Label(rect, "+", style); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/AddStepButtonRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/AddStepButtonRenderer.cs.meta deleted file mode 100644 index 19b81cadc..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/AddStepButtonRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3f32cb5ac8604ad682921cef1e938e58 -timeCreated: 1540395526 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/ColoredGraphicalElementRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/ColoredGraphicalElementRenderer.cs deleted file mode 100644 index 027f0a5cd..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/ColoredGraphicalElementRenderer.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Base class for graphical element renderers that use only one color. - /// - internal abstract class ColoredGraphicalElementRenderer : GraphicalElementRenderer where TOwner : GraphicalElement - { - /// - /// Color palette which is used in current Workflow window. Use colors from it to keep your elements in the same style. - /// - protected WorkflowEditorColorPalette ColorPalette - { - get; - private set; - } - - /// - /// Default color of the element. - /// - public abstract Color NormalColor - { - get; - } - - /// - /// Current color of the element. - /// - public Color CurrentColor - { - get; - set; - } - - protected ColoredGraphicalElementRenderer(TOwner owner, WorkflowEditorColorPalette colorPalette) : base(owner) - { - ColorPalette = colorPalette; - CurrentColor = NormalColor; - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/ColoredGraphicalElementRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/ColoredGraphicalElementRenderer.cs.meta deleted file mode 100644 index 1f9f0cdf5..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/ColoredGraphicalElementRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 18b785bbb59b410d94bab7ef8bed3847 -timeCreated: 1540395544 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/CreateTransitionButtonRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/CreateTransitionButtonRenderer.cs deleted file mode 100644 index 915f3bfa5..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/CreateTransitionButtonRenderer.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class CreateTransitionButtonRenderer : MulticoloredGraphicalElementRenderer - { - private static EditorIcon plusIcon = new EditorIcon("icon_add"); - private int iconSize = 14; - - public CreateTransitionButtonRenderer(CreateTransitionButton owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - - public override void Draw() - { - EditorDrawingHelper.DrawCircle(Owner.Position, Owner.BoundingBox.width / 2f, CurrentColor); - Rect iconBoundingBox = new Rect(Owner.Position.x - (iconSize / 2f), Owner.Position.y - (iconSize / 2f), iconSize, iconSize); - EditorDrawingHelper.DrawTexture(iconBoundingBox, plusIcon.Texture, Color.gray); - } - - public override Color NormalColor - { - get - { - return ColorPalette.Transition; - } - } - - protected override Color PressedColor - { - get - { - return ColorPalette.Primary; - } - } - - protected override Color HoveredColor - { - get - { - return ColorPalette.Secondary; - } - } - - protected override Color TextColor - { - get - { - return ColorPalette.ElementBackground; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/CreateTransitionButtonRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/CreateTransitionButtonRenderer.cs.meta deleted file mode 100644 index bcd6698f8..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/CreateTransitionButtonRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a629912a68214443906788d45af8a076 -timeCreated: 1563465768 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/EditorNodeRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/EditorNodeRenderer.cs deleted file mode 100644 index f9086a0da..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/EditorNodeRenderer.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Base class for rendering nodes of the Workflow window (entry node, exit node, and step node). - /// - internal abstract class EditorNodeRenderer : ColoredGraphicalElementRenderer where TOwner : EditorNode - { - /// - public override Color NormalColor - { - get - { - return ColorPalette.ElementBackground; - } - } - - public EditorNodeRenderer(TOwner owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/EditorNodeRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/EditorNodeRenderer.cs.meta deleted file mode 100644 index c14faab4f..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/EditorNodeRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: df3c28ac98f24eaf8ac62a609a5695a6 -timeCreated: 1540395835 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/EntryJointRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/EntryJointRenderer.cs deleted file mode 100644 index 3c02d1bdf..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/EntryJointRenderer.cs +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class EntryJointRenderer : MulticoloredGraphicalElementRenderer - { - private static EditorIcon ingoingIcon = new EditorIcon("icon_arrow_right"); - private int iconSize = 15; - - public EntryJointRenderer(EntryJoint owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - - public override void Draw() - { - EditorDrawingHelper.DrawCircle(Owner.Position, Owner.BoundingBox.width / 4f, CurrentColor); - Rect iconRect = new Rect(Owner.Position.x - iconSize / 2f, Owner.Position.y - iconSize / 2f, iconSize, iconSize); - EditorDrawingHelper.DrawTexture(iconRect, ingoingIcon.Texture, Color.gray); - } - - public override Color NormalColor - { - get - { - return ColorPalette.Transition; - } - } - - protected override Color PressedColor - { - get - { - return ColorPalette.Primary; - } - } - - protected override Color HoveredColor - { - get - { - return ColorPalette.Secondary; - } - } - - protected override Color TextColor - { - get - { - return ColorPalette.ElementBackground; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/EntryJointRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/EntryJointRenderer.cs.meta deleted file mode 100644 index 5bc10f562..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/EntryJointRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 66b9f118f44c4641bdc3f1626f518b5f -timeCreated: 1563798959 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/EntryNodeRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/EntryNodeRenderer.cs deleted file mode 100644 index 81d649c88..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/EntryNodeRenderer.cs +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; -using UnityEditor; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class EntryNodeRenderer : MulticoloredGraphicalElementRenderer - { - private static int LabelWidth = 30; - private static int LabelHeight = 50; - - /// - public override Color NormalColor - { - get - { - if (Owner.IsDragging) - { - return SelectedColor; - } - return ColorPalette.ElementBackground; - } - } - - protected override Color PressedColor - { - get - { - return SelectedColor; - } - } - - protected override Color HoveredColor - { - get - { - return ColorPalette.Secondary; - } - } - - protected override Color TextColor - { - get - { - return ColorPalette.Text; - } - } - - protected virtual Color SelectedColor - { - get - { - return ColorPalette.Primary; - } - } - - public EntryNodeRenderer(EntryNode owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - - /// - public override void Draw() - { - EditorDrawingHelper.DrawCircle(Owner.BoundingBox.center, Owner.BoundingBox.size.x / 2f, CurrentColor); - Rect StartLabelRect = new Rect(Owner.BoundingBox.center.x - LabelWidth / 2f, Owner.BoundingBox.center.y, LabelWidth, LabelHeight); - EditorGUI.LabelField(StartLabelRect, "Start", EditorStyles.label); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/EntryNodeRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/EntryNodeRenderer.cs.meta deleted file mode 100644 index 4f9d8e543..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/EntryNodeRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d88f263743484280b87697c8e4ecca92 -timeCreated: 1540470025 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/ExitJointRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/ExitJointRenderer.cs deleted file mode 100644 index 29377536d..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/ExitJointRenderer.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - internal class ExitJointRenderer : MulticoloredGraphicalElementRenderer - { - private static EditorIcon outgoingIcon = new EditorIcon("icon_arrow_right"); - private int iconSize = 15; - - public ExitJointRenderer(ExitJoint owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - - public override void Draw() - { - EditorDrawingHelper.DrawCircle(Owner.Position, Owner.BoundingBox.width / 2f, CurrentColor); - - if (Owner.DragDelta.magnitude > Owner.BoundingBox.width / 2f) - { - EditorDrawingHelper.DrawArrow(Owner.Position, Owner.Position + Owner.DragDelta, CurrentColor, 40f, 10f); - } - - Rect iconRect = new Rect(Owner.Position.x - iconSize / 2f, Owner.Position.y - iconSize / 2f, iconSize, iconSize); - EditorDrawingHelper.DrawTexture(iconRect, outgoingIcon.Texture, Color.gray); - } - - public override Color NormalColor - { - get - { - return ColorPalette.Transition; - } - } - - protected override Color PressedColor - { - get - { - return ColorPalette.Primary; - } - } - - protected override Color HoveredColor - { - get - { - return ColorPalette.Secondary; - } - } - - protected override Color TextColor - { - get - { - return ColorPalette.Text; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/ExitJointRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/ExitJointRenderer.cs.meta deleted file mode 100644 index 790742e2c..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/ExitJointRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e55bb6b61bc64ec1bf8c1aac09c9b8a2 -timeCreated: 1563356927 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/GraphicalElementRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/GraphicalElementRenderer.cs deleted file mode 100644 index 8038b197a..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/GraphicalElementRenderer.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Base class for all graphical element renderers. - /// - internal abstract class GraphicalElementRenderer : GraphicalElementRenderer where TOwner : GraphicalElement - { - /// - /// Graphical element to which this renderer belongs. - /// - protected TOwner Owner - { - get; - private set; - } - - protected GraphicalElementRenderer(TOwner owner) - { - Owner = owner; - } - } - - public abstract class GraphicalElementRenderer - { - /// - /// Called once in the end of the frame. Use it to draw elements in the editor window. - /// - public abstract void Draw(); - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/GraphicalElementRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/GraphicalElementRenderer.cs.meta deleted file mode 100644 index c21d08f32..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/GraphicalElementRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2616dafaad1349b296e6751f3bbd8bdb -timeCreated: 1540394726 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/GridRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/GridRenderer.cs deleted file mode 100644 index cb8a835ac..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/GridRenderer.cs +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Base class which handles rendering of a . - /// - internal abstract class GridRenderer : GraphicalElementRenderer where TOwner : Grid - { - /// - /// Bounding box of the grid. - /// - public virtual Rect BoundingBox { get; set; } - - /// - /// Size of a cell within the grid. Cells are always square. - /// - public virtual float CellSize { get; set; } = 10f; - - protected GridRenderer(TOwner owner) : base(owner) - { - } - - /// - /// Color used for lines of grid. - /// - public virtual Color MainColor { get; set; } = Color.gray * 0.3f; - - /// - /// Color used for every 10th line of the grid. - /// - public virtual Color SecondaryColor { get; set; } = Color.black; - - /// - public override void Draw() - { - Color drawColor; - - int lineCount = 0; - float yPosTop = 0; - float yPosBot = 0; - - float width = BoundingBox.x + BoundingBox.width; - float height = BoundingBox.y + BoundingBox.height; - - // Draw horizontal lines starting from (0, 0). - while (yPosTop > BoundingBox.y || yPosBot <= height) - { - drawColor = lineCount % 10 == 0 ? SecondaryColor : MainColor; - lineCount++; - - if (yPosTop > BoundingBox.y) - { - EditorDrawingHelper.DrawHorizontalLine(new Vector3(BoundingBox.x, yPosTop), BoundingBox.width, drawColor); - yPosTop -= CellSize; - } - - if (yPosBot <= height) - { - EditorDrawingHelper.DrawHorizontalLine(new Vector3(BoundingBox.x, yPosBot), BoundingBox.width, drawColor); - yPosBot += CellSize; - } - } - - lineCount = 0; - float xPosLeft = 0; - float xPosRight = 0; - - // Draw vertical lines starting from (0, 0). - while (xPosLeft > BoundingBox.x || xPosRight <= width) - { - drawColor = lineCount % 10 == 0 ? SecondaryColor : MainColor; - lineCount++; - if (xPosLeft > BoundingBox.x) - { - EditorDrawingHelper.DrawVerticalLine(new Vector3(xPosLeft, BoundingBox.y), BoundingBox.height, drawColor); - xPosLeft -= CellSize; - } - - if (xPosRight <= width) - { - EditorDrawingHelper.DrawVerticalLine(new Vector3(xPosRight, BoundingBox.y), BoundingBox.height, drawColor); - xPosRight += CellSize; - } - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/GridRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/GridRenderer.cs.meta deleted file mode 100644 index 93a9c5deb..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/GridRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c17b32cb6a94df94394c3b2e46a1ba24 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Graphics/Renderers/MulticoloredGraphicalElementRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/MulticoloredGraphicalElementRenderer.cs deleted file mode 100644 index 10864e783..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/MulticoloredGraphicalElementRenderer.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Renderer for graphical elements that are supposed to change their color while being pressed or hovered over. - /// - internal abstract class MulticoloredGraphicalElementRenderer : ColoredGraphicalElementRenderer where TOwner : GraphicalElement - { - /// - /// Color of the element while that element is pressed down. - /// - protected abstract Color PressedColor { get; } - - /// - /// Color of the element that is hovered over. - /// - protected abstract Color HoveredColor { get; } - - /// - /// Color of the text at the element. - /// - protected abstract Color TextColor { get; } - - protected MulticoloredGraphicalElementRenderer(TOwner owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - if (owner.IsReceivingEvents) - { - owner.GraphicalEventHandler.PointerDown += (sender, args) => CurrentColor = PressedColor; - owner.GraphicalEventHandler.PointerUp += (sender, args) => CurrentColor = NormalColor; - owner.GraphicalEventHandler.PointerHoverStart += (sender, args) => CurrentColor = HoveredColor; - owner.GraphicalEventHandler.PointerHoverStop += (sender, args) => CurrentColor = NormalColor; - - owner.GraphicalEventHandler.ContextPointerDown += (sender, args) => CurrentColor = PressedColor; - owner.GraphicalEventHandler.ContextPointerUp += (sender, args) => CurrentColor = NormalColor; - } - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/MulticoloredGraphicalElementRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/MulticoloredGraphicalElementRenderer.cs.meta deleted file mode 100644 index 78bddb078..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/MulticoloredGraphicalElementRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3571fd7c283a48e9acc84263d321ddbe -timeCreated: 1540397839 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/StepNodeRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/StepNodeRenderer.cs deleted file mode 100644 index 4f6b0e9ab..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/StepNodeRenderer.cs +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System.Collections.Generic; -using VRBuilder.Editor.Configuration; -using VRBuilder.Editor.ProcessValidation; -using UnityEditor; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - internal class StepNodeRenderer : MulticoloredGraphicalElementRenderer - { - private const float labelBorderOffsetInwards = 10f; - - public override Color NormalColor - { - get - { - if (Owner.IsLastSelectedStep) - { - return SelectedColor; - } - - return ColorPalette.ElementBackground; - } - } - - protected override Color PressedColor - { - get - { - return SelectedColor; - } - } - - protected override Color HoveredColor - { - get - { - return ColorPalette.Secondary; - } - } - - protected override Color TextColor - { - get - { - return ColorPalette.Text; - } - } - - protected virtual Color SelectedColor - { - get - { - return ColorPalette.Primary; - } - } - - public StepNodeRenderer(StepNode owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - owner.SelectedChanged += isSelected => - { - CurrentColor = isSelected ? SelectedColor : NormalColor; - }; - } - - public override void Draw() - { - EditorDrawingHelper.DrawRoundedRect(Owner.BoundingBox, CurrentColor, 10f); - - IValidationHandler validation = EditorConfigurator.Instance.Validation; - if (validation.IsAllowedToValidate()) - { - IContextResolver resolver = validation.ContextResolver; - - IContext context = resolver.FindContext(Owner.Step.Data, GlobalEditorHandler.GetCurrentProcess()); - if (validation.LastReport != null) - { - List errors = validation.LastReport.GetEntriesFor(context); - if (errors.Count > 0) - { - string tooltip = ValidationTooltipGenerator.CreateStepTooltip(errors, - resolver.FindContext(Owner.ActiveChapter.Data, GlobalEditorHandler.GetCurrentProcess())); - GUIContent content = new GUIContent("", null, tooltip); - Rect rect = new Rect(Owner.BoundingBox.x + Owner.BoundingBox.width * 0.70f, Owner.BoundingBox.y - 8, 16, 16); - // Label icons are too small so we draw a label for the tool tip and icon separated. - GUI.Label(rect, content); - GUI.DrawTexture(rect, EditorGUIUtility.IconContent("Warning").image); - } - } - } - - float labelX = Owner.BoundingBox.x + labelBorderOffsetInwards; - float labelY = Owner.BoundingBox.y + labelBorderOffsetInwards; - float labelWidth = Owner.BoundingBox.width - labelBorderOffsetInwards * 2f; - float labelHeight = Owner.BoundingBox.height - labelBorderOffsetInwards * 2f; - - Rect labelPosition = new Rect(labelX, labelY, labelWidth, labelHeight); - - GUIStyle labelStyle = new GUIStyle - { - alignment = TextAnchor.MiddleCenter, - normal = { textColor = TextColor }, - wordWrap = false, - }; - - string name = EditorDrawingHelper.TruncateText(Owner.Step.Data.Name, labelStyle, labelPosition.width); - - GUIContent labelContent = new GUIContent(name); - - GUI.Label(labelPosition, labelContent, labelStyle); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/StepNodeRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/StepNodeRenderer.cs.meta deleted file mode 100644 index 3ed5b77d0..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/StepNodeRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 303f25cc3a9b4372a6db309e8f6a2518 -timeCreated: 1540469429 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/TransitionRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/TransitionRenderer.cs deleted file mode 100644 index 50afc4749..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/TransitionRenderer.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Renderer for transition between editor nodes. - /// - internal class TransitionRenderer : ColoredGraphicalElementRenderer - { - /// - public override Color NormalColor - { - get - { - return ColorPalette.Transition; - } - } - - public TransitionRenderer(TransitionElement owner, WorkflowEditorColorPalette colorPalette) : base(owner, colorPalette) - { - } - - /// - public override void Draw() - { - EditorDrawingHelper.DrawPolyline(Owner.PolylinePoints, CurrentColor); - EditorDrawingHelper.DrawTriangle(Owner.PolylinePoints, CurrentColor); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/TransitionRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/TransitionRenderer.cs.meta deleted file mode 100644 index 0b890f195..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/TransitionRenderer.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: fb2fae26352f43d3b2aca1a663e4cb84 -timeCreated: 1540396924 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/Renderers/WorkflowEditorGridRenderer.cs b/Source/Core/Editor/UI/Graphics/Renderers/WorkflowEditorGridRenderer.cs deleted file mode 100644 index 2beac74e0..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/WorkflowEditorGridRenderer.cs +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -namespace VRBuilder.Editor.UI.Graphics.Renderers -{ - /// - /// Handles rendering of a . - /// - internal class WorkflowEditorGridRenderer : GridRenderer - { - public WorkflowEditorGridRenderer(WorkflowEditorGrid owner) : base(owner) - { - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/Renderers/WorkflowEditorGridRenderer.cs.meta b/Source/Core/Editor/UI/Graphics/Renderers/WorkflowEditorGridRenderer.cs.meta deleted file mode 100644 index 8defc88ec..000000000 --- a/Source/Core/Editor/UI/Graphics/Renderers/WorkflowEditorGridRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2e81a88911a7fef44a8bc2fb1618dc17 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/Graphics/StepNode.cs b/Source/Core/Editor/UI/Graphics/StepNode.cs deleted file mode 100644 index e5884acd0..000000000 --- a/Source/Core/Editor/UI/Graphics/StepNode.cs +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using VRBuilder.Core; -using VRBuilder.Editor.ProcessValidation; -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Represents step node of the Workflow window. - /// - internal class StepNode : EditorNode - { - private static readonly Vector2 initialSize = new Vector2(100f, 24f); - private Vector2 size = initialSize; - - private bool isLastSelectedStep; - - private IStep step; - - //The last step that was clicked on is selected. - private readonly GraphicalElementRenderer renderer; - - public CreateTransitionButton CreateTransitionButton { get; private set; } - - public IChapter ActiveChapter { get; } - - /// - /// Currently displayed step instance. If this step node is selected, the same step instance is used by a Step Inspector as well. - /// - public IStep Step - { - get - { - return step; - } - set - { - step = value; - if (step != null) - { - Position = step.StepMetadata.Position; - } - } - } - - /// - /// Indicates that this node represents last step selected by user. - /// - public bool IsLastSelectedStep - { - get - { - return isLastSelectedStep; - } - set - { - if (value != isLastSelectedStep) - { - isLastSelectedStep = value; - if (SelectedChanged != null) - { - SelectedChanged.Invoke(value); - } - } - } - } - - public event Action SelectedChanged; - - /// - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - /// - public override Rect BoundingBox - { - get - { - return new Rect(Position - initialSize / 2f, size); - } - } - - /// - public StepNode(EditorGraphics graphics, IChapter chapter, IStep step) : base(graphics, true) - { - ActiveChapter = chapter; - Step = step; - renderer = new StepNodeRenderer(this, graphics.ColorPalette); - - EntryJoints.Add(new EntryJoint(graphics, this) { RelativePosition = new Vector2(-size.x / 2f, -1f) }); - - CreateTransitionButton = new CreateTransitionButton(graphics, this) { RelativePosition = new Vector2(size.x / 2f, 0) }; - } - - public ExitJoint AddExitJoint() - { - ExitJoint toAdd = new ExitJoint(Graphics, this); - toAdd.RelativePosition = new Vector2(size.x / 2f, ExitJoints.Count * 20f); - size.y += 20f; - ExitJoints.Add(toAdd); - - CreateTransitionButton.RelativePosition = new Vector2(size.x / 2f, (ExitJoints.Count) * 20f); - - return toAdd; - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/StepNode.cs.meta b/Source/Core/Editor/UI/Graphics/StepNode.cs.meta deleted file mode 100644 index d23cb7435..000000000 --- a/Source/Core/Editor/UI/Graphics/StepNode.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3118b66e59be45b388dcdebefc888d39 -timeCreated: 1539872985 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/TransitionElement.cs b/Source/Core/Editor/UI/Graphics/TransitionElement.cs deleted file mode 100644 index db14bba49..000000000 --- a/Source/Core/Editor/UI/Graphics/TransitionElement.cs +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using System; -using System.Collections.ObjectModel; -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Represents transition arrow between two steps. - /// - internal class TransitionElement : GraphicalElement - { - private readonly TransitionRenderer renderer; - - private Rect boundingBox; - private ExitJoint start; - - /// - /// Amount of segments a bezier curve consists of. - /// - public static int CurveSegmentCount = 33; - - /// - /// Points forming the bezier curve. - /// - public ReadOnlyCollection PolylinePoints { get; private set; } - - /// - /// Joint that arrow is pointing at. - /// - public EntryJoint Destination { get; private set; } - - /// - /// Joint from which transition starts. - /// - public ExitJoint Start - { - get { return start; } - - private set - { - start = value; - Parent = start; - } - } - - /// - public override Rect BoundingBox - { - get { return boundingBox; } - } - - /// - public override int Layer - { - get { return 80; } - } - - /// - public override GraphicalElementRenderer Renderer - { - get { return renderer; } - } - - /// - public TransitionElement(EditorGraphics editorGraphics, ExitJoint start, EntryJoint destination) : base(editorGraphics, false, start) - { - Destination = destination; - Start = start; - renderer = new TransitionRenderer(this, editorGraphics.ColorPalette); - } - - public override void HandleDeregistration() - { - base.HandleDeregistration(); - Start = null; - Destination = null; - } - - public override void Layout() - { - base.Layout(); - - RelativePosition = (Destination.Position - Start.Position) / 2f; - - if (Mathf.Abs(Start.Position.y - Destination.Position.y) > 1.0 || start.Position.x > Destination.Position.x) - { - Vector2[] controlPoints = BezierCurveHelper.CalculateControlPointsForTransition(Start.Position, Destination.Position, Start.Parent.BoundingBox, Destination.Parent.BoundingBox); - PolylinePoints = Array.AsReadOnly(BezierCurveHelper.CalculateDeCastejauCurve(Start.Position, controlPoints[0], controlPoints[1], Destination.Position, CurveSegmentCount)); - } - else - { - PolylinePoints = Array.AsReadOnly(new Vector2[] {Start.Position, Destination.Position}); - } - - boundingBox = BezierCurveHelper.CalculateBoundingBoxForPolyline(PolylinePoints); - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/TransitionElement.cs.meta b/Source/Core/Editor/UI/Graphics/TransitionElement.cs.meta deleted file mode 100644 index c2d607977..000000000 --- a/Source/Core/Editor/UI/Graphics/TransitionElement.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 70a4749dffe7407f8032e231c21b9ee0 -timeCreated: 1539683488 \ No newline at end of file diff --git a/Source/Core/Editor/UI/Graphics/WorkflowEditorGrid.cs b/Source/Core/Editor/UI/Graphics/WorkflowEditorGrid.cs deleted file mode 100644 index 042121f99..000000000 --- a/Source/Core/Editor/UI/Graphics/WorkflowEditorGrid.cs +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2013-2019 Innoactive GmbH -// Licensed under the Apache License, Version 2.0 -// Modifications copyright (c) 2021-2024 MindPort GmbH - -using VRBuilder.Editor.UI.Graphics.Renderers; -using UnityEngine; - -namespace VRBuilder.Editor.UI.Graphics -{ - /// - /// Represents the grid in the background of the chapter within the Workflow window. - /// - internal class WorkflowEditorGrid : Grid - { - private readonly WorkflowEditorGridRenderer renderer; - - /// - public override GraphicalElementRenderer Renderer - { - get - { - return renderer; - } - } - - /// - public override int Layer - { - get { return 1000; } - } - - /// - /// The grid should always be drawn. - public override bool IsVisibleInRect(Rect rect) - { - return true; - } - - public WorkflowEditorGrid(EditorGraphics editorGraphics) : base(editorGraphics, false) - { - renderer = new WorkflowEditorGridRenderer(this); - } - - public WorkflowEditorGrid(EditorGraphics editorGraphics, float cellSize) : base(editorGraphics, false) - { - renderer = new WorkflowEditorGridRenderer(this); - renderer.CellSize = cellSize; - } - - /// - /// Set the size of the whole grid. - /// - /// Rect which defines size. - public void SetSize(Rect controlRect) - { - renderer.BoundingBox = controlRect; - } - } -} diff --git a/Source/Core/Editor/UI/Graphics/WorkflowEditorGrid.cs.meta b/Source/Core/Editor/UI/Graphics/WorkflowEditorGrid.cs.meta deleted file mode 100644 index 5bdf107d2..000000000 --- a/Source/Core/Editor/UI/Graphics/WorkflowEditorGrid.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9f62c9efb09334443845f2bacae0dccb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/IEditorGraphicDrawer.cs b/Source/Core/Editor/UI/IEditorGraphicDrawer.cs index 557ffd449..75754e343 100644 --- a/Source/Core/Editor/UI/IEditorGraphicDrawer.cs +++ b/Source/Core/Editor/UI/IEditorGraphicDrawer.cs @@ -4,7 +4,7 @@ using UnityEngine; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { /// /// Allows to draws over the normal EditorGraphics. diff --git a/Source/Core/Editor/UI/Inspector/BezierSplineInspector.cs b/Source/Core/Editor/UI/Inspector/BezierSplineInspector.cs index bcaf91471..609b04fe2 100644 --- a/Source/Core/Editor/UI/Inspector/BezierSplineInspector.cs +++ b/Source/Core/Editor/UI/Inspector/BezierSplineInspector.cs @@ -1,58 +1,57 @@ using UnityEditor; using UnityEngine; -using VRBuilder.Core.Utils; -using VRBuilder.Editor.UI; +using VRBuilder.Core.Utils.Bezier; -namespace VRBuilder.Editor.Core.UI +namespace VRBuilder.Core.Editor.UI.Inspector { /// /// Editor for . /// [CustomEditor(typeof(BezierSpline))] - public class BezierSplineInspector : UnityEditor.Editor - { - private const int stepsPerCurve = 10; - private const float directionScale = 0.5f; - private const float handleSize = 0.04f; - private const float pickSize = 0.06f; + public class BezierSplineInspector : UnityEditor.Editor + { + private const int stepsPerCurve = 10; + private const float directionScale = 0.5f; + private const float handleSize = 0.04f; + private const float pickSize = 0.06f; private static Color[] modeColors = { - new Color32(231,64,255, 255), - new Color32(255,238,74, 255), - new Color32(120,241,200, 255), - }; - - private static Color lineColor = Color.white; - private static Color handleColor = new Color32(191, 191, 191, 255); - private static Color tangentColor = new Color32(102,150,255, 255); - - private BezierSpline spline; - private Transform handleTransform; - private Quaternion handleRotation; - private int selectedIndex = -1; - - public override void OnInspectorGUI() - { - spline = target as BezierSpline; - EditorGUI.BeginChangeCheck(); - bool loop = EditorGUILayout.Toggle("Loop", spline.Loop); - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(spline, "Toggle Loop"); - EditorUtility.SetDirty(spline); - spline.Loop = loop; - } + new Color32(231,64,255, 255), + new Color32(255,238,74, 255), + new Color32(120,241,200, 255), + }; + + private static Color lineColor = Color.white; + private static Color handleColor = new Color32(191, 191, 191, 255); + private static Color tangentColor = new Color32(102, 150, 255, 255); + + private BezierSpline spline; + private Transform handleTransform; + private Quaternion handleRotation; + private int selectedIndex = -1; + + public override void OnInspectorGUI() + { + spline = target as BezierSpline; + EditorGUI.BeginChangeCheck(); + bool loop = EditorGUILayout.Toggle("Loop", spline.Loop); + if (EditorGUI.EndChangeCheck()) + { + Undo.RecordObject(spline, "Toggle Loop"); + EditorUtility.SetDirty(spline); + spline.Loop = loop; + } spline.LinearVelocity = EditorGUILayout.Toggle("Approximate Linear Velocity", spline.LinearVelocity); - if(spline.LinearVelocity) + if (spline.LinearVelocity) { spline.CurveResolution = EditorGUILayout.IntField("Granularity of Approximation", Mathf.Clamp(spline.CurveResolution, 2, spline.CurveResolution)); } GUILayout.Label("Control Points", BuilderEditorStyles.Header); - for(int point = 0; point < spline.ControlPointCount; ++point) + for (int point = 0; point < spline.ControlPointCount; ++point) { if (point == spline.ControlPointCount - 1 && loop) { @@ -62,25 +61,25 @@ public override void OnInspectorGUI() DrawInspectorForPoint(point); } - if (GUILayout.Button("Add Curve")) - { - Undo.RecordObject(spline, "Add Curve"); - spline.AddCurve(); - EditorUtility.SetDirty(spline); - } + if (GUILayout.Button("Add Curve")) + { + Undo.RecordObject(spline, "Add Curve"); + spline.AddCurve(); + EditorUtility.SetDirty(spline); + } EditorGUI.BeginDisabledGroup(spline.ControlPointCount <= 4); - if(GUILayout.Button("Remove Curve")) + if (GUILayout.Button("Remove Curve")) { Undo.RecordObject(spline, "Remove Curve"); spline.RemoveCurve(); EditorUtility.SetDirty(spline); } EditorGUI.EndDisabledGroup(); - } + } - private void DrawInspectorForPoint(int index) - { + private void DrawInspectorForPoint(int index) + { GUIStyle labelStyle = new GUIStyle(GUI.skin.label); labelStyle.fontStyle = FontStyle.Bold; @@ -89,7 +88,7 @@ private void DrawInspectorForPoint(int index) string label; - if(index == 0 || index % 3 == 2) + if (index == 0 || index % 3 == 2) { GUILayout.Label($"Point {(index + 1) / 3}", labelStyle); } @@ -98,7 +97,7 @@ private void DrawInspectorForPoint(int index) { label = "Anchor"; } - else if(index % 3 == 1) + else if (index % 3 == 1) { label = "Handle Out"; } @@ -119,9 +118,9 @@ private void DrawInspectorForPoint(int index) } } - EditorGUILayout.BeginHorizontal(); + EditorGUILayout.BeginHorizontal(); EditorGUI.BeginDisabledGroup(index == selectedIndex); - if(GUILayout.Button(label, buttonStyle)) + if (GUILayout.Button(label, buttonStyle)) { selectedIndex = index; Repaint(); @@ -131,80 +130,80 @@ private void DrawInspectorForPoint(int index) GUILayout.FlexibleSpace(); - EditorGUI.BeginChangeCheck(); - Vector3 point = EditorGUILayout.Vector3Field(string.Empty, spline.GetControlPoint(index)); - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(spline, "Move Point"); - EditorUtility.SetDirty(spline); - spline.SetControlPoint(index, point); - } + EditorGUI.BeginChangeCheck(); + Vector3 point = EditorGUILayout.Vector3Field(string.Empty, spline.GetControlPoint(index)); + if (EditorGUI.EndChangeCheck()) + { + Undo.RecordObject(spline, "Move Point"); + EditorUtility.SetDirty(spline); + spline.SetControlPoint(index, point); + } EditorGUILayout.EndHorizontal(); - } - - private void OnSceneGUI() - { - spline = target as BezierSpline; - handleTransform = spline.transform; - handleRotation = Tools.pivotRotation == PivotRotation.Local ? - handleTransform.rotation : Quaternion.identity; - - Vector3 p0 = ShowPoint(0); - for (int i = 1; i < spline.ControlPointCount; i += 3) - { - Vector3 p1 = ShowPoint(i); - Vector3 p2 = ShowPoint(i + 1); - Vector3 p3 = ShowPoint(i + 2); - - Handles.color = handleColor; - Handles.DrawLine(p0, p1); - Handles.DrawLine(p2, p3); - - Handles.DrawBezier(p0, p3, p1, p2, lineColor, null, 2f); - p0 = p3; - } - ShowDirections(); - } - - private void ShowDirections() - { - Handles.color = tangentColor; - Vector3 point = spline.GetPoint(0f); - Handles.DrawLine(point, point + spline.GetDirection(0f) * directionScale); - int steps = stepsPerCurve * spline.CurveCount; - for (int i = 1; i <= steps; i++) - { - point = spline.GetPoint(i / (float)steps); - Handles.DrawLine(point, point + spline.GetDirection(i / (float)steps) * directionScale); - } - } - - private Vector3 ShowPoint(int index) - { - Vector3 point = handleTransform.TransformPoint(spline.GetControlPoint(index)); - float size = HandleUtility.GetHandleSize(point); - if (index == 0) - { - size *= 2f; - } - Handles.color = modeColors[(int)spline.GetControlPointMode(index)]; - if (Handles.Button(point, handleRotation, size * handleSize, size * pickSize, Handles.DotHandleCap)) - { - selectedIndex = index; - Repaint(); - } - if (selectedIndex == index) - { - EditorGUI.BeginChangeCheck(); - point = Handles.DoPositionHandle(point, handleRotation); - if (EditorGUI.EndChangeCheck()) - { - Undo.RecordObject(spline, "Move Point"); - EditorUtility.SetDirty(spline); - spline.SetControlPoint(index, handleTransform.InverseTransformPoint(point)); - } - } - return point; - } - } + } + + private void OnSceneGUI() + { + spline = target as BezierSpline; + handleTransform = spline.transform; + handleRotation = Tools.pivotRotation == PivotRotation.Local ? + handleTransform.rotation : Quaternion.identity; + + Vector3 p0 = ShowPoint(0); + for (int i = 1; i < spline.ControlPointCount; i += 3) + { + Vector3 p1 = ShowPoint(i); + Vector3 p2 = ShowPoint(i + 1); + Vector3 p3 = ShowPoint(i + 2); + + Handles.color = handleColor; + Handles.DrawLine(p0, p1); + Handles.DrawLine(p2, p3); + + Handles.DrawBezier(p0, p3, p1, p2, lineColor, null, 2f); + p0 = p3; + } + ShowDirections(); + } + + private void ShowDirections() + { + Handles.color = tangentColor; + Vector3 point = spline.GetPoint(0f); + Handles.DrawLine(point, point + spline.GetDirection(0f) * directionScale); + int steps = stepsPerCurve * spline.CurveCount; + for (int i = 1; i <= steps; i++) + { + point = spline.GetPoint(i / (float)steps); + Handles.DrawLine(point, point + spline.GetDirection(i / (float)steps) * directionScale); + } + } + + private Vector3 ShowPoint(int index) + { + Vector3 point = handleTransform.TransformPoint(spline.GetControlPoint(index)); + float size = HandleUtility.GetHandleSize(point); + if (index == 0) + { + size *= 2f; + } + Handles.color = modeColors[(int)spline.GetControlPointMode(index)]; + if (Handles.Button(point, handleRotation, size * handleSize, size * pickSize, Handles.DotHandleCap)) + { + selectedIndex = index; + Repaint(); + } + if (selectedIndex == index) + { + EditorGUI.BeginChangeCheck(); + point = Handles.DoPositionHandle(point, handleRotation); + if (EditorGUI.EndChangeCheck()) + { + Undo.RecordObject(spline, "Move Point"); + EditorUtility.SetDirty(spline); + spline.SetControlPoint(index, handleTransform.InverseTransformPoint(point)); + } + } + return point; + } + } } diff --git a/Source/Core/Editor/ProcessController/UI/ProcessControllerSetupEditor.cs b/Source/Core/Editor/UI/Inspector/ProcessControllerSetupEditor.cs similarity index 90% rename from Source/Core/Editor/ProcessController/UI/ProcessControllerSetupEditor.cs rename to Source/Core/Editor/UI/Inspector/ProcessControllerSetupEditor.cs index c86b5710a..398e8061a 100644 --- a/Source/Core/Editor/ProcessController/UI/ProcessControllerSetupEditor.cs +++ b/Source/Core/Editor/UI/Inspector/ProcessControllerSetupEditor.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using VRBuilder.Core.Utils; -using VRBuilder.UX; using UnityEditor; using UnityEngine; +using VRBuilder.Core.Utils; +using VRBuilder.ProcessController; -namespace VRBuilder.Editor.UX +namespace VRBuilder.Core.Editor.UI.Inspector { /// /// Custom editor for s. @@ -22,7 +22,7 @@ internal class ProcessControllerSetupEditor : UnityEditor.Editor private SerializedProperty customPrefabProperty; private ProcessControllerSetup setupObject; - + private IProcessController[] availableProcessControllers; private string[] availableProcessControllerNames; private GameObject customPrefab = null; @@ -30,7 +30,7 @@ internal class ProcessControllerSetupEditor : UnityEditor.Editor private bool useCustomPrefab; private List currentRequiredComponents = new List(); - + private void OnEnable() { processControllerProperty = serializedObject.FindProperty("processControllerQualifiedName"); @@ -38,11 +38,11 @@ private void OnEnable() useCustomPrefabProperty = serializedObject.FindProperty("useCustomPrefab"); customPrefabProperty = serializedObject.FindProperty("customPrefab"); - customPrefab = (GameObject) customPrefabProperty.objectReferenceValue; - setupObject = (ProcessControllerSetup) serializedObject.targetObject; + customPrefab = (GameObject)customPrefabProperty.objectReferenceValue; + setupObject = (ProcessControllerSetup)serializedObject.targetObject; availableProcessControllers = ReflectionUtils.GetConcreteImplementationsOf() - .Select(c => (IProcessController) ReflectionUtils.CreateInstanceOfType(c)).OrderByDescending(controller => controller.Priority).ToArray(); + .Select(c => (IProcessController)ReflectionUtils.CreateInstanceOfType(c)).OrderByDescending(controller => controller.Priority).ToArray(); availableProcessControllerNames = availableProcessControllers.Select(controller => controller.Name).ToArray(); @@ -51,11 +51,11 @@ private void OnEnable() { selectedIndex = 0; } - + currentRequiredComponents = availableProcessControllers[selectedIndex].GetRequiredSetupComponents(); currentRequiredComponents.AddRange(currentRequiredComponents .SelectMany(type => type.GetCustomAttributes(typeof(RequireComponent)).Cast()) - .SelectMany(component => new List() {component.m_Type0, component.m_Type1, component.m_Type2}) + .SelectMany(component => new List() { component.m_Type0, component.m_Type1, component.m_Type2 }) .Where(type => type != null) .Distinct() .Except(currentRequiredComponents) @@ -69,11 +69,11 @@ public override void OnInspectorGUI() GUI.enabled = useCustomPrefab == false && Application.isPlaying == false; bool prevUseCustomPrefab = useCustomPrefab; int prevIndex = selectedIndex; - + selectedIndex = EditorGUILayout.Popup("Process Controller", selectedIndex, availableProcessControllerNames); autoStartProperty.boolValue = EditorGUILayout.Toggle("Auto start process", autoStartProperty.boolValue); - + GUI.enabled = !Application.isPlaying; useCustomPrefab = EditorGUILayout.Toggle("Use custom prefab", useCustomPrefabProperty.boolValue); @@ -85,10 +85,10 @@ public override void OnInspectorGUI() customPrefab = EditorGUILayout.ObjectField("Custom prefab", customPrefab, typeof(GameObject), false) as GameObject; } serializedObject.ApplyModifiedProperties(); - + return; } - + if (useCustomPrefab) { customPrefab = EditorGUILayout.ObjectField("Custom prefab", customPrefab, typeof(GameObject), false) as GameObject; @@ -109,7 +109,7 @@ public override void OnInspectorGUI() useCustomPrefabProperty.boolValue = useCustomPrefab; processControllerProperty.stringValue = availableProcessControllers[selectedIndex].GetType().AssemblyQualifiedName; - + serializedObject.ApplyModifiedProperties(); } @@ -137,4 +137,4 @@ private bool HasComponents(List components) return components.Except(setupObject.gameObject.GetComponents().ToList().Select(c => c.GetType())).Any() == false; } } -} \ No newline at end of file +} diff --git a/Source/Core/Editor/ProcessController/UI/ProcessControllerSetupEditor.cs.meta b/Source/Core/Editor/UI/Inspector/ProcessControllerSetupEditor.cs.meta similarity index 100% rename from Source/Core/Editor/ProcessController/UI/ProcessControllerSetupEditor.cs.meta rename to Source/Core/Editor/UI/Inspector/ProcessControllerSetupEditor.cs.meta diff --git a/Source/Core/Editor/UI/LogoEditorHelper.cs b/Source/Core/Editor/UI/LogoEditorHelper.cs index 9dfcc0c91..1a7112272 100644 --- a/Source/Core/Editor/UI/LogoEditorHelper.cs +++ b/Source/Core/Editor/UI/LogoEditorHelper.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { /// /// Helper editor class that allows retrieving or drawing a logo that diff --git a/Source/Core/Editor/UI/LogoStyle.cs b/Source/Core/Editor/UI/LogoStyle.cs index 9751d565c..fa89c8ecc 100644 --- a/Source/Core/Editor/UI/LogoStyle.cs +++ b/Source/Core/Editor/UI/LogoStyle.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { public enum LogoStyle { diff --git a/Source/Core/Editor/UI/Menu/AddPropertyExtensionsMenuEntry.cs b/Source/Core/Editor/UI/Menu/AddPropertyExtensionsMenuEntry.cs index 337ba25b3..a9cb223cd 100644 --- a/Source/Core/Editor/UI/Menu/AddPropertyExtensionsMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/AddPropertyExtensionsMenuEntry.cs @@ -5,7 +5,7 @@ using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { /// /// Adds all property extensions required by the current scene setup to the objects in the scene. @@ -15,11 +15,11 @@ internal static class AddPropertyExtensionsMenuEntry [MenuItem("Tools/VR Builder/Developer/Add Scene Property Extensions", false, 70)] private static void AddPropertyExtensions() { - if(EditorUtility.DisplayDialog("Add Scene Property Extensions?", "This will add the extensions required by the current scene setup to all scene object properties in the scene.\n" + + if (EditorUtility.DisplayDialog("Add Scene Property Extensions?", "This will add the extensions required by the current scene setup to all scene object properties in the scene.\n" + "Previously added extensions will not be removed.\n" + "Continue?", "Ok", "Cancel")) { - IEnumerable processSceneObjects = GameObject.FindObjectsOfType(true); + IEnumerable processSceneObjects = GameObject.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None); float processedObjects = 0; foreach (ProcessSceneObject processSceneObject in processSceneObjects) diff --git a/Source/Core/Editor/UI/Menu/AddonsMenuEntry.cs b/Source/Core/Editor/UI/Menu/AddonsMenuEntry.cs index d4519e60c..8b29eea2a 100644 --- a/Source/Core/Editor/UI/Menu/AddonsMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/AddonsMenuEntry.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class AddonsMenuEntry { diff --git a/Source/Core/Editor/UI/Menu/ChooseSerializerPopup.cs b/Source/Core/Editor/UI/Menu/ChooseSerializerPopup.cs index 77ef27f9c..6f301561f 100644 --- a/Source/Core/Editor/UI/Menu/ChooseSerializerPopup.cs +++ b/Source/Core/Editor/UI/Menu/ChooseSerializerPopup.cs @@ -9,7 +9,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { /// /// Allows user to select which serializer they want to use. diff --git a/Source/Core/Editor/UI/Menu/CommunityMenuEntry.cs b/Source/Core/Editor/UI/Menu/CommunityMenuEntry.cs index 26c948437..732f74229 100644 --- a/Source/Core/Editor/UI/Menu/CommunityMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/CommunityMenuEntry.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class CommunityMenuEntry { diff --git a/Source/Core/Editor/UI/Menu/DocumentationMenuEntry.cs b/Source/Core/Editor/UI/Menu/DocumentationMenuEntry.cs index f07a9a2f9..4e7219e4d 100644 --- a/Source/Core/Editor/UI/Menu/DocumentationMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/DocumentationMenuEntry.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class DocumentationMenuEntry { diff --git a/Source/Core/Editor/UI/Menu/ImportProcessMenuEntry.cs b/Source/Core/Editor/UI/Menu/ImportProcessMenuEntry.cs index 7b3366738..c5633a970 100644 --- a/Source/Core/Editor/UI/Menu/ImportProcessMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/ImportProcessMenuEntry.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using VRBuilder.Core.Utils; -using VRBuilder.Core.Serialization; using UnityEditor; -using UnityEngine; +using VRBuilder.Core.Editor.ProcessAssets; +using VRBuilder.Core.Serialization; +using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class ImportProcessMenuEntry { @@ -33,7 +33,7 @@ private static void ImportProcess() if (result.Count == 0) { - Debug.LogError("Tried to import, but no Serializer found."); + UnityEngine.Debug.LogError("Tried to import, but no Serializer found."); return; } diff --git a/Source/Core/Editor/UI/Menu/OpenProcessMenuEntry.cs b/Source/Core/Editor/UI/Menu/OpenProcessMenuEntry.cs index 0828e052f..7230b481a 100644 --- a/Source/Core/Editor/UI/Menu/OpenProcessMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/OpenProcessMenuEntry.cs @@ -3,9 +3,10 @@ using UnityEditor; using VRBuilder.Core.Configuration; -using VRBuilder.Editor.Configuration; +using VRBuilder.Core.Editor.Configuration; +using VRBuilder.Core.Editor.ProcessAssets; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class OpenProcessMenuEntry { diff --git a/Source/Core/Editor/UI/Menu/ReviewMenuEntry.cs b/Source/Core/Editor/UI/Menu/ReviewMenuEntry.cs index 98c111f1d..ebbf8f6bf 100644 --- a/Source/Core/Editor/UI/Menu/ReviewMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/ReviewMenuEntry.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class ReviewMenuEntry { diff --git a/Source/Core/Editor/UI/Menu/RoadmapMenuEntry.cs b/Source/Core/Editor/UI/Menu/RoadmapMenuEntry.cs index 9b177f14e..fb55f24be 100644 --- a/Source/Core/Editor/UI/Menu/RoadmapMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/RoadmapMenuEntry.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class RoadmapMenuEntry { diff --git a/Source/Core/Editor/UI/Menu/SceneObjectRegistryVisualizerMenuEntry.cs b/Source/Core/Editor/UI/Menu/SceneObjectRegistryVisualizerMenuEntry.cs index b7f749d82..be631d8ab 100644 --- a/Source/Core/Editor/UI/Menu/SceneObjectRegistryVisualizerMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/SceneObjectRegistryVisualizerMenuEntry.cs @@ -1,7 +1,7 @@ using UnityEditor; -using VRBuilder.Editor.Debugging; +using VRBuilder.Core.Editor.Debug; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class SceneObjectRegistryVisualizerMenuEntry { @@ -11,7 +11,7 @@ internal static class SceneObjectRegistryVisualizerMenuEntry [MenuItem("Tools/VR Builder/Developer/Scene Object Registry Visualizer", false, 1000)] private static void OpenSceneObjectRegistryVisualizer() { - EditorWindow.GetWindow().Show(); + EditorWindow.GetWindow().Show(); } } } diff --git a/Source/Core/Editor/UI/Menu/ShowBuilderSettingsMenuEntry.cs b/Source/Core/Editor/UI/Menu/ShowBuilderSettingsMenuEntry.cs index 9337bd860..241de7a28 100644 --- a/Source/Core/Editor/UI/Menu/ShowBuilderSettingsMenuEntry.cs +++ b/Source/Core/Editor/UI/Menu/ShowBuilderSettingsMenuEntry.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -using VRBuilder.Editor.Configuration; +using VRBuilder.Core.Editor.Configuration; using UnityEditor; -namespace VRBuilder.Editor.BuilderMenu +namespace VRBuilder.Core.Editor.Menu { internal static class ShowBuilderSettingsMenuEntry { diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems.meta b/Source/Core/Editor/UI/MenuItems.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems.meta rename to Source/Core/Editor/UI/MenuItems.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors.meta b/Source/Core/Editor/UI/MenuItems/Behaviors.meta similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors.meta index d2b95f87d..0e567c9f5 100644 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Behaviors.meta +++ b/Source/Core/Editor/UI/MenuItems/Behaviors.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5d7dc6472cf93f4a942c5ef4d8855df +guid: 9dc2ed39235e0ba40a7a8e40b54d786e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/BehaviorSequenceMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/BehaviorSequenceMenuItem.cs similarity index 72% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/BehaviorSequenceMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/BehaviorSequenceMenuItem.cs index 3b1a894e1..a64c91e7c 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/BehaviorSequenceMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/BehaviorSequenceMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class BehaviorSequenceMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/BehaviorSequenceMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/BehaviorSequenceMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/BehaviorSequenceMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/BehaviorSequenceMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ConfettiMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/ConfettiMenuItem.cs similarity index 69% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ConfettiMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/ConfettiMenuItem.cs index d91ef34f9..ce60b3b32 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ConfettiMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/ConfettiMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { public class ConfettiMenuItem : MenuItem { diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ConfettiMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/ConfettiMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ConfettiMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/ConfettiMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DelayMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/DelayMenuItem.cs similarity index 70% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DelayMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/DelayMenuItem.cs index bf36a0bbc..9bda4b4a6 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DelayMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/DelayMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class DelayMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DelayMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/DelayMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DelayMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/DelayMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableComponentMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/DisableComponentMenuItem.cs similarity index 79% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableComponentMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/DisableComponentMenuItem.cs index 99ca79003..7e7371f71 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableComponentMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/DisableComponentMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class DisableComponentMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableComponentMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/DisableComponentMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableComponentMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/DisableComponentMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableObjectsMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/DisableObjectsMenuItem.cs similarity index 79% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableObjectsMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/DisableObjectsMenuItem.cs index f1845de07..4af1c7320 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableObjectsMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/DisableObjectsMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class DisableObjectsMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableObjectsMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/DisableObjectsMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/DisableObjectsMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/DisableObjectsMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableComponentMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/EnableComponentMenuItem.cs similarity index 79% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableComponentMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/EnableComponentMenuItem.cs index 9b0b07c1b..d1d8b717f 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableComponentMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/EnableComponentMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class EnableComponentMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableComponentMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/EnableComponentMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableComponentMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/EnableComponentMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableObjectsMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/EnableObjectsMenuItem.cs similarity index 78% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableObjectsMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/EnableObjectsMenuItem.cs index 2c027bf9a..b6574b7b9 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableObjectsMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/EnableObjectsMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class EnableObjectsMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableObjectsMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/EnableObjectsMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/EnableObjectsMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/EnableObjectsMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/HighlightObjectMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/HighlightObjectMenuItem.cs similarity index 72% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/HighlightObjectMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/HighlightObjectMenuItem.cs index c0c9bb7ce..03384b286 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/HighlightObjectMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/HighlightObjectMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class HighlightObjectMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/HighlightObjectMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/HighlightObjectMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/HighlightObjectMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/HighlightObjectMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/LoadSceneMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/LoadSceneMenuItem.cs similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/LoadSceneMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/LoadSceneMenuItem.cs index 08b239613..0e4f0645a 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/LoadSceneMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/LoadSceneMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class LoadSceneMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/LoadSceneMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/LoadSceneMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/LoadSceneMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/LoadSceneMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/MoveObjectMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/MoveObjectMenuItem.cs similarity index 71% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/MoveObjectMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/MoveObjectMenuItem.cs index 54d6997ff..69324ef71 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/MoveObjectMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/MoveObjectMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class MoveObjectMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/MoveObjectMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/MoveObjectMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/MoveObjectMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/MoveObjectMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/PlayResourceAudioMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/PlayResourceAudioMenuItem.cs similarity index 76% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/PlayResourceAudioMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/PlayResourceAudioMenuItem.cs index c3e31e126..21466d103 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/PlayResourceAudioMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/PlayResourceAudioMenuItem.cs @@ -1,8 +1,8 @@ -using VRBuilder.Core.Audio; using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Utils.Audio; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class PlayResourceAudioMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/PlayResourceAudioMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/PlayResourceAudioMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/PlayResourceAudioMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/PlayResourceAudioMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ScalingMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/ScalingMenuItem.cs similarity index 69% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ScalingMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/ScalingMenuItem.cs index e246be4f3..36501f0bb 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ScalingMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/ScalingMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { public class ScalingMenuItem : MenuItem { diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ScalingMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/ScalingMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ScalingMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/ScalingMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/SetParentMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/SetParentMenuItem.cs similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/SetParentMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/SetParentMenuItem.cs index 998336b4a..af4929c64 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/SetParentMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/SetParentMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Conditions +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class SetParentMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/SetParentMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/SetParentMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/SetParentMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/SetParentMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StartParticleEmissionMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/StartParticleEmissionMenuItem.cs similarity index 79% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StartParticleEmissionMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/StartParticleEmissionMenuItem.cs index 16f8de497..bc85b21d6 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StartParticleEmissionMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/StartParticleEmissionMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class StartParticleEmissionMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StartParticleEmissionMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/StartParticleEmissionMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StartParticleEmissionMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/StartParticleEmissionMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StopParticleEmissionMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/StopParticleEmissionMenuItem.cs similarity index 79% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StopParticleEmissionMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/StopParticleEmissionMenuItem.cs index 55b2c04eb..90c30d4b8 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StopParticleEmissionMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/StopParticleEmissionMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Behaviors; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class StopParticleEmissionMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StopParticleEmissionMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/StopParticleEmissionMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/StopParticleEmissionMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/StopParticleEmissionMenuItem.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/MenuItems/TextToSpeechMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Behaviors/TextToSpeechMenuItem.cs similarity index 71% rename from Source/TextToSpeech-Component/Editor/MenuItems/TextToSpeechMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Behaviors/TextToSpeechMenuItem.cs index dfad397f6..bd19e1747 100644 --- a/Source/TextToSpeech-Component/Editor/MenuItems/TextToSpeechMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Behaviors/TextToSpeechMenuItem.cs @@ -1,8 +1,8 @@ -using VRBuilder.Core.Behaviors; -using VRBuilder.TextToSpeech.Audio; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Behaviors; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.TextToSpeech; -namespace VRBuilder.Editor.TextToSpeech.UI.Behaviors +namespace VRBuilder.Core.Editor.UI.MenuItems.Behaviors { /// public class TextToSpeechMenuItem : MenuItem diff --git a/Source/TextToSpeech-Component/Editor/MenuItems/TextToSpeechMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Behaviors/TextToSpeechMenuItem.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/MenuItems/TextToSpeechMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Behaviors/TextToSpeechMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Runtime/Conditions.meta b/Source/Core/Editor/UI/MenuItems/Conditions.meta similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Runtime/Conditions.meta rename to Source/Core/Editor/UI/MenuItems/Conditions.meta index f0f181cd1..3d05c93b7 100644 --- a/Source/Basic-Conditions-And-Behaviors/Runtime/Conditions.meta +++ b/Source/Core/Editor/UI/MenuItems/Conditions.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e31d9cbea2a53b4499dac12191a4a374 +guid: fcd384926f1c9834cbaa31f543047e33 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInColliderMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Conditions/ObjectInColliderMenuItem.cs similarity index 72% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInColliderMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Conditions/ObjectInColliderMenuItem.cs index dbf6f8c26..6ad9d1184 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInColliderMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Conditions/ObjectInColliderMenuItem.cs @@ -1,7 +1,7 @@ -using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Conditions; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Conditions +namespace VRBuilder.Core.Editor.UI.MenuItems.Conditions { /// public class ObjectInColliderMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInColliderMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Conditions/ObjectInColliderMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInColliderMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Conditions/ObjectInColliderMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInRangeMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Conditions/ObjectInRangeMenuItem.cs similarity index 78% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInRangeMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Conditions/ObjectInRangeMenuItem.cs index 0bd66cf43..dd2a29f60 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInRangeMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Conditions/ObjectInRangeMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Conditions +namespace VRBuilder.Core.Editor.UI.MenuItems.Conditions { /// public class ObjectInRangeMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInRangeMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Conditions/ObjectInRangeMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/ObjectInRangeMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Conditions/ObjectInRangeMenuItem.cs.meta diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/TimeoutMenuItem.cs b/Source/Core/Editor/UI/MenuItems/Conditions/TimeoutMenuItem.cs similarity index 77% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/TimeoutMenuItem.cs rename to Source/Core/Editor/UI/MenuItems/Conditions/TimeoutMenuItem.cs index 980c70f80..c0849524a 100644 --- a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/TimeoutMenuItem.cs +++ b/Source/Core/Editor/UI/MenuItems/Conditions/TimeoutMenuItem.cs @@ -1,7 +1,7 @@ using VRBuilder.Core.Conditions; -using VRBuilder.Editor.UI.StepInspector.Menu; +using VRBuilder.Core.Editor.UI.StepInspector.Menu; -namespace VRBuilder.Editor.UI.Conditions +namespace VRBuilder.Core.Editor.UI.MenuItems.Conditions { /// public class TimeoutMenuItem : MenuItem diff --git a/Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/TimeoutMenuItem.cs.meta b/Source/Core/Editor/UI/MenuItems/Conditions/TimeoutMenuItem.cs.meta similarity index 100% rename from Source/Basic-Conditions-And-Behaviors/Editor/UI/MenuItems/TimeoutMenuItem.cs.meta rename to Source/Core/Editor/UI/MenuItems/Conditions/TimeoutMenuItem.cs.meta diff --git a/Source/Core/Editor/UI/ProcessSceneObjectEditor.cs b/Source/Core/Editor/UI/ProcessSceneObjectEditor.cs index 9fa741e78..062f101c4 100644 --- a/Source/Core/Editor/UI/ProcessSceneObjectEditor.cs +++ b/Source/Core/Editor/UI/ProcessSceneObjectEditor.cs @@ -8,13 +8,14 @@ using UnityEngine; using UnityEngine.UIElements; using VRBuilder.Core.Configuration; +using VRBuilder.Core.Editor.UI.GraphView.Windows; +using VRBuilder.Core.Editor.UI.Views; using VRBuilder.Core.Properties; using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -using VRBuilder.Editor.UI.Windows; using VRBuilder.Unity; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI { /// /// Custom editor for . @@ -253,6 +254,11 @@ private void AddGroupToAll(List groupContainers, SceneObjectGrou Undo.RecordObject((UnityEngine.Object)container, "Added group"); container.AddGuid(group.Guid); } + + foreach (UnityEngine.Object unityObject in groupContainers.Where(container => container is UnityEngine.Object).Cast()) + { + EditorUtility.SetDirty(unityObject); + } } private static void EvaluateNewGroupName(string newGroup, Button addNewGroupButton) diff --git a/Source/Core/Editor/UI/ProjectSettings/AdvancedSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/AdvancedSettingsSection.cs index 0182b37f0..22aa8e8e2 100644 --- a/Source/Core/Editor/UI/ProjectSettings/AdvancedSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/AdvancedSettingsSection.cs @@ -3,7 +3,7 @@ using UnityEngine; using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Settings useful to speed up some procedures for advanced users. diff --git a/Source/Core/Editor/UI/ProjectSettings/BaseSettingsProvider.cs b/Source/Core/Editor/UI/ProjectSettings/BaseSettingsProvider.cs index 5b03b0a2e..4522bc314 100644 --- a/Source/Core/Editor/UI/ProjectSettings/BaseSettingsProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/BaseSettingsProvider.cs @@ -1,14 +1,14 @@ -// Copyright (c) 2013-2019 Innoactive GmbH +// Copyright (c) 2013-2019 Innoactive GmbH // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH using System.Collections.Generic; using System.Linq; -using VRBuilder.Core.Utils; using UnityEditor; using UnityEngine; +using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Base Settings provider which allows to inject additional sections which implement . @@ -21,7 +21,7 @@ protected BaseSettingsProvider(string path, SettingsScope scopes, IEnumerable().ToList().ForEach(type => { - IProjectSettingsSection section = (IProjectSettingsSection) ReflectionUtils.CreateInstanceOfType(type); + IProjectSettingsSection section = (IProjectSettingsSection)ReflectionUtils.CreateInstanceOfType(type); if (section.TargetPageProvider == GetType()) { sections.Add(section); @@ -37,17 +37,17 @@ protected BaseSettingsProvider(string path, SettingsScope scopes, IEnumerable - { - GUILayout.Label(section.Title, BuilderEditorStyles.Header); - section.OnGUI(searchContext); - }); - GUILayout.EndVertical(); + sections.ForEach(section => + { + GUILayout.Label(section.Title, BuilderEditorStyles.Header); + section.OnGUI(searchContext); + }); + GUILayout.EndVertical(); GUILayout.EndHorizontal(); } diff --git a/Source/Core/Editor/UI/ProjectSettings/BuilderPageProvider.cs b/Source/Core/Editor/UI/ProjectSettings/BuilderPageProvider.cs index dd91d7e8f..835fb3f6b 100644 --- a/Source/Core/Editor/UI/ProjectSettings/BuilderPageProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/BuilderPageProvider.cs @@ -3,9 +3,8 @@ // Modifications copyright (c) 2021-2024 MindPort GmbH using UnityEditor; -using UnityEngine; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { internal class BuilderPageProvider : BaseSettingsProvider { diff --git a/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsProvider.cs b/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsProvider.cs index e714406f5..0646d5e96 100644 --- a/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsProvider.cs @@ -1,6 +1,6 @@ using UnityEditor; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Settings provider that groups global settings for scene components in separate sections. diff --git a/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsSection.cs index 1b9295f48..a9cbc86fd 100644 --- a/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/ComponentSettingsSection.cs @@ -2,9 +2,9 @@ using System.Reflection; using UnityEditor; using UnityEngine; -using VRBuilder.Core.Runtime.Utils; +using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Settings section holding global settings for a specified scene component. diff --git a/Source/Core/Editor/UI/ProjectSettings/IProjectSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/IProjectSettingsSection.cs index dce5a3d7b..e9837d9a7 100644 --- a/Source/Core/Editor/UI/ProjectSettings/IProjectSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/IProjectSettingsSection.cs @@ -1,10 +1,10 @@ -// Copyright (c) 2013-2019 Innoactive GmbH +// Copyright (c) 2013-2019 Innoactive GmbH // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH using System; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Allows to inject a settings section into a setting provider. diff --git a/Source/Core/Editor/UI/ProjectSettings/InteractionComponentSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/InteractionComponentSettingsSection.cs index 227fd116e..89703177a 100644 --- a/Source/Core/Editor/UI/ProjectSettings/InteractionComponentSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/InteractionComponentSettingsSection.cs @@ -2,9 +2,9 @@ using UnityEditor; using UnityEditor.Compilation; using UnityEngine; -using VRBuilder.Editor.Settings; +using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { internal class InteractionComponentSettingsSection : IProjectSettingsSection { diff --git a/Source/Core/Editor/UI/ProjectSettings/InteractionSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/InteractionSettingsSection.cs index 15a0ed4c0..92c2a25f2 100644 --- a/Source/Core/Editor/UI/ProjectSettings/InteractionSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/InteractionSettingsSection.cs @@ -3,7 +3,7 @@ using UnityEngine; using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Section where the user can set up interaction preferences. diff --git a/Source/Core/Editor/UI/ProjectSettings/LanguageSettingsProvider.cs b/Source/Core/Editor/UI/ProjectSettings/LanguageSettingsProvider.cs index 91ceb2daa..aa7c2660d 100644 --- a/Source/Core/Editor/UI/ProjectSettings/LanguageSettingsProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/LanguageSettingsProvider.cs @@ -7,9 +7,9 @@ using UnityEngine; using UnityEngine.Localization; using UnityEngine.Localization.Settings; -using VRBuilder.Core.Localization; +using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { public class LanguageSettingsProvider : BaseSettingsProvider { diff --git a/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsProvider.cs b/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsProvider.cs index d48358318..1591e42a4 100644 --- a/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsProvider.cs @@ -4,7 +4,7 @@ using UnityEditor; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { internal class LoggingSettingsProvider : BaseSettingsProvider { diff --git a/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsSection.cs index 4f0eb0525..f19a00667 100644 --- a/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/LoggingSettingsSection.cs @@ -7,7 +7,7 @@ using UnityEngine; using VRBuilder.Core.Utils.Logging; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { internal class LoggingSettingsSection : IProjectSettingsSection { diff --git a/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsProvider.cs b/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsProvider.cs index c0409487f..fe5f26bcb 100644 --- a/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsProvider.cs @@ -1,7 +1,7 @@ using UnityEditor; using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Provider for a list of scene object groups. diff --git a/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsSection.cs index 683fe727c..7ebbcb02b 100644 --- a/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/SceneObjectGroupsSettingsSection.cs @@ -7,7 +7,7 @@ using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Settings section to manage groups that scene objects can belong to. diff --git a/Source/Core/Editor/UI/Spectator/SpectatorSettingsProvider.cs b/Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsProvider.cs similarity index 88% rename from Source/Core/Editor/UI/Spectator/SpectatorSettingsProvider.cs rename to Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsProvider.cs index 60365615e..3d72b7c53 100644 --- a/Source/Core/Editor/UI/Spectator/SpectatorSettingsProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsProvider.cs @@ -1,6 +1,6 @@ -using UnityEditor; +using UnityEditor; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { public class SpectatorSettingsProvider : BaseSettingsProvider { diff --git a/Source/Core/Editor/UI/Spectator/SpectatorSettingsProvider.cs.meta b/Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsProvider.cs.meta similarity index 100% rename from Source/Core/Editor/UI/Spectator/SpectatorSettingsProvider.cs.meta rename to Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsProvider.cs.meta diff --git a/Source/Core/Editor/UI/Spectator/SpectatorSettingsSection.cs b/Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsSection.cs similarity index 89% rename from Source/Core/Editor/UI/Spectator/SpectatorSettingsSection.cs rename to Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsSection.cs index f8cfe5e15..d2558dda5 100644 --- a/Source/Core/Editor/UI/Spectator/SpectatorSettingsSection.cs +++ b/Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsSection.cs @@ -1,9 +1,9 @@ -using System; -using VRBuilder.Editor.Input; +using System; using UnityEditor; using UnityEngine; +using VRBuilder.Core.Editor.Input; -namespace VRBuilder.Editor.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { internal class SpectatorSettingsSection : IProjectSettingsSection { diff --git a/Source/Core/Editor/UI/Spectator/SpectatorSettingsSection.cs.meta b/Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsSection.cs.meta similarity index 100% rename from Source/Core/Editor/UI/Spectator/SpectatorSettingsSection.cs.meta rename to Source/Core/Editor/UI/ProjectSettings/SpectatorSettingsSection.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/ProjectSettings/TextToSpeechSectionProvider.cs b/Source/Core/Editor/UI/ProjectSettings/TextToSpeechSectionProvider.cs similarity index 91% rename from Source/TextToSpeech-Component/Editor/ProjectSettings/TextToSpeechSectionProvider.cs rename to Source/Core/Editor/UI/ProjectSettings/TextToSpeechSectionProvider.cs index 9fb0809c4..13e8bf97b 100644 --- a/Source/TextToSpeech-Component/Editor/ProjectSettings/TextToSpeechSectionProvider.cs +++ b/Source/Core/Editor/UI/ProjectSettings/TextToSpeechSectionProvider.cs @@ -1,10 +1,9 @@ using System; using UnityEditor; using UnityEngine; -using VRBuilder.Editor.UI; -using VRBuilder.TextToSpeech; +using VRBuilder.Core.TextToSpeech; -namespace VRBuilder.Editor.TextToSpeech.UI.ProjectSettings +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// Provides text to speech settings. @@ -44,4 +43,4 @@ public void OnGUI(string searchContext) } } } -} \ No newline at end of file +} diff --git a/Source/TextToSpeech-Component/Editor/ProjectSettings/TextToSpeechSectionProvider.cs.meta b/Source/Core/Editor/UI/ProjectSettings/TextToSpeechSectionProvider.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/ProjectSettings/TextToSpeechSectionProvider.cs.meta rename to Source/Core/Editor/UI/ProjectSettings/TextToSpeechSectionProvider.cs.meta diff --git a/Source/TextToSpeech-Component/Editor/TextToSpeechSettingsEditor.cs b/Source/Core/Editor/UI/ProjectSettings/TextToSpeechSettingsEditor.cs similarity index 92% rename from Source/TextToSpeech-Component/Editor/TextToSpeechSettingsEditor.cs rename to Source/Core/Editor/UI/ProjectSettings/TextToSpeechSettingsEditor.cs index 59ee8662a..e019a6abb 100644 --- a/Source/TextToSpeech-Component/Editor/TextToSpeechSettingsEditor.cs +++ b/Source/Core/Editor/UI/ProjectSettings/TextToSpeechSettingsEditor.cs @@ -1,17 +1,18 @@ -using System; +using System; using System.IO; using System.Linq; using UnityEditor; using UnityEngine; -using VRBuilder.Core; -using VRBuilder.Core.Utils; -using VRBuilder.TextToSpeech; -using VRBuilder.Core.Localization; using UnityEngine.Localization.Settings; -using Source.TextToSpeech_Component.Runtime; -using VRBuilder.Editor.UI; +using VRBuilder.Core.Editor.TextToSpeech.Providers; +using VRBuilder.Core.Editor.TextToSpeech.Utils; +using VRBuilder.Core.Settings; +using VRBuilder.Core.TextToSpeech; +using VRBuilder.Core.TextToSpeech.Configuration; +using VRBuilder.Core.TextToSpeech.Providers; +using VRBuilder.Core.Utils; -namespace VRBuilder.Editor.TextToSpeech.UI +namespace VRBuilder.Core.Editor.UI.ProjectSettings { /// /// This class draws list of in and other properties for text to speech settings. @@ -21,22 +22,22 @@ namespace VRBuilder.Editor.TextToSpeech.UI public class TextToSpeechSettingsEditor : UnityEditor.Editor { private TextToSpeechSettings textToSpeechSettings; - + private string[] providers = { "Empty" }; private string cacheDirectoryName = "TextToSpeech"; - + private ITextToSpeechProvider currentElement; private ITextToSpeechConfiguration currentElementSettings; - + private string lastSelectedCacheDirectory = ""; private int providersIndex = 0; private int lastProviderSelectedIndex = 0; - + /// public override void OnInspectorGUI() { EditorGUI.BeginChangeCheck(); - + providersIndex = EditorGUILayout.Popup("Provider", providersIndex, providers); lastSelectedCacheDirectory = EditorGUILayout.TextField("Streaming Asset Cache Directory Name", lastSelectedCacheDirectory); @@ -45,25 +46,25 @@ public override void OnInspectorGUI() cacheDirectoryName = lastSelectedCacheDirectory; textToSpeechSettings.StreamingAssetCacheDirectoryName = lastSelectedCacheDirectory; } - + //check if a new provider is selected if (providersIndex != lastProviderSelectedIndex) { lastProviderSelectedIndex = providersIndex; - + GetProviderInstance(); //save new config textToSpeechSettings.Provider = providers[providersIndex]; textToSpeechSettings.Configuration = currentElementSettings; - + textToSpeechSettings.Save(); } - + //check selected element is if (currentElementSettings is ScriptableObject scriptableObject) { GUILayout.Space(8); - + var customHeader = BuilderEditorStyles.Header; customHeader.fixedHeight = 25f; EditorGUILayout.LabelField("Provider specific settings", customHeader); @@ -71,7 +72,7 @@ public override void OnInspectorGUI() GUILayout.Label("Configuration for your Text to Speech provider.", BuilderEditorStyles.ApplyPadding(BuilderEditorStyles.Label, 0)); UnityEditor.Editor.CreateEditor(scriptableObject).OnInspectorGUI(); } - + IProcess currentProcess = GlobalEditorHandler.GetCurrentProcess(); GUILayout.Space(EditorGUIUtility.standardVerticalSpacing); @@ -82,7 +83,7 @@ public override void OnInspectorGUI() } GUILayout.Space(EditorGUIUtility.standardVerticalSpacing); - + string tooltip = LocalizationSettings.HasSettings ? GetAvailableLocales() : string.Empty; if (GUILayout.Button(new GUIContent("Generate all TTS files for all Available Locales", $"Available Locales: {tooltip}"))) { @@ -101,16 +102,16 @@ public override void OnInspectorGUI() if (AssetDatabase.DeleteAsset(directory)) { - Debug.Log("TTS cache flushed."); + UnityEngine.Debug.Log("TTS cache flushed."); } else { - Debug.Log("No TTS cache to flush."); + UnityEngine.Debug.Log("No TTS cache to flush."); } } } } - + private void OnEnable() { textToSpeechSettings = (TextToSpeechSettings)target; @@ -119,10 +120,10 @@ private void OnEnable() providers = ReflectionUtils.GetConcreteImplementationsOf().ToList().Where(type => type != typeof(FileTextToSpeechProvider)).Select(type => type.Name).ToArray(); lastProviderSelectedIndex = providersIndex = string.IsNullOrEmpty(textToSpeechSettings.Provider) ? Array.IndexOf(providers, nameof(MicrosoftSapiTextToSpeechProvider)) : Array.IndexOf(providers, textToSpeechSettings.Provider); textToSpeechSettings.Provider = providers[providersIndex]; - + GetProviderInstance(); } - + private void GetProviderInstance() { var currentProviderType = ReflectionUtils.GetConcreteImplementationsOf().FirstOrDefault(type => type.Name == providers[providersIndex]); @@ -132,7 +133,7 @@ private void GetProviderInstance() currentElementSettings = currentElement.LoadConfig(); } } - + private string GetAvailableLocales() { string availableLOcalesString = ""; @@ -143,4 +144,4 @@ private string GetAvailableLocales() return availableLOcalesString; } } -} \ No newline at end of file +} diff --git a/Source/TextToSpeech-Component/Editor/TextToSpeechSettingsEditor.cs.meta b/Source/Core/Editor/UI/ProjectSettings/TextToSpeechSettingsEditor.cs.meta similarity index 100% rename from Source/TextToSpeech-Component/Editor/TextToSpeechSettingsEditor.cs.meta rename to Source/Core/Editor/UI/ProjectSettings/TextToSpeechSettingsEditor.cs.meta diff --git a/Source/Core/Editor/UI/Spectator.meta b/Source/Core/Editor/UI/Spectator.meta deleted file mode 100644 index 8cf04f881..000000000 --- a/Source/Core/Editor/UI/Spectator.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 966fb0822ff57854da1336b5fa99f9c2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Source/Core/Editor/UI/StepInspector/Menu/DisabledMenuItem.cs b/Source/Core/Editor/UI/StepInspector/Menu/DisabledMenuItem.cs index 2b5b4f931..2bd388792 100644 --- a/Source/Core/Editor/UI/StepInspector/Menu/DisabledMenuItem.cs +++ b/Source/Core/Editor/UI/StepInspector/Menu/DisabledMenuItem.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -namespace VRBuilder.Editor.UI.StepInspector.Menu +namespace VRBuilder.Core.Editor.UI.StepInspector.Menu { /// /// The Step Inspector populates "Add Behavior" and "Add Condition" buttons' dropdown menus with implementations of this class. diff --git a/Source/Core/Editor/UI/StepInspector/Menu/IInternalTypeProvider.cs b/Source/Core/Editor/UI/StepInspector/Menu/IInternalTypeProvider.cs index c344fe625..c5945cdba 100644 --- a/Source/Core/Editor/UI/StepInspector/Menu/IInternalTypeProvider.cs +++ b/Source/Core/Editor/UI/StepInspector/Menu/IInternalTypeProvider.cs @@ -4,7 +4,7 @@ using System; -namespace VRBuilder.Editor.UI.StepInspector.Menu +namespace VRBuilder.Core.Editor.UI.StepInspector.Menu { /// /// This is a helper for generic typed class to be able to get the internal items type. diff --git a/Source/Core/Editor/UI/StepInspector/Menu/MenuItem.cs b/Source/Core/Editor/UI/StepInspector/Menu/MenuItem.cs index 5a62fb8b0..7fc2e8705 100644 --- a/Source/Core/Editor/UI/StepInspector/Menu/MenuItem.cs +++ b/Source/Core/Editor/UI/StepInspector/Menu/MenuItem.cs @@ -4,7 +4,7 @@ using System; -namespace VRBuilder.Editor.UI.StepInspector.Menu +namespace VRBuilder.Core.Editor.UI.StepInspector.Menu { /// /// The Step Inspector populates "Add Behavior" and "Add Condition" buttons' dropdown menus with implementations of this class. diff --git a/Source/Core/Editor/UI/StepInspector/Menu/MenuOption.cs b/Source/Core/Editor/UI/StepInspector/Menu/MenuOption.cs index b1848084a..0dead041f 100644 --- a/Source/Core/Editor/UI/StepInspector/Menu/MenuOption.cs +++ b/Source/Core/Editor/UI/StepInspector/Menu/MenuOption.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -namespace VRBuilder.Editor.UI.StepInspector.Menu +namespace VRBuilder.Core.Editor.UI.StepInspector.Menu { /// /// A base class for options displayed in the "Add Behavior" and "Add Condition" buttons' dropdown menus. diff --git a/Source/Core/Editor/UI/StepInspector/Menu/MenuSeparator.cs b/Source/Core/Editor/UI/StepInspector/Menu/MenuSeparator.cs index c2c97c733..afad2be20 100644 --- a/Source/Core/Editor/UI/StepInspector/Menu/MenuSeparator.cs +++ b/Source/Core/Editor/UI/StepInspector/Menu/MenuSeparator.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH -namespace VRBuilder.Editor.UI.StepInspector.Menu +namespace VRBuilder.Core.Editor.UI.StepInspector.Menu { /// /// This class adds a separator in the "Add Behavior"/"Add Condition" dropdown menus. diff --git a/Source/Core/Editor/UI/Tabs/DynamicTab.cs b/Source/Core/Editor/UI/Tabs/DynamicTab.cs index e5e610726..f55588efd 100644 --- a/Source/Core/Editor/UI/Tabs/DynamicTab.cs +++ b/Source/Core/Editor/UI/Tabs/DynamicTab.cs @@ -5,7 +5,7 @@ using System; using UnityEngine; -namespace VRBuilder.Editor.Tabs +namespace VRBuilder.Core.Editor.Tabs { /// /// This implementation defines and implementation with delegates through the constructor. diff --git a/Source/Core/Editor/UI/Tabs/GlobalTabsGroup.cs b/Source/Core/Editor/UI/Tabs/GlobalTabsGroup.cs index f5bd1b87c..22f8be894 100644 --- a/Source/Core/Editor/UI/Tabs/GlobalTabsGroup.cs +++ b/Source/Core/Editor/UI/Tabs/GlobalTabsGroup.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; -namespace VRBuilder.Editor.Tabs +namespace VRBuilder.Core.Editor.Tabs { /// /// Tabs group which has the selected tab passed externally. diff --git a/Source/Core/Editor/UI/Tabs/ITab.cs b/Source/Core/Editor/UI/Tabs/ITab.cs index c13d97e3b..d0958af0d 100644 --- a/Source/Core/Editor/UI/Tabs/ITab.cs +++ b/Source/Core/Editor/UI/Tabs/ITab.cs @@ -4,7 +4,7 @@ using UnityEngine; -namespace VRBuilder.Editor.Tabs +namespace VRBuilder.Core.Editor.Tabs { /// /// A tab in the diff --git a/Source/Core/Editor/UI/Tabs/ITabsGroup.cs b/Source/Core/Editor/UI/Tabs/ITabsGroup.cs index 485663043..13018c79c 100644 --- a/Source/Core/Editor/UI/Tabs/ITabsGroup.cs +++ b/Source/Core/Editor/UI/Tabs/ITabsGroup.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace VRBuilder.Editor.Tabs +namespace VRBuilder.Core.Editor.Tabs { /// /// Draws a view with multiple tabs. diff --git a/Source/Core/Editor/UI/Tabs/LockablePropertyTab.cs b/Source/Core/Editor/UI/Tabs/LockablePropertyTab.cs index 1cc187684..9c817580d 100644 --- a/Source/Core/Editor/UI/Tabs/LockablePropertyTab.cs +++ b/Source/Core/Editor/UI/Tabs/LockablePropertyTab.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2013-2019 Innoactive GmbH +// Copyright (c) 2013-2019 Innoactive GmbH // Licensed under the Apache License, Version 2.0 // Modifications copyright (c) 2021-2024 MindPort GmbH @@ -6,7 +6,7 @@ using VRBuilder.Core; using UnityEngine; -namespace VRBuilder.Editor.Tabs +namespace VRBuilder.Core.Editor.Tabs { internal class LockablePropertyTab : ITab { diff --git a/Source/Core/Editor/UI/Tabs/TabsGroup.cs b/Source/Core/Editor/UI/Tabs/TabsGroup.cs index 6555a6326..9a8f3f7b9 100644 --- a/Source/Core/Editor/UI/Tabs/TabsGroup.cs +++ b/Source/Core/Editor/UI/Tabs/TabsGroup.cs @@ -7,7 +7,7 @@ using System.Runtime.Serialization; using VRBuilder.Core; -namespace VRBuilder.Editor.Tabs +namespace VRBuilder.Core.Editor.Tabs { /// /// Tabs group which stores the selected tab in the parent object metadata. diff --git a/Source/Core/Editor/UI/TestableEditorElements.cs b/Source/Core/Editor/UI/TestableEditorElements.cs index 5cfb54d50..3a269baa0 100644 --- a/Source/Core/Editor/UI/TestableEditorElements.cs +++ b/Source/Core/Editor/UI/TestableEditorElements.cs @@ -9,7 +9,7 @@ using UnityEditor; using UnityEngine; -namespace VRBuilder.Editor +namespace VRBuilder.Core.Editor { public static class TestableEditorElements { diff --git a/Source/Core/Editor/UI/Views/GroupListItem.cs b/Source/Core/Editor/UI/Views/GroupListItem.cs index 3cf5bca13..936f535b3 100644 --- a/Source/Core/Editor/UI/Views/GroupListItem.cs +++ b/Source/Core/Editor/UI/Views/GroupListItem.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -6,56 +5,59 @@ using VRBuilder.Core.SceneObjects; using VRBuilder.Core.Settings; -/// -/// Helper to fill a GroupListItem.uxml UI item. -/// -public class GroupListItem +namespace VRBuilder.Core.Editor.UI.Views { /// - /// String to display when the group count is not available. + /// Helper to fill a GroupListItem.uxml UI item. /// - public const string GroupCountNotAvailableText = "n/a"; - - /// - /// Fills a GroupListItem.xml View with the data from data. - /// - /// The VisualElement representing the group list item. - /// The name of the Group or Gamobject containing Process Scene Object. - /// A flag indicating whether should be display instead of . - /// The count of s in the group. Default value is -1. - /// A flag indicating whether the element represents a unique and not a . Default value is false. - public static void FillGroupListItem(VisualElement groupListItem, string name, bool isPreviewInContext = false, IEnumerable referencedSceneObjects = null, bool elementIsUniqueIdDisplayName = false) + public class GroupListItem { - Label groupReferenceCountLabel = groupListItem.Q