diff --git a/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/BootstrappingManager.cs b/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/BootstrappingManager.cs index 518bf7eca..323d1272b 100644 --- a/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/BootstrappingManager.cs +++ b/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/BootstrappingManager.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System.Collections.Generic; +using UnityEngine; namespace Maroon.GlobalEntities { @@ -26,6 +27,10 @@ public class BootstrappingManager : MonoBehaviour, GlobalEntity MonoBehaviour GlobalEntity.Instance => Instance; +#if UNITY_WEBGL + public Dictionary UrlParameters { get; private set; } +#endif + // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // Methods @@ -68,16 +73,19 @@ private void Start() (this._webglEnableSceneLoadingViaUrlParameter) ) { // Read URL parameter - string parameter = Maroon.WebGLUrlParameterReader.GetUrlParameter(this._webglUrlParameterName); + this.UrlParameters = Maroon.WebGlUrlParameterReader.GetAllUrlParameters(); // Get scene asset - Maroon.CustomSceneAsset urlScene; - urlScene = SceneManager.Instance.GetSceneAssetBySceneName(parameter + ".pc"); - - // Check if scene requested by parameter exists, and try to load it - if((urlScene != null) && (SceneManager.Instance.LoadSceneRequest(urlScene))) + if(this.UrlParameters.TryGetValue(WebGlUrlParameter.LoadScene, out string parameter)) { - alreadyRedirected = true; + Maroon.CustomSceneAsset urlScene; + urlScene = SceneManager.Instance.GetSceneAssetBySceneName(parameter + ".pc"); + + // Check if scene requested by parameter exists, and try to load it + if((urlScene != null) && (SceneManager.Instance.LoadSceneRequest(urlScene))) + { + alreadyRedirected = true; + } } } #endif diff --git a/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/Maroon.GlobalEntities.BootstrappingManager.asmdef b/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/Maroon.GlobalEntities.BootstrappingManager.asmdef index d141e43fb..7010de2fb 100644 --- a/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/Maroon.GlobalEntities.BootstrappingManager.asmdef +++ b/unity/Assets/Maroon/GlobalEntities/BootstrappingManager/Maroon.GlobalEntities.BootstrappingManager.asmdef @@ -3,7 +3,6 @@ "rootNamespace": "", "references": [ "GUID:ccf513c02a7c0734f97bf699ec9fcc75", - "GUID:20a3f6c7643c02b4f91ee2b86822b6a7", "GUID:833d205176b3e444a810dbf875342968", "GUID:9d2d2b17ea939f447a2e35b833b82ffa", "GUID:56f15dd651d5d3a44bbfc9ca89629921" diff --git a/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Plugins/WebGLUrlParameterReader.jslib b/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Plugins/WebGLUrlParameterReader.jslib index 357af654b..a15fbfdc0 100644 --- a/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Plugins/WebGLUrlParameterReader.jslib +++ b/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Plugins/WebGLUrlParameterReader.jslib @@ -1,9 +1,9 @@ mergeInto(LibraryManager.library, { - GetUrlParameter: function(url_parameter_name_ptr) + _getUrlParameter: function(url_parameter_name_ptr) { // Get requested parameter - var url_parameter_name = Pointer_stringify(url_parameter_name_ptr); + var url_parameter_name = UTF8ToString(url_parameter_name_ptr); // Extract requested parameter from URL var searchParams = new URLSearchParams(window.location.search); @@ -14,6 +14,26 @@ mergeInto(LibraryManager.library, returnString = searchParams.get(url_parameter_name); } + // Send it back to Unity + var bufferSize = lengthBytesUTF8(returnString) + 1; + var buffer = _malloc(bufferSize); + stringToUTF8(returnString, buffer, bufferSize); + return buffer; + }, + + _getAllUrlParameters: function() + { + var searchParams = new URLSearchParams(window.location.search); + var returnDict = {}; + + for (var pair of searchParams.entries()) + { + returnDict[pair[0]] = pair[1]; + } + + // Convert the dictionary to a JSON string + var returnString = JSON.stringify(returnDict); + // Send it back to Unity var bufferSize = lengthBytesUTF8(returnString) + 1; var buffer = _malloc(bufferSize); diff --git a/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Scripts/WebGLUrlParameterReader.cs b/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Scripts/WebGLUrlParameterReader.cs index 163a9ca01..55787d27b 100644 --- a/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Scripts/WebGLUrlParameterReader.cs +++ b/unity/Assets/Maroon/GlobalEntities/WebGLUrlParameterReader/Scripts/WebGLUrlParameterReader.cs @@ -1,12 +1,54 @@ using UnityEngine; using System.Runtime.InteropServices; +using System.Collections.Generic; +using System; +using Newtonsoft.Json; namespace Maroon { - public class WebGLUrlParameterReader : MonoBehaviour + public enum WebGlUrlParameter + { + LoadScene, + Config, + } + public class WebGlUrlParameterReader : MonoBehaviour { // JS implementation at Plugins/WebGLUrlParameterReader.jslib [DllImport("__Internal")] - public static extern string GetUrlParameter(string urlParameterName); + private static extern string _getUrlParameter(string urlParameterName); + [DllImport("__Internal")] + private static extern IntPtr _getAllUrlParameters(); + + [Obsolete("GetUrlParameter is deprecated due to case-sensitivity. Use 'BootstrappingManager.UrlParameters' instead.")] + public static string GetUrlParameter(WebGlUrlParameter urlParameter) + { + return GetAllUrlParameters().TryGetValue(urlParameter, out string value) ? value : null; + } + + public static Dictionary GetAllUrlParameters() + { + // rawJson = {"LoadScene":"Optics","Config":"Default"} + var rawJson = Marshal.PtrToStringAnsi(_getAllUrlParameters()); + var stringKeyedValues = JsonConvert.DeserializeObject>(rawJson); + + var enumKeyedValues = new Dictionary(); + + foreach (var kvp in stringKeyedValues) + { + // TODO: ignore case sensitivity of enums + // Enum consists of LoadScene and Config + if (Enum.TryParse(kvp.Key, true, out WebGlUrlParameter parsedEnum)) + { + enumKeyedValues[parsedEnum] = kvp.Value; + } + else + { + // Handle the case where the key cannot be parsed into an enum + Debug.LogWarning($"Key '{kvp.Key}' does not exist in WebGlUrlParameter enum and will be ignored."); + } + } + + return enumKeyedValues; + } } } diff --git a/unity/Assets/Maroon/reusablePrefabs/3darrows/MovingArrows.prefab b/unity/Assets/Maroon/reusablePrefabs/3darrows/MovingArrows.prefab index 7f833e0f1..e5dfa463b 100644 --- a/unity/Assets/Maroon/reusablePrefabs/3darrows/MovingArrows.prefab +++ b/unity/Assets/Maroon/reusablePrefabs/3darrows/MovingArrows.prefab @@ -28,12 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2971051385462793878} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -1} m_LocalScale: {x: 200, y: 100, z: 200} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482331554849848127} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &2971051385459780154 MeshFilter: @@ -54,6 +55,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -92,8 +94,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2971051385462793878} 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.0015 m_Height: 0.015 m_Direction: 1 @@ -117,10 +128,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2971051385462793878} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -154,12 +176,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4053506750638633141} + serializedVersion: 2 m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 200, y: 100, z: 200} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482331554849848127} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} --- !u!33 &4053506750635359257 MeshFilter: @@ -180,6 +203,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -218,8 +242,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4053506750638633141} 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.0015 m_Height: 0.015 m_Direction: 1 @@ -243,10 +276,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4053506750638633141} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -280,12 +324,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4491584819978646239} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 200, y: 100, z: 200} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482331554849848127} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4491584819979828851 MeshFilter: @@ -306,6 +351,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -344,8 +390,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4491584819978646239} 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.0015 m_Height: 0.015 m_Direction: 1 @@ -369,10 +424,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4491584819978646239} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -403,9 +469,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4584993937279052820} + 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: 6187333593230566659} - {fileID: 4821317984717271680} @@ -414,10 +482,10 @@ Transform: - {fileID: 5627844484088602645} - {fileID: 2971051385463143860} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &6115437440910998134 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -427,6 +495,7 @@ LineRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -504,16 +573,20 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 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 &4513896859846796369 MonoBehaviour: m_ObjectHideFlags: 0 @@ -580,12 +653,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4821317984716925346} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 200, y: 100, z: 200} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482331554849848127} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} --- !u!33 &4821317984720200974 MeshFilter: @@ -606,6 +680,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -644,8 +719,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4821317984716925346} 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.002 m_Height: 0.015 m_Direction: 1 @@ -669,10 +753,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4821317984716925346} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -706,12 +801,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5627844484088298295} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 200, y: 100, z: 200} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482331554849848127} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &5627844484085282715 MeshFilter: @@ -732,6 +828,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -770,8 +867,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5627844484088298295} 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.0015 m_Height: 0.015 m_Direction: 1 @@ -795,10 +901,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5627844484088298295} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -832,12 +949,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6187333593230884385} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -1, y: 0, z: 0} m_LocalScale: {x: 200, y: 100, z: 200} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482331554849848127} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &6187333593231798925 MeshFilter: @@ -858,6 +976,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -896,8 +1015,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6187333593230884385} 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.002 m_Height: 0.015 m_Direction: 1 @@ -921,10 +1049,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6187333593230884385} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/unity/Assets/Maroon/reusablePrefabs/Drawer/ShelveWithDrawer.prefab b/unity/Assets/Maroon/reusablePrefabs/Drawer/ShelveWithDrawer.prefab index 037560bf4..6c9a5e277 100644 --- a/unity/Assets/Maroon/reusablePrefabs/Drawer/ShelveWithDrawer.prefab +++ b/unity/Assets/Maroon/reusablePrefabs/Drawer/ShelveWithDrawer.prefab @@ -25,12 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 230819483742110470} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: 0.045, z: 0} m_LocalScale: {x: 0.07, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6638964904907203662} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &6198054719024031768 MeshFilter: @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -106,12 +108,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 271734959723166597} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.145, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5066283284228446985} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6887425694630216649 MeshFilter: @@ -132,6 +135,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -187,12 +191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 286888096582168832} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0.045, z: -0.0012} m_LocalScale: {x: 0.04, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6008993104593354164} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &1231224265453065633 MeshFilter: @@ -213,6 +218,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -273,9 +279,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6900728100717593668} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -293,6 +299,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -417,12 +424,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34630388} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2250844643676653518} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2250844643676653518} + m_maskType: 0 --- !u!114 &5923934503176053623 MonoBehaviour: m_ObjectHideFlags: 0 @@ -463,12 +470,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338025602334860775} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3459379230825198257} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2065859732869832980 MeshFilter: @@ -489,6 +497,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -527,9 +536,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338025602334860775} 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.0011300002, y: 0.00072000036, z: 0.0004000001} m_Center: {x: -0.00016000007, y: -9.313226e-10, z: -0.0001749991} --- !u!1 &366237465787495619 @@ -555,12 +572,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 366237465787495619} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.24, y: 0.6, z: 0.17} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203964946032134724} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &426348150658928958 GameObject: @@ -586,16 +604,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 426348150658928958} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.21000019, y: 0.651, z: -0.18500018} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 478818142380705536} - {fileID: 6823839529582009493} - {fileID: 4269999514724075439} - {fileID: 3667579476662814060} m_Father: {fileID: 4418183761825325635} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3370123982952813423 MonoBehaviour: @@ -636,12 +655,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 575762484158497420} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2381157907859677341} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3226200072627249961 MeshFilter: @@ -662,6 +682,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -700,9 +721,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 575762484158497420} 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.0010735003, y: 0.00072000036, z: 0.0004000001} m_Center: {x: 0.0021300004, y: -9.313226e-10, z: -0.0001749991} --- !u!1 &604353562831031208 @@ -730,12 +759,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604353562831031208} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0.3, y: 0.06236819, z: 0.24499997} m_LocalScale: {x: 2, y: 2, z: 1.5999986} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366070642330} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &8116153206523330029 MeshFilter: @@ -756,6 +786,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -811,12 +842,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 647122690812583446} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: 0.045, z: -0.0012} m_LocalScale: {x: 0.04, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7663304388804029264} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &7037551281709997975 MeshFilter: @@ -837,6 +869,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -893,12 +926,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664082592548846484} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.7071067} m_LocalPosition: {x: -0.2925001, y: 0.036174983, z: 0} m_LocalScale: {x: 50, y: 75, z: 75} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366947067927} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8390073061526336854 MeshFilter: @@ -919,6 +953,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -957,9 +992,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 664082592548846484} 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: 1 m_CookingOptions: 30 m_Mesh: {fileID: 6851453002167132944, guid: d8c0847c30c200246a95abfe57fa898d, type: 3} @@ -989,13 +1032,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 720124447769620047} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2710793806966856491} m_Father: {fileID: 3989773806534339103} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4509570526928667312 MonoBehaviour: @@ -1163,12 +1207,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365763369770} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036365823587353 GameObject: @@ -1200,9 +1245,9 @@ RectTransform: m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: 0.0000001192093, w: -0.0000001192093} m_LocalPosition: {x: 0, y: 0, z: 0.000028} m_LocalScale: {x: 0.0049999976, y: 0.009999997, z: 0.009999997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4335435789227919141} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1220,6 +1265,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1344,12 +1390,12 @@ MonoBehaviour: m_margin: {x: 0.44595283, y: 0.4722246, z: 0.4494633, w: 0.43939626} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036365823587356} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036365823587356} + m_maskType: 0 --- !u!114 &727036365823587355 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1390,13 +1436,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365859191471} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036367309402844} m_Father: {fileID: 727036367064990741} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3211144495951053586 MonoBehaviour: @@ -1562,12 +1609,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365864478236} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: 0.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036365930176222 GameObject: @@ -1592,9 +1640,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365930176222} + 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: 727036365999797661} - {fileID: 727036366497242116} @@ -1603,7 +1653,6 @@ Transform: - {fileID: 727036366983500680} - {fileID: 727036367891256336} m_Father: {fileID: 727036366511910468} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036365950539423 GameObject: @@ -1628,12 +1677,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365950539423} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: 0.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036365956730428 GameObject: @@ -1658,9 +1708,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365956730428} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.41, z: -0.242} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036365966334473} - {fileID: 727036366317323464} @@ -1669,7 +1721,6 @@ Transform: - {fileID: 727036367058937462} - {fileID: 727036366493600944} m_Father: {fileID: 727036366947067927} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036365966334470 GameObject: @@ -1696,12 +1747,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365966334470} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: -0.10000004, y: 0.401, z: 0.002000004} m_LocalScale: {x: 100, y: 200, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365956730431} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036365966334475 MeshFilter: @@ -1722,6 +1774,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1778,12 +1831,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365999797658} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365930176193} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036365999797662 MeshFilter: @@ -1804,6 +1858,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1842,9 +1897,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036365999797658} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!1 &727036366056466688 @@ -1870,12 +1933,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366056466688} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3377222543777075995} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366070642331 GameObject: @@ -1900,16 +1964,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366070642331} + 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: 7413072658335866777} - {fileID: 7447259094126057337} - {fileID: 1500368260631253508} - {fileID: 8392643862473018988} m_Father: {fileID: 3377222543777075995} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366084036397 GameObject: @@ -1937,13 +2002,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366084036397} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.105, y: 0.07794112, z: -0.0817} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036366273644217} m_Father: {fileID: 727036367183048504} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &9185230798559108751 MonoBehaviour: @@ -2115,9 +2181,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367841398849} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2135,6 +2201,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2259,12 +2326,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.6261204, z: 0.5113164, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366130038040} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366130038040} + m_maskType: 0 --- !u!1 &727036366222322381 GameObject: m_ObjectHideFlags: 0 @@ -2293,13 +2360,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366222322381} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036367400241819} m_Father: {fileID: 727036365930176193} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &3445579924577558242 MonoBehaviour: @@ -2471,6 +2539,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &727036366261841749 GameObject: m_ObjectHideFlags: 0 @@ -2501,9 +2575,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367183048504} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2521,6 +2595,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2647,12 +2722,12 @@ MonoBehaviour: m_margin: {x: 0.30837247, y: 0.52567637, z: 0.30257416, w: 0.4096872} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366261841752} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366261841752} + m_maskType: 0 --- !u!114 &727036366261841751 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2693,14 +2768,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366273644214} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710665} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100.000015, y: 200.00008, z: 100.000015} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036367832627452} - {fileID: 727036366979976407} m_Father: {fileID: 727036366084036396} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036366273644219 MeshFilter: @@ -2721,6 +2797,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2759,9 +2836,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366273644214} 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.0011299999, y: 0.0007199999, z: 0.00039999993} m_Center: {x: -0.00016000001, y: 0, z: -0.00017499995} --- !u!1 &727036366317323465 @@ -2787,12 +2872,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366317323465} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.15400007, y: 0.47600004, z: 0.12200003} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365956730431} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366406819176 GameObject: @@ -2824,9 +2910,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367841398849} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2844,6 +2930,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2968,12 +3055,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366406819183} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366406819183} + m_maskType: 0 --- !u!114 &727036366406819178 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3011,12 +3098,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366455175482} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: 0.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366489632023 GameObject: @@ -3048,9 +3136,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367064990741} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3068,6 +3156,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3192,12 +3281,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366489632026} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366489632026} + m_maskType: 0 --- !u!114 &727036366489632025 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3242,9 +3331,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.0599} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365956730431} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3262,6 +3351,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3386,12 +3476,12 @@ MonoBehaviour: m_margin: {x: 0.33965924, y: 0.6261204, z: 0.46430552, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366493600948} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366493600948} + m_maskType: 0 --- !u!114 &727036366493600947 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3430,12 +3520,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366497242117} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.054, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365930176193} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366511910469 GameObject: @@ -3460,14 +3551,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366511910469} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036365930176193} - {fileID: 6990453361090056865} m_Father: {fileID: 727036367108221470} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366630894062 GameObject: @@ -3494,12 +3586,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366630894062} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.000306, y: 3.1432124e-11, z: 0.000029999903} m_LocalScale: {x: 0.000015, y: 1, z: 0.00003} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4335435789227919141} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 180, y: 90, z: 90} --- !u!33 &727036366630893842 MeshFilter: @@ -3520,6 +3613,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3579,9 +3673,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.11999997} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367064990741} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3599,6 +3693,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3723,12 +3818,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.6261204, z: 0.5113164, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366633555793} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366633555793} + m_maskType: 0 --- !u!1 &727036366664340021 GameObject: m_ObjectHideFlags: 0 @@ -3752,12 +3847,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366664340021} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.24, y: 0.6, z: 0.17} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367541748409} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366737575202 GameObject: @@ -3785,12 +3881,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366737575202} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 200.00003, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367832156320} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &727036366737575206 MeshFilter: @@ -3811,6 +3908,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3849,9 +3947,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366737575202} 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.0007500002, y: 0.00075000053, z: 0.00040000022} m_Center: {x: 0, y: -1.1641534e-10, z: -0.00017500008} --- !u!1 &727036366749680165 @@ -3882,13 +3988,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366749680165} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.2450344, y: 0.6058, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036366933242048} m_Father: {fileID: 727036367541748409} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: -90} --- !u!114 &467326028634419997 MonoBehaviour: @@ -4048,6 +4155,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &727036366774728125 GameObject: m_ObjectHideFlags: 0 @@ -4078,9 +4191,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.0599} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367155957786} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4098,6 +4211,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4222,12 +4336,12 @@ MonoBehaviour: m_margin: {x: 0.33965924, y: 0.6261204, z: 0.46430552, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366774728096} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366774728096} + m_maskType: 0 --- !u!114 &727036366774728127 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4266,12 +4380,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366781094535} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: 0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366808255536 GameObject: @@ -4296,12 +4411,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366808255536} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.24, y: 0.6, z: -0.17} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367541748409} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036366814746745 GameObject: @@ -4327,16 +4443,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366814746745} + 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: 963218785329801431} - {fileID: 6385654825995056855} - {fileID: 6754489835395467861} - {fileID: 657855583835289894} m_Father: {fileID: 727036367824649591} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8774676074117826581 BoxCollider: @@ -4346,9 +4463,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366814746745} 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.6272488, y: 0.014519036, z: 0.5359907} m_Center: {x: 0.010656237, y: 0.6450498, z: 0.0007206797} --- !u!1 &727036366817534449 @@ -4376,12 +4501,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366817534449} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.2802, y: 0.068, z: 0.2446} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366996835259} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!198 &727036366817534450 ParticleSystem: @@ -4390,19 +4516,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366817534449} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -4601,6 +4727,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4630,6 +4757,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -4951,7 +5079,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 100 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -5679,6 +5809,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5708,6 +5839,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -7928,6 +8060,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -7957,6 +8090,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -8346,6 +8480,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -8388,6 +8523,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8417,6 +8553,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -8504,6 +8641,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8533,6 +8671,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -8571,6 +8710,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8600,6 +8740,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -8853,6 +8994,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8882,6 +9024,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9113,6 +9256,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -9143,6 +9287,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.021 @@ -9155,17 +9300,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &727036366933242049 GameObject: @@ -9193,12 +9344,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366933242049} + serializedVersion: 2 m_LocalRotation: {x: -0.000000059604645, y: -0.7071068, z: -0.000000059604645, w: 0.7071068} m_LocalPosition: {x: 0.005799949, y: 0, z: 0.005034387} m_LocalScale: {x: 99.999985, y: 100.000046, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366749680164} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036366933242053 MeshFilter: @@ -9219,6 +9371,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9257,8 +9410,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366933242049} 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.00026598302 m_Height: 0.00068732625 m_Direction: 2 @@ -9292,16 +9454,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366947067924} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 397505826110461108} - {fileID: 7251535073979980120} - {fileID: 727036367155957786} - {fileID: 727036365956730431} m_Father: {fileID: 727036367824649591} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6788685807865592468 MonoBehaviour: @@ -9432,6 +9595,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!114 &727036366947067926 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9500,12 +9669,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366979976404} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.50000006, z: -0.5, w: 0.50000006} m_LocalPosition: {x: -0.000306, y: 3.143212e-11, z: 0.0000299999} m_LocalScale: {x: 0.000014999997, y: 1, z: 0.000029999996} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366273644217} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 180, y: 90, z: 90} --- !u!33 &727036366979976408 MeshFilter: @@ -9526,6 +9696,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9586,9 +9757,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365930176193} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9606,6 +9777,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9730,12 +9902,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036366983500684} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036366983500684} + m_maskType: 0 --- !u!114 &727036366983500683 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9773,16 +9945,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036366996835256} + 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: 727036367679212820} - {fileID: 727036366817534448} - {fileID: 727036367874187356} - {fileID: 727036367176742228} m_Father: {fileID: 727036367824649591} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367003297500 GameObject: @@ -9814,9 +9987,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.07299998} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367155957786} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9834,6 +10007,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9958,12 +10132,12 @@ MonoBehaviour: m_margin: {x: 0.35322934, y: 0.5926396, z: 0.45170465, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036367003297475} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036367003297475} + m_maskType: 0 --- !u!114 &727036367003297502 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10001,12 +10175,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367034600680} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367058937463 GameObject: @@ -10038,9 +10213,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.07299998} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365956730431} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10058,6 +10233,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -10182,12 +10358,12 @@ MonoBehaviour: m_margin: {x: 0.35322934, y: 0.5926396, z: 0.45170465, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036367058937466} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036367058937466} + m_maskType: 0 --- !u!114 &727036367058937465 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10225,16 +10401,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367064990738} + 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: 727036367282339773} - {fileID: 727036365859191470} - {fileID: 727036366489632022} - {fileID: 727036366633555756} m_Father: {fileID: 6990453361090056865} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367108221471 GameObject: @@ -10264,16 +10441,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367108221471} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036366511910468} - {fileID: 727036367541748409} - {fileID: 5386476759241253729} - {fileID: 1981685404658413343} m_Father: {fileID: 727036367824649591} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3702261927164684669 MonoBehaviour: @@ -10404,6 +10582,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!114 &727036367108221441 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10456,12 +10640,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367155105961} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367155957787 GameObject: @@ -10486,9 +10671,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367155957787} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7451968474279015466} - {fileID: 727036367280449937} @@ -10497,7 +10684,6 @@ Transform: - {fileID: 727036367003297503} - {fileID: 727036366774728124} m_Father: {fileID: 727036366947067927} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367176742229 GameObject: @@ -10524,12 +10710,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367176742229} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.3005, y: 0.067999974, z: -0.2445} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366996835259} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!198 &727036367176742230 ParticleSystem: @@ -10538,19 +10725,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367176742229} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -10749,6 +10936,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -10778,6 +10966,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -11099,7 +11288,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 100 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11827,6 +12018,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -11856,6 +12048,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -14076,6 +14269,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14105,6 +14299,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -14494,6 +14689,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -14536,6 +14732,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14565,6 +14762,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -14652,6 +14850,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14681,6 +14880,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -14719,6 +14919,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14748,6 +14949,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -15001,6 +15203,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -15030,6 +15233,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -15261,6 +15465,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -15291,6 +15496,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.021 @@ -15303,17 +15509,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &727036367183048505 GameObject: @@ -15344,9 +15556,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367183048505} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.27, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8458349227040318807} - {fileID: 7575537386502037740} @@ -15355,7 +15569,6 @@ Transform: - {fileID: 727036366084036396} - {fileID: 727036366261841748} m_Father: {fileID: 727036367824649591} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7707950897889375743 MonoBehaviour: @@ -15486,6 +15699,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!114 &727036367183048507 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15561,13 +15780,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367192790421} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.52952886, z: 0} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 542843955701554463} m_Father: {fileID: 727036367541748409} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036367192790425 MeshFilter: @@ -15588,6 +15808,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15626,9 +15847,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367192790421} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.0010500002, y: 0.004800002, z: 0.00034999996} m_Center: {x: -0.0023750004, y: -0.0000000018626451, z: 0.00017499998} --- !u!1 &727036367195092686 @@ -15654,9 +15883,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367195092686} + 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: 727036367833980552} - {fileID: 727036366781094534} @@ -15667,7 +15898,6 @@ Transform: - {fileID: 727036365763369773} - {fileID: 727036366455175485} m_Father: {fileID: 727036367824649591} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367199346141 GameObject: @@ -15695,12 +15925,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367199346141} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367863676017} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036367199346113 MeshFilter: @@ -15721,6 +15952,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15759,9 +15991,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367199346141} 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.0011300002, y: 0.00072000036, z: 0.0004000001} m_Center: {x: -0.00016000007, y: -9.313226e-10, z: -0.0001749991} --- !u!1 &727036367280451182 @@ -15787,12 +16027,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367280451182} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.15400007, y: 0.47600004, z: 0.12200003} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367155957786} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367282339770 GameObject: @@ -15819,12 +16060,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367282339770} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367064990741} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036367282339775 MeshFilter: @@ -15845,6 +16087,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15898,12 +16141,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367286804301} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.1579, y: 0.47600004, z: 0.12200003} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367155957786} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367309402845 GameObject: @@ -15931,12 +16175,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367309402845} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365859191470} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036367309402817 MeshFilter: @@ -15957,6 +16202,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -15995,9 +16241,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367309402845} 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.0010735003, y: 0.00072000036, z: 0.0004000001} m_Center: {x: 0.0021300004, y: -9.313226e-10, z: -0.0001749991} --- !u!1 &727036367329439636 @@ -16028,13 +16282,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367329439636} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0.47600004, z: 0.12200003} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2655579453446261055} m_Father: {fileID: 727036367155957786} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &575105173273375876 MonoBehaviour: @@ -16218,6 +16473,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &727036367364209857 GameObject: m_ObjectHideFlags: 0 @@ -16244,13 +16505,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367364209857} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.105, y: 0.07794112, z: 0.0797} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4335435789227919141} m_Father: {fileID: 727036367183048504} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4479632975387283735 MonoBehaviour: @@ -16419,12 +16681,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367400241816} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 100, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366222322380} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &727036367400241820 MeshFilter: @@ -16445,6 +16708,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -16483,9 +16747,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367400241816} 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.0007500002, y: 0.00075000036, z: 0.0004000001} m_Center: {x: 0, y: -0.0000000027939677, z: -0.0001749991} --- !u!1 &727036367541748406 @@ -16512,16 +16784,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367541748406} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036367192790420} - {fileID: 727036366749680164} - {fileID: 727036366664340020} - {fileID: 727036366808255539} m_Father: {fileID: 727036367108221470} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4432100047781324686 MonoBehaviour: @@ -16561,12 +16834,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367608295655} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2495, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365930176193} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367623549107 GameObject: @@ -16591,12 +16865,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367623549107} + 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: 3377222543777075995} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367679212821 GameObject: @@ -16623,12 +16898,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367679212821} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.2802, y: 0.067999974, z: -0.2452} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366996835259} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!198 &727036367679212822 ParticleSystem: @@ -16637,19 +16913,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367679212821} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -16848,6 +17124,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -16877,6 +17154,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -17198,7 +17476,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 100 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -17926,6 +18206,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -17955,6 +18236,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -20175,6 +20457,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20204,6 +20487,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -20593,6 +20877,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -20635,6 +20920,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20664,6 +20950,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -20751,6 +21038,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20780,6 +21068,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -20818,6 +21107,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -20847,6 +21137,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -21100,6 +21391,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -21129,6 +21421,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -21360,6 +21653,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -21390,6 +21684,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.021 @@ -21402,17 +21697,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &727036367696089219 GameObject: @@ -21445,16 +21746,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367696089219} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8294107164461501721} - {fileID: 5132906617319538988} - {fileID: 9206128374011407141} - {fileID: 203964946032134724} m_Father: {fileID: 727036367824649591} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &326297724083863379 MonoBehaviour: @@ -21585,6 +21887,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!114 &727036367696089221 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21697,9 +22005,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367824649588} + 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: 6435577481023571004} - {fileID: 727036366996835259} @@ -21710,7 +22020,6 @@ Transform: - {fileID: 727036366814746744} - {fileID: 727036367195092721} m_Father: {fileID: 3377222543777075995} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &727036367824649594 MonoBehaviour: @@ -21862,6 +22171,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!114 &727036367824649597 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21915,10 +22230,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367824649588} - 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: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -21952,13 +22278,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367832156321} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0.47600004, z: 0.12200003} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036366737575205} m_Father: {fileID: 727036365956730431} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &1128973058602751973 MonoBehaviour: @@ -22142,6 +22469,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &727036367832627453 GameObject: m_ObjectHideFlags: 0 @@ -22172,9 +22505,9 @@ RectTransform: m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: 0.0000001192093, w: -0.0000001192093} m_LocalPosition: {x: 0, y: 0, z: 0.000026} m_LocalScale: {x: 0.0049999976, y: 0.009999997, z: 0.009999997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366273644217} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -22192,6 +22525,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -22316,12 +22650,12 @@ MonoBehaviour: m_margin: {x: 0.44595283, y: 0.4722246, z: 0.4494633, w: 0.43939626} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036367832627424} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036367832627424} + m_maskType: 0 --- !u!114 &727036367832627455 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22359,12 +22693,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367833980553} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367195092721} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367841398878 GameObject: @@ -22389,16 +22724,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367841398878} + 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: 727036367887511567} - {fileID: 727036367863676017} - {fileID: 727036366406819179} - {fileID: 727036366130038039} m_Father: {fileID: 6990453361090056865} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &727036367863675982 GameObject: @@ -22426,13 +22762,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367863675982} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036367199346140} m_Father: {fileID: 727036367841398849} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1102702572479509308 MonoBehaviour: @@ -22600,12 +22937,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367874187357} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.3005, y: 0.067999974, z: 0.2446} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366996835259} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!198 &727036367874187358 ParticleSystem: @@ -22614,19 +22952,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367874187357} - serializedVersion: 7 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -22825,6 +23163,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -22854,6 +23193,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -23175,7 +23515,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 100 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -23903,6 +24245,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23932,6 +24275,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -26152,6 +26496,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -26181,6 +26526,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -26570,6 +26916,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -26612,6 +26959,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -26641,6 +26989,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -26728,6 +27077,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -26757,6 +27107,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -26795,6 +27146,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -26824,6 +27176,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -27077,6 +27430,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -27106,6 +27460,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -27337,6 +27692,7 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -27367,6 +27723,7 @@ ParticleSystemRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_RenderMode: 4 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.021 @@ -27379,17 +27736,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 m_MaskInteraction: 0 --- !u!1 &727036367887511564 GameObject: @@ -27416,12 +27779,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367887511564} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367841398849} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &727036367887511601 MeshFilter: @@ -27442,6 +27806,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -27502,9 +27867,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365930176193} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -27522,6 +27887,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -27646,12 +28012,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.6261204, z: 0.5113164, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 727036367891256340} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 727036367891256340} + m_maskType: 0 --- !u!114 &727036367891256339 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27690,12 +28056,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 727036367898471184} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.1579, y: 0.47600004, z: 0.12200003} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036365956730431} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &834342204670198175 GameObject: @@ -27727,9 +28094,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5209057863537956563} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -27747,6 +28114,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -27871,12 +28239,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1646562880406587466} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1646562880406587466} + m_maskType: 0 --- !u!114 &1705393423196511560 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27916,12 +28284,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 846683977216872727} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.087, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5066283284228446985} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8078683950828398909 MeshFilter: @@ -27942,6 +28311,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28001,9 +28371,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.00038} m_LocalScale: {x: 0.0009999999, y: 0.001, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1981685404658413343} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -28021,6 +28391,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28137,12 +28508,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7732953053880843909} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7732953053880843909} + m_maskType: 0 --- !u!114 &139443110583030234 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28187,12 +28558,12 @@ RectTransform: m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710665} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 50.000027, z: 50.00001} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3278938123389435113} - {fileID: 2705964769532808043} - {fileID: 6822793347535463996} m_Father: {fileID: 727036367108221470} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -28218,6 +28589,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28316,9 +28688,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2743431660881624822} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -28336,6 +28708,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28460,12 +28833,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 573045177834959430} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 573045177834959430} + m_maskType: 0 --- !u!114 &7179345518673007189 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28503,12 +28876,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007579782434187364} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.0389002, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6334011334434167471} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &1025230360888882483 GameObject: @@ -28540,9 +28914,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1390126953339156440} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -28560,6 +28934,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28684,12 +29059,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34116992} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 5072520658109763835} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5072520658109763835} + m_maskType: 0 --- !u!114 &414131997923936775 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28730,12 +29105,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129127262313600170} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.0434, z: 0} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3745300873240431333} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &667791795245195423 MeshFilter: @@ -28756,6 +29132,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28794,9 +29171,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129127262313600170} 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_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1198837267755713398 @@ -28822,15 +29207,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1198837267755713398} + 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: 8957861927628779580} - {fileID: 3459379230825198257} - {fileID: 5103834768542749599} m_Father: {fileID: 7896399610083090077} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1320256761857772114 GameObject: @@ -28857,12 +29243,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1320256761857772114} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8294107164461501721} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &761598371655492405 MeshFilter: @@ -28883,6 +29270,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -28936,9 +29324,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1350538495453245434} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0929, y: 0.5766, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6215333242333409973} - {fileID: 3152573868077803163} @@ -28947,7 +29337,6 @@ Transform: - {fileID: 169629724688127237} - {fileID: 8016818603323328315} m_Father: {fileID: 6937880529394566074} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1370776335147912215 GameObject: @@ -28977,9 +29366,9 @@ RectTransform: 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: 9113716716668067758} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29050,13 +29439,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1510498925472223413} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2620752646978328457} m_Father: {fileID: 4927318678120244463} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &496722479309198882 MonoBehaviour: @@ -29168,34 +29558,10 @@ MonoBehaviour: m_Calls: [] OnButtonOn: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: On - m_BoolArgument: 1 - m_CallState: 2 + m_Calls: [] OnButtonOff: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Off - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] OnForcedButtonState: m_PersistentCalls: m_Calls: [] @@ -29224,13 +29590,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593419342124745353} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.041800283, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1147193371420307083} m_Father: {fileID: 7062223458847209228} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6863612041846891234 MeshFilter: @@ -29251,6 +29618,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29311,9 +29679,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1063456583379082519} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -29331,6 +29699,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29455,12 +29824,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3348624346947567058} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 3348624346947567058} + m_maskType: 0 --- !u!114 &786459669564982448 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29498,9 +29867,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1692975798269841553} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0929, y: 0.5766, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3903848312942807070} - {fileID: 7881836209477541518} @@ -29509,7 +29880,6 @@ Transform: - {fileID: 4780483800961855040} - {fileID: 3125138507721960975} m_Father: {fileID: 1390126953339156440} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1753238469447344830 GameObject: @@ -29536,12 +29906,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753238469447344830} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.28000003, y: 0.06236819, z: -0.24499997} m_LocalScale: {x: 2, y: 2, z: 1.5999986} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366070642330} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &4999141643780340051 MeshFilter: @@ -29562,6 +29933,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29615,12 +29987,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1760136733713252884} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.045, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6937880529394566074} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &1835055016507855143 GameObject: @@ -29647,12 +30020,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1835055016507855143} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: -0.0262} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6008993104593354164} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &5852112147573421334 MeshFilter: @@ -29673,6 +30047,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29733,9 +30108,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6086198188708898311} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -29753,6 +30128,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -29877,12 +30253,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 308594577266374038} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 308594577266374038} + m_maskType: 0 --- !u!114 &522150858871179146 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29922,13 +30298,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1991804155314529342} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.13180044, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5817074652933116018} m_Father: {fileID: 2220057806174769241} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6379438252601525489 MeshFilter: @@ -29949,6 +30326,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30009,9 +30387,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4865771288455787537} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -30029,6 +30407,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30153,12 +30532,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6136578021046104849} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6136578021046104849} + m_maskType: 0 --- !u!114 &4179471253042501029 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30199,12 +30578,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037439116616611244} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: 0.0238} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6008993104593354164} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &1663351380903458911 MeshFilter: @@ -30225,6 +30605,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30263,9 +30644,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037439116616611244} 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: 6.0165014, y: 1, z: 1} m_Center: {x: -2.508249, y: -0.0000000022776128, z: 0.00000011960262} --- !u!1 &2071392117228706032 @@ -30296,16 +30685,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2071392117228706032} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.045, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8559475758634662047} - {fileID: 4450826135634510770} - {fileID: 7513375799929664307} - {fileID: 4648766845328723760} m_Father: {fileID: 6937880529394566074} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &468800358967741126 MonoBehaviour: @@ -30480,6 +30870,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2139048900925719828 GameObject: m_ObjectHideFlags: 0 @@ -30505,12 +30901,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2139048900925719828} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.145, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5066283284228446985} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3733827010602955305 MeshFilter: @@ -30531,6 +30928,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30584,12 +30982,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2203616652994319904} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.0389002, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3810545479839178472} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &2232927237716963498 GameObject: @@ -30616,12 +31015,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2232927237716963498} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.029, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3648886008998029087} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9144576190172257359 MeshFilter: @@ -30642,6 +31042,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30698,12 +31099,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2234504055495934752} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8124095184756904866} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7526549090018851560 MeshFilter: @@ -30724,6 +31126,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -30762,9 +31165,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2234504055495934752} 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.0010735003, y: 0.00072000036, z: 0.0004000001} m_Center: {x: 0.0021300004, y: -9.313226e-10, z: -0.0001749991} --- !u!1 &2264897919934311547 @@ -30790,15 +31201,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2264897919934311547} + 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: 8043452973711940169} - {fileID: 2381157907859677341} - {fileID: 5268067968520996473} m_Father: {fileID: 2804732037853233738} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2306919652195171230 GameObject: @@ -30829,11 +31241,11 @@ RectTransform: m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15, y: 0.15, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1092627525727085365} - {fileID: 1375746426739798824} m_Father: {fileID: 3745300873240431333} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -30857,7 +31269,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -30924,12 +31338,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2368879449953284648} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0.24, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1390126953339156440} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &2622254133041585504 GameObject: @@ -30954,16 +31369,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2622254133041585504} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0929, y: 0.5766, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8842662946810857358} - {fileID: 7994830139918603491} - {fileID: 2743431660881624822} - {fileID: 1063456583379082519} m_Father: {fileID: 3810545479839178472} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2737757494695734541 GameObject: @@ -30991,12 +31407,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2737757494695734541} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710665} m_LocalPosition: {x: -0.2925005, y: 0.024528861, z: 0} m_LocalScale: {x: 50, y: 74.99998, z: 74.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367108221470} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4328687197945260987 MeshFilter: @@ -31017,6 +31434,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31055,9 +31473,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2737757494695734541} 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: 1 m_CookingOptions: 30 m_Mesh: {fileID: 8713199324992633856, guid: d8c0847c30c200246a95abfe57fa898d, type: 3} @@ -31084,12 +31510,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2809763854328142885} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0.2311, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6334011334434167471} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &2857037004466355891 GameObject: @@ -31116,12 +31543,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2857037004466355891} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8458349227040318807} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &1694868583717973210 MeshFilter: @@ -31142,6 +31570,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31197,12 +31626,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2889521822875978945} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 397505826110461108} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &1666194604921040908 MeshFilter: @@ -31223,6 +31653,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31278,12 +31709,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2955378443566446906} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: 0.045, z: -0.0012} m_LocalScale: {x: 0.04, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6008993104593354164} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &4002817940589421655 MeshFilter: @@ -31304,6 +31736,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31357,12 +31790,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2980093341665625479} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0.2311, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3810545479839178472} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &3086679307120829256 GameObject: @@ -31389,12 +31823,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3086679307120829256} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.029, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3648886008998029087} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3058780841462446301 MeshFilter: @@ -31415,6 +31850,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31473,9 +31909,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.000000025145713} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4269999514724075439} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -31548,9 +31984,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000000025145713} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4269999514724075439} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -31620,12 +32056,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3307663536470003511} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8294107164461501721} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &246387753972389942 MeshFilter: @@ -31646,6 +32083,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31705,11 +32143,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.00036} m_LocalScale: {x: 0.0048, y: 0.001, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2227947139112231864} - {fileID: 5870637488705454860} m_Father: {fileID: 6956060828949233680} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -31733,7 +32171,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -31800,12 +32240,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3363327197892255591} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0.24, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6937880529394566074} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &3443867187240165705 GameObject: @@ -31832,12 +32273,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3443867187240165705} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: -0.04} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6638964904907203662} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &4427826014594296322 MeshFilter: @@ -31858,6 +32300,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -31918,9 +32361,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3810545479839178472} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -31938,6 +32381,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32062,12 +32506,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34116992} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3678724100872894205} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 3678724100872894205} + m_maskType: 0 --- !u!114 &6276590153404687475 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32107,12 +32551,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3517931667323359581} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1981685404658413343} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &7263765206118073541 MeshFilter: @@ -32133,6 +32578,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32188,12 +32634,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3531800258695561861} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: 0.49999994, w: 0.50000006} m_LocalPosition: {x: -0.0006, y: -0.00005, z: 0.00047} m_LocalScale: {x: 0.002, y: 0.0013333332, z: 0.013333399} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5132906617319538988} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8157844638322258544 MeshFilter: @@ -32214,6 +32661,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 @@ -32269,12 +32717,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3555117227915098060} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0.009999991, y: 0.45814735, z: 0} m_LocalScale: {x: 117.49999, y: 99.999985, z: 149.99997} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366814746744} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8132513272212426680 MeshFilter: @@ -32295,6 +32744,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32350,12 +32800,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3584759276428777215} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: -0.0262} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7663304388804029264} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &8454460301776720802 MeshFilter: @@ -32376,6 +32827,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32434,9 +32886,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.000000025145713} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3667579476662814060} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -32507,14 +32959,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3674216802712086237} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710665} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100.000015, y: 200.00008, z: 100.000015} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036365823587352} - {fileID: 727036366630893841} m_Father: {fileID: 727036367364209856} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2323606442661520943 MeshFilter: @@ -32535,6 +32988,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32573,9 +33027,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3674216802712086237} 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.0011299999, y: 0.0007199999, z: 0.00039999993} m_Center: {x: -0.00016000001, y: 0, z: -0.00017499995} --- !u!1 &3824942561666324819 @@ -32603,12 +33065,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3824942561666324819} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6900728100717593668} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &272951144749422837 MeshFilter: @@ -32629,6 +33092,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32684,12 +33148,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3858190652222544214} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.087, y: 0, z: -0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5066283284228446985} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3696753921595769484 MeshFilter: @@ -32710,6 +33175,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -32769,14 +33235,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3898808951097997561} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.375, y: -1.583635, z: 0.594} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3377222543777075995} - {fileID: 3745300873240431333} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &9148701441803882360 MonoBehaviour: @@ -32982,12 +33449,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3975214473452184537} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.25324237, z: 0} m_LocalScale: {x: 120, y: 99.999985, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366814746744} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7763678203619217144 MeshFilter: @@ -33008,6 +33476,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -33066,9 +33535,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 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: 542843955701554463} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33136,15 +33605,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4086676380083507203} + 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: 367309053968961741} - {fileID: 8124095184756904866} - {fileID: 597154795495341420} m_Father: {fileID: 7896399610083090077} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4287523020671280675 GameObject: @@ -33171,12 +33641,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4287523020671280675} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.145, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3648886008998029087} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &8911439169394008349 MeshFilter: @@ -33197,6 +33668,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -33251,9 +33723,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4329171977626912067} + 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: 4605541112239466682} - {fileID: 4401330485447073226} @@ -33262,7 +33736,6 @@ Transform: - {fileID: 7543401061078398139} - {fileID: 5066283284228446985} m_Father: {fileID: 9206128374011407141} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6833217150703586639 MonoBehaviour: @@ -33311,15 +33784,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4390376275449855818} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.7071067} m_LocalPosition: {x: 0, y: 0.0029411316, z: 0} m_LocalScale: {x: 50, y: 50.00001, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8028400133350012483} - {fileID: 4838845143827912874} - {fileID: 1703393910188223437} m_Father: {fileID: 727036367183048504} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6955424472613238656 MeshFilter: @@ -33340,6 +33814,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -33398,16 +33873,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4445343009778770765} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.0389002, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 761973340285490284} - {fileID: 4133665287506746551} - {fileID: 6134568991285946106} - {fileID: 8606007734231269042} m_Father: {fileID: 6334011334434167471} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &4116868285902624759 MonoBehaviour: @@ -33582,6 +34058,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4693997419201659369 GameObject: m_ObjectHideFlags: 0 @@ -33608,13 +34090,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4693997419201659369} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5614732009771691312} m_Father: {fileID: 6900728100717593668} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1576002100714835763 MonoBehaviour: @@ -33726,34 +34209,10 @@ MonoBehaviour: m_Calls: [] OnButtonOn: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: On - m_BoolArgument: 1 - m_CallState: 2 + m_Calls: [] OnButtonOff: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Off - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] OnForcedButtonState: m_PersistentCalls: m_Calls: [] @@ -33785,9 +34244,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.000000025145713} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3667579476662814060} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33855,9 +34314,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4725270263605488066} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6937880529394566074} - {fileID: 1390126953339156440} @@ -33866,7 +34327,6 @@ Transform: - {fileID: 3810545479839178472} - {fileID: 7896399610083090077} m_Father: {fileID: 727036367696089218} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4784261320592319166 GameObject: @@ -33893,12 +34353,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4784261320592319166} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0.3000002, y: 0.06236819, z: -0.24500006} m_LocalScale: {x: 2, y: 2, z: 1.5999986} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366070642330} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &8655334226384498997 MeshFilter: @@ -33919,6 +34380,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -33973,9 +34435,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4845613416702461514} + 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: 2340990262000434737} - {fileID: 541278613445993373} @@ -33984,7 +34448,6 @@ Transform: - {fileID: 2634897139270888728} - {fileID: 7062223458847209228} m_Father: {fileID: 9206128374011407141} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6027618199923438201 MonoBehaviour: @@ -34026,14 +34489,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4861447558610740790} + 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: 4927318678120244463} - {fileID: 6900728100717593668} m_Father: {fileID: 9206128374011407141} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4890284959194558537 GameObject: @@ -34060,12 +34524,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4890284959194558537} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0.045, z: -0.0012} m_LocalScale: {x: 0.04, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7663304388804029264} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &5807242674235613778 MeshFilter: @@ -34086,6 +34551,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34142,12 +34608,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5039033673377509725} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 200.00003, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367329439639} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &3254468713620210251 MeshFilter: @@ -34168,6 +34635,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34206,9 +34674,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5039033673377509725} 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.0007500002, y: 0.00075000053, z: 0.00040000022} m_Center: {x: 0, y: -1.1641534e-10, z: -0.00017500008} --- !u!1 &5116513471671206249 @@ -34239,9 +34715,9 @@ RectTransform: 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: 4720458782189596051} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34312,13 +34788,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5119539786355228723} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.7071067} m_LocalPosition: {x: -0.2925001, y: 0.050277084, z: 0} m_LocalScale: {x: 50, y: 75, z: 75} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7344204774869510429} m_Father: {fileID: 727036367696089218} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1200649304910699196 MeshFilter: @@ -34339,6 +34816,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34377,9 +34855,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5119539786355228723} 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: 1 m_CookingOptions: 30 m_Mesh: {fileID: 695264398214928890, guid: d8c0847c30c200246a95abfe57fa898d, type: 3} @@ -34412,9 +34898,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.00038} m_LocalScale: {x: 0.0009999999, y: 0.001, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8458349227040318807} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -34432,6 +34918,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34548,12 +35035,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7733448833169718047} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7733448833169718047} + m_maskType: 0 --- !u!114 &8999607777271152279 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34596,9 +35083,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 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: 9113716716668067758} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34672,11 +35159,11 @@ RectTransform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 0.001, y: 0.00033333333, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8513406204580135466} - {fileID: 1863106854845775462} m_Father: {fileID: 6435577481023571004} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -34700,7 +35187,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -34773,9 +35262,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.00038} m_LocalScale: {x: 0.0009999999, y: 0.001, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8294107164461501721} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -34793,6 +35282,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -34909,12 +35399,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6601774884822926677} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6601774884822926677} + m_maskType: 0 --- !u!114 &3801219538173264679 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34954,12 +35444,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5295555242404248302} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: -0.04} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5168393409298177867} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &3445504891266914927 MeshFilter: @@ -34980,6 +35471,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35035,13 +35527,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5464793742531608497} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.13819993, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2518061772766926728} m_Father: {fileID: 7062223458847209228} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &855617185207437238 MeshFilter: @@ -35062,6 +35555,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35117,12 +35611,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5467323512632373786} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8458349227040318807} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &4197956914907714018 MeshFilter: @@ -35143,6 +35638,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35201,13 +35697,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5483918795411090586} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.2450344, y: 0.6058, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6774951302354923015} m_Father: {fileID: 203964946032134724} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: -90} --- !u!114 &5970570655335320417 MonoBehaviour: @@ -35367,6 +35864,12 @@ MonoBehaviour: onValueChangedInt: m_PersistentCalls: m_Calls: [] + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5533426360246107497 GameObject: m_ObjectHideFlags: 0 @@ -35393,12 +35896,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5533426360246107497} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: 0.04} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6638964904907203662} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &2407596839081609952 MeshFilter: @@ -35419,6 +35923,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35457,9 +35962,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5533426360246107497} 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: 6.0165014, y: 1, z: 1} m_Center: {x: -2.508249, y: -0.0000000022776128, z: 0.00000011960262} --- !u!1 &5547728952695350427 @@ -35487,12 +36000,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5547728952695350427} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.27999997, y: 0.06236819, z: 0.24500006} m_LocalScale: {x: 2, y: 2, z: 1.5999986} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366070642330} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &278573967001736633 MeshFilter: @@ -35513,6 +36027,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35569,12 +36084,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5678337256263610262} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6937880529394566074} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3143451526714821560 MeshFilter: @@ -35595,6 +36111,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35633,9 +36150,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5678337256263610262} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!1 &5719195352864218793 @@ -35664,12 +36189,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5719195352864218793} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: 0.04} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5168393409298177867} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &9089000046583937048 MeshFilter: @@ -35690,6 +36216,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35728,9 +36255,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5719195352864218793} 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: 6.0165014, y: 1, z: 1} m_Center: {x: -2.508249, y: -0.0000000022776128, z: 0.00000011960262} --- !u!1 &5734551747718240404 @@ -35758,13 +36293,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5734551747718240404} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.13819993, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7862167516380530383} m_Father: {fileID: 2220057806174769241} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2912803090647852187 MeshFilter: @@ -35785,6 +36321,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35841,12 +36378,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5833897441221191683} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6334011334434167471} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2048640776992707792 MeshFilter: @@ -35867,6 +36405,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -35905,9 +36444,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5833897441221191683} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!1 &5923463507185786344 @@ -35935,12 +36482,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5923463507185786344} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.38218868, z: 0} m_LocalScale: {x: 120, y: 99.999985, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366814746744} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2540148201957260559 MeshFilter: @@ -35961,6 +36509,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36016,12 +36565,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5952112504674191402} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0.045, z: 0} m_LocalScale: {x: 0.07, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6638964904907203662} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &9061554695691327798 MeshFilter: @@ -36042,6 +36592,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36097,12 +36648,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6076130486502225575} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.029, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5066283284228446985} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1456602216464803856 MeshFilter: @@ -36123,6 +36675,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36182,11 +36735,11 @@ RectTransform: m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.15, y: 0.15, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2364598867861731530} - {fileID: 3544704415259230698} m_Father: {fileID: 3745300873240431333} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -36210,7 +36763,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -36279,12 +36834,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6317314231494446763} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.51064986, z: 0} m_LocalScale: {x: 120, y: 99.999985, z: 3} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036366814746744} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8564867154802910795 MeshFilter: @@ -36305,6 +36861,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36360,12 +36917,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6391433763398165812} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.0171, z: 0} m_LocalScale: {x: 0.02, y: 0.015, z: 0.02} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3745300873240431333} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &547542436016043955 MeshFilter: @@ -36386,6 +36944,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36440,9 +36999,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6446338324940453153} + 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: 2825001667042726934} - {fileID: 6945535932486376460} @@ -36451,7 +37012,6 @@ Transform: - {fileID: 5804543366344424077} - {fileID: 3648886008998029087} m_Father: {fileID: 9206128374011407141} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4039422156495365585 MonoBehaviour: @@ -36512,15 +37072,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6477945857379690654} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.7071067} m_LocalPosition: {x: 0, y: -0.008825004, z: 0} m_LocalScale: {x: 50, y: 50.00001, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 571741847891041879} - {fileID: 7273656975163797549} - {fileID: 3766022318478924686} m_Father: {fileID: 727036366947067927} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5336678608002072562 MeshFilter: @@ -36541,6 +37102,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36594,12 +37156,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6487293581490818379} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.24, y: 0.6, z: -0.17} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203964946032134724} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6493397467294219700 GameObject: @@ -36631,9 +37194,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8842662946810857358} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -36651,6 +37214,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36775,12 +37339,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 5955776471947161432} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 5955776471947161432} + m_maskType: 0 --- !u!114 &6883266573817849095 MonoBehaviour: m_ObjectHideFlags: 0 @@ -36821,12 +37385,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6773320679121175803} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0, z: 0.0238} m_LocalScale: {x: 0.01, y: 0.1, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7663304388804029264} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &6135438010867451550 MeshFilter: @@ -36847,6 +37412,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -36885,9 +37451,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6773320679121175803} 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: 6.0165014, y: 1, z: 1} m_Center: {x: -2.508249, y: -0.0000000022776128, z: 0.00000011960262} --- !u!1 &6851372906371337008 @@ -36920,9 +37494,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6334011334434167471} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -36940,6 +37514,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37064,12 +37639,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34116992} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2141937510833610269} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2141937510833610269} + m_maskType: 0 --- !u!114 &5583075998108959825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37107,15 +37682,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6867623835551658487} + 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: 5403840279910395894} - {fileID: 2042247227911476139} - {fileID: 498991455358342364} m_Father: {fileID: 2804732037853233738} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6880276171371183511 GameObject: @@ -37142,12 +37718,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6880276171371183511} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 397505826110461108} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &8029134172529933250 MeshFilter: @@ -37168,6 +37745,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37224,12 +37802,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6906643718389645199} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042247227911476139} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3646832804370404998 MeshFilter: @@ -37250,6 +37829,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37288,9 +37868,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6906643718389645199} 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.0011300002, y: 0.00072000036, z: 0.0004000001} m_Center: {x: -0.00016000007, y: -9.313226e-10, z: -0.0001749991} --- !u!1 &7007727814177016268 @@ -37322,9 +37910,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.00038} m_LocalScale: {x: 0.0009999999, y: 0.001, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 397505826110461108} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -37342,6 +37930,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37458,12 +38047,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6671544441331896101} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6671544441331896101} + m_maskType: 0 --- !u!114 &4514524279356819455 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37506,16 +38095,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7028955341810897615} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.045, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7696361706680765487} - {fileID: 535903478004450644} - {fileID: 1827051540634174786} - {fileID: 4888670604643086431} m_Father: {fileID: 1390126953339156440} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &4223888036606622838 MonoBehaviour: @@ -37690,6 +38280,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7042744844827025350 GameObject: m_ObjectHideFlags: 0 @@ -37716,13 +38312,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7042744844827025350} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.52952886, z: 0} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4720458782189596051} m_Father: {fileID: 203964946032134724} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2225908635609052905 MeshFilter: @@ -37743,6 +38340,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37781,9 +38379,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7042744844827025350} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.0010500002, y: 0.004800002, z: 0.00034999996} m_Center: {x: -0.0023750004, y: -0.0000000018626451, z: 0.00017499998} --- !u!1 &7137438156974717872 @@ -37811,12 +38417,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7137438156974717872} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: -0.045, z: 0} m_LocalScale: {x: 0.07, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5168393409298177867} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &336509828577032377 MeshFilter: @@ -37837,6 +38444,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37892,12 +38500,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7138414577614784147} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0224, y: 0.045, z: 0} m_LocalScale: {x: 0.07, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5168393409298177867} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &2395353632345656389 MeshFilter: @@ -37918,6 +38527,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -37973,12 +38583,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7146881980872744041} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.00606, y: 0.003512, z: 0.000377} m_LocalScale: {x: 0.00028, y: 1, z: 0.0001} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1981685404658413343} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &729242339510428469 MeshFilter: @@ -37999,6 +38610,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38052,12 +38664,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7241036644938037348} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.045, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1390126953339156440} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!1 &7260640583355367835 GameObject: @@ -38084,15 +38697,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7260640583355367835} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.7071067} m_LocalPosition: {x: 0, y: -0.03234926, z: 0} m_LocalScale: {x: 50, y: 50.00001, z: 50} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7218806887560928264} - {fileID: 1346292131058425387} - {fileID: 3246385614159564878} m_Father: {fileID: 727036367696089218} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5206148041967614476 MeshFilter: @@ -38113,6 +38727,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38167,16 +38782,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7288035286046906967} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6956060828949233680} - {fileID: 6264882944712255870} - {fileID: 7645830782944419723} - {fileID: 1680059070751198196} m_Father: {fileID: 727036367696089218} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7919665705669621303 MonoBehaviour: @@ -38225,12 +38841,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7294271428205828326} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3810545479839178472} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4042020620837708251 MeshFilter: @@ -38251,6 +38868,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38289,9 +38907,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7294271428205828326} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!1 &7305910142556223846 @@ -38317,16 +38943,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7305910142556223846} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0929, y: 0.5766, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1642601715752491148} - {fileID: 6086198188708898311} - {fileID: 5209057863537956563} - {fileID: 4865771288455787537} m_Father: {fileID: 6334011334434167471} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7372136791521102040 GameObject: @@ -38353,12 +38980,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7372136791521102040} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3989773806534339103} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7670171965015284637 MeshFilter: @@ -38379,6 +39007,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38437,16 +39066,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7478431846651354087} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: -0.0389002, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4323010727558588267} - {fileID: 4747843007021654872} - {fileID: 2306307030867792519} - {fileID: 1932964338074568342} m_Father: {fileID: 3810545479839178472} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &2673535569699502126 MonoBehaviour: @@ -38633,6 +39263,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + onRelease: + m_PersistentCalls: + m_Calls: [] + onReleaseInt: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7557367113678361032 GameObject: m_ObjectHideFlags: 0 @@ -38658,12 +39294,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7557367113678361032} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.087, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3648886008998029087} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4259683566148596696 MeshFilter: @@ -38684,6 +39321,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38744,9 +39382,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3989773806534339103} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -38764,6 +39402,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38888,12 +39527,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34630388} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6506781283028818918} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6506781283028818918} + m_maskType: 0 --- !u!114 &1240062351747350958 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38934,12 +39573,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7636771599328067230} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1390126953339156440} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5090484668020103121 MeshFilter: @@ -38960,6 +39600,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -38998,9 +39639,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7636771599328067230} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!1 &7710008177545166458 @@ -39027,9 +39676,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7710008177545166458} + 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: 7021380048607083371} - {fileID: 8829677622359947527} @@ -39038,7 +39689,6 @@ Transform: - {fileID: 1810988324631592455} - {fileID: 2220057806174769241} m_Father: {fileID: 9206128374011407141} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3403148416976817799 MonoBehaviour: @@ -39095,9 +39745,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1642601715752491148} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -39115,6 +39765,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -39239,12 +39890,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 3262299259030044828} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 3262299259030044828} + m_maskType: 0 --- !u!114 &2917954335781139235 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39284,12 +39935,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7837431867881467573} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.087, y: 0, z: -0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3648886008998029087} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2163838942775182974 MeshFilter: @@ -39310,6 +39962,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -39370,9 +40023,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4927318678120244463} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -39390,6 +40043,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -39514,12 +40168,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34085086} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 4541788158523307525} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 4541788158523307525} + m_maskType: 0 --- !u!114 &2476960308143001928 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39557,14 +40211,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8026281843517097214} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 727036367841398849} - {fileID: 727036367064990741} m_Father: {fileID: 727036366511910468} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8068697050467330596 GameObject: @@ -39594,9 +40249,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 1, w: 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: 4720458782189596051} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -39666,12 +40321,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8082370903050515994} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710665} m_LocalPosition: {x: -0.105000034, y: 0.0029999912, z: -0.24100007} m_LocalScale: {x: 100.00002, y: 400.00012, z: 100.00002} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367183048504} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4679880059381372150 MeshFilter: @@ -39692,6 +40348,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -39751,11 +40408,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.00036} m_LocalScale: {x: 0.0048, y: 0.001, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7408688174054451649} - {fileID: 5274982014689243644} m_Father: {fileID: 727036367192790420} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -39779,7 +40436,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -39848,13 +40507,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8174083001908017981} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.048200026, y: 0, z: 0.000000015832484} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8053217033451329563} m_Father: {fileID: 2220057806174769241} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8449548226365132318 MeshFilter: @@ -39875,6 +40535,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -39929,16 +40590,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8178149901435340790} + 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: 727036366070642330} - {fileID: 727036367824649591} - {fileID: 727036367623549106} - {fileID: 727036366056466691} m_Father: {fileID: 4418183761825325635} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5247144340994765125 MonoBehaviour: @@ -39983,12 +40645,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8264291835391597424} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8101291365181887732} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2901857234214047588 MeshFilter: @@ -40009,6 +40672,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40064,12 +40728,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8279810029235637352} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.029, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5066283284228446985} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &761592566917908625 MeshFilter: @@ -40090,6 +40755,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40146,12 +40812,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8404443188040478150} + serializedVersion: 2 m_LocalRotation: {x: -0.000000059604645, y: -0.7071068, z: -0.000000059604645, w: 0.7071068} m_LocalPosition: {x: 0.005799949, y: 0, z: 0.005034387} m_LocalScale: {x: 99.999985, y: 100.000046, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6264882944712255870} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1407825800361566513 MeshFilter: @@ -40172,6 +40839,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40210,8 +40878,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8404443188040478150} 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.00026598302 m_Height: 0.00068732625 m_Direction: 2 @@ -40246,9 +40923,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7994830139918603491} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -40266,6 +40943,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40390,12 +41068,12 @@ MonoBehaviour: m_margin: {x: 1, y: 1, z: 1, w: 1} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 724503256519801284} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 724503256519801284} + m_maskType: 0 --- !u!114 &3153552218412593665 MonoBehaviour: m_ObjectHideFlags: 0 @@ -40435,13 +41113,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8532350362975035216} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.13180044, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4864703934791531090} m_Father: {fileID: 7062223458847209228} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1152133474774440506 MeshFilter: @@ -40462,6 +41141,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40522,9 +41202,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6937880529394566074} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -40542,6 +41222,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40666,12 +41347,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34116992} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 499260207157832909} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 499260207157832909} + m_maskType: 0 --- !u!114 &7913090426173769498 MonoBehaviour: m_ObjectHideFlags: 0 @@ -40712,12 +41393,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8657370791432356165} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.7071067} m_LocalPosition: {x: -0.2925001, y: 0.04794112, z: 0} m_LocalScale: {x: 50, y: 75, z: 75} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367183048504} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6462226708339840231 MeshFilter: @@ -40738,6 +41420,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40776,9 +41459,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8657370791432356165} 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: 1 m_CookingOptions: 30 m_Mesh: {fileID: -8475924372182132322, guid: d8c0847c30c200246a95abfe57fa898d, type: 3} @@ -40807,12 +41498,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8818283452311072849} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.145, y: 0, z: 0} m_LocalScale: {x: 0.005, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3648886008998029087} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1250421534272794560 MeshFilter: @@ -40833,6 +41525,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40888,12 +41581,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8826695463131446835} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12} m_LocalScale: {x: 100, y: 99.999985, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4927318678120244463} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2033003580104915375 MeshFilter: @@ -40914,6 +41608,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -40969,13 +41664,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8828398868832965227} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.041800283, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1198416186849477988} m_Father: {fileID: 2220057806174769241} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3467531716180907355 MeshFilter: @@ -40996,6 +41692,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -41056,9 +41753,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8101291365181887732} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -41076,6 +41773,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -41200,12 +41898,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.34085086} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1496849322440046770} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1496849322440046770} + m_maskType: 0 --- !u!114 &5999869454129881167 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41243,14 +41941,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8954818070755600032} + 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: 8101291365181887732} - {fileID: 3989773806534339103} m_Father: {fileID: 9206128374011407141} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8991757378998939640 GameObject: @@ -41280,9 +41979,9 @@ RectTransform: 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: 542843955701554463} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -41352,12 +42051,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9111304356634095180} + serializedVersion: 2 m_LocalRotation: {x: -0.70710695, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: -0.10000004, y: 0.401, z: 0.002000004} m_LocalScale: {x: 100, y: 200, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 727036367155957786} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8289995213877764445 MeshFilter: @@ -41378,6 +42078,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -41434,13 +42135,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9133191654676705079} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5254682864860762358} m_Father: {fileID: 8101291365181887732} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1150936079210508242 MonoBehaviour: @@ -41610,13 +42312,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9154009488487978374} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.048200026, y: 0, z: 0} m_LocalScale: {x: 0.008, y: 0.01, z: 0.008} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3635626891505407179} m_Father: {fileID: 7062223458847209228} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &108538555465687854 MeshFilter: @@ -41637,6 +42340,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -41693,13 +42397,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9173624820288049035} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: -0.49999997} m_LocalPosition: {x: -0.17446391, y: 0.57590383, z: 0.2886525} m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9113716716668067758} m_Father: {fileID: 727036367824649591} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8687326811475699921 MeshFilter: @@ -41720,6 +42425,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -41758,8 +42464,16 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9173624820288049035} 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.0002500001, y: 0.00037499965, z: 0.0016499998} m_Center: {x: 1.6414554e-11, y: 0.000062499785, z: -1.8626392e-12} diff --git a/unity/Assets/Maroon/reusablePrefabs/experimentSetting/ExperimentSetting.pc.prefab b/unity/Assets/Maroon/reusablePrefabs/experimentSetting/ExperimentSetting.pc.prefab index b6c74b10a..20cf7dff3 100644 --- a/unity/Assets/Maroon/reusablePrefabs/experimentSetting/ExperimentSetting.pc.prefab +++ b/unity/Assets/Maroon/reusablePrefabs/experimentSetting/ExperimentSetting.pc.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119206284569723} + 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: 2131119208124075183} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!20 &2131119206284569727 Camera: @@ -48,9 +48,17 @@ Camera: 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_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -168,6 +176,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119206773090613} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.51139116, y: 1.5836351, z: 3.8194156} m_LocalScale: {x: 1, y: 1, z: 1} @@ -175,7 +184,6 @@ Transform: m_Children: - {fileID: 6947993208854680194} m_Father: {fileID: 2131119208124844621} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119206932974240 GameObject: @@ -200,13 +208,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119206932974240} + 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: 2131119208124844621} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119206982812907 GameObject: @@ -231,13 +239,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119206982812907} + 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: 2131119208124844621} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119207148510633 GameObject: @@ -262,6 +270,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119207148510633} + 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} @@ -269,7 +278,6 @@ Transform: m_Children: - {fileID: 305501996476679957} m_Father: {fileID: 2131119208124844621} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119207166603078 GameObject: @@ -294,13 +302,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119207166603078} + 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: 2131119208124844621} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119207646241845 GameObject: @@ -325,6 +333,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119207646241845} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.51139116, y: 1.5836351, z: 3.8194156} m_LocalScale: {x: 1, y: 1, z: 1} @@ -333,7 +342,6 @@ Transform: - {fileID: 1935421742356538054} - {fileID: 58754831712102505} m_Father: {fileID: 2131119208124844621} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119207919652542 GameObject: @@ -358,13 +366,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119207919652542} + 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: 2131119208124844621} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119207974420913 GameObject: @@ -389,6 +397,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119207974420913} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 2, z: -0.2} m_LocalScale: {x: 1, y: 1, z: 1} @@ -396,7 +405,6 @@ Transform: m_Children: - {fileID: 2131119208124075183} m_Father: {fileID: 2131119208124844621} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119208124075180 GameObject: @@ -424,6 +432,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119208124075180} + 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} @@ -431,7 +440,6 @@ Transform: m_Children: - {fileID: 2131119206284569722} m_Father: {fileID: 2131119207974420912} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &2131119208124075152 Camera: @@ -447,9 +455,17 @@ Camera: 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_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -515,6 +531,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119208124844618} + 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} @@ -531,7 +548,6 @@ Transform: - {fileID: 2131119207919652513} - {fileID: 2131119207974420912} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2131119208300757128 GameObject: @@ -556,6 +572,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131119208300757128} + 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} @@ -564,13 +581,13 @@ Transform: - {fileID: 447441433245880778} - {fileID: 6505820974878846935} m_Father: {fileID: 2131119208124844621} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1140480039935015613 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208124844621} m_Modifications: - target: {fileID: 378110362638372100, guid: c6c418fdd21aa054fb854a2c70683b60, @@ -634,6 +651,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6c418fdd21aa054fb854a2c70683b60, type: 3} --- !u!4 &7453738353254342677 stripped Transform: @@ -646,6 +666,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208300757131} m_Modifications: - target: {fileID: 1992526434481557022, guid: 10c26744ecceac04bb4ab6fcce082646, @@ -719,6 +740,9 @@ PrefabInstance: value: ExperimentRoom objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10c26744ecceac04bb4ab6fcce082646, type: 3} --- !u!4 &447441433245880778 stripped Transform: @@ -731,6 +755,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119207646241844} m_Modifications: - target: {fileID: 524878756086650094, guid: 146c2114323150942bfd5dbe5e9392c7, @@ -794,6 +819,9 @@ PrefabInstance: value: PauseMenu objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 146c2114323150942bfd5dbe5e9392c7, type: 3} --- !u!4 &1935421742356538054 stripped Transform: @@ -806,6 +834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119207148510632} m_Modifications: - target: {fileID: 1850449288085236197, guid: 31b6c6f8b89327e449e5d496feddbd16, @@ -869,6 +898,9 @@ PrefabInstance: value: SimulationController objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31b6c6f8b89327e449e5d496feddbd16, type: 3} --- !u!4 &305501996476679957 stripped Transform: @@ -881,6 +913,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119206773090612} m_Modifications: - target: {fileID: 9079110210785623904, guid: fe0a30be743451540982d538c670799e, @@ -964,6 +997,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe0a30be743451540982d538c670799e, type: 3} --- !u!4 &6947993208854680194 stripped Transform: @@ -976,6 +1012,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208300757131} m_Modifications: - target: {fileID: 782924764267166418, guid: 6b290524dc8e97b4187d16c5f5c21e8f, @@ -1039,6 +1076,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b290524dc8e97b4187d16c5f5c21e8f, type: 3} --- !u!4 &6505820974878846935 stripped Transform: @@ -1051,6 +1091,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119207646241844} m_Modifications: - target: {fileID: 340845351035402039, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, @@ -1083,6 +1124,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1077885280684003424, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1077885280684003424, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1267081982187938012, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} propertyPath: m_AnchorMax.y @@ -1158,6 +1209,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3075722342592844338, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3075722342592844338, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3075722342592844338, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3075722342592844338, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3278572994891445752, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} propertyPath: m_SizeDelta.y @@ -1193,6 +1264,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4921793460365709044, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4921793460365709044, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5169527117284327996, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} propertyPath: m_AnchorMax.y @@ -1223,6 +1304,16 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5390118224362070804, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5390118224362070804, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5629570535121380032, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} propertyPath: m_AnchorMax.x @@ -1251,7 +1342,17 @@ PrefabInstance: - target: {fileID: 7948993310725718338, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} propertyPath: m_Size - value: 0.9999999 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8052549968947438205, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8052549968947438205, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 8087163789343532165, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} @@ -1488,6 +1589,26 @@ PrefabInstance: propertyPath: m_Name value: UI objectReference: {fileID: 0} + - target: {fileID: 8814912292850135568, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8814912292850135568, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8814912292850135568, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8814912292850135568, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8890817537280987951, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} propertyPath: m_AnchorMax.y @@ -1549,6 +1670,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} --- !u!224 &58754831712102505 stripped RectTransform: diff --git a/unity/Assets/Maroon/reusableScripts/ExperimentParameters/Maroon.ReusableScripts.ExperimentParameters.asmdef b/unity/Assets/Maroon/reusableScripts/ExperimentParameters/Maroon.ReusableScripts.ExperimentParameters.asmdef index de7a6b42a..10ad9066e 100644 --- a/unity/Assets/Maroon/reusableScripts/ExperimentParameters/Maroon.ReusableScripts.ExperimentParameters.asmdef +++ b/unity/Assets/Maroon/reusableScripts/ExperimentParameters/Maroon.ReusableScripts.ExperimentParameters.asmdef @@ -2,7 +2,8 @@ "name": "Maroon.ReusableScripts.ExperimentParameters", "rootNamespace": "", "references": [ - "GUID:56f15dd651d5d3a44bbfc9ca89629921" + "GUID:56f15dd651d5d3a44bbfc9ca89629921", + "GUID:833d205176b3e444a810dbf875342968" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity/Assets/Maroon/reusableScripts/ExperimentParameters/ParameterLoader.cs b/unity/Assets/Maroon/reusableScripts/ExperimentParameters/ParameterLoader.cs index 6386bc04c..3c1ab9064 100644 --- a/unity/Assets/Maroon/reusableScripts/ExperimentParameters/ParameterLoader.cs +++ b/unity/Assets/Maroon/reusableScripts/ExperimentParameters/ParameterLoader.cs @@ -2,14 +2,25 @@ using UnityEngine; using UnityEngine.Events; using Newtonsoft.Json; -#if UNITY_WEBGL -using Maroon.GlobalEntities; // For WebGlReceiver +using Maroon.GlobalEntities; +using System.IO; + +// IMPORTS USED FOR WEBGL +#if UNITY_WEBGL && !UNITY_EDITOR +using System.Collections; +using UnityEngine.Networking; +using System; #endif namespace Maroon.ReusableScripts.ExperimentParameters { public class ParameterLoader : MonoBehaviour { + /// + /// If true, the JSON files are automatically detected and loaded from the StreamingAssets folder. + /// + [SerializeField] private bool _automaticiallyDetectJsonFiles = false; + [Tooltip("JSON files that can then be loaded via their index and the method LoadJsonFromFileIndex")] [SerializeField] private List _jsonFile = new List(); @@ -19,9 +30,14 @@ public class ParameterLoader : MonoBehaviour public UnityEvent parametersLoaded = new UnityEvent(); /// - /// Invoked when ExperimentParameters have been loaded, which are custom (e.g. received from Javascript WebGL). + /// Invoked when the JSON files have been initialized. /// - public UnityEvent CustomParametersLoaded = new UnityEvent(); + public UnityEvent OnFilesInitialized = new UnityEvent(); + + /// + /// The name of the experiment that is currently loaded. + /// + private string _experimentName; /// /// The most recently loaded ExperimentParameters @@ -32,11 +48,6 @@ public ExperimentParameters MostRecentParameters private set; } - /// - /// Used to know whether there was already an experiment which potentially used the URL fragment parameters on WebGL already - /// - private static bool firstExperimentDefaultParametersLoaded = false; - #region Singleton private static ParameterLoader _instance; public static ParameterLoader Instance @@ -53,13 +64,76 @@ public static ParameterLoader Instance private void Start() { + _experimentName = SceneManager.Instance.ActiveSceneNameWithoutPlatformExtension; + +#if UNITY_WEBGL && !UNITY_EDITOR // Listener for external json data (sent e.g. via a Javascript button from a website where Maroon is embedded) -#if UNITY_WEBGL WebGlReceiver.Instance.OnIncomingData.AddListener((string jsonData) => { LoadJsonFromString(jsonData); - CustomParametersLoaded?.Invoke(); }); #endif + + if (_automaticiallyDetectJsonFiles) + { +#if UNITY_WEBGL && !UNITY_EDITOR + StartCoroutine(LoadAllConfigsWebGl()); +#else + LoadAllConfigs(); +#endif + } + } + + /// + /// Returns the names of all JSON files. + /// + /// List of JSON file names + public List GetJsonNames() + { + List names = new List(); + foreach (TextAsset file in _jsonFile) + { + names.Add(file.name); + } + + return names; + } + + /// + /// Returns the index of the JSON file with the given name. + /// + /// Name of the JSON file + /// Index of the JSON file + public int IndexOfJson(string name) + { + string modifiedName = name.ToLower().Replace(" ", ""); + for (int i = 0; i < _jsonFile.Count; i++) + { + string modifiedFileName = _jsonFile[i].name.ToLower().Replace(" ", ""); + + if (modifiedFileName == modifiedName) + { + return i; + } + } + + Debug.LogError("No file with name " + name + " found."); + return -1; + } + + /// + /// Method for when the JSON files are not set in the inspector but are loaded from an external source. + /// + /// List of JSON files to load + public void InitJsonFiles(List jsonFiles) + { + if (_jsonFile.Count > 0) + { + Debug.LogWarning("JSON files have already been initialized. Action denied."); + return; + } + + _jsonFile = jsonFiles; + OnFilesInitialized?.Invoke(); } #region Loading of Parameters @@ -67,24 +141,9 @@ private void Start() /// Method for loading intern JSON-File /// /// File to load - /// If a new experiment has just loaded and this is call should load the initial default parameters. - /// If true, might be ignored and instead the URL fragment parameters will be used. /// The loaded ExperimentParameters - public ExperimentParameters LoadJsonFromFileIndex(int index, bool firstDefaultParametersLoad = false) + public ExperimentParameters LoadJsonFromFileIndex(int index) { -#if UNITY_WEBGL - /* - * Initial config received from Javascript (originating from the URL Fragment config) will be received before the requested experiment is loaded, - * thus if on WebGL and the WebGlReceiver.Instance.MostRecentData is not null and this it the first experiment, load instead the WebGlReceiver.Instance.MostRecentData instead of the requested default file. - */ - if (firstDefaultParametersLoad && !firstExperimentDefaultParametersLoaded && !string.IsNullOrWhiteSpace(WebGlReceiver.Instance.MostRecentData)) - { - firstExperimentDefaultParametersLoaded = true; - CustomParametersLoaded?.Invoke(); - return LoadJsonFromString(WebGlReceiver.Instance.MostRecentData); - } -#endif - if (index >= _jsonFile.Count) { Debug.LogError("Index " + index + " is greater or equal the number of files " + _jsonFile.Count); @@ -96,6 +155,23 @@ public ExperimentParameters LoadJsonFromFileIndex(int index, bool firstDefaultPa return LoadJsonFromString(data); } + /// + /// Method for loading intern JSON-File via their filename + /// + /// Name of the file to load + /// The loaded ExperimentParameters + public ExperimentParameters LoadJsonFromFileName(string name) + { + int index = IndexOfJson(name); + if (index == -1) + { + Debug.LogError("No file with name " + name + " found."); + return null; + } + + return LoadJsonFromFileIndex(index); + } + /// /// Method for loading JSON string /// @@ -103,16 +179,7 @@ public ExperimentParameters LoadJsonFromFileIndex(int index, bool firstDefaultPa /// The loaded ExperimentParameters public ExperimentParameters LoadJsonFromString(string data) { - Debug.Log("Trying to load ExperimentParameters from JSON String."); MostRecentParameters = ConvertJsonToExperimentParameters(data); - if (MostRecentParameters == null) - { - Debug.LogError("Loaded ExperimentParameters are null."); - } - else - { - Debug.Log("Successfully parsed ExperimentParameters: " + MostRecentParameters.GetType()); - } parametersLoaded?.Invoke(MostRecentParameters); return MostRecentParameters; } @@ -134,6 +201,77 @@ private ExperimentParameters ConvertJsonToExperimentParameters(string data) return JsonConvert.DeserializeObject(data, settings); } -#endregion + #endregion + + + /// + /// Load all JSON files from the StreamingAssets folder (Non-WebGL) + /// + private void LoadAllConfigs() + { + string basePath = Path.Combine(Application.streamingAssetsPath, "Config", _experimentName); + string[] txtFiles = Directory.GetFiles(basePath, "*.json"); + List assets = new List(); + + foreach (string file in txtFiles) + { + string jsonText = File.ReadAllText(file); + string fileName = Path.GetFileNameWithoutExtension(file); + + TextAsset textAsset = new TextAsset(jsonText); + textAsset.name = fileName; + + assets.Add(textAsset); + } + + InitJsonFiles(assets); + } + +#if UNITY_WEBGL && !UNITY_EDITOR + /// + /// Load all JSON files from the server (WebGL) + /// + private IEnumerator LoadAllConfigsWebGl() + { + string baseDomain = new Uri(Application.absoluteURL).ToString(); + if (baseDomain.Contains("?")) baseDomain = baseDomain.Substring(0, baseDomain.IndexOf('?')); + string basePath = $"{baseDomain}/StreamingAssets/Config/{_experimentName}/"; + string configListUrl = $"{baseDomain}/configs.php?experimentName={_experimentName}"; + + List assets = new List(); + List httpFiles = new List(); + UnityWebRequest uwr = UnityWebRequest.Get(configListUrl); + + yield return uwr.SendWebRequest(); + + var jsonFile = uwr.downloadHandler.text; + var parseJSON = JsonConvert.DeserializeObject>(jsonFile); + + for(int i = 0; i < parseJSON.Count; i++) { + httpFiles.Add(basePath + parseJSON[i]); + } + + for(int i = 0; i < httpFiles.Count; i++) { + UnityWebRequest webReq = UnityWebRequest.Get(httpFiles[i]); + yield return webReq.SendWebRequest(); + + if (webReq.result != UnityWebRequest.Result.Success) + { + Debug.LogError(webReq.error); + continue; + } + + var jsonText = webReq.downloadHandler.text; + string fileName = Path.GetFileNameWithoutExtension(httpFiles[i]); + + TextAsset textAsset = new TextAsset(jsonText); + textAsset.name = fileName; + + assets.Add(textAsset); + } + + InitJsonFiles(assets); + } +#endif } } diff --git a/unity/Assets/Maroon/reusableScripts/Maroon.ReusableScripts.asmdef b/unity/Assets/Maroon/reusableScripts/Maroon.ReusableScripts.asmdef index 6fc9e8a03..fd9dcfa3e 100644 --- a/unity/Assets/Maroon/reusableScripts/Maroon.ReusableScripts.asmdef +++ b/unity/Assets/Maroon/reusableScripts/Maroon.ReusableScripts.asmdef @@ -6,7 +6,6 @@ "GUID:a2847fe8ff68496469df31833d8fdacb", "GUID:339607d959a71f14eadd1d72a99e0287", "GUID:5c3ba91dd3f1c8f41a4c009c1e31712a", - "GUID:20a3f6c7643c02b4f91ee2b86822b6a7", "GUID:e4c75b2556442fb489c9292e2964558b", "GUID:a05d9522839c8f043bf985c292eea734", "GUID:ccf513c02a7c0734f97bf699ec9fcc75", diff --git a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/3DMotionSimulation.pc.unity b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/3DMotionSimulation.pc.unity index bd8e0929f..72c18f9a5 100644 --- a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/3DMotionSimulation.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/3DMotionSimulation.pc.unity @@ -1075,62 +1075,62 @@ PrefabInstance: - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 550 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} @@ -1291,6 +1291,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 292083220} m_SourcePrefab: {fileID: 100100000, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} +--- !u!114 &128101943 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + m_PrefabInstance: {fileID: 2615165636024863964} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 194f2b069550fd34fa1e4499e3e5752c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &172267054 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4028703640781824248, guid: 804ae9890eac3f941be98f32cab2066a, @@ -2477,7 +2489,12 @@ PrefabInstance: - target: {fileID: 1841423615295626704, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, type: 3} propertyPath: m_text - value: Default + value: Option A + objectReference: {fileID: 0} + - target: {fileID: 1841423615295626704, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, + type: 3} + propertyPath: m_fontSize + value: 24 objectReference: {fileID: 0} - target: {fileID: 1841423615295626704, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, type: 3} @@ -2614,56 +2631,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.size - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[0].m_Text - value: Default - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[1].m_Text - value: Satellite - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[2].m_Text - value: 'Ball in the Wind ' - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[3].m_Text - value: Charged Particle - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[4].m_Text - value: Resonance - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[5].m_Text - value: Parametric Oscillator - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[6].m_Text - value: Relaxation Oscillator - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[7].m_Text - value: Rocket Launch - objectReference: {fileID: 0} - - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, - type: 3} - propertyPath: m_Options.m_Options.Array.data[8].m_Text - value: Coupled Oscillators - objectReference: {fileID: 0} - target: {fileID: 2353017652562495998, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size @@ -3441,7 +3408,7 @@ PrefabInstance: - target: {fileID: 2015412783071595291, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783071595291, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3606,7 +3573,7 @@ PrefabInstance: - target: {fileID: 2015412783105289339, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783105289339, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3631,7 +3598,7 @@ PrefabInstance: - target: {fileID: 2015412783112863759, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783112863759, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3646,12 +3613,12 @@ PrefabInstance: - target: {fileID: 2015412783258539040, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 110.75315 + value: 116.37356 objectReference: {fileID: 0} - target: {fileID: 2015412783258539040, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 548.38916 + value: 573.681 objectReference: {fileID: 0} - target: {fileID: 2015412783258539040, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3676,7 +3643,7 @@ PrefabInstance: - target: {fileID: 2015412783343896929, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783343896929, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3691,12 +3658,12 @@ PrefabInstance: - target: {fileID: 2015412783393012426, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 110.75315 + value: 116.37356 objectReference: {fileID: 0} - target: {fileID: 2015412783393012426, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 437.63605 + value: 457.30743 objectReference: {fileID: 0} - target: {fileID: 2015412783393012426, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3731,7 +3698,7 @@ PrefabInstance: - target: {fileID: 2015412783467937535, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783467937535, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3756,7 +3723,7 @@ PrefabInstance: - target: {fileID: 2015412783614643205, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783614643205, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3781,7 +3748,7 @@ PrefabInstance: - target: {fileID: 2015412783654883572, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: -623.76575 + value: -651.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783654883572, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3791,7 +3758,7 @@ PrefabInstance: - target: {fileID: 2015412783680731265, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 611.76575 + value: 639.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783680731265, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3816,7 +3783,7 @@ PrefabInstance: - target: {fileID: 2015412783772436133, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 611.76575 + value: 639.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783772436133, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3831,7 +3798,7 @@ PrefabInstance: - target: {fileID: 2015412783926316940, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783926316940, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3841,7 +3808,7 @@ PrefabInstance: - target: {fileID: 2015412783960716041, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 611.76575 + value: 639.8678 objectReference: {fileID: 0} - target: {fileID: 2015412783960716041, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3856,7 +3823,7 @@ PrefabInstance: - target: {fileID: 2015412784064884788, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 611.76575 + value: 639.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784064884788, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3881,7 +3848,7 @@ PrefabInstance: - target: {fileID: 2015412784081821438, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784081821438, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3906,7 +3873,7 @@ PrefabInstance: - target: {fileID: 2015412784097146585, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784097146585, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3931,7 +3898,7 @@ PrefabInstance: - target: {fileID: 2015412784153889186, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784153889186, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3941,12 +3908,12 @@ PrefabInstance: - target: {fileID: 2015412784159432773, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 110.75315 + value: 116.37356 objectReference: {fileID: 0} - target: {fileID: 2015412784159432773, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 216.12973 + value: 224.56033 objectReference: {fileID: 0} - target: {fileID: 2015412784159432773, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3956,7 +3923,7 @@ PrefabInstance: - target: {fileID: 2015412784190028790, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 588.76575 + value: 616.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784190028790, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3966,7 +3933,7 @@ PrefabInstance: - target: {fileID: 2015412784269090257, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 611.76575 + value: 639.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784269090257, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -3991,7 +3958,7 @@ PrefabInstance: - target: {fileID: 2015412784283279769, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784283279769, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4016,7 +3983,7 @@ PrefabInstance: - target: {fileID: 2015412784287199749, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784287199749, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4026,12 +3993,12 @@ PrefabInstance: - target: {fileID: 2015412784303210928, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 110.75315 + value: 116.37356 objectReference: {fileID: 0} - target: {fileID: 2015412784303210928, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 659.14233 + value: 690.05457 objectReference: {fileID: 0} - target: {fileID: 2015412784303210928, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4061,7 +4028,7 @@ PrefabInstance: - target: {fileID: 2015412784473477962, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784473477962, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4071,7 +4038,7 @@ PrefabInstance: - target: {fileID: 2015412784508426851, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784508426851, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4096,7 +4063,7 @@ PrefabInstance: - target: {fileID: 2015412784508544480, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784508544480, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4121,7 +4088,7 @@ PrefabInstance: - target: {fileID: 2015412784518526062, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784518526062, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4146,7 +4113,7 @@ PrefabInstance: - target: {fileID: 2015412784535863359, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784535863359, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4166,17 +4133,17 @@ PrefabInstance: - target: {fileID: 2015412784621449163, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784675258446, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 110.75315 + value: 116.37356 objectReference: {fileID: 0} - target: {fileID: 2015412784675258446, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 105.37657 + value: 108.18678 objectReference: {fileID: 0} - target: {fileID: 2015412784675258446, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4211,7 +4178,7 @@ PrefabInstance: - target: {fileID: 2015412784717578576, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784717578576, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4221,7 +4188,7 @@ PrefabInstance: - target: {fileID: 2015412784771384626, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 611.76575 + value: 639.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784771384626, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4246,7 +4213,7 @@ PrefabInstance: - target: {fileID: 2015412784783111748, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784783111748, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4271,7 +4238,7 @@ PrefabInstance: - target: {fileID: 2015412784842136891, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784842136891, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4281,12 +4248,12 @@ PrefabInstance: - target: {fileID: 2015412784848333874, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 110.75315 + value: 116.37356 objectReference: {fileID: 0} - target: {fileID: 2015412784848333874, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 326.88287 + value: 340.9339 objectReference: {fileID: 0} - target: {fileID: 2015412784848333874, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4321,7 +4288,7 @@ PrefabInstance: - target: {fileID: 2015412784875842250, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784875842250, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4346,7 +4313,7 @@ PrefabInstance: - target: {fileID: 2015412784928933585, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784928933585, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4371,7 +4338,7 @@ PrefabInstance: - target: {fileID: 2015412784979443261, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412784979443261, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4396,7 +4363,7 @@ PrefabInstance: - target: {fileID: 2015412785010643975, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_SizeDelta.x - value: 633.76575 + value: 661.8678 objectReference: {fileID: 0} - target: {fileID: 2015412785010643975, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -4406,7 +4373,7 @@ PrefabInstance: - target: {fileID: 2015412785077842314, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} propertyPath: m_AnchoredPosition.x - value: 326.88287 + value: 340.9339 objectReference: {fileID: 0} - target: {fileID: 2015412785077842314, guid: 9933f3dc85381c94cb153a25954cd1e1, type: 3} @@ -8146,62 +8113,62 @@ PrefabInstance: - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 550 objectReference: {fileID: 0} - target: {fileID: 9085299239040558691, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 9085299239350200118, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} @@ -8420,7 +8387,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1794432016} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 87bdbf503828e0c43a74cf82ad4d83c8, type: 3} m_Name: @@ -10233,6 +10200,11 @@ PrefabInstance: propertyPath: m_textInfo.characterCount value: 41 objectReference: {fileID: 0} + - target: {fileID: 763283710717574005, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: m_Name + value: JsonFileLoader + objectReference: {fileID: 0} - target: {fileID: 917984679356767533, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} propertyPath: m_AnchorMax.x @@ -10513,6 +10485,251 @@ PrefabInstance: propertyPath: ignoreForLightBaking.Array.data[2] value: objectReference: {fileID: 2131119208208072626} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1794432018} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 600711561} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_Target + value: + objectReference: {fileID: 600711561} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_enabled + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: OnConfigLoaded + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: OnConfigsLoadedInital + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName + value: OnConfigLoaded + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1794432018} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 128101943} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnParametersLoaded + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_enabled + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: InitJSONfiles + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.Behaviour, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: ParameterLoader, Maroon.Experiments.3DMotionSimulation + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: ParameterUI, Maroon.Experiments.3DMotionSimulation + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName + value: ParameterUI, Maroon.Experiments.3DMotionSimulation + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: ParameterLoader, Maroon.Experiments.3DMotionSimulation + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.Behaviour, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: Maroon.ReusableScripts.ExperimentParameters.ParameterLoader, Maroon.ReusableScripts.ExperimentParameters + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnConfigLoaded.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: ParametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5479289251142666600, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 5705491956898752977, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} propertyPath: m_AnchorMax.y @@ -11045,21 +11262,61 @@ PrefabInstance: propertyPath: simpleLineChart value: objectReference: {fileID: 1854339349} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _configLoader + value: + objectReference: {fileID: 0} - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} propertyPath: _jsonFile.Array.size value: 9 objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[1] + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[2] + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[3] + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[4] + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[5] + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFile.Array.data[6] + value: + objectReference: {fileID: 0} - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} propertyPath: _jsonFile.Array.data[7] value: - objectReference: {fileID: 4900000, guid: 69892c5131c81bb42b43b9ce04b07704, type: 3} + objectReference: {fileID: 0} - target: {fileID: 2615165635816148407, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} propertyPath: _jsonFile.Array.data[8] value: - objectReference: {fileID: 4900000, guid: 51ff4ffbc5c2efb45a18b7dd2f6a7231, type: 3} + objectReference: {fileID: 0} - target: {fileID: 2615165636486811590, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} propertyPath: m_Name @@ -11205,6 +11462,16 @@ PrefabInstance: propertyPath: _parameters value: objectReference: {fileID: 2017746584} + - target: {fileID: 2615165636625313109, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _configLoader + value: + objectReference: {fileID: 0} + - target: {fileID: 2615165636625313109, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: _jsonFileLoader + value: + objectReference: {fileID: 0} - target: {fileID: 2615165636625313109, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} propertyPath: _showOriginGrid @@ -11270,7 +11537,58 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: parametersLoaded.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1794432018} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_enabled + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.Behaviour, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3819443581575981680, guid: 33f6933ecd1830f41b91201dbd5574df, + type: 3} + propertyPath: OnFilesInitialized.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 6484876488195960525, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} m_RemovedGameObjects: - {fileID: 2616569031490582291, guid: 33f6933ecd1830f41b91201dbd5574df, type: 3} m_AddedGameObjects: diff --git a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Prefabs/3DMotionSimulation.prefab b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Prefabs/3DMotionSimulation.prefab index 80112623e..32b7be693 100644 --- a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Prefabs/3DMotionSimulation.prefab +++ b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Prefabs/3DMotionSimulation.prefab @@ -405,7 +405,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2615165635816148406} - - component: {fileID: 492032003982172904} + - component: {fileID: 3819443581575981680} m_Layer: 0 m_Name: ParameterLoader m_TagString: Untagged @@ -428,7 +428,7 @@ Transform: m_Children: [] m_Father: {fileID: 2615165636486811591} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &492032003982172904 +--- !u!114 &3819443581575981680 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -440,23 +440,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 194f2b069550fd34fa1e4499e3e5752c, type: 3} m_Name: m_EditorClassIdentifier: - _jsonFile: - - {fileID: 4900000, guid: c68c6d1aa7a3303478aab8504f865cd7, type: 3} - - {fileID: 4900000, guid: ef900496e1772a54cb19bc6f5ea05a1e, type: 3} - - {fileID: 4900000, guid: c8337eeb0f28ad145a874c9274610dc6, type: 3} - - {fileID: 4900000, guid: f3d4ced9881170d409402fc79031ccbf, type: 3} - - {fileID: 4900000, guid: 82559040d372fde4680750696eb12682, type: 3} - - {fileID: 4900000, guid: 383fa3b65b7348d4ebdc8c0d7de333d5, type: 3} - - {fileID: 4900000, guid: 615f64ec8fb0bfb4f870466f4654ad1b, type: 3} - - {fileID: 4900000, guid: 69892c5131c81bb42b43b9ce04b07704, type: 3} - - {fileID: 4900000, guid: 51ff4ffbc5c2efb45a18b7dd2f6a7231, type: 3} + _automaticiallyDetectJsonFiles: 1 + _jsonFile: [] parametersLoaded: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2615165636625313109} - m_TargetAssemblyTypeName: ParameterUI, Maroon.Experiments.3DMotionSimulation - m_MethodName: LoadParameters - m_Mode: 0 + m_TargetAssemblyTypeName: Maroon.Parameter.ParameterUI, Maroon.Experiments.3DMotionSimulation + m_MethodName: OnLoadedExperimentParameters + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -465,6 +457,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + OnFilesInitialized: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2615165636305501045 GameObject: m_ObjectHideFlags: 0 diff --git a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/CoordSystem.cs b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/CoordSystem.cs index 06ecbdd19..58063c7cc 100644 --- a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/CoordSystem.cs +++ b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/CoordSystem.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; using TMPro; -using ObjectsInUse; +using Maroon.Parameter.ObjectsInUse; namespace Maroon.Physics.ThreeDimensionalMotion { diff --git a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/Maroon.Experiments.3DMotionSimulation.asmdef b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/Maroon.Experiments.3DMotionSimulation.asmdef index 4759b44d2..b3896e288 100644 --- a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/Maroon.Experiments.3DMotionSimulation.asmdef +++ b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/Maroon.Experiments.3DMotionSimulation.asmdef @@ -6,6 +6,7 @@ "GUID:f9b0aa2a96663864693b204ee0977e65", "GUID:c4aed1b7b59d62c48ab35dda9c36ff44", "GUID:1953f89b4f2e6124ca6485dfe7c707a5", + "GUID:566f6fdebd119a54485118cb24dec5cb", "GUID:e4c75b2556442fb489c9292e2964558b", "GUID:439bfe3ac83f3a841bf6789865bedc18", "GUID:6055be8ebefd69e48b49212b09b47b2f", @@ -14,8 +15,10 @@ "GUID:339607d959a71f14eadd1d72a99e0287", "GUID:56f15dd651d5d3a44bbfc9ca89629921", "GUID:9d2d2b17ea939f447a2e35b833b82ffa", + "GUID:fa0a654c04e2bb340adc914c7fa94150", + "GUID:2817771fcf0304841bfd288f7982748a", "GUID:9f64e54542c8a1d4ea36f9126abf642c", - "GUID:566f6fdebd119a54485118cb24dec5cb" + "GUID:9c000fb14b57aec4bbe5b17655caccc2" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/MotionCalculation.cs b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/MotionCalculation.cs index ae63a66f5..d93fafe26 100644 --- a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/MotionCalculation.cs +++ b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/MotionCalculation.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; using UnityEngine; -using ObjectsInUse; using System; using System.Linq; using GEAR.Localization; using Maroon.Physics.Motion; +using Maroon.Parameter.ObjectsInUse; +using Maroon.Parameter; namespace Maroon.Physics.ThreeDimensionalMotion { diff --git a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/ParameterUI.cs b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/ParameterUI.cs index 5ed8b1689..8adf9a462 100644 --- a/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/ParameterUI.cs +++ b/unity/Assets/Maroon/scenes/experiments/3DMotionSimulation/Scripts/ParameterUI.cs @@ -3,466 +3,481 @@ using UnityEngine; using TMPro; using Maroon.UI; -using ObjectsInUse; using GEAR.Localization; using Maroon.Physics; using Maroon.Physics.ThreeDimensionalMotion; +using Maroon.Parameter.ObjectsInUse; using Maroon.ReusableScripts.ExperimentParameters; -namespace ObjectsInUse +// IMPORTS USED FOR WEBGL +#if UNITY_WEBGL && !UNITY_EDITOR +using Maroon.GlobalEntities; +#endif + +namespace Maroon.Parameter { - public enum ParticleObject + namespace ObjectsInUse { - Default, - Ball, - Rocket, - Satellite + public enum ParticleObject + { + Default, + Ball, + Rocket, + Satellite + } } -} - -public class ParameterUI : PausableObject -{ - private ParticleObject _particleInUse = ParticleObject.Default; - [SerializeField] private GameObject _parameters; - [SerializeField] private GameObject _initialConditions; - [SerializeField] private GameObject _dataVisualization; - - private static ParameterUI _instance; - private DialogueManager _dialogueManager; - - public TMP_Dropdown dropdown; - List menuOptions; - - [SerializeField] private UnityEngine.UI.Button _showInputPanelButton; - [SerializeField] private TMP_Text _inputPanelButtonText; - [SerializeField] private UnityEngine.UI.Button _showDataVisualizationButton; - [SerializeField] private TMP_Text _dataVisualizationButtonText; - private bool _showInputPanel = true; - private bool _showDataPanel = true; - - private string _background = "ExperimentRoom"; - - [SerializeField] InputField fxIF; - [SerializeField] InputField fyIF; - [SerializeField] InputField fzIF; - - private Vector3 _toDeltatSteps = new Vector3(0, 0, 0); - private Vector3 _xyz = new Vector3(0, 0, 0); - private Vector3 _vxvyvz = new Vector3(0, 0, 0); - - private float _mass = 1f; - private float _t0 = 0f; - private float _deltaT = 0.05f; - private float _steps = 500f; - - private float _x = 0f; - private float _y = 0f; - private float _z = 0f; - - private float _vx = 1f; - private float _vy = 0f; - private float _vz = 0f; - - [SerializeField] InputField ifMass; - - [SerializeField] InputField ifT0; - [SerializeField] InputField ifDeltat; - [SerializeField] InputField ifSteps; - - [SerializeField] InputField ifX; - [SerializeField] InputField ifY; - [SerializeField] InputField ifZ; - - [SerializeField] InputField ifVx; - [SerializeField] InputField ifVy; - [SerializeField] InputField ifVz; - - [SerializeField] private UnityEngine.UI.Toggle _showLabel; - [SerializeField] private UnityEngine.UI.Toggle _showOriginGrid; - - /// - /// Inits the dictionary for the formulas and handles the visibility of UI elements - /// Displays the welcome message - /// - protected override void Start() - { - if (_dialogueManager == null) - _dialogueManager = FindObjectOfType(); - - string message = LanguageManager.Instance.GetString("Welcome"); - DisplayMessage(message); - - LoadDefault(); - } - - /// - /// Update is called every frame - /// - protected override void HandleUpdate() - { - } - - /// - /// Dynamic Show/Hide functionality of the UI panels - /// - protected override void HandleFixedUpdate() + public class ParameterUI : PausableObject { + private ParticleObject _particleInUse = ParticleObject.Default; + [SerializeField] private GameObject _parameters; + [SerializeField] private GameObject _initialConditions; + [SerializeField] private GameObject _dataVisualization; - } - - /// - /// Show/Hide the Input Panel - /// - public void ToggleInputPanel() - { - _showInputPanel = !_showInputPanel; - - _parameters.SetActive(_showInputPanel); - _initialConditions.SetActive(_showInputPanel); - _inputPanelButtonText.text = _showInputPanel ? - LanguageManager.Instance.GetString("HideInputField") : - LanguageManager.Instance.GetString("ShowInputField"); - } - - /// - /// Show/Hide Data Visualization Panel - /// - public void ToggleDataVisualizationPanel() - { - _showDataPanel = !_showDataPanel; - - _dataVisualization.SetActive(_showDataPanel); - _dataVisualizationButtonText.text = _showDataPanel ? - LanguageManager.Instance.GetString("HideDataVisualization") : - LanguageManager.Instance.GetString("ShowDataVisualization"); - } - - /// - /// Gets the Function Fx from the UI and brings the formula to the right form - /// - /// The corrected formula Fx - public string GetFunctionFx() - { - return fxIF.text; - } - - /// - /// Gets the Function Fy from the UI and brings the formula to the right form - /// - /// The corrected formula Fy - public string GetFunctionFy() - { - return fyIF.text; - } - - /// - /// Gets the Function Fz from the UI and brings the formula to the right form - /// - /// The corrected formula Fz - public string GetFunctionFz() - { - return fzIF.text; - } - - /// - /// Gets the mass from the UI and checks the value range - /// - /// The mass - public string GetMass() - { - return ifMass.text; - } - /// - /// Sets the value for mass from the UI - /// - /// Mass - public void SetMass(string value) - { - _mass = float.Parse(value); - } - - /// - /// Sets the value for t0 from the UI - /// - /// T0 - public void SetT0(string value) - { - _t0 = System.Convert.ToSingle(value); - } - - /// - /// Sets the value for DeltaT from the UI - /// - /// DeltaT - public void SetDeltaT(string value) - { - _deltaT = float.Parse(value); - } - - /// - /// Sets the value for steps from the UI - /// - /// Steps - public void SetSteps(string value) - { - _steps = System.Convert.ToSingle(value); - } - - /// - /// Getter for t0, deltaT and steps. Adapts values if not in valid range - /// - /// T0, deltaT and steps - public Vector3 GetTimes() - { - if (_t0 < 0) - { - ShowError(LanguageManager.Instance.GetString("T0Error")); - _t0 = 0f; - ifT0.text = "0"; - } - if (_deltaT <= 0) - { - ShowError(LanguageManager.Instance.GetString("DeltaTError")); - _deltaT = 1f; - ifDeltat.text = "1"; - } - if (_steps <= 0) - { - ShowError(LanguageManager.Instance.GetString("StepSizeError")); - _steps = 1f; - ifSteps.text = "1"; - } - - _toDeltatSteps = new Vector3(_t0, _deltaT, _steps); - - return _toDeltatSteps; - } - - /// - /// Sets the value for x from the UI - /// - /// X - public void SetX(string value) - { - _x = System.Convert.ToSingle(value); - } - - /// - /// Sets the value for y from the UI - /// - /// Y - public void SetY(string value) - { - _y = System.Convert.ToSingle(value); - } - - /// - /// Sets the value for z from the UI - /// - /// Z - public void SetZ(string value) - { - _z = System.Convert.ToSingle(value); - } - - /// - /// Getter for x,y and z values - /// - /// x,y,z - public Vector3 GetXYZ() - { - _xyz = new Vector3(_x, _y, _z); - - return _xyz; - } - - /// - /// Sets the value for vx from the UI - /// - /// Vx - public void SetVX(string value) - { - _vx = System.Convert.ToSingle(value); - } - - /// - /// Sets the value for vy from the UI - /// - /// Vy - public void SetVY(string value) - { - _vy = System.Convert.ToSingle(value); - } - - /// - /// Sets the value for vz from the UI - /// - /// Vzx - public void SetVZ(string value) - { - _vz = System.Convert.ToSingle(value); - } - - /// - /// Getter for Vx,Vy and Vz values - /// - /// Vx,Vy,Vz - public Vector3 GetVxVyVz() - { - _vxvyvz = new Vector3(_vx, _vy, _vz); - - return _vxvyvz; - } - - /// - /// Loads the chosen parameters from the JSON file - /// - /// The choice from the UI (Dropdown menu) - public void DropdownListener(int choice) - { - // This has caused some sort of double invocation of this code, - // which was the source of some bugs, so for the time being it is - // commented out. - // - // I am not quite sure what is more hacky, the reset of the whole - // simulation or my solution of just commenting it out ... - //SimulationController.Instance.ResetSimulation(); - - LoadParametersFromFile(choice); - dropdown.SetValueWithoutNotify(choice); - } - - /// - /// Handles loading the parameters from the (intern) JSON file and sets the member variables - /// - /// FileIndex to load - /// If this parameter loading is the initial default parameter loading. - private void LoadParametersFromFile(int fileIndex, bool firstDefaultParametersLoad = false) - { - ThreeDimensionalMotionParameters parameters = (ThreeDimensionalMotionParameters)ParameterLoader.Instance.LoadJsonFromFileIndex(fileIndex, firstDefaultParametersLoad); - LoadParameters(parameters); - } + private static ParameterUI _instance; + public static ParameterUI Instance => _instance; + private DialogueManager _dialogueManager; + + public TMP_Dropdown dropdown; - public void LoadParameters(ExperimentParameters experimentParameters) - { - ThreeDimensionalMotionParameters parameters; - if (experimentParameters is ThreeDimensionalMotionParameters motionParameters) + [SerializeField] private UnityEngine.UI.Button _showInputPanelButton; + [SerializeField] private TMP_Text _inputPanelButtonText; + [SerializeField] private UnityEngine.UI.Button _showDataVisualizationButton; + [SerializeField] private TMP_Text _dataVisualizationButtonText; + private bool _showInputPanel = true; + private bool _showDataPanel = true; + + private string _background = "ExperimentRoom"; + + [SerializeField] InputField fxIF; + [SerializeField] InputField fyIF; + [SerializeField] InputField fzIF; + + private Vector3 _toDeltatSteps = new Vector3(0, 0, 0); + private Vector3 _xyz = new Vector3(0, 0, 0); + private Vector3 _vxvyvz = new Vector3(0, 0, 0); + + private float _mass = 1f; + private float _t0 = 0f; + private float _deltaT = 0.05f; + private float _steps = 500f; + + private float _x = 0f; + private float _y = 0f; + private float _z = 0f; + + private float _vx = 1f; + private float _vy = 0f; + private float _vz = 0f; + + [SerializeField] InputField ifMass; + + [SerializeField] InputField ifT0; + [SerializeField] InputField ifDeltat; + [SerializeField] InputField ifSteps; + + [SerializeField] InputField ifX; + [SerializeField] InputField ifY; + [SerializeField] InputField ifZ; + + [SerializeField] InputField ifVx; + [SerializeField] InputField ifVy; + [SerializeField] InputField ifVz; + + [SerializeField] private UnityEngine.UI.Toggle _showLabel; + [SerializeField] private UnityEngine.UI.Toggle _showOriginGrid; + + private int _currentConfigIndex = 0; + + private void Awake() { - parameters = motionParameters; + if (_instance == null) + { + _instance = this; + } + else if (_instance != this) + { + DestroyImmediate(this.gameObject); + return; + } + + DontDestroyOnLoad(this.gameObject); + ParameterLoader.Instance.OnFilesInitialized.AddListener(OnFilesLoadedInital); } - else + + /// + /// Inits the dictionary for the formulas and handles the visibility of UI elements + /// Displays the welcome message + /// + protected override void Start() { - Debug.LogError("ExperimentParameters are not of the expected type ThreeDimensionalMotionParameters!"); - return; + if (_dialogueManager == null) + _dialogueManager = FindObjectOfType(); + + string message = LanguageManager.Instance.GetString("Welcome"); + DisplayMessage(message); } - _background = parameters.Background; + public void OnFilesLoadedInital() + { + dropdown.ClearOptions(); + dropdown.AddOptions(ParameterLoader.Instance.GetJsonNames()); + +#if UNITY_WEBGL && !UNITY_EDITOR + if (BootstrappingManager.Instance.UrlParameters.TryGetValue(WebGlUrlParameter.Config, out string config)) + { + if (!ApplyConfig(config)) ApplyConfig("Default"); + } + else +#endif + { + ApplyConfig("Default"); + } + + ParameterLoader.Instance.OnFilesInitialized.RemoveListener(OnFilesLoadedInital); + } - _particleInUse = parameters.Particle?.ToLower() switch + public bool ApplyConfig(string configName) { - "ball" => ParticleObject.Ball, - "rocket" => ParticleObject.Rocket, - "satellite" => ParticleObject.Satellite, - _ => ParticleObject.Default - }; + _currentConfigIndex = ParameterLoader.Instance.IndexOfJson(configName); + dropdown.SetValueWithoutNotify(_currentConfigIndex); + var parameters = ParameterLoader.Instance.LoadJsonFromFileName(configName); + + return parameters != null; + } - fxIF.text = parameters.fx; - fyIF.text = parameters.fy; - fzIF.text = parameters.fz; + /// + /// Update is called every frame + /// + protected override void HandleUpdate() + { - ifMass.text = parameters.m; - ifT0.text = parameters.T0.ToString(); - ifDeltat.text = parameters.DeltaT.ToString(); - ifSteps.text = parameters.Steps.ToString(); + } - ifX.text = parameters.X.ToString(); - ifY.text = parameters.Y.ToString(); - ifZ.text = parameters.Z.ToString(); + /// + /// Dynamic Show/Hide functionality of the UI panels + /// + protected override void HandleFixedUpdate() + { - ifVx.text = parameters.Vx.ToString(); - ifVy.text = parameters.Vy.ToString(); - ifVz.text = parameters.Vz.ToString(); + } - SkyboxController.Instance.SetBackground(_background); + /// + /// Show/Hide the Input Panel + /// + public void ToggleInputPanel() + { + _showInputPanel = !_showInputPanel; - MotionCalculation.Instance.ResetObject(); - ValueGraph.Instance.ResetObject(); - } - - public void OnEndEdit(string param) - { - MotionCalculation.Instance.ResetObject(); - } - - public Dictionary GetExpressions() - { - return ((ThreeDimensionalMotionParameters)ParameterLoader.Instance.MostRecentParameters).expressions; - } - - /// - /// Displays a message on the screen. (welcome message, error messages) - /// - /// Message to show - public void DisplayMessage(string message) - { - if (_dialogueManager == null) - return; + _parameters.SetActive(_showInputPanel); + _initialConditions.SetActive(_showInputPanel); + _inputPanelButtonText.text = _showInputPanel ? + LanguageManager.Instance.GetString("HideInputField") : + LanguageManager.Instance.GetString("ShowInputField"); + } - _dialogueManager.ShowMessage(message); - } - - /// - /// Getter for the object in use (e.g Ball or Satellite) - /// - /// Object in use - public ParticleObject GetObjectInUse() - { - return _particleInUse; - } - - /// - /// Getter for the background of the experiment - /// - /// Background - public string GetBackground() - { - return _background; - } - - public static ParameterUI Instance - { - get + /// + /// Show/Hide Data Visualization Panel + /// + public void ToggleDataVisualizationPanel() { - if (_instance == null) - _instance = FindObjectOfType(); - return _instance; - } - } - - /// - /// Resets the object - /// - public void ResetObject() - { - } + _showDataPanel = !_showDataPanel; - /// - /// Function to display error messages - /// - /// Message to show - private void ShowError(string message) - { - DisplayMessage(message); - } + _dataVisualization.SetActive(_showDataPanel); + _dataVisualizationButtonText.text = _showDataPanel ? + LanguageManager.Instance.GetString("HideDataVisualization") : + LanguageManager.Instance.GetString("ShowDataVisualization"); + } - /// - /// Loads the default parameters for resetting the experiment. - /// Hard coded because of WebGL version - /// - private void LoadDefault() - { - LoadParametersFromFile(0, true); - dropdown.SetValueWithoutNotify(0); - } -} + /// + /// Gets the Function Fx from the UI and brings the formula to the right form + /// + /// The corrected formula Fx + public string GetFunctionFx() + { + return fxIF.text; + } + + /// + /// Gets the Function Fy from the UI and brings the formula to the right form + /// + /// The corrected formula Fy + public string GetFunctionFy() + { + return fyIF.text; + } + + /// + /// Gets the Function Fz from the UI and brings the formula to the right form + /// + /// The corrected formula Fz + public string GetFunctionFz() + { + return fzIF.text; + } + + /// + /// Gets the mass from the UI and checks the value range + /// + /// The mass + public string GetMass() + { + return ifMass.text; + } + /// + /// Sets the value for mass from the UI + /// + /// Mass + public void SetMass(string value) + { + _mass = float.Parse(value); + } + + /// + /// Sets the value for t0 from the UI + /// + /// T0 + public void SetT0(string value) + { + _t0 = System.Convert.ToSingle(value); + } + + /// + /// Sets the value for DeltaT from the UI + /// + /// DeltaT + public void SetDeltaT(string value) + { + _deltaT = float.Parse(value); + } + + /// + /// Sets the value for steps from the UI + /// + /// Steps + public void SetSteps(string value) + { + _steps = System.Convert.ToSingle(value); + } + + /// + /// Getter for t0, deltaT and steps. Adapts values if not in valid range + /// + /// T0, deltaT and steps + public Vector3 GetTimes() + { + if (_t0 < 0) + { + ShowError(LanguageManager.Instance.GetString("T0Error")); + _t0 = 0f; + ifT0.text = "0"; + } + if (_deltaT <= 0) + { + ShowError(LanguageManager.Instance.GetString("DeltaTError")); + _deltaT = 1f; + ifDeltat.text = "1"; + } + if (_steps <= 0) + { + ShowError(LanguageManager.Instance.GetString("StepSizeError")); + _steps = 1f; + ifSteps.text = "1"; + } + + _toDeltatSteps = new Vector3(_t0, _deltaT, _steps); + + return _toDeltatSteps; + } + + /// + /// Sets the value for x from the UI + /// + /// X + public void SetX(string value) + { + _x = System.Convert.ToSingle(value); + } + + /// + /// Sets the value for y from the UI + /// + /// Y + public void SetY(string value) + { + _y = System.Convert.ToSingle(value); + } + + /// + /// Sets the value for z from the UI + /// + /// Z + public void SetZ(string value) + { + _z = System.Convert.ToSingle(value); + } + + /// + /// Getter for x,y and z values + /// + /// x,y,z + public Vector3 GetXYZ() + { + _xyz = new Vector3(_x, _y, _z); + + return _xyz; + } + + /// + /// Sets the value for vx from the UI + /// + /// Vx + public void SetVX(string value) + { + _vx = System.Convert.ToSingle(value); + } + + /// + /// Sets the value for vy from the UI + /// + /// Vy + public void SetVY(string value) + { + _vy = System.Convert.ToSingle(value); + } + + /// + /// Sets the value for vz from the UI + /// + /// Vzx + public void SetVZ(string value) + { + _vz = System.Convert.ToSingle(value); + } + + /// + /// Getter for Vx,Vy and Vz values + /// + /// Vx,Vy,Vz + public Vector3 GetVxVyVz() + { + _vxvyvz = new Vector3(_vx, _vy, _vz); + + return _vxvyvz; + } + + /// + /// Loads the chosen parameters from the JSON file + /// + /// The choice from the UI (Dropdown menu) + public void DropdownListener(int choice) + { + string configName = ParameterLoader.Instance.GetJsonNames()[choice]; + ApplyConfig(configName); + } + + public void OnLoadedExperimentParameters(ExperimentParameters experimentParameters) + { + if (experimentParameters is ThreeDimensionalMotionParameters threeDimensionalMotionParameters) + { + LoadExperimentParameters(threeDimensionalMotionParameters); + } + else + { + Debug.LogError("OnLoadedExperimentParameters requires ThreeDimensionalMotionParameters"); + } + } + + + private void LoadExperimentParameters(ThreeDimensionalMotionParameters parameters) + { + _background = parameters.Background; + + _particleInUse = parameters.Particle?.ToLower() switch + { + "ball" => ParticleObject.Ball, + "rocket" => ParticleObject.Rocket, + "satellite" => ParticleObject.Satellite, + _ => ParticleObject.Default + }; + + fxIF.text = parameters.fx; + fyIF.text = parameters.fy; + fzIF.text = parameters.fz; + + ifMass.text = parameters.m; + ifT0.text = parameters.T0.ToString(); + ifDeltat.text = parameters.DeltaT.ToString(); + ifSteps.text = parameters.Steps.ToString(); + + ifX.text = parameters.X.ToString(); + ifY.text = parameters.Y.ToString(); + ifZ.text = parameters.Z.ToString(); + + ifVx.text = parameters.Vx.ToString(); + ifVy.text = parameters.Vy.ToString(); + ifVz.text = parameters.Vz.ToString(); + + SkyboxController.Instance.SetBackground(_background); + + MotionCalculation.Instance.ResetObject(); + ValueGraph.Instance.ResetObject(); + } + + public void OnEndEdit(string param) + { + MotionCalculation.Instance.ResetObject(); + } + + public Dictionary GetExpressions() + { + return ((ThreeDimensionalMotionParameters) ParameterLoader.Instance.MostRecentParameters).expressions; + } + + /// + /// Displays a message on the screen. (welcome message, error messages) + /// + /// Message to show + public void DisplayMessage(string message) + { + if (_dialogueManager == null) + return; + + _dialogueManager.ShowMessage(message); + } + + /// + /// Getter for the object in use (e.g Ball or Satellite) + /// + /// Object in use + public ParticleObject GetObjectInUse() + { + return _particleInUse; + } + + /// + /// Getter for the background of the experiment + /// + /// Background + public string GetBackground() + { + return _background; + } + + /// + /// Resets the object + /// + public void ResetObject() + { + } + + /// + /// Function to display error messages + /// + /// Message to show + private void ShowError(string message) + { + DisplayMessage(message); + } + } +} diff --git a/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/CoulombsLaw.pc.unity b/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/CoulombsLaw.pc.unity index ca4e92a16..0051ce1c2 100644 --- a/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/CoulombsLaw.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/CoulombsLaw.pc.unity @@ -23228,21 +23228,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 1482331554849848127, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1482331554849848127, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1482331554849848127, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1482331554849848127, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: m_LocalPosition.x @@ -23368,11 +23353,6 @@ PrefabInstance: propertyPath: minimumBoundary value: objectReference: {fileID: 1659628924} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: restrictZMovement - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.size @@ -23388,11 +23368,6 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -23413,41 +23388,21 @@ PrefabInstance: propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 941568999} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: Select objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -23458,11 +23413,6 @@ PrefabInstance: propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 4584993937279052820, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: m_Name @@ -29037,19 +28987,7 @@ MonoBehaviour: m_CallState: 2 onViewChanged: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &941568980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29128,19 +29066,7 @@ MonoBehaviour: m_Calls: [] OnEndRotation: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &941568984 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29362,11 +29288,33 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 OnRotate: + m_PersistentCalls: + m_Calls: [] + OnEndRotation: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 941568995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 200 + rotationObject: {fileID: 941568977} + enableShortcuts: 0 + onlyRotateOnSimulationPause: 0 + OnStartRotation: m_PersistentCalls: m_Calls: - m_Target: {fileID: 941568999} m_TargetAssemblyTypeName: - m_MethodName: RotationChanged + m_MethodName: Select m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29376,12 +29324,34 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + OnRotate: + m_PersistentCalls: + m_Calls: [] OnEndRotation: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 941568996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 200 + rotationObject: {fileID: 941568977} + enableShortcuts: 0 + onlyRotateOnSimulationPause: 0 + OnStartRotation: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 941568999} m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation + m_MethodName: Select m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29391,13 +29361,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &941569001 + OnRotate: + m_PersistentCalls: + m_Calls: [] + OnEndRotation: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569003 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568995} + m_GameObject: {fileID: 941568997} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} @@ -29423,11 +29399,45 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 OnRotate: + m_PersistentCalls: + m_Calls: [] + OnEndRotation: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569004 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6896857270606356320, guid: bdfec920f90e5d7499f7d0276bf96c41, + type: 3} + m_PrefabInstance: {fileID: 941568970} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 941568973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66bf5cd5ecdf5af429495ffe9376c96a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &941569006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 941568973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9325e85c21518c46baf840be9875edd, type: 3} + m_Name: + m_EditorClassIdentifier: + highlightObjects: + - {fileID: 941568973} + type: 2 + nameKey: VoltmeterPositiveKey + onSelect: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 941568999} + - m_Target: {fileID: 1540520686} m_TargetAssemblyTypeName: - m_MethodName: RotationChanged + m_MethodName: Select m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29437,12 +29447,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - OnEndRotation: + onPositionChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 249590959} m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation + m_MethodName: UpdateDisplay m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29452,28 +29462,40 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &941569002 + onRotationChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569007 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568996} + m_GameObject: {fileID: 941568973} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} + m_Script: {fileID: 11500000, guid: 233dba56b7c33c54f9a9b1982ce376b2, type: 3} m_Name: m_EditorClassIdentifier: - rotationSpeed: 200 - rotationObject: {fileID: 941568977} - enableShortcuts: 0 - onlyRotateOnSimulationPause: 0 - OnStartRotation: + movingObject: {fileID: 0} + minBoundary: {fileID: 0} + maxBoundary: {fileID: 0} + allowedXMovement: 1 + allowedYMovement: 1 + allowedZMovement: 1 + useLocalCoordinates: 0 + changeMaterialIfOutside: [] + outsideTransparency: 0.7 + ArrowMovement: {fileID: 2046931705} + onStartedMoving: + m_PersistentCalls: + m_Calls: [] + onMove: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 941568999} + - m_Target: {fileID: 941569006} m_TargetAssemblyTypeName: - m_MethodName: Select + m_MethodName: PositionChanged m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29483,12 +29505,24 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - OnRotate: + - m_Target: {fileID: 249590959} + m_TargetAssemblyTypeName: + m_MethodName: UpdateDisplay + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onEndMovingOutsideBoundaries: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 941568999} + - m_Target: {fileID: 941569004} m_TargetAssemblyTypeName: - m_MethodName: RotationChanged + m_MethodName: HideObject m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29498,12 +29532,37 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - OnEndRotation: + onEndMovingInsideBoundaries: + m_PersistentCalls: + m_Calls: [] + onEnabled: + m_PersistentCalls: + m_Calls: [] + onDisabled: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 941568990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 200 + rotationObject: {fileID: 941568977} + enableShortcuts: 0 + onlyRotateOnSimulationPause: 0 + OnStartRotation: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 941568999} m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation + m_MethodName: Select m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -29513,13 +29572,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &941569003 + OnRotate: + m_PersistentCalls: + m_Calls: [] + OnEndRotation: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &941569009 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568997} + m_GameObject: {fileID: 941568991} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} @@ -29545,354 +29610,11 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 OnRotate: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: RotationChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - OnEndRotation: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &941569004 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6896857270606356320, guid: bdfec920f90e5d7499f7d0276bf96c41, - type: 3} - m_PrefabInstance: {fileID: 941568970} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568973} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 66bf5cd5ecdf5af429495ffe9376c96a, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &941569006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568973} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b9325e85c21518c46baf840be9875edd, type: 3} - m_Name: - m_EditorClassIdentifier: - highlightObjects: - - {fileID: 941568973} - type: 2 - nameKey: VoltmeterPositiveKey - onSelect: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1540520686} - m_TargetAssemblyTypeName: - m_MethodName: Select - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onPositionChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 249590959} - m_TargetAssemblyTypeName: - m_MethodName: UpdateDisplay - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onRotationChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &941569007 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568973} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 233dba56b7c33c54f9a9b1982ce376b2, type: 3} - m_Name: - m_EditorClassIdentifier: - movingObject: {fileID: 0} - minBoundary: {fileID: 0} - maxBoundary: {fileID: 0} - allowedXMovement: 1 - allowedYMovement: 1 - allowedZMovement: 1 - useLocalCoordinates: 0 - changeMaterialIfOutside: [] - outsideTransparency: 0.7 - ArrowMovement: {fileID: 2046931705} - onStartedMoving: m_PersistentCalls: m_Calls: [] - onMove: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941569006} - m_TargetAssemblyTypeName: - m_MethodName: PositionChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 249590959} - m_TargetAssemblyTypeName: - m_MethodName: UpdateDisplay - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onEndMovingOutsideBoundaries: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941569004} - m_TargetAssemblyTypeName: - m_MethodName: HideObject - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onEndMovingInsideBoundaries: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onEnabled: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - onDisabled: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &941569008 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568990} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 200 - rotationObject: {fileID: 941568977} - enableShortcuts: 0 - onlyRotateOnSimulationPause: 0 - OnStartRotation: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: Select - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - OnRotate: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: RotationChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - OnEndRotation: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &941569009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941568991} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a587092aeeb92834ab5bf34b2f2ebd96, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 200 - rotationObject: {fileID: 941568977} - enableShortcuts: 0 - onlyRotateOnSimulationPause: 0 - OnStartRotation: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: Select - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - OnRotate: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: RotationChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 OnEndRotation: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &941569010 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29926,34 +29648,10 @@ MonoBehaviour: m_CallState: 2 OnRotate: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: RotationChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] OnEndRotation: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &941569011 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29987,34 +29685,10 @@ MonoBehaviour: m_CallState: 2 OnRotate: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 941568999} - m_TargetAssemblyTypeName: - m_MethodName: RotationChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] OnEndRotation: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdateRotation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &941569013 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6896857271066270642, guid: bdfec920f90e5d7499f7d0276bf96c41, @@ -30073,18 +29747,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 onRotationChanged: m_PersistentCalls: m_Calls: [] @@ -30155,63 +29817,15 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 onEndMovingInsideBoundaries: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] onEnabled: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] onDisabled: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &941569016 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6896857271073400315, guid: bdfec920f90e5d7499f7d0276bf96c41, @@ -32274,11 +31888,6 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -32314,41 +31923,21 @@ PrefabInstance: propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 941569014} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: Select objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -32364,11 +31953,6 @@ PrefabInstance: propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 4584993937279052820, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: m_Name @@ -53749,7 +53333,7 @@ PrefabInstance: - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -53761,16 +53345,11 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -53789,33 +53368,13 @@ PrefabInstance: - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName value: UpdateDisplay objectReference: {fileID: 0} - - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition - objectReference: {fileID: 0} - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -53826,11 +53385,6 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 531307401340712683, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 752236177884761726, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: m_Enabled @@ -53874,17 +53428,17 @@ PrefabInstance: - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEnabled.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onDisabled.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -53900,7 +53454,7 @@ PrefabInstance: type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -53959,7 +53513,7 @@ PrefabInstance: - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54009,12 +53563,12 @@ PrefabInstance: - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.size - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54045,7 +53599,7 @@ PrefabInstance: type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -54060,7 +53614,7 @@ PrefabInstance: type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.data[2].m_Target @@ -54079,7 +53633,7 @@ PrefabInstance: - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54109,7 +53663,7 @@ PrefabInstance: - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 3013094973333130685, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54284,17 +53838,17 @@ PrefabInstance: - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEnabled.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onDisabled.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54310,7 +53864,7 @@ PrefabInstance: type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -54369,7 +53923,7 @@ PrefabInstance: - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onMove.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54419,12 +53973,12 @@ PrefabInstance: - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.size - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54455,7 +54009,7 @@ PrefabInstance: type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -54470,7 +54024,7 @@ PrefabInstance: type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.data[2].m_Target @@ -54489,7 +54043,7 @@ PrefabInstance: - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingInsideBoundaries.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54519,7 +54073,7 @@ PrefabInstance: - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: onEndMovingOutsideBoundaries.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 6231548434669007651, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54599,7 +54153,7 @@ PrefabInstance: - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} @@ -54611,16 +54165,11 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1401798983} - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Target @@ -54639,33 +54188,13 @@ PrefabInstance: - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition + value: UpdateDisplay objectReference: {fileID: 0} - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName value: UpdateDisplay objectReference: {fileID: 0} - - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition - objectReference: {fileID: 0} - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -54676,11 +54205,6 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 6600565567420275962, guid: 25af714453cfd4147834948a37c2a53e, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 6736695404065723196, guid: 25af714453cfd4147834948a37c2a53e, type: 3} propertyPath: m_LocalScale.y @@ -54955,19 +54479,7 @@ MonoBehaviour: m_CallState: 2 onPositionChanged: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] onRotationChanged: m_PersistentCalls: m_Calls: [] @@ -55004,19 +54516,7 @@ MonoBehaviour: m_CallState: 2 onPositionChanged: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] onRotationChanged: m_PersistentCalls: m_Calls: [] @@ -56414,11 +55914,6 @@ PrefabInstance: propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[1].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -56454,41 +55949,21 @@ PrefabInstance: propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 941569006} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: Select objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: UpdatePosition - objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMove.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -56504,11 +55979,6 @@ PrefabInstance: propertyPath: OnMovementStart.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, - type: 3} - propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 4584993937279052820, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: m_Name diff --git a/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/prefabs/Particle.prefab b/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/prefabs/Particle.prefab index 485064063..079f70384 100644 --- a/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/prefabs/Particle.prefab +++ b/unity/Assets/Maroon/scenes/experiments/CoulombsLaw/prefabs/Particle.prefab @@ -26,6 +26,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43556716716376549} + 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} @@ -34,7 +35,6 @@ Transform: - {fileID: 5991014159398745934} - {fileID: 3046867823948206692} m_Father: {fileID: 222567040141688388} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4589385753357242748 MonoBehaviour: @@ -107,13 +107,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222567040141845088} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222567040141688388} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &222567040142982758 MeshFilter: @@ -193,6 +193,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222567040141845092} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -205,7 +206,6 @@ Transform: - {fileID: 725601085861586812} - {fileID: 263544389824666547} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &222567040141845091 MonoBehaviour: @@ -287,10 +287,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222567040141845092} - 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: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -304,9 +315,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222567040141845092} 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_Radius: 0.70224214 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &1182506105227209955 @@ -390,18 +409,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 onEndMovingInsideBoundaries: m_PersistentCalls: m_Calls: @@ -417,48 +424,12 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 onEnabled: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] onDisabled: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: UpdatePosition - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &1376864048248906643 MonoBehaviour: m_ObjectHideFlags: 0 @@ -534,13 +505,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 222567040141845094} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222567040141688388} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: -90, z: 0} --- !u!33 &222567040142982756 MeshFilter: @@ -617,13 +588,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2433028222904055166} + 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: 263544389824666547} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3150413966677578302 GameObject: @@ -650,13 +621,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3150413966677578302} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.45, y: 1.45, z: 1.45} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 222567040141688388} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &849048382167916708 MeshFilter: @@ -730,6 +701,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6981387575739027365} + serializedVersion: 2 m_LocalRotation: {x: 0.00000016292066, y: -0.00000016292071, z: -0.00000016292071, w: 1} m_LocalPosition: {x: -69.304565, y: 14.722417, z: 3.0781066} @@ -737,7 +709,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 263544389824666547} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7401672955092122463 GameObject: @@ -762,19 +733,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7401672955092122463} + 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: 222567040141688388} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2198766957091068995 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 222567040141688388} m_Modifications: - target: {fileID: 1482331554849848127, guid: 565f734b46691944bb8c7cb7888df542, @@ -885,7 +857,7 @@ PrefabInstance: - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} propertyPath: OnMovementFinish.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4513896859846796369, guid: 565f734b46691944bb8c7cb7888df542, type: 3} @@ -1038,6 +1010,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 565f734b46691944bb8c7cb7888df542, type: 3} --- !u!4 &725601085861586812 stripped Transform: diff --git a/unity/Assets/Maroon/scenes/experiments/FaradaysLaw/FaradaysLaw.vr.unity b/unity/Assets/Maroon/scenes/experiments/FaradaysLaw/FaradaysLaw.vr.unity index 19107cea7..68bcdd1e4 100644 --- a/unity/Assets/Maroon/scenes/experiments/FaradaysLaw/FaradaysLaw.vr.unity +++ b/unity/Assets/Maroon/scenes/experiments/FaradaysLaw/FaradaysLaw.vr.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.5486161, g: 0.59847665, b: 0.5596256, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: @@ -105,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 1 agentHeight: 30 @@ -118,7 +117,7 @@ NavMeshSettings: cellSize: 0.33333334 manualTileSize: 0 tileSize: 256 - accuratePlacement: 1 + buildHeightMesh: 1 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -153,10 +152,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0.99691737, z: -0.078459114, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.026} m_LocalScale: {x: 0.0011699996, y: 0.0010899999, z: 1.1105498} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 541238941} m_Father: {fileID: 1374272769} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 9, y: 180, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -220,7 +219,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -254,9 +255,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1171577109} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -364,12 +365,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.6261204, z: 0.5113164, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 96839737} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 96839737} + m_maskType: 0 --- !u!222 &96839736 CanvasRenderer: m_ObjectHideFlags: 0 @@ -389,6 +390,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -426,7 +428,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 3 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -439,7 +441,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 2 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -465,8 +467,8 @@ LightingSettings: m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 - m_PVRMinBounces: 1 - m_PVREnvironmentMIS: 1 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -480,6 +482,9 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &335797502 GameObject: m_ObjectHideFlags: 0 @@ -510,9 +515,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731941343} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -620,12 +625,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.6261204, z: 0.5113164, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 335797507} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 335797507} + m_maskType: 0 --- !u!222 &335797506 CanvasRenderer: m_ObjectHideFlags: 0 @@ -645,6 +650,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -705,9 +711,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731941343} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -814,12 +820,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 374367763} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 374367763} + m_maskType: 0 --- !u!222 &374367762 CanvasRenderer: m_ObjectHideFlags: 0 @@ -839,6 +845,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -895,12 +902,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 439837438} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731941343} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &439837440 BoxCollider: @@ -910,9 +918,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 439837438} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!23 &439837441 @@ -926,6 +942,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -992,13 +1009,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 533910179} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1042349278} m_Father: {fileID: 1731941343} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &533910181 MonoBehaviour: @@ -1190,6 +1208,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 89506534} m_Modifications: - target: {fileID: 1762013046297486303, guid: d4ab877282073fe48837a142a361ea5a, @@ -2428,6 +2447,9 @@ PrefabInstance: value: 400 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ab877282073fe48837a142a361ea5a, type: 3} --- !u!224 &541238941 stripped RectTransform: @@ -2440,6 +2462,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 183061162506234656, guid: 31a6116c7cb92304fae6c40f09b2d852, @@ -2692,6 +2715,16 @@ PrefabInstance: propertyPath: controls.Array.data[4] value: objectReference: {fileID: 550665751} + - target: {fileID: 5422565182975029356, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + propertyPath: OnButtonOn.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5422565182975029356, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + propertyPath: OnButtonOff.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5422565182975029356, guid: 31a6116c7cb92304fae6c40f09b2d852, type: 3} propertyPath: OnButtonOn.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -3048,6 +3081,157 @@ PrefabInstance: value: objectReference: {fileID: 4900000, guid: e44999d5f9a9d0f4fb45a1298f36cd47, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8143316763422872546, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1731941343} + - targetCorrespondingSourceObject: {fileID: 8143316763422872546, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1676090985} + - targetCorrespondingSourceObject: {fileID: 8143316763422872546, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1171577109} + - targetCorrespondingSourceObject: {fileID: 1272221725471183081, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 989797770} + - targetCorrespondingSourceObject: {fileID: 1272221725471183081, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1374272769} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1076595806931077886, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 722781086426495048, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316765097717295, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316764793809335, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316763594875086, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316764341483698, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8635383170616491397, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1897246463081264234, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316765145029498, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316763695876123, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316765022149585, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316763507044631, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4336332336713998427, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316764177123775, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316764852372827, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8143316764208763635, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 3705110626988476076, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 929570720582298443, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8443815400039008405, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1520351884570176224, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 9194904839507093298, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 2594314801686099606, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1659100998571035855, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7112737955455369844, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8106480541111270457, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7432935322349768160, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 5416851416786179613, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 2380436478150328338, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1062811538289767314, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8548315427263143387, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7807073100746783229, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 13988901045511904, guid: 31a6116c7cb92304fae6c40f09b2d852, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 31a6116c7cb92304fae6c40f09b2d852, type: 3} --- !u!4 &550665746 stripped Transform: @@ -3125,13 +3309,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 572902579} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1721872109} m_Father: {fileID: 1171577109} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &572902581 MonoBehaviour: @@ -3344,12 +3529,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 703953745} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1171577109} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &703953747 BoxCollider: @@ -3359,9 +3545,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 703953745} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!23 &703953748 @@ -3375,6 +3569,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3436,12 +3631,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 714067346} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.054, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1171577109} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &800022891 GameObject: @@ -3473,9 +3669,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676090985} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3582,12 +3778,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 800022896} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 800022896} + m_maskType: 0 --- !u!222 &800022895 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3607,6 +3803,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3660,13 +3857,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 828189211} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2495, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676090985} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &989797770 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4136362258603276, guid: b523193efcd4e074ab3a36220d8e3703, + type: 3} + m_PrefabInstance: {fileID: 1252003180} + m_PrefabAsset: {fileID: 0} --- !u!1 &1040328557 GameObject: m_ObjectHideFlags: 0 @@ -3710,12 +3914,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040328557} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1042349277 GameObject: @@ -3743,12 +3948,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042349277} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 100, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 533910180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!65 &1042349279 BoxCollider: @@ -3758,9 +3964,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042349277} 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.0007500002, y: 0.00075000036, z: 0.0004000001} m_Center: {x: 0, y: -0.0000000027939677, z: -0.0001749991} --- !u!23 &1042349280 @@ -3774,6 +3988,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3838,12 +4053,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129284326} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 100, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1540314956} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!65 &1129284328 BoxCollider: @@ -3853,9 +4069,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129284326} 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.0007500002, y: 0.00075000036, z: 0.0004000001} m_Center: {x: 0, y: -0.0000000027939677, z: -0.0001749991} --- !u!23 &1129284329 @@ -3869,6 +4093,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3930,9 +4155,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1171577108} + 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: 703953746} - {fileID: 714067347} @@ -3941,7 +4168,6 @@ Transform: - {fileID: 1298670506} - {fileID: 96839733} m_Father: {fileID: 550665748} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1184240756 GameObject: @@ -3973,9 +4199,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676090985} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4083,12 +4309,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.6261204, z: 0.5113164, w: 0.34172443} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1184240761} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1184240761} + m_maskType: 0 --- !u!222 &1184240760 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4108,6 +4334,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4143,6 +4370,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 550665746} m_Modifications: - target: {fileID: 1691984543764974, guid: b523193efcd4e074ab3a36220d8e3703, type: 3} @@ -4235,6 +4463,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1569596360, guid: b523193efcd4e074ab3a36220d8e3703, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1145523142630352, guid: b523193efcd4e074ab3a36220d8e3703, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1252003185} + - targetCorrespondingSourceObject: {fileID: 1145523142630352, guid: b523193efcd4e074ab3a36220d8e3703, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1252003186} + - targetCorrespondingSourceObject: {fileID: 1145523142630352, guid: b523193efcd4e074ab3a36220d8e3703, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1252003193} m_SourcePrefab: {fileID: 100100000, guid: b523193efcd4e074ab3a36220d8e3703, type: 3} --- !u!114 &1252003181 stripped MonoBehaviour: @@ -4471,9 +4714,9 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1171577109} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4580,12 +4823,12 @@ MonoBehaviour: m_margin: {x: 0.3900626, y: 0.5926396, z: 0.5113164, w: 0.37135926} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1298670510} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1298670510} + m_maskType: 0 --- !u!222 &1298670509 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4605,6 +4848,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4640,6 +4884,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 550665746} m_Modifications: - target: {fileID: 2362484557408566429, guid: df0929cddac4dad4d88ecf95d68e624c, @@ -4714,6 +4959,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1428732944267474543, guid: df0929cddac4dad4d88ecf95d68e624c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4422255420666329435, guid: df0929cddac4dad4d88ecf95d68e624c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 89506534} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2362221925656719435, guid: df0929cddac4dad4d88ecf95d68e624c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1374272771} + - targetCorrespondingSourceObject: {fileID: 2362221925656719435, guid: df0929cddac4dad4d88ecf95d68e624c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1374272772} m_SourcePrefab: {fileID: 100100000, guid: df0929cddac4dad4d88ecf95d68e624c, type: 3} --- !u!4 &1374272769 stripped Transform: @@ -4735,9 +4995,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1374272770} 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.011657585, y: 0.00007809121, z: 0.00053774094} m_Center: {x: -4.656613e-10, y: -0.00001151007, z: 0.000000007451181} --- !u!65 &1374272772 @@ -4748,9 +5016,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1374272770} 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.011657585, y: 0.00036529204, z: 0.0000910005} m_Center: {x: -6.0988714e-10, y: 0.00013208996, z: -0.00031018382} --- !u!114 &1428322527 stripped @@ -4793,13 +5069,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1540314955} + serializedVersion: 2 m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1129284327} m_Father: {fileID: 1676090985} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: -90, z: 90} --- !u!114 &1540314957 MonoBehaviour: @@ -5009,12 +5286,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1573097057} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.054, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731941343} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1629734597 GameObject: @@ -5042,12 +5320,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629734597} + serializedVersion: 2 m_LocalRotation: {x: -0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0, y: 0.5295289, z: 0.12000014} m_LocalScale: {x: 100, y: 100.00002, z: 99.99998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676090985} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1629734599 BoxCollider: @@ -5057,9 +5336,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629734597} 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: 0 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.004750001, y: 0.0012000005, z: 0.0005} m_Center: {x: 0.0005250001, y: -0.00060000306, z: 0.00025} --- !u!23 &1629734600 @@ -5073,6 +5360,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5134,12 +5422,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637356968} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.054, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676090985} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1672630349 GameObject: @@ -5164,12 +5453,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672630349} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2495, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731941343} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1676090984 GameObject: @@ -5194,9 +5484,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1676090984} + 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: 1629734598} - {fileID: 1637356969} @@ -5205,7 +5497,6 @@ Transform: - {fileID: 800022892} - {fileID: 1184240757} m_Father: {fileID: 550665748} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1721872108 GameObject: @@ -5233,12 +5524,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721872108} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 50, y: 100, z: 100} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 572902580} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!65 &1721872110 BoxCollider: @@ -5248,9 +5540,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721872108} 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.0007500002, y: 0.00075000036, z: 0.0004000001} m_Center: {x: 0, y: -0.0000000027939677, z: -0.0001749991} --- !u!23 &1721872111 @@ -5264,6 +5564,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5325,9 +5626,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731941342} + 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: 439837439} - {fileID: 1573097058} @@ -5336,7 +5639,6 @@ Transform: - {fileID: 374367759} - {fileID: 335797503} m_Father: {fileID: 550665748} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1860838989 GameObject: @@ -5361,10 +5663,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1860838989} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2495, y: 0.6045288, z: 0.18} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1171577109} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 550665745} + - {fileID: 1040328559} diff --git a/unity/Assets/Maroon/scenes/experiments/MinimumSpanningTree/MinimumSpanningTree.pc.unity b/unity/Assets/Maroon/scenes/experiments/MinimumSpanningTree/MinimumSpanningTree.pc.unity index ca0b4e5d7..3ea0e986d 100644 --- a/unity/Assets/Maroon/scenes/experiments/MinimumSpanningTree/MinimumSpanningTree.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/MinimumSpanningTree/MinimumSpanningTree.pc.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1698385633} - m_IndirectSpecularColor: {r: 0.4265163, g: 0.34394744, b: 0.23117243, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -105,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -129,6 +128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 851087254} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -242,12 +242,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &20021104 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 20021103} + m_PrefabAsset: {fileID: 0} --- !u!1001 &176574034 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 1554921343261613334, guid: 8851cb2edfc238a4bb39e24e9fd8b55b, @@ -601,12 +611,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8851cb2edfc238a4bb39e24e9fd8b55b, type: 3} +--- !u!224 &176574035 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8398156767901699499, guid: 8851cb2edfc238a4bb39e24e9fd8b55b, + type: 3} + m_PrefabInstance: {fileID: 176574034} + m_PrefabAsset: {fileID: 0} --- !u!1001 &267339714 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -735,7 +755,16 @@ PrefabInstance: value: Button objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &267339715 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 267339714} + m_PrefabAsset: {fileID: 0} --- !u!224 &322994513 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -747,6 +776,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 1841423615335754710, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, @@ -860,7 +890,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, type: 3} +--- !u!224 &329559419 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1841423615335754711, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, + type: 3} + m_PrefabInstance: {fileID: 329559418} + m_PrefabAsset: {fileID: 0} --- !u!1 &335729800 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, @@ -886,6 +925,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 851087254} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -1094,12 +1134,26 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 986491164} m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &449056150 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 449056149} + m_PrefabAsset: {fileID: 0} --- !u!1001 &450833833 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 9085299239040558688, guid: 47808144d6757244da5be7e2e38f1f94, @@ -1283,12 +1337,22 @@ PrefabInstance: value: ToggleGroup (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} +--- !u!224 &450833834 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + m_PrefabInstance: {fileID: 450833833} + m_PrefabAsset: {fileID: 0} --- !u!1001 &453313942 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208208072628} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -1517,6 +1581,17 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 561315680} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 453313945} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &453313943 stripped RectTransform: @@ -1544,11 +1619,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: ConnectingIslands suffix: +--- !u!224 &453313946 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 453313942} + m_PrefabAsset: {fileID: 0} --- !u!1001 &463527007 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1876915975} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -1667,7 +1749,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &463527008 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 463527007} + m_PrefabAsset: {fileID: 0} --- !u!4 &491200780 stripped Transform: m_CorrespondingSourceObject: {fileID: 2131119207974420912, guid: 4698ba446015d9f4ea6cde9f4c774547, @@ -1679,6 +1770,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2126937661} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -1882,12 +1974,26 @@ PrefabInstance: value: To Text (TMP) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1168183084} m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &502032406 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 502032405} + m_PrefabAsset: {fileID: 0} --- !u!1001 &507227359 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -2006,12 +2112,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &507227360 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 507227359} + m_PrefabAsset: {fileID: 0} --- !u!1001 &554257108 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 676593826} m_Modifications: - target: {fileID: 2367108594856730739, guid: 1292b8070e2cfd84b9e1cbede2c41072, @@ -2140,7 +2256,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1292b8070e2cfd84b9e1cbede2c41072, type: 3} +--- !u!224 &554257109 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2378944178364704254, guid: 1292b8070e2cfd84b9e1cbede2c41072, + type: 3} + m_PrefabInstance: {fileID: 554257108} + m_PrefabAsset: {fileID: 0} --- !u!224 &561315680 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, @@ -2152,6 +2277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2005477752} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -2270,12 +2396,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &659024523 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 659024522} + m_PrefabAsset: {fileID: 0} --- !u!1001 &661669561 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 6137969441452191929, guid: 3606421e3647c8f45a70859e9cde2a31, @@ -2509,6 +2645,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6137969441452191926, guid: 3606421e3647c8f45a70859e9cde2a31, + type: 3} + insertIndex: -1 + addedObject: {fileID: 661669563} m_SourcePrefab: {fileID: 100100000, guid: 3606421e3647c8f45a70859e9cde2a31, type: 3} --- !u!1 &661669562 stripped GameObject: @@ -2530,6 +2673,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: Show Hide Manual Try suffix: +--- !u!224 &661669564 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6137969441731437967, guid: 3606421e3647c8f45a70859e9cde2a31, + type: 3} + m_PrefabInstance: {fileID: 661669561} + m_PrefabAsset: {fileID: 0} --- !u!224 &676593826 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -2541,6 +2690,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208208072628} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -2754,12 +2904,78 @@ PrefabInstance: value: 65535 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1508800319} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1577291703} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 329559419} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2135670050} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 726552001} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2014627531} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 873685635} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1177786138} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1029509173} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 877993234} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 267339715} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 176574035} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2074309350} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 450833834} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} +--- !u!224 &677421513 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 677421512} + m_PrefabAsset: {fileID: 0} --- !u!1001 &694713777 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1082444324} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -2930,6 +3146,13 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 694713779} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &694713778 stripped GameObject: @@ -2951,11 +3174,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: suffix: +--- !u!224 &694713780 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 694713777} + m_PrefabAsset: {fileID: 0} --- !u!1001 &696765706 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, @@ -3069,6 +3299,13 @@ PrefabInstance: value: Table objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 676593826} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} --- !u!1 &697213144 GameObject: @@ -3113,18 +3350,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 697213144} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &726552000 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 3159391440998900524, guid: 2aa42e7bac7070f4087dfc8eab453a64, @@ -3243,12 +3482,22 @@ PrefabInstance: value: ToggleButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2aa42e7bac7070f4087dfc8eab453a64, type: 3} +--- !u!224 &726552001 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6611549834742293359, guid: 2aa42e7bac7070f4087dfc8eab453a64, + type: 3} + m_PrefabInstance: {fileID: 726552000} + m_PrefabAsset: {fileID: 0} --- !u!1001 &851087253 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 6348855676192520657, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -3412,6 +3661,21 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1530386643} + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 449056150} + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 20021104} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2086b75ff63f701428e7e482bde8abd0, type: 3} --- !u!224 &851087254 stripped RectTransform: @@ -3424,6 +3688,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 9085299239040558688, guid: 47808144d6757244da5be7e2e38f1f94, @@ -3612,7 +3877,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} +--- !u!224 &873685635 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + m_PrefabInstance: {fileID: 873685634} + m_PrefabAsset: {fileID: 0} --- !u!224 &877993234 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, @@ -3656,6 +3930,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -3798,48 +4073,23 @@ PrefabInstance: propertyPath: m_Name value: PrimTest objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: PrimTest - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: StartMSTExperiment, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &1029509173 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 1029509172} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1040443227 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2126937661} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -4043,12 +4293,26 @@ PrefabInstance: value: From Text (TMP) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 335729801} m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &1040443228 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 1040443227} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1045176200 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -4167,7 +4431,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &1045176201 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 1045176200} + m_PrefabAsset: {fileID: 0} --- !u!114 &1053055411 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9085299239375179215, guid: 47808144d6757244da5be7e2e38f1f94, @@ -4185,6 +4458,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208208072628} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -4438,6 +4712,21 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 694713780} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1658761090} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1082444326} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &1082444324 stripped RectTransform: @@ -4465,6 +4754,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: suffix: +--- !u!224 &1082444327 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 1082444323} + m_PrefabAsset: {fileID: 0} --- !u!224 &1085415541 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, @@ -4496,6 +4791,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 6137969441452191929, guid: 3606421e3647c8f45a70859e9cde2a31, @@ -4709,12 +5005,22 @@ PrefabInstance: value: -20 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3606421e3647c8f45a70859e9cde2a31, type: 3} +--- !u!224 &1177786138 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6137969441731437967, guid: 3606421e3647c8f45a70859e9cde2a31, + type: 3} + m_PrefabInstance: {fileID: 1177786137} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1203415278 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 322994513} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -4863,6 +5169,13 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1203415280} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &1203415279 stripped GameObject: @@ -4884,6 +5197,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: to suffix: +--- !u!224 &1203415281 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1203415278} + m_PrefabAsset: {fileID: 0} --- !u!114 &1218098522 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4219775298309787030, guid: 123bb38770b526a43bbf708d78ccd17a, @@ -4901,6 +5220,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 322994513} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -5049,6 +5369,13 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1368086799} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &1368086798 stripped GameObject: @@ -5070,11 +5397,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: from suffix: +--- !u!224 &1368086800 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1368086797} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1425070524 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1876915975} m_Modifications: - target: {fileID: 1347347726171386947, guid: 09c73ed225a086845b90fbeaba0dc5ea, @@ -5498,12 +5832,22 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} +--- !u!224 &1425070525 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1347347726625204806, guid: 09c73ed225a086845b90fbeaba0dc5ea, + type: 3} + m_PrefabInstance: {fileID: 1425070524} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1447179607 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 453313943} m_Modifications: - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, @@ -5529,7 +5873,7 @@ PrefabInstance: - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} @@ -5539,12 +5883,12 @@ PrefabInstance: - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} propertyPath: m_SizeDelta.x - value: 541.9949 + value: 593.30493 objectReference: {fileID: 0} - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} @@ -5589,12 +5933,12 @@ PrefabInstance: - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} propertyPath: m_AnchoredPosition.x - value: 280.99744 + value: 306.65247 objectReference: {fileID: 0} - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -103.965 objectReference: {fileID: 0} - target: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} @@ -5617,12 +5961,44 @@ PrefabInstance: value: Table objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 322994513} + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2126937661} + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1045176201} + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 661669564} + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 507227360} + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 851087254} + - targetCorrespondingSourceObject: {fileID: 990489160396379603, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1635399304} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e6d2fdd5c7ed6a640897a87c8c0c46b0, type: 3} --- !u!1001 &1508800318 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -5755,48 +6131,23 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: startTestBridge - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: StartMSTExperiment, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &1508800319 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 1508800318} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1530386642 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 851087254} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -5915,12 +6266,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &1530386643 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 1530386642} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1577291702 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -6054,12 +6415,22 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1577291703 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1577291702} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1600599687 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2005477752} m_Modifications: - target: {fileID: -864158086102149507, guid: e2b704602653a724bbbe19e9499fd447, @@ -6395,6 +6766,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1600599689} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &1600599688 stripped GameObject: @@ -6416,11 +6794,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: MinimumSpanningTree Description suffix: +--- !u!224 &1600599690 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1600599687} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1635399303 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 1833168799816158577, guid: 022d5a99f64150c4f9da24d7336d73d2, @@ -6539,12 +6924,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022d5a99f64150c4f9da24d7336d73d2, type: 3} +--- !u!224 &1635399304 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3288950519174612086, guid: 022d5a99f64150c4f9da24d7336d73d2, + type: 3} + m_PrefabInstance: {fileID: 1635399303} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1644474858 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 676593826} m_Modifications: - target: {fileID: 5624592654616792139, guid: 5577c830a10bd6f4ebc6f1f868979448, @@ -6673,7 +7068,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5577c830a10bd6f4ebc6f1f868979448, type: 3} +--- !u!224 &1644474859 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7008337427646634513, guid: 5577c830a10bd6f4ebc6f1f868979448, + type: 3} + m_PrefabInstance: {fileID: 1644474858} + m_PrefabAsset: {fileID: 0} --- !u!1 &1650753364 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, @@ -6699,6 +7103,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1082444324} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -6931,7 +7336,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1658761090 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1658761089} + m_PrefabAsset: {fileID: 0} --- !u!114 &1658761094 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7672486521338770134, guid: e2b704602653a724bbbe19e9499fd447, @@ -6951,7 +7365,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 3 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -6964,7 +7378,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -6990,8 +7404,8 @@ LightingSettings: m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 - m_PVRMinBounces: 1 - m_PVREnvironmentMIS: 1 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -7005,6 +7419,9 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!108 &1698385633 stripped Light: m_CorrespondingSourceObject: {fileID: 447441432653837836, guid: 4698ba446015d9f4ea6cde9f4c774547, @@ -7051,9 +7468,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 20 + 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_FocalLength: 20 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -7087,18 +7512,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721582137} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 2, z: 5.2} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 491200780} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1001 &1754686817 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -7212,12 +7639,24 @@ PrefabInstance: value: TableRow objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1040443228} + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 502032406} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2086b75ff63f701428e7e482bde8abd0, type: 3} --- !u!1001 &1825259939 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2005477752} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -7475,6 +7914,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1825259941} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &1825259940 stripped GameObject: @@ -7496,11 +7942,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: Prims Algortihm Description suffix: +--- !u!224 &1825259942 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1825259939} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1876915974 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208208072628} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -7724,6 +8177,25 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2087837088} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1425070525} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 463527008} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1650753369} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &1876915975 stripped RectTransform: @@ -7731,11 +8203,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1876915974} m_PrefabAsset: {fileID: 0} +--- !u!224 &1876915976 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 1876915974} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2005477751 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208208072629} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -7989,6 +8468,25 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1600599690} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 659024523} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1825259942} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2005477754} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &2005477752 stripped RectTransform: @@ -8016,11 +8514,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: Description suffix: +--- !u!224 &2005477755 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 2005477751} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2014479058 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 877993234} m_Modifications: - target: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -8134,12 +8639,24 @@ PrefabInstance: value: TableRow objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 554257109} + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1644474859} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2086b75ff63f701428e7e482bde8abd0, type: 3} --- !u!1001 &2014627530 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 6874453005530812691, guid: 7b7ae140e528744468c8ac7540931b8a, @@ -8284,12 +8801,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7b7ae140e528744468c8ac7540931b8a, type: 3} +--- !u!224 &2014627531 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9163227653711826684, guid: 7b7ae140e528744468c8ac7540931b8a, + type: 3} + m_PrefabInstance: {fileID: 2014627530} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2068044693 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 561315680} m_Modifications: - target: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -8403,12 +8930,24 @@ PrefabInstance: value: TableRow objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1368086800} + - targetCorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1203415281} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2086b75ff63f701428e7e482bde8abd0, type: 3} --- !u!1001 &2074309349 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 4486073274192676, guid: 592024056c9349546b808fdcf93535cd, type: 3} @@ -8590,12 +9129,22 @@ PrefabInstance: value: -26.61 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 592024056c9349546b808fdcf93535cd, type: 3} +--- !u!224 &2074309350 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4486073274192679, guid: 592024056c9349546b808fdcf93535cd, + type: 3} + m_PrefabInstance: {fileID: 2074309349} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2087837085 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1876915975} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -8729,6 +9278,13 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2087837087} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &2087837086 stripped GameObject: @@ -8750,6 +9306,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: NumberOfIslands suffix: +--- !u!224 &2087837088 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 2087837085} + m_PrefabAsset: {fileID: 0} --- !u!224 &2126937661 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6348855676192520659, guid: 2086b75ff63f701428e7e482bde8abd0, @@ -8761,6 +9323,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1085415541} m_Modifications: - target: {fileID: 4900700732492044869, guid: 305a9de3178659349ab5d42c65544f14, @@ -8894,12 +9457,22 @@ PrefabInstance: value: InputField objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 305a9de3178659349ab5d42c65544f14, type: 3} +--- !u!224 &2135670050 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7416093515041706199, guid: 305a9de3178659349ab5d42c65544f14, + type: 3} + m_PrefabInstance: {fileID: 2135670049} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2131119208208072625 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 58754831700822723, guid: 4698ba446015d9f4ea6cde9f4c774547, @@ -9899,6 +10472,37 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6183878073129598398, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1876915976} + - targetCorrespondingSourceObject: {fileID: 6183878073129598398, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1082444327} + - targetCorrespondingSourceObject: {fileID: 6183878073129598398, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 677421513} + - targetCorrespondingSourceObject: {fileID: 6183878073129598398, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 453313946} + - targetCorrespondingSourceObject: {fileID: 5836639678399279200, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2005477755} + - targetCorrespondingSourceObject: {fileID: 2131119207148510632, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4219775297360476365} + - targetCorrespondingSourceObject: {fileID: 2131119207974420912, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1721582140} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} --- !u!1 &2131119208208072626 stripped GameObject: @@ -9935,6 +10539,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131119208208072627} m_Modifications: - target: {fileID: 4036924426462124931, guid: 123bb38770b526a43bbf708d78ccd17a, @@ -10013,4 +10618,19 @@ PrefabInstance: value: objectReference: {fileID: 1658761094} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 123bb38770b526a43bbf708d78ccd17a, type: 3} +--- !u!4 &4219775297360476365 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4036924426462124931, guid: 123bb38770b526a43bbf708d78ccd17a, + type: 3} + m_PrefabInstance: {fileID: 4219775297360476364} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2131119208208072625} + - {fileID: 697213146} diff --git a/unity/Assets/Maroon/scenes/experiments/PathFinding/PathFinding.pc.unity b/unity/Assets/Maroon/scenes/experiments/PathFinding/PathFinding.pc.unity index 7edab73e9..538cfec35 100644 --- a/unity/Assets/Maroon/scenes/experiments/PathFinding/PathFinding.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/PathFinding/PathFinding.pc.unity @@ -38,12 +38,11 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1698385633} - m_IndirectSpecularColor: {r: 0.4265163, g: 0.34394744, b: 0.23117243, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,13 +98,14 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000000, guid: 4a3d56e541f04a54d82db9bdbaabbec3, type: 2} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 226d1e5893e972b4488dcc262ac99b3f, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,9 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -192,17 +194,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c4c33265ce35d124eb8450afc8657b2e, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &138328006 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - m_PrefabInstance: {fileID: 1763277400} - m_PrefabAsset: {fileID: 0} --- !u!1001 &146771772 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1631161021} m_Modifications: - target: {fileID: 1347347726171386947, guid: 09c73ed225a086845b90fbeaba0dc5ea, @@ -466,18 +463,22 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} ---- !u!224 &152483867 stripped +--- !u!224 &146771773 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + m_CorrespondingSourceObject: {fileID: 1347347726625204806, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - m_PrefabInstance: {fileID: 2520975315710143516} + m_PrefabInstance: {fileID: 146771772} m_PrefabAsset: {fileID: 0} --- !u!1001 &191670444 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1631161021} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -646,12 +647,26 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1858584354} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &191670445 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 191670444} + m_PrefabAsset: {fileID: 0} --- !u!1001 &281114197 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 282714142} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -895,6 +910,37 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 191670445} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 858288761} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1914265383} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 359146675} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1949920270} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 146771773} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 15026203} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!1 &282714141 GameObject: @@ -923,10 +969,10 @@ RectTransform: 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: 892102179} m_Father: {fileID: 841351912} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -958,6 +1004,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &315420050 GameObject: m_ObjectHideFlags: 0 @@ -987,10 +1034,10 @@ RectTransform: 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: 1920291968} m_Father: {fileID: 1676664585} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1025,6 +1072,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1047,12 +1095,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 315420050} m_CullTransparentMesh: 0 ---- !u!224 &332755719 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 58754831712102505, guid: 4698ba446015d9f4ea6cde9f4c774547, - type: 3} - m_PrefabInstance: {fileID: 2131119208208072625} - m_PrefabAsset: {fileID: 0} --- !u!1 &358329620 GameObject: m_ObjectHideFlags: 0 @@ -1081,9 +1123,9 @@ RectTransform: 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: 993932173} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1105,6 +1147,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1132,6 +1175,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1631161021} m_Modifications: - target: {fileID: 1347347726171386947, guid: 09c73ed225a086845b90fbeaba0dc5ea, @@ -1420,7 +1464,16 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} +--- !u!224 &359146675 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1347347726625204806, guid: 09c73ed225a086845b90fbeaba0dc5ea, + type: 3} + m_PrefabInstance: {fileID: 359146674} + m_PrefabAsset: {fileID: 0} --- !u!1 &362077717 GameObject: m_ObjectHideFlags: 0 @@ -1464,18 +1517,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 362077717} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &400911681 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 429704760} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -1719,7 +1774,24 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2136511514} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 618091268} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} +--- !u!224 &400911682 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 400911681} + m_PrefabAsset: {fileID: 0} --- !u!224 &429704760 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5836639678399279200, guid: 4698ba446015d9f4ea6cde9f4c774547, @@ -1731,6 +1803,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1303721053} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -1884,6 +1957,13 @@ PrefabInstance: value: ResetScoreButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 493410226} m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} --- !u!1 &493410225 stripped GameObject: @@ -1905,6 +1985,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: ResetScore suffix: +--- !u!224 &493410227 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 493410224} + m_PrefabAsset: {fileID: 0} --- !u!224 &600829487 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, @@ -1936,6 +2022,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1650068587} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -2174,6 +2261,13 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1146933957} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &624970175 stripped RectTransform: @@ -2236,10 +2330,10 @@ RectTransform: 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: 677578095} m_Father: {fileID: 1676664585} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2260,6 +2354,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2309,6 +2404,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2377,10 +2473,10 @@ RectTransform: 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: 961203330} m_Father: {fileID: 637221818} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2398,6 +2494,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1631161021} m_Modifications: - target: {fileID: 1841423615295626704, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, @@ -2766,7 +2863,16 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, type: 3} +--- !u!224 &858288761 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1841423615335754711, guid: 8dec41cb1bd0f0a4e8beabcdd339d90f, + type: 3} + m_PrefabInstance: {fileID: 858288760} + m_PrefabAsset: {fileID: 0} --- !u!224 &892102179 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -2778,6 +2884,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 600829487} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -2931,7 +3038,20 @@ PrefabInstance: value: ResetScoreButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 80958} m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} +--- !u!224 &940025645 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 940025644} + m_PrefabAsset: {fileID: 0} --- !u!1 &961203329 GameObject: m_ObjectHideFlags: 0 @@ -2960,9 +3080,9 @@ RectTransform: 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: 677578095} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2984,6 +3104,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3054,11 +3175,11 @@ RectTransform: 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: 1882621778} - {fileID: 1653842439} m_Father: {fileID: 600829487} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3090,6 +3211,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!222 &987348323 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3124,10 +3246,10 @@ RectTransform: 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: 358329621} m_Father: {fileID: 2079080433} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3159,6 +3281,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 429704760} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -3402,24 +3525,42 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1532249273} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 987348321} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1676664585} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 940025645} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 670617438} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} ---- !u!114 &1053620438 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, +--- !u!224 &1027304200 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, type: 3} - m_PrefabInstance: {fileID: 940025644} + m_PrefabInstance: {fileID: 1027304199} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1055764689 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1303721053} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -3588,7 +3729,16 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1055764690 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1055764689} + m_PrefabAsset: {fileID: 0} --- !u!114 &1086766485 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7672486521338770134, guid: e2b704602653a724bbbe19e9499fd447, @@ -3630,6 +3780,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 624970176} m_Modifications: - target: {fileID: -864158086102149507, guid: e2b704602653a724bbbe19e9499fd447, @@ -3820,7 +3971,16 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1146933957 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1146933956} + m_PrefabAsset: {fileID: 0} --- !u!114 &1173175403 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 385548748201882001, guid: 591900cdc4a2b2b45b0f6f83a60a6dc0, @@ -3852,9 +4012,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scrollViewContent: {fileID: 1920291967} - leftOnlineButton: {fileID: 1882621780} - rightOnlineButton: {fileID: 1653842441} - resetOnlineButton: {fileID: 1053620438} leftOfflineButton: {fileID: 1926158392} rightOfflineButton: {fileID: 1842988610} resetOfflineButton: {fileID: 28383588} @@ -3866,6 +4023,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 429704760} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -4109,6 +4267,29 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1544290792} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2081841653} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1055764690} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 493410227} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1303721055} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &1303721053 stripped RectTransform: @@ -4136,11 +4317,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: Quiz suffix: +--- !u!224 &1303721056 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 1303721052} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1323872280 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 987348321} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -4289,6 +4477,9 @@ PrefabInstance: value: LeftAnswerButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} --- !u!114 &1341395606 stripped MonoBehaviour: @@ -4319,6 +4510,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 600829487} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -4472,12 +4664,26 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 632893698} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1532249273 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1532249272} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1544290789 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1303721053} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -4631,6 +4837,13 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1544290791} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} --- !u!1 &1544290790 stripped GameObject: @@ -4652,11 +4865,18 @@ MonoBehaviour: m_EditorClassIdentifier: key: QuizQuestion suffix: +--- !u!224 &1544290792 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1544290789} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1546522620 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2081841653} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -4805,6 +5025,9 @@ PrefabInstance: value: LeftAnswerButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} --- !u!224 &1546522621 stripped RectTransform: @@ -4851,10 +5074,10 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9999494, y: 0.9999494, z: 0.9999494} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 624970175} m_Father: {fileID: 841351912} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4886,24 +5109,13 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!224 &1653842439 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} m_PrefabInstance: {fileID: 1704806761} m_PrefabAsset: {fileID: 0} ---- !u!114 &1653842441 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - m_PrefabInstance: {fileID: 1704806761} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1676664584 GameObject: m_ObjectHideFlags: 0 @@ -4934,12 +5146,12 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.000011, y: 1.000011, z: 1.000011} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 315420051} - {fileID: 637221818} - {fileID: 2079080433} m_Father: {fileID: 600829487} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5011,6 +5223,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5044,6 +5257,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 987348321} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -5192,6 +5406,9 @@ PrefabInstance: value: RightAnserButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} --- !u!1 &1733255275 GameObject: @@ -5224,9 +5441,9 @@ RectTransform: 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: 1621172459} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5251,6 +5468,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: m_Mode: 6 m_Arguments: @@ -5266,6 +5484,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: m_Mode: 6 m_Arguments: @@ -5310,6 +5529,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -5340,6 +5560,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1173175403} + m_TargetAssemblyTypeName: m_MethodName: SkipForward m_Mode: 1 m_Arguments: @@ -5365,6 +5586,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5387,235 +5609,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733255275} m_CullTransparentMesh: 0 ---- !u!1001 &1763277400 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1940047492} - m_Modifications: - - target: {fileID: 2520975314027716147, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975314027716147, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975314027716147, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.wordCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2520975314027716147, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.spaceCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975314027716147, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.characterCount - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 2520975314668908183, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975314668908183, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975314668908183, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.wordCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2520975314668908183, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.spaceCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975314668908183, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.characterCount - value: 17 - objectReference: {fileID: 0} - - target: {fileID: 2520975315229176456, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.lineCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975315229176456, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.pageCount - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975315229176456, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.wordCount - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 2520975315229176456, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.spaceCount - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 2520975315229176456, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_textInfo.characterCount - value: 43 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820422, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_Name - value: RightBattlePanel - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_SizeDelta.x - value: 600 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_SizeDelta.y - value: 175 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 325 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_Transition - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: EnterDetailMode - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 067e9479d0779704ba7c763ff53159d9, type: 3} --- !u!114 &1842988610 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, @@ -5654,23 +5647,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1323872280} m_PrefabAsset: {fileID: 0} ---- !u!114 &1882621780 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, - type: 3} - m_PrefabInstance: {fileID: 1323872280} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1914265382 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1631161021} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -5824,7 +5806,20 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 983254828} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1914265383 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1914265382} + m_PrefabAsset: {fileID: 0} --- !u!1 &1920291967 GameObject: m_ObjectHideFlags: 0 @@ -5853,9 +5848,9 @@ RectTransform: 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: 315420051} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5901,6 +5896,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &1926158392 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5681846035356040140, guid: 804ae9890eac3f941be98f32cab2066a, @@ -5913,48 +5909,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1940047491 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1940047492} - m_Layer: 5 - m_Name: BattlePanels - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1940047492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1940047491} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 152483867} - - {fileID: 138328006} - m_Father: {fileID: 332755719} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1949920269 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1631161021} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -6093,7 +6053,16 @@ PrefabInstance: value: 512 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1949920270 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1949920269} + m_PrefabAsset: {fileID: 0} --- !u!4 &1997158274 stripped Transform: m_CorrespondingSourceObject: {fileID: 2131119207148510632, guid: 4698ba446015d9f4ea6cde9f4c774547, @@ -6105,6 +6074,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2081841653} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -6253,6 +6223,9 @@ PrefabInstance: value: RightAnserButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} --- !u!224 &2055784883 stripped RectTransform: @@ -6289,10 +6262,10 @@ RectTransform: 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: 993932173} m_Father: {fileID: 1676664585} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6313,6 +6286,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -6362,6 +6336,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6412,11 +6387,11 @@ RectTransform: 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: 1546522621} - {fileID: 2055784883} m_Father: {fileID: 1303721053} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6448,6 +6423,7 @@ MonoBehaviour: m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!222 &2081841655 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6461,6 +6437,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 43040441} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -6614,12 +6591,26 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1004226431} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &2136511514 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 2136511513} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2131119208208072625 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 58754831700844273, guid: 4698ba446015d9f4ea6cde9f4c774547, @@ -7558,172 +7549,54 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7344706927347907378, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - {fileID: 219266525608613516, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} ---- !u!1 &2131119208208072626 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1679491144765878956, guid: 4698ba446015d9f4ea6cde9f4c774547, - type: 3} - m_PrefabInstance: {fileID: 2131119208208072625} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2520975315710143516 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1940047492} - m_Modifications: - - target: {fileID: 2520975315861820422, guid: 067e9479d0779704ba7c763ff53159d9, + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6183878073129598398, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_Name - value: LeftBattlePanel - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 282714142} + - targetCorrespondingSourceObject: {fileID: 6183878073129598398, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 1650068587} + - targetCorrespondingSourceObject: {fileID: 5836639678399279200, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 400911682} + - targetCorrespondingSourceObject: {fileID: 5836639678399279200, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 1027304200} + - targetCorrespondingSourceObject: {fileID: 5836639678399279200, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 1303721056} + - targetCorrespondingSourceObject: {fileID: 58754831712124099, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 1733255276} + - targetCorrespondingSourceObject: {fileID: 2131119207148510632, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_SizeDelta.x - value: 600 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, + insertIndex: -1 + addedObject: {fileID: 4221229874392938223} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3884335669717982136, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} - propertyPath: m_SizeDelta.y - value: 175 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -325 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 350 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2520975315861820423, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_Transition - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: EnterDetailMode - objectReference: {fileID: 0} - - target: {fileID: 7228472741606850621, guid: 067e9479d0779704ba7c763ff53159d9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 067e9479d0779704ba7c763ff53159d9, type: 3} + insertIndex: -1 + addedObject: {fileID: 1303327692} + m_SourcePrefab: {fileID: 100100000, guid: 4698ba446015d9f4ea6cde9f4c774547, type: 3} +--- !u!1 &2131119208208072626 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1679491144765878956, guid: 4698ba446015d9f4ea6cde9f4c774547, + type: 3} + m_PrefabInstance: {fileID: 2131119208208072625} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4221229874392938221 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1997158274} m_Modifications: - target: {fileID: 229378979605537890, guid: 591900cdc4a2b2b45b0f6f83a60a6dc0, @@ -7842,6 +7715,9 @@ PrefabInstance: value: 0.669 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 591900cdc4a2b2b45b0f6f83a60a6dc0, type: 3} --- !u!114 &4221229874392938222 stripped MonoBehaviour: @@ -7855,3 +7731,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b17530687ac68d444b5b5402b5962940, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &4221229874392938223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 229378979605537890, guid: 591900cdc4a2b2b45b0f6f83a60a6dc0, + type: 3} + m_PrefabInstance: {fileID: 4221229874392938221} + m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2131119208208072625} + - {fileID: 362077719} diff --git a/unity/Assets/Maroon/scenes/experiments/Pendulum/Pendulum.pc.unity b/unity/Assets/Maroon/scenes/experiments/Pendulum/Pendulum.pc.unity index 67ad2ebe3..30de768f9 100644 --- a/unity/Assets/Maroon/scenes/experiments/Pendulum/Pendulum.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/Pendulum/Pendulum.pc.unity @@ -2499,41 +2499,11 @@ PrefabInstance: propertyPath: m_MinValue value: 1 objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ForceUpdateValue - objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[1].m_Mode @@ -2556,49 +2526,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ForceUpdateValue - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: weight + propertyPath: onSliderInit.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: GameLabGraz.UI.InputField, GameLabGraz.UserInterface objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: weight + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: GameLabGraz.UI.InputField, GameLabGraz.UserInterface objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: Maroon.Physics.Pendulum, Maroon.Experiments.Pendulum objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 6065738619167329253, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_AnchorMax.y @@ -3184,41 +3129,11 @@ PrefabInstance: propertyPath: m_MinValue value: 0.2 objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ForceUpdateValue - objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[1].m_Mode @@ -3261,38 +3176,18 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: GameLabGraz.UI.InputField, GameLabGraz.UserInterface objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ForceUpdateValue + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: Maroon.Physics.Pendulum, Maroon.Experiments.Pendulum objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: ropeLength - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: ropeLength - objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onEndDrag.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: Maroon.Physics.PendulumRope, Maroon.Experiments.Pendulum objectReference: {fileID: 0} - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} @@ -3304,11 +3199,6 @@ PrefabInstance: propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 2399235266715423803, guid: 09c73ed225a086845b90fbeaba0dc5ea, - type: 3} - propertyPath: onSetSliderValueViaInput.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 6065738619167329253, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} propertyPath: m_AnchorMax.y @@ -3709,36 +3599,6 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 5202824135465736138, guid: f1d29f2ffd6e5e44a8358b7534612945, - type: 3} - propertyPath: OnRelease.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5202824135465736138, guid: f1d29f2ffd6e5e44a8358b7534612945, - type: 3} - propertyPath: OnRelease.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5202824135465736138, guid: f1d29f2ffd6e5e44a8358b7534612945, - type: 3} - propertyPath: OnRelease.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2092327460} - - target: {fileID: 5202824135465736138, guid: f1d29f2ffd6e5e44a8358b7534612945, - type: 3} - propertyPath: OnRelease.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5202824135465736138, guid: f1d29f2ffd6e5e44a8358b7534612945, - type: 3} - propertyPath: OnRelease.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: PendulumReleased - objectReference: {fileID: 0} - - target: {fileID: 5202824135465736138, guid: f1d29f2ffd6e5e44a8358b7534612945, - type: 3} - propertyPath: OnRelease.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 5202824135465736140, guid: f1d29f2ffd6e5e44a8358b7534612945, type: 3} propertyPath: m_ConnectedAnchor.x @@ -4206,6 +4066,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4453640219361526913, guid: a5ba8aa97eae48c4080c95a40fd17a46, + type: 3} + propertyPath: m_fontSize + value: 25 + objectReference: {fileID: 0} - target: {fileID: 6094154364091172394, guid: a5ba8aa97eae48c4080c95a40fd17a46, type: 3} propertyPath: m_Pivot.x @@ -4461,86 +4326,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SendMessage - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SendMessage - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: enter - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: clear - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onCalculate.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 6319860868303247907, guid: a5ba8aa97eae48c4080c95a40fd17a46, - type: 3} - propertyPath: onClearCalculation.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 6319860868410372588, guid: a5ba8aa97eae48c4080c95a40fd17a46, type: 3} propertyPath: m_AnchorMax.y diff --git a/unity/Assets/Maroon/scenes/experiments/Pendulum/prefabs/PendulumExperiment.prefab b/unity/Assets/Maroon/scenes/experiments/Pendulum/prefabs/PendulumExperiment.prefab index 2452d5e66..823726371 100644 --- a/unity/Assets/Maroon/scenes/experiments/Pendulum/prefabs/PendulumExperiment.prefab +++ b/unity/Assets/Maroon/scenes/experiments/Pendulum/prefabs/PendulumExperiment.prefab @@ -1425,18 +1425,6 @@ MonoBehaviour: OnRelease: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: pull - m_BoolArgument: 0 - m_CallState: 2 - m_Target: {fileID: 5998583639729668546} m_TargetAssemblyTypeName: m_MethodName: PendulumReleased @@ -1446,7 +1434,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: pull m_BoolArgument: 0 m_CallState: 2 OnGrab: diff --git a/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/PlanetarySystem.pc.unity b/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/PlanetarySystem.pc.unity index 069307d30..ae1ba46d3 100644 --- a/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/PlanetarySystem.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/PlanetarySystem.pc.unity @@ -22448,21 +22448,111 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1490499186} m_Modifications: + - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, type: 3} propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 70881451} + - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: StartPlanetarySortingGameOnInput + objectReference: {fileID: 0} + - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Maroon.Experiments.PlanetarySystem.StartScreenScenes, Maroon.Experiments.PlanetarySystem + objectReference: {fileID: 0} + - target: {fileID: 969763638036047191, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, type: 3} propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 70881451} + - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: StartPlanetorySystemSimulationOnInput + objectReference: {fileID: 0} + - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Maroon.Experiments.PlanetarySystem.StartScreenScenes, Maroon.Experiments.PlanetarySystem + objectReference: {fileID: 0} + - target: {fileID: 1495483405413317098, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, type: 3} propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 70881451} + - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: StartPlanetorySystemSimulationOnInput + objectReference: {fileID: 0} + - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Maroon.Experiments.PlanetarySystem.StartScreenScenes, Maroon.Experiments.PlanetarySystem + objectReference: {fileID: 0} + - target: {fileID: 5558256651017013709, guid: e9a5e4a369e56f6428ea556982c6adca, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 5932816078991445157, guid: e9a5e4a369e56f6428ea556982c6adca, type: 3} propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target diff --git a/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/InteractablePlanetarySystemScreens.prefab b/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/InteractablePlanetarySystemScreens.prefab index f879c8d63..cf4ee0420 100644 --- a/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/InteractablePlanetarySystemScreens.prefab +++ b/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/InteractablePlanetarySystemScreens.prefab @@ -147,6 +147,11 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: -0.002 objectReference: {fileID: 0} + - target: {fileID: 4340845500957255942, guid: 8f0f040f465d2754a9e71de187920861, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7628159796456530537, guid: 8f0f040f465d2754a9e71de187920861, type: 3} @@ -374,20 +379,7 @@ MonoBehaviour: m_EditorClassIdentifier: onMouseDownEvent: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: Maroon.Experiments.PlanetarySystem.StartScreenScenes, - Maroon.Experiments.PlanetarySystem - m_MethodName: StartPlanetarySortingGameOnInput - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] hoverColor: {r: 0, g: 0.8784314, b: 1, a: 0} --- !u!4 &8074294147499055783 stripped Transform: @@ -458,6 +450,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4340845500957255942, guid: 8f0f040f465d2754a9e71de187920861, + type: 3} + propertyPath: onMouseDownEvent.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/StartPlanetarySystemSimulationScreen.prefab b/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/StartPlanetarySystemSimulationScreen.prefab index 4fc295412..876ab1b25 100644 --- a/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/StartPlanetarySystemSimulationScreen.prefab +++ b/unity/Assets/Maroon/scenes/experiments/PlanetarySystem/Prefabs/Environment/StartPlanetarySystemSimulationScreen.prefab @@ -143,20 +143,7 @@ MonoBehaviour: m_EditorClassIdentifier: onMouseDownEvent: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: Maroon.Experiments.PlanetarySystem.StartScreenScenes, - Maroon.Experiments.PlanetarySystem - m_MethodName: StartPlanetorySystemSimulationOnInput - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] hoverColor: {r: 0, g: 0.8784314, b: 1, a: 0} --- !u!1 &2877514900681181704 GameObject: diff --git a/unity/Assets/Maroon/scenes/experiments/VanDeGraaffGenerator/VandeGraaffGenerator.pc.unity b/unity/Assets/Maroon/scenes/experiments/VanDeGraaffGenerator/VandeGraaffGenerator.pc.unity index 4020b2aef..773eb0dd9 100644 --- a/unity/Assets/Maroon/scenes/experiments/VanDeGraaffGenerator/VandeGraaffGenerator.pc.unity +++ b/unity/Assets/Maroon/scenes/experiments/VanDeGraaffGenerator/VandeGraaffGenerator.pc.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 996086869} - m_IndirectSpecularColor: {r: 0.4234474, g: 0.3429849, b: 0.23095757, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -106,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -119,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -142,6 +141,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1078996886646160, guid: 5b4b1d970d33c39409d99f60d6050cc7, type: 3} @@ -193,12 +193,16 @@ PrefabInstance: value: -61.467003 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5b4b1d970d33c39409d99f60d6050cc7, type: 3} --- !u!1001 &360704510 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1026293817} m_Modifications: - target: {fileID: 508958419711248900, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, @@ -487,12 +491,26 @@ PrefabInstance: value: 0 V objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1820075770532083712, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 587880240} m_SourcePrefab: {fileID: 100100000, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, type: 3} +--- !u!224 &360704511 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3201826832388988205, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, + type: 3} + m_PrefabInstance: {fileID: 360704510} + m_PrefabAsset: {fileID: 0} --- !u!1001 &402150979 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 524878756086650094, guid: 146c2114323150942bfd5dbe5e9392c7, @@ -556,12 +574,16 @@ PrefabInstance: value: prePauseMenu objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 146c2114323150942bfd5dbe5e9392c7, type: 3} --- !u!1001 &484797290 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1052417246} m_Modifications: - target: {fileID: 9085299239040558688, guid: 47808144d6757244da5be7e2e38f1f94, @@ -800,7 +822,20 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9085299239040558684, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1352315766} m_SourcePrefab: {fileID: 100100000, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} +--- !u!224 &484797291 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + m_PrefabInstance: {fileID: 484797290} + m_PrefabAsset: {fileID: 0} --- !u!114 &488747792 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4176083183224910867, guid: 92f84f922ba87e247ba1fabd1b790bff, @@ -850,6 +885,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 378110362638372100, guid: c6c418fdd21aa054fb854a2c70683b60, @@ -913,6 +949,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6c418fdd21aa054fb854a2c70683b60, type: 3} --- !u!1 &711724884 GameObject: @@ -963,9 +1002,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 19.32 + 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_FocalLength: 19.32 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -999,6 +1046,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 711724884} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071067} m_LocalPosition: {x: -3.514, y: 2.08, z: -6.86} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1006,7 +1054,6 @@ Transform: m_Children: - {fileID: 1335228203} m_Father: {fileID: 0} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &746605364 stripped GameObject: @@ -1039,6 +1086,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1026293817} m_Modifications: - target: {fileID: 508958419711248900, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, @@ -1328,7 +1376,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 2530875306394715277, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1820075770532083712, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1153339352} m_SourcePrefab: {fileID: 100100000, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, type: 3} +--- !u!224 &819879774 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3201826832388988205, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, + type: 3} + m_PrefabInstance: {fileID: 819879773} + m_PrefabAsset: {fileID: 0} --- !u!1 &898093974 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9085299239040558684, guid: 47808144d6757244da5be7e2e38f1f94, @@ -1360,6 +1421,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 752895154} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -1598,6 +1660,21 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 360704511} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 819879774} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1026293819} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} --- !u!224 &1026293817 stripped RectTransform: @@ -1625,6 +1702,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: Display suffix: +--- !u!224 &1026293820 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 1026293816} + m_PrefabAsset: {fileID: 0} --- !u!224 &1052417246 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, @@ -1662,6 +1745,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1850449288085236197, guid: 31b6c6f8b89327e449e5d496feddbd16, @@ -1725,6 +1809,9 @@ PrefabInstance: value: SimulationController objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31b6c6f8b89327e449e5d496feddbd16, type: 3} --- !u!114 &1284383691 stripped MonoBehaviour: @@ -1764,13 +1851,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1335228202} + 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: 711724889} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1335228204 MonoBehaviour: @@ -1854,9 +1941,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 19.32 + 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_FocalLength: 19.32 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1888,6 +1983,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1052417246} m_Modifications: - target: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, @@ -2041,7 +2137,20 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1450312465} m_SourcePrefab: {fileID: 100100000, guid: e2b704602653a724bbbe19e9499fd447, type: 3} +--- !u!224 &1342157886 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3134226572171519034, guid: e2b704602653a724bbbe19e9499fd447, + type: 3} + m_PrefabInstance: {fileID: 1342157885} + m_PrefabAsset: {fileID: 0} --- !u!1 &1352315764 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9085299239040558684, guid: 47808144d6757244da5be7e2e38f1f94, @@ -2067,6 +2176,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 9079110210785623904, guid: fe0a30be743451540982d538c670799e, @@ -2155,6 +2265,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe0a30be743451540982d538c670799e, type: 3} --- !u!1 &1377659646 stripped GameObject: @@ -2167,6 +2280,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1052417246} m_Modifications: - target: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, @@ -2350,6 +2464,13 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7201648050145499614, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1437536626} m_SourcePrefab: {fileID: 100100000, guid: 804ae9890eac3f941be98f32cab2066a, type: 3} --- !u!1 &1437536625 stripped GameObject: @@ -2371,6 +2492,12 @@ MonoBehaviour: m_EditorClassIdentifier: key: EFieldFilling suffix: +--- !u!224 &1437536627 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2472079172140665120, guid: 804ae9890eac3f941be98f32cab2066a, + type: 3} + m_PrefabInstance: {fileID: 1437536624} + m_PrefabAsset: {fileID: 0} --- !u!1 &1450312463 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3831747236779710014, guid: e2b704602653a724bbbe19e9499fd447, @@ -2396,6 +2523,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1052417246} m_Modifications: - target: {fileID: 9085299239040558688, guid: 47808144d6757244da5be7e2e38f1f94, @@ -2659,12 +2787,26 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9085299239040558684, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1616354769} m_SourcePrefab: {fileID: 100100000, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} +--- !u!224 &1554779223 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + m_PrefabInstance: {fileID: 1554779222} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1594232468 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 340845351035402039, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, @@ -3518,6 +3660,17 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3278572994891445752, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2084861035} + - targetCorrespondingSourceObject: {fileID: 3278572994891445752, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1026293820} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 17a8edfe802a9ab4caccb7dc9014a7ef, type: 3} --- !u!1 &1616354767 stripped GameObject: @@ -3563,13 +3716,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1785483229} + serializedVersion: 2 m_LocalRotation: {x: -0.6687313, y: -0.74350417, z: 0.00021341443, w: 0.00019082986} m_LocalPosition: {x: -2.3256292, y: -0.4040177, z: 1.0988871} m_LocalScale: {x: 129.13036, y: 40.669117, z: 133.33356} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1125260725} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 180.033, y: 0, z: 0} --- !u!108 &1785483231 Light: @@ -3640,7 +3793,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 4 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 @@ -3674,13 +3827,13 @@ LightingSettings: m_PVRCulling: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVREnvironmentSampleCount: 500 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 0 + m_PVREnvironmentImportanceSampling: 0 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -3695,11 +3848,14 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1001 &1825569334 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1052417246} m_Modifications: - target: {fileID: 9085299239040558688, guid: 47808144d6757244da5be7e2e38f1f94, @@ -3938,7 +4094,20 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9085299239040558684, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + insertIndex: -1 + addedObject: {fileID: 898093976} m_SourcePrefab: {fileID: 100100000, guid: 47808144d6757244da5be7e2e38f1f94, type: 3} +--- !u!224 &1825569335 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9085299239375179209, guid: 47808144d6757244da5be7e2e38f1f94, + type: 3} + m_PrefabInstance: {fileID: 1825569334} + m_PrefabAsset: {fileID: 0} --- !u!114 &1830459738 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4176083184104367082, guid: 92f84f922ba87e247ba1fabd1b790bff, @@ -3956,6 +4125,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1052417246} m_Modifications: - target: {fileID: 1347347726171386947, guid: 09c73ed225a086845b90fbeaba0dc5ea, @@ -4224,7 +4394,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 09c73ed225a086845b90fbeaba0dc5ea, type: 3} +--- !u!224 &1864729369 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1347347726625204806, guid: 09c73ed225a086845b90fbeaba0dc5ea, + type: 3} + m_PrefabInstance: {fileID: 1864729368} + m_PrefabAsset: {fileID: 0} --- !u!1 &1953304593 GameObject: m_ObjectHideFlags: 0 @@ -4249,13 +4428,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1953304593} + serializedVersion: 2 m_LocalRotation: {x: -0.6687313, y: -0.74350417, z: 0.00021341443, w: 0.00019082986} m_LocalPosition: {x: -1.2799085, y: -0.12640321, z: 1.0988859} m_LocalScale: {x: 129.13036, y: 40.669117, z: 133.33356} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1125260725} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 180.033, y: 0, z: 0} --- !u!108 &1953304595 Light: @@ -4376,19 +4555,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036917370} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3.6354146, y: 1.3702334, z: -6.623777} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2084861034 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 752895154} m_Modifications: - target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, @@ -4632,7 +4812,44 @@ PrefabInstance: value: -1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1554779223} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1825569335} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 484797291} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1342157886} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1864729369} + - targetCorrespondingSourceObject: {fileID: 6709668890126188764, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1437536627} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1619815061314202928, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 746605369} m_SourcePrefab: {fileID: 100100000, guid: 5c79149608e055446ae721a812143cd5, type: 3} +--- !u!224 &2084861035 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5, + type: 3} + m_PrefabInstance: {fileID: 2084861034} + m_PrefabAsset: {fileID: 0} --- !u!114 &1029840699281989 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4177023945950991686, guid: 92f84f922ba87e247ba1fabd1b790bff, @@ -4668,6 +4885,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1992526433514635078, guid: 10c26744ecceac04bb4ab6fcce082646, @@ -4921,12 +5139,24 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1992526434963678819, guid: 10c26744ecceac04bb4ab6fcce082646, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1953304594} + - targetCorrespondingSourceObject: {fileID: 1992526434963678819, guid: 10c26744ecceac04bb4ab6fcce082646, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1785483230} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10c26744ecceac04bb4ab6fcce082646, type: 3} --- !u!1001 &4176083183713634051 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4067979326449068543, guid: 92f84f922ba87e247ba1fabd1b790bff, @@ -5155,6 +5385,13 @@ PrefabInstance: value: chargeSrength objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4177023945950991687, guid: 92f84f922ba87e247ba1fabd1b790bff, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4176083183713634053} m_SourcePrefab: {fileID: 100100000, guid: 92f84f922ba87e247ba1fabd1b790bff, type: 3} --- !u!1 &4176083183713634052 stripped GameObject: @@ -5179,17 +5416,19 @@ MonoBehaviour: MovementSpeed: 1 onMove: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: StartSimulation - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] _invertInput: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 652625639} + - {fileID: 1284383690} + - {fileID: 402150979} + - {fileID: 4176083183713634051} + - {fileID: 266736477} + - {fileID: 1594232468} + - {fileID: 1367393751} + - {fileID: 1992526434269542133} + - {fileID: 2036917372} + - {fileID: 711724889} diff --git a/unity/Assets/Resources/MLG/3DMotionSimulation.xml b/unity/Assets/Resources/MLG/3DMotionSimulation.xml index d3273dde4..c0701f45a 100644 --- a/unity/Assets/Resources/MLG/3DMotionSimulation.xml +++ b/unity/Assets/Resources/MLG/3DMotionSimulation.xml @@ -77,11 +77,11 @@ Satellite Satellit - + Ball in the Wind Ball im Wind - + Charged Particle Geladenes Teilchen @@ -89,14 +89,22 @@ Resonance Resonanz - + Parametric Oscillator Parametrischer Oszillator - + Relaxation Oscillator Relaxationsoszillator + + Rocket Launch + Raketenstart + + + Coupled Oscillators + Gekoppelte Oszillatoren + Welcome to the 3D Motion Simulation experiment. You can use the control buttons at the bottom to start, reset or step through the calculation. Please press the reset button if you change any parameters beforehand. Willkommen bei dem 3D Motion Simulation Experiment. Du kannst die Tasten im unteren Bereich drücken, um die Simulation zu starten, pausieren oder Schritt für Schritt durch die Simulation zu gehen. Bitte betätige bevor du Änderungen an den Parametern vornimmst die Taste "Zurücksetzen". diff --git a/unity/Assets/StreamingAssets/Config.meta b/unity/Assets/StreamingAssets/Config.meta new file mode 100644 index 000000000..a3bf24fc9 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4871bae25c8e16c4b8dbfa87eb287f3d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation.meta new file mode 100644 index 000000000..269c7736c --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ee55446cb7827c4d881c59daf6f037b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/BallInTheWind.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/BallInTheWind.json new file mode 100644 index 000000000..a64503057 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/BallInTheWind.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "Grass", + "Particle" : "Ball", + "FX" : "(-0.01*(vx-(1))-0.03*(vx-(1))*sqrt((vx-(1))*(vx-(1))+(vy-(7*Exp(-x*x)))*(vy-(7*Exp(-x*x)))+(vz-(-3*Exp(-t*t)))*(vz-(-3*Exp(-t*t)))))", + "FY" : "(-0.01*(vy-(7*Exp(-x*x)))-0.03*(vy-(7*Exp(-x*x)))*Sqrt((vx-(1))*(vx-(1))+(vy-(7*Exp(-x*x)))*(vy-(7*Exp(-x*x)))+(vz-(-3*Exp(-t*t)))*(vz-(-3*Exp(-t*t)))))", + "FZ" : "(-0.01*(vz-(-3*Exp(-t*t)))-0.03*(vz-(-3*Exp(-t*t)))*Sqrt((vx-(1))*(vx-(1))+(vy-(7*Exp(-x*x)))*(vy-(7*Exp(-x*x)))+(vz-(-3*Exp(-t*t)))*(vz-(-3*Exp(-t*t)))))-9.81*0.1", + "M" : "0.1", + "T0" : "0", + "DeltaT" : "0.01", + "Steps" : "100", + "X" : "0", + "Y" : "0", + "Z" : "0", + "Vx" : "-7", + "Vy" : "5", + "Vz" : "10" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/BallInTheWind.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/BallInTheWind.json.meta new file mode 100644 index 000000000..fab857b94 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/BallInTheWind.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ed718abfc2fa6f48a0ab9bc2a12ffda +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ChargedParticle.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ChargedParticle.json new file mode 100644 index 000000000..ded4631f2 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ChargedParticle.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "ExperimentRoom", + "Particle" : "Particle", + "FX" : "-1.6022E-19*((1E5)+vy*(1)-vz*(0))", + "FY" : "-1.6022E-19*((0)+vz*(0)-vx*(1))", + "FZ" : "-1.6022E-19*((0)+vx*(0)-vy*(0))", + "M" : "9.11E-31", + "T0" : "0", + "DeltaT" : "3e-13", + "Steps" : "500", + "X" : "0", + "Y" : "0", + "Z" : "0", + "Vx" : "0", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ChargedParticle.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ChargedParticle.json.meta new file mode 100644 index 000000000..60d887b72 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ChargedParticle.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 50dd20a56a52d2a4899390c17b22dead +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/CoupledOscillators.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/CoupledOscillators.json new file mode 100644 index 000000000..1efb8c295 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/CoupledOscillators.json @@ -0,0 +1,12 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "fx": "(-0.9*x-2.0*(x-y))/1", + "fy": "(-0.9*y-2.0*(y-x))/1", + "fz": "0", + "m": "1", + "t0": "0", + "deltaT": "0.05", + "steps": "500", + "x": "0", "y": "0", "z": "0", + "vx": "1", "vy": "0", "vz": "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/CoupledOscillators.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/CoupledOscillators.json.meta new file mode 100644 index 000000000..96c595319 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/CoupledOscillators.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4da88ab1b0827404eb12a3a4bdf98793 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Default.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Default.json new file mode 100644 index 000000000..01edb73d8 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Default.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "ExperimentRoom", + "Particle" : "Particle", + "FX" : "-x", + "FY" : "0", + "FZ" : "0", + "M" : "1", + "T0" : "0", + "DeltaT" : "0.05", + "Steps" : "500", + "X" : "0", + "Y" : "0", + "Z" : "0", + "Vx" : "1", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Default.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Default.json.meta new file mode 100644 index 000000000..d2e295a24 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Default.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 930ea07f77c75f2449eae7577deb0101 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/NormalModes.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/NormalModes.json new file mode 100644 index 000000000..811c3409c --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/NormalModes.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "ExperimentRoom", + "Particle" : "Particle", + "FX" : "(0.2*(Sqrt((0.4-x)*(0.4-x)+y*y)-0.15)*Cos(Atan(y/(0.4-x)))-0.2*(Sqrt((0.4+x)*(0.4+x)+y*y)-0.15)*Cos(Atan(y/(0.4+x))))/(0.4)", + "FY" : "(-0.2*(Sqrt((0.4-x)*(0.4-x)+y*y)-0.15)*Sin(Atan(y/(0.4-x)))-0.2*(Sqrt((0.4+x)*(0.4+x)+y*y)-0.15)*Sin(Atan(y/(0.4+x))))/(0.4)", + "FZ" : "0", + "M" : "1", + "T0" : "0", + "DeltaT" : "0.05", + "Steps" : "500", + "X" : "0.15", + "Y" : "-0.07", + "Z" : "0", + "Vx" : "0", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/NormalModes.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/NormalModes.json.meta new file mode 100644 index 000000000..48d65f02a --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/NormalModes.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 129a0fab6e15a8848957d407571bf2e9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ParametricOscillator.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ParametricOscillator.json new file mode 100644 index 000000000..95a4162a4 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ParametricOscillator.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "ExperimentRoom", + "Particle" : "Particle", + "FX" : "-0.2500*vx-9.81*x/(0.5*(1-0.4*cos(8*t)))", + "FY" : "0", + "FZ" : "0", + "M" : "1", + "T0" : "0", + "DeltaT" : "0.05", + "Steps" : "300", + "X" : "0.02", + "Y" : "0", + "Z" : "0", + "Vx" : "0", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ParametricOscillator.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ParametricOscillator.json.meta new file mode 100644 index 000000000..f14e4d22b --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/ParametricOscillator.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3b4b69fa9179e2b4d8c877e9eb753786 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RelaxationOscillator.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RelaxationOscillator.json new file mode 100644 index 000000000..fb5d1979d --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RelaxationOscillator.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "ExperimentRoom", + "Particle" : "Particle", + "FX" : "(1-x*x)*vx-x", + "FY" : "0", + "FZ" : "0", + "M" : "1", + "T0" : "0", + "DeltaT" : "0.05", + "Steps" : "300", + "X" : "0.02", + "Y" : "0", + "Z" : "0", + "Vx" : "0", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RelaxationOscillator.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RelaxationOscillator.json.meta new file mode 100644 index 000000000..8f3ac42d0 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RelaxationOscillator.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a180132b63e06b54e9aaaf2bdbe96b76 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Resonance.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Resonance.json new file mode 100644 index 000000000..a76c87d41 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Resonance.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "ExperimentRoom", + "Particle" : "Particle", + "FX" : "-0.9*x-0.2*vx+0.1000*cos(1*t)", + "FY" : "0", + "FZ" : "0", + "M" : "1", + "T0" : "0", + "DeltaT" : "0.05", + "Steps" : "300", + "X" : "0.02", + "Y" : "0", + "Z" : "0", + "Vx" : "0", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Resonance.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Resonance.json.meta new file mode 100644 index 000000000..52be52847 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Resonance.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8ee1c026b19089f479046b41536bbee3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RocketLaunch.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RocketLaunch.json new file mode 100644 index 000000000..a5a4b55cc --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RocketLaunch.json @@ -0,0 +1,17 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "background": "grass", + "particle": "rocket", + "fx": "(-0.01*(vx-(0.2*exp(-t*t/50)))-0.03*(vx-(0.2*exp(-t*t/50)))*sqrt((vx-(0.2*exp(-t*t/50)))*(vx-(0.2*exp(-t*t/50)))+(vy-(-0.3*exp(-t*t/50)))*(vy-(-0.3*exp(-t*t/50)))+(vz-(0))*(vz-(0))))", + "fy": "(-0.01*(vy-(-0.3*exp(-t*t/50)))-0.03*(vy-(-0.3*exp(-t*t/50)))*sqrt((vx-(0.2*exp(-t*t/50)))*(vx-(0.2*exp(-t*t/50)))+(vy-(-0.3*exp(-t*t/50)))*(vy-(-0.3*exp(-t*t/50)))+(vz-(0))*(vz-(0))))", + "fz": "(-0.01*(vz-(0))-0.03*(vz-(0))*sqrt((vx-(0.2*exp(-t*t/50)))*(vx-(0.2*exp(-t*t/50)))+(vy-(-0.3*exp(-t*t/50)))*(vy-(-0.3*exp(-t*t/50)))+(vz-(0))*(vz-(0))))-9.81*0.1*(2-H(3-t)*t/3-H(t-3))+5*H(3-t)", + "m": "0.1*(2-H(3-t)*t/3-H(t-3))", + "t0": "0", + "deltaT": "0.02", + "steps": "500", + "x": "0", "y": "0", "z": "0", + "vx": "0", "vy": "0", "vz": "0", + "expressions": { + "h(x)": "if(x == 0, 0.5, (1 + x/abs(x))/2)" + } +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RocketLaunch.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RocketLaunch.json.meta new file mode 100644 index 000000000..23c69f802 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/RocketLaunch.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b991600bdb23d21418a59130fb7c7cad +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Satellite.json b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Satellite.json new file mode 100644 index 000000000..5a33a7957 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Satellite.json @@ -0,0 +1,18 @@ +{ + "$type": "Maroon.Physics.ThreeDimensionalMotion.ThreeDimensionalMotionParameters, Maroon.Experiments.3DMotionSimulation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "Background" : "Space", + "Particle" : "Satellite", + "FX" : "-100*x*6.6726E-11*5.97219E24/Pow(x*x+y*y+z*z,3/2)", + "FY" : "-100*y*6.6726E-11*5.97219E24/Pow(x*x+y*y+z*z,3/2)", + "FZ" : "-100*z*6.6726E-11*5.97219E24/Pow(x*x+y*y+z*z,3/2)", + "M" : "100", + "T0" : "0", + "DeltaT" : "60", + "Steps" : "1500", + "X" : "0", + "Y" : "6371000", + "Z" : "0", + "Vx" : "7900", + "Vy" : "0", + "Vz" : "0" +} \ No newline at end of file diff --git a/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Satellite.json.meta b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Satellite.json.meta new file mode 100644 index 000000000..c3b59bd03 --- /dev/null +++ b/unity/Assets/StreamingAssets/Config/3DMotionSimulation/Satellite.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5969fed32c7cedc45b6095a4c84d870f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Tests/EditModeTests/ContentValidation/SceneValidationBaseFixture.cs b/unity/Assets/Tests/EditModeTests/ContentValidation/SceneValidationBaseFixture.cs index 2e3ac0368..69681a8e5 100644 --- a/unity/Assets/Tests/EditModeTests/ContentValidation/SceneValidationBaseFixture.cs +++ b/unity/Assets/Tests/EditModeTests/ContentValidation/SceneValidationBaseFixture.cs @@ -3,9 +3,13 @@ using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.SceneManagement; +using NUnit.Framework; using static Tests.Utilities.Constants; using static Tests.Utilities.CustomAttributes; using static Tests.Utilities.UtilityFunctions; +using System.Collections.Generic; +using System.Reflection; +using UnityEngine.Events; namespace Tests.EditModeTests.ContentValidation { @@ -91,5 +95,77 @@ protected void SkipCheck(string objectNameUnderTest, [CallerMemberName] string c SkipCheckBase(TypePC, _objectNamesFromExperimentPrefab, _experimentName, objectNameUnderTest, callingMethodName); } + + [Test, Description("MonoBehaviours must not have any missing target objects or methods for UnityEvents.")] + public void SceneHasNoMissingUnityEventMethods() + { + // Based on https://gist.github.com/AaronV/3fd7cc22039cf34f536ab98db47d044a + // and https://stackoverflow.com/questions/42784338/unity-missing-warning-when-button-has-missing-onclick/42788400 + + List errors = new List(); + + // Iterate over all MonoBehaviours + MonoBehaviour[] monoBehavioursInScene = Resources.FindObjectsOfTypeAll(); + foreach (MonoBehaviour monoBehaviour in monoBehavioursInScene) + { + // Check all fields whether they are a UnityEvent + System.Type monoBehaviourType = monoBehaviour.GetType(); + FieldInfo[] fields = monoBehaviourType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public); + foreach (FieldInfo field in fields) + { + if (!typeof(UnityEvent).IsAssignableFrom(field.FieldType)) + continue; + + UnityEvent unityEvent = field.GetValue(monoBehaviour) as UnityEvent; + // Check all persistent (assigned via the Inspector) UnityEvent listeners + for (int persistentEventCountIndex = 0; persistentEventCountIndex < unityEvent.GetPersistentEventCount(); persistentEventCountIndex++) + { + // Assert event target object is not null + UnityEngine.Object eventTargetObject = unityEvent.GetPersistentTarget(persistentEventCountIndex); + if (eventTargetObject == null) + { + errors.Add($"The UnityEvent of {monoBehaviourType.Name} \"{monoBehaviour.name}\" called \"{field.Name}\" " + + $"has an event target object that is null (index {persistentEventCountIndex}). " + + $"The path of the GameObject is {monoBehaviour.gameObject.GetScenePath()}"); + continue; + } + + // Assert event target object Type is not null + string eventTargetObjectFullName = eventTargetObject.GetType()?.AssemblyQualifiedName; + if (string.IsNullOrEmpty(eventTargetObjectFullName)) // AssemblyQualifiedName can be null if the current instance represents a generic type parameter + continue; + System.Type eventTargetObjectType = System.Type.GetType(eventTargetObjectFullName); + if (eventTargetObjectType == null) + { + errors.Add($"The UnityEvent of {monoBehaviourType.Name} \"{monoBehaviour.name}\" called \"{field.Name}\" " + + $"has an event target object whose type is null (index {persistentEventCountIndex})." + + $"The path of the GameObject is {monoBehaviour.gameObject.GetScenePath()}"); + continue; + } + + string eventTargetMethodName = unityEvent.GetPersistentMethodName(persistentEventCountIndex); + try + { + MethodInfo methodInfo = eventTargetObjectType.GetMethod + (eventTargetMethodName, + BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + + // Assert the event target method exists + if (methodInfo != null) + continue; + errors.Add($"The UnityEvent of {monoBehaviourType.Name} \" {monoBehaviour.name} \" called \"{field.Name}\" " + + $"has an event target method \"{eventTargetMethodName}\" that could not be found (index {persistentEventCountIndex}). " + + $"The path of the GameObject is {monoBehaviour.gameObject.GetScenePath()}"); + } + catch (AmbiguousMatchException) + { + // Multiple overloads for the method found, this is okay + } + } + } + } + + Assert.Zero(errors.Count, "Found " + errors.Count + " error(s):\r\n" + string.Join("\r\n", errors)); + } } } diff --git a/unity/Assets/Tests/Utilities/UtilityFunctions.cs b/unity/Assets/Tests/Utilities/UtilityFunctions.cs index 5f1757dd1..1648c5eb6 100644 --- a/unity/Assets/Tests/Utilities/UtilityFunctions.cs +++ b/unity/Assets/Tests/Utilities/UtilityFunctions.cs @@ -227,5 +227,22 @@ public static void ReportTestFailureWithPopup(ITestResultAdaptor result) EditorUtility.DisplayDialog(GuiPopupTitle, $"{result.FailCount} test{(result.FailCount > 1 ? "s" : "")} failed:\n{failedTestNames}\n\n" + "Check Test Runner window for more information", "Ok"); } + + /// + /// Gets the path of the GameObject in the scene hierarchy. + /// + /// The path to the gameObject + /// based on https://discussions.unity.com/t/how-can-i-get-the-full-path-to-a-gameobject/412/2 + public static string GetScenePath(this GameObject gameObject) + { + char delimiter = '/'; + string path = delimiter + gameObject.name; + while (gameObject.transform.parent != null) + { + gameObject = gameObject.transform.parent.gameObject; + path = delimiter + gameObject.name + path; + } + return path; + } } } diff --git a/unity/Assets/WebGLTemplates/MaroonWeb/configs.php b/unity/Assets/WebGLTemplates/MaroonWeb/configs.php new file mode 100644 index 000000000..5ae62db22 --- /dev/null +++ b/unity/Assets/WebGLTemplates/MaroonWeb/configs.php @@ -0,0 +1,23 @@ + diff --git a/unity/Assets/WebGLTemplates/MaroonWeb/configs.php.meta b/unity/Assets/WebGLTemplates/MaroonWeb/configs.php.meta new file mode 100644 index 000000000..13d2ab72d --- /dev/null +++ b/unity/Assets/WebGLTemplates/MaroonWeb/configs.php.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6acaad0c2ebce249a736907ed260197 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Packages/packages-lock.json b/unity/Packages/packages-lock.json index 4a5044e45..d278efcec 100644 --- a/unity/Packages/packages-lock.json +++ b/unity/Packages/packages-lock.json @@ -18,7 +18,7 @@ "dependencies": { "com.unity.textmeshpro": "1.4.1" }, - "hash": "9ca396a39a95831d41be6cc2f6f2d98d5cfdd6f3" + "hash": "89ee687a8ae1a6b823773b22547f34ce8aa9da04" }, "com.gamelabgraz.userinterface": { "version": "https://github.com/GameLabGraz/Utilities.git#package/userinterface", @@ -90,8 +90,8 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.analytics": "1.0.4", - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" }, "url": "https://packages.unity.com" }, @@ -174,10 +174,10 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.8.2", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.8.2" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -187,8 +187,8 @@ "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.services.core": "1.10.1" + "com.unity.services.core": "1.10.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -197,9 +197,9 @@ "depth": 1, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -251,9 +251,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -292,9 +292,9 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", + "com.unity.modules.subsystems": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com"