diff --git a/Actions/BaseAction.cs b/Actions/BaseAction.cs index cf7b19541..86ad16883 100644 --- a/Actions/BaseAction.cs +++ b/Actions/BaseAction.cs @@ -7,14 +7,16 @@ namespace UnityEditor.Experimental.EditorVR.Actions /// abstract class BaseAction : MonoBehaviour, IAction { +#pragma warning disable 649 + [SerializeField] + Sprite m_Icon; +#pragma warning restore 649 + public Sprite icon { get { return m_Icon; } } - [SerializeField] - Sprite m_Icon; - public abstract void ExecuteAction(); } } diff --git a/Editor/LockableHierarchyGUI.cs b/Editor/LockableHierarchyGUI.cs index e0c9da9a7..6871526b2 100644 --- a/Editor/LockableHierarchyGUI.cs +++ b/Editor/LockableHierarchyGUI.cs @@ -4,11 +4,13 @@ [InitializeOnLoad] class LockableHierarchyGUI : ScriptableSingleton { +#pragma warning disable 649 [SerializeField] Texture2D m_LockIcon; [SerializeField] Texture2D m_UnlockIcon; +#pragma warning restore 649 static LockableHierarchyGUI() { diff --git a/Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat b/Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat index 15f967ff4..3b4996f3d 100644 --- a/Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat +++ b/Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: Roboto-Medium SDF Alternate Menu Text m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} diff --git a/Manipulators/BaseManipulator.cs b/Manipulators/BaseManipulator.cs index dc65f34b9..be0b78670 100644 --- a/Manipulators/BaseManipulator.cs +++ b/Manipulators/BaseManipulator.cs @@ -8,10 +8,6 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators { class BaseManipulator : MonoBehaviour, IManipulator { - protected const float k_BaseManipulatorSize = 0.3f; - const float k_MinHandleTipDirectionDelta = 0.01f; - const float k_LazyFollow = 40f; - class HandleTip { public Renderer renderer; @@ -20,6 +16,12 @@ class HandleTip public Vector3? positionOffset; } + const float k_MinHandleTipDirectionDelta = 0.01f; + const float k_LazyFollow = 40f; + + protected const float k_BaseManipulatorSize = 0.3f; + +#pragma warning disable 649 [SerializeField] Renderer m_HandleTip; @@ -40,6 +42,7 @@ class HandleTip [SerializeField] float m_HandleHoverAlpha = 0.8f; +#pragma warning restore 649 readonly Dictionary m_ScaleBumps = new Dictionary(); readonly Dictionary m_HandleTips = new Dictionary(); diff --git a/Manipulators/ScaleManipulator.cs b/Manipulators/ScaleManipulator.cs index 1cc012ed3..5ce557a9e 100644 --- a/Manipulators/ScaleManipulator.cs +++ b/Manipulators/ScaleManipulator.cs @@ -5,8 +5,10 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators { sealed class ScaleManipulator : BaseManipulator { +#pragma warning disable 649 [SerializeField] BaseHandle m_UniformHandle; +#pragma warning restore 649 protected override void OnHandleDragging(BaseHandle handle, HandleEventData eventData) { diff --git a/Manipulators/ScaleManipulator.prefab b/Manipulators/ScaleManipulator.prefab index 86a9e514d..e15ae24ff 100644 --- a/Manipulators/ScaleManipulator.prefab +++ b/Manipulators/ScaleManipulator.prefab @@ -429,8 +429,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_SelectionFlags: 3 m_OrientDragPlaneToRay: 1 m_Constraints: 0 @@ -443,8 +443,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_SelectionFlags: 3 m_OrientDragPlaneToRay: 1 m_Constraints: 0 @@ -457,8 +457,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_SelectionFlags: 3 m_OrientDragPlaneToRay: 1 m_Constraints: 0 @@ -471,8 +471,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_SelectionFlags: 3 m_OrientDragPlaneToRay: 1 m_Constraints: 0 @@ -485,8 +485,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4dbf941c00473034b89a9acd39176c7f, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HandleTip: {fileID: 23000013012300180} m_AllHandles: - {fileID: 114000010053947466} diff --git a/Manipulators/StandardManipulator.cs b/Manipulators/StandardManipulator.cs index ca0a7c7d3..2f70c0c2b 100644 --- a/Manipulators/StandardManipulator.cs +++ b/Manipulators/StandardManipulator.cs @@ -6,6 +6,7 @@ namespace UnityEditor.Experimental.EditorVR.Manipulators { sealed class StandardManipulator : BaseManipulator { +#pragma warning disable 649 [SerializeField] Transform m_PlaneHandlesParent; @@ -17,6 +18,7 @@ sealed class StandardManipulator : BaseManipulator [SerializeField] float m_SphereHandleHideScale = 0.1f; +#pragma warning restore 649 void Update() { diff --git a/Menus/MainMenu/MainMenu.cs b/Menus/MainMenu/MainMenu.cs index 7e2fa2a66..3ad4dad6c 100644 --- a/Menus/MainMenu/MainMenu.cs +++ b/Menus/MainMenu/MainMenu.cs @@ -18,6 +18,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia const string k_SettingsMenuSectionName = "Settings"; const float k_MaxFlickDuration = 0.3f; +#pragma warning disable 649 [SerializeField] ActionMap m_ActionMap; @@ -38,6 +39,7 @@ sealed class MainMenu : MonoBehaviour, IMainMenu, IConnectInterfaces, IInstantia [SerializeField] HapticPulse m_ButtonHoverPulse; +#pragma warning restore 649 Transform m_AlternateMenuOrigin; Transform m_MenuOrigin; diff --git a/Menus/MainMenu/Scripts/MainMenuButton.cs b/Menus/MainMenu/Scripts/MainMenuButton.cs index da9cf3bf9..6623a669f 100644 --- a/Menus/MainMenu/Scripts/MainMenuButton.cs +++ b/Menus/MainMenu/Scripts/MainMenuButton.cs @@ -12,8 +12,10 @@ namespace UnityEditor.Experimental.EditorVR.Menus { sealed class MainMenuButton : MainMenuSelectable, ITooltip, IRayEnterHandler, IRayExitHandler, IPointerClickHandler { +#pragma warning disable 649 [SerializeField] Button m_Button; +#pragma warning restore 649 CanvasGroup m_CanvasGroup; diff --git a/Menus/MainMenu/Scripts/MainMenuFace.cs b/Menus/MainMenu/Scripts/MainMenuFace.cs index e4f34ded7..6c02dadf3 100644 --- a/Menus/MainMenu/Scripts/MainMenuFace.cs +++ b/Menus/MainMenu/Scripts/MainMenuFace.cs @@ -20,6 +20,7 @@ sealed class MainMenuFace : MonoBehaviour { static readonly Vector3 k_LocalOffset = Vector3.down * 0.15f; +#pragma warning disable 649 [SerializeField] MeshRenderer m_BorderOutline; @@ -39,6 +40,7 @@ sealed class MainMenuFace : MonoBehaviour [SerializeField] ScrollRect m_ScrollRect; +#pragma warning restore 649 Material m_BorderOutlineMaterial; Vector3 m_BorderOutlineOriginalLocalScale; diff --git a/Menus/MainMenu/Scripts/MainMenuToggle.cs b/Menus/MainMenu/Scripts/MainMenuToggle.cs index 580c542d4..971088c0e 100644 --- a/Menus/MainMenu/Scripts/MainMenuToggle.cs +++ b/Menus/MainMenu/Scripts/MainMenuToggle.cs @@ -11,8 +11,10 @@ namespace UnityEditor.Experimental.EditorVR.Menus { sealed class MainMenuToggle : MainMenuSelectable, IRayEnterHandler, IRayExitHandler, IPointerClickHandler { +#pragma warning disable 649 [SerializeField] Toggle m_Toggle; +#pragma warning restore 649 CanvasGroup m_CanvasGroup; diff --git a/Menus/MainMenu/Scripts/MainMenuUI.cs b/Menus/MainMenu/Scripts/MainMenuUI.cs index 2520ddbf5..fe6ff015f 100644 --- a/Menus/MainMenu/Scripts/MainMenuUI.cs +++ b/Menus/MainMenu/Scripts/MainMenuUI.cs @@ -42,9 +42,10 @@ enum VisibilityState const float k_RotationEpsilon = 1f; const int k_FaceCount = 4; - readonly string k_UncategorizedFaceName = "Uncategorized"; - readonly Color k_MenuFacesHiddenColor = new Color(1f, 1f, 1f, 0.5f); + const string k_UncategorizedFaceName = "Uncategorized"; + static readonly Color k_MenuFacesHiddenColor = new Color(1f, 1f, 1f, 0.5f); +#pragma warning disable 649 [SerializeField] MainMenuButton m_ButtonTemplatePrefab; @@ -62,6 +63,7 @@ enum VisibilityState [SerializeField] Transform m_AlternateMenu; +#pragma warning restore 649 int m_TargetFaceIndex; diff --git a/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader b/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader index ba2339d23..c4581db48 100644 --- a/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader +++ b/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader @@ -14,6 +14,9 @@ _ColorMask("Color Mask", Float) = 15 [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0 + + // Unused _MainTex property, added to prevent runtime exceptions for elements whose parent is a ScrollRect + [HideInInspector] _MainTex("Main Texture - unused", 2D) = "white" {} } SubShader diff --git a/Menus/RadialMenu/Materials/RadialMenuFrame.mat b/Menus/RadialMenu/Materials/RadialMenuFrame.mat index 5e3763ce1..2861a68f6 100644 --- a/Menus/RadialMenu/Materials/RadialMenuFrame.mat +++ b/Menus/RadialMenu/Materials/RadialMenuFrame.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: RadialMenuFrame m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3} diff --git a/Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat b/Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat index 9525c8af2..d0adf9274 100644 --- a/Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat +++ b/Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: RadialMenuFrameOuterBorder m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3} diff --git a/Menus/RadialMenu/Materials/RadialMenuIcon.mat b/Menus/RadialMenu/Materials/RadialMenuIcon.mat index 8af266de6..d52ec106a 100644 --- a/Menus/RadialMenu/Materials/RadialMenuIcon.mat +++ b/Menus/RadialMenu/Materials/RadialMenuIcon.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: RadialMenuIcon m_Shader: {fileID: 4800000, guid: bb5c2bef6f6cd59459628622758d17ff, type: 3} diff --git a/Menus/RadialMenu/Materials/RadialMenuSlotInset.mat b/Menus/RadialMenu/Materials/RadialMenuSlotInset.mat index 4e34256fa..303285860 100644 --- a/Menus/RadialMenu/Materials/RadialMenuSlotInset.mat +++ b/Menus/RadialMenu/Materials/RadialMenuSlotInset.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: RadialMenuSlotInset m_Shader: {fileID: 4800000, guid: c8cf0b95851289d40aecbbb604f214fd, type: 3} diff --git a/Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat b/Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat index 337b9123b..26d4849ad 100644 --- a/Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat +++ b/Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: RadialMenuSlotsMask m_Shader: {fileID: 4800000, guid: da29182e4499c6740bf4e5dc3198313a, type: 3} diff --git a/Menus/RadialMenu/RadialMenu.cs b/Menus/RadialMenu/RadialMenu.cs index e32775fff..1913b70b4 100644 --- a/Menus/RadialMenu/RadialMenu.cs +++ b/Menus/RadialMenu/RadialMenu.cs @@ -14,6 +14,7 @@ sealed class RadialMenu : MonoBehaviour, IInstantiateUI, IAlternateMenu, IUsesMe const float k_ActivationThreshold = 0.5f; // Do not consume thumbstick or activate menu if the control vector's magnitude is below this threshold const string k_SpatialDescription = "Perform actions based on selected-object context"; +#pragma warning disable 649 [SerializeField] ActionMap m_ActionMap; @@ -28,6 +29,7 @@ sealed class RadialMenu : MonoBehaviour, IInstantiateUI, IAlternateMenu, IUsesMe [SerializeField] HapticPulse m_ButtonClickedPulse; +#pragma warning restore 649 RadialMenuUI m_RadialMenuUI; List m_MenuActions; diff --git a/Menus/RadialMenu/Scripts/RadialMenuSlot.cs b/Menus/RadialMenu/Scripts/RadialMenuSlot.cs index 0f5033d77..d747bfb52 100644 --- a/Menus/RadialMenu/Scripts/RadialMenuSlot.cs +++ b/Menus/RadialMenu/Scripts/RadialMenuSlot.cs @@ -11,8 +11,6 @@ namespace UnityEditor.Experimental.EditorVR.Menus { sealed class RadialMenuSlot : MonoBehaviour, ISetTooltipVisibility, ITooltip, ITooltipPlacement, IRayEnterHandler, IRayExitHandler { - static Color s_FrameOpaqueColor; - static GradientPair s_GradientPair; static readonly Vector3 k_HiddenLocalScale = new Vector3(1f, 0f, 1f); const float k_IconHighlightedLocalYOffset = 0.006f; const string k_MaterialAlphaProperty = "_Alpha"; @@ -22,6 +20,10 @@ sealed class RadialMenuSlot : MonoBehaviour, ISetTooltipVisibility, ITooltip, IT const string k_MaterialColorProperty = "_Color"; const string k_MaterialStencilRefProperty = "_StencilRef"; + static Color s_FrameOpaqueColor; + static GradientPair s_GradientPair; + +#pragma warning disable 649 [SerializeField] MeshRenderer m_InsetMeshRenderer; @@ -54,6 +56,7 @@ sealed class RadialMenuSlot : MonoBehaviour, ISetTooltipVisibility, ITooltip, IT [SerializeField] Transform m_TooltipSource; +#pragma warning restore 649 bool m_Pressed; bool m_Highlighted; @@ -107,7 +110,7 @@ public bool pressed // Proceed only if value is true after previously being false if (m_Highlighted && value != m_Pressed && value && gameObject.activeSelf) { - m_Pressed = value; + m_Pressed = true; this.StopCoroutine(ref m_IconHighlightCoroutine); @@ -169,7 +172,7 @@ public bool visible { set { - if (value && m_Visible == value) // Allow false to fall through and perform hiding regardless of visibility + if (value && m_Visible) // Allow false to fall through and perform hiding regardless of visibility return; m_Visible = value; @@ -394,23 +397,20 @@ IEnumerator Highlight() HighlightIcon(); var opacity = Time.deltaTime; - var topColor = m_OriginalInsetGradientPair.a; - var bottomColor = m_OriginalInsetGradientPair.b; var initialFrameColor = m_FrameMaterial.color; - var currentFrameColor = initialFrameColor; while (opacity > 0) { if (m_Highlighted) { opacity = Mathf.Clamp01(opacity + Time.deltaTime * 4); // stay highlighted - currentFrameColor = Color.Lerp(initialFrameColor, s_FrameOpaqueColor, opacity); + var currentFrameColor = Color.Lerp(initialFrameColor, s_FrameOpaqueColor, opacity); m_FrameMaterial.SetColor(k_MaterialColorProperty, currentFrameColor); } else opacity = Mathf.Clamp01(opacity - Time.deltaTime * 2); - topColor = Color.Lerp(m_OriginalInsetGradientPair.a, s_GradientPair.a, opacity * 2f); - bottomColor = Color.Lerp(m_OriginalInsetGradientPair.b, s_GradientPair.b, opacity); + var topColor = Color.Lerp(m_OriginalInsetGradientPair.a, s_GradientPair.a, opacity * 2f); + var bottomColor = Color.Lerp(m_OriginalInsetGradientPair.b, s_GradientPair.b, opacity); m_InsetMaterial.SetColor(k_MaterialColorTopProperty, topColor); m_InsetMaterial.SetColor(k_MaterialColorBottomProperty, bottomColor); diff --git a/Menus/RadialMenu/Scripts/RadialMenuUI.cs b/Menus/RadialMenu/Scripts/RadialMenuUI.cs index 124e04966..3bc58aef8 100644 --- a/Menus/RadialMenu/Scripts/RadialMenuUI.cs +++ b/Menus/RadialMenu/Scripts/RadialMenuUI.cs @@ -12,6 +12,7 @@ sealed class RadialMenuUI : MonoBehaviour, IConnectInterfaces, IRequestStencilRe { const int k_SlotCount = 16; +#pragma warning disable 649 [SerializeField] Sprite m_MissingActionIcon; @@ -20,6 +21,7 @@ sealed class RadialMenuUI : MonoBehaviour, IConnectInterfaces, IRequestStencilRe [SerializeField] Transform m_SlotContainer; +#pragma warning restore 649 List m_RadialMenuSlots; Coroutine m_VisibilityCoroutine; diff --git a/Menus/SpatialUI/Materials/SpatialUIRobotoRegularOverlaySDF.mat b/Menus/SpatialUI/Materials/SpatialUIRobotoRegularOverlaySDF.mat index 82344cdbc..0be7f5363 100644 --- a/Menus/SpatialUI/Materials/SpatialUIRobotoRegularOverlaySDF.mat +++ b/Menus/SpatialUI/Materials/SpatialUIRobotoRegularOverlaySDF.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: SpatialUIRobotoRegularOverlaySDF m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} diff --git a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs index 62380cf9e..4a28fdc64 100644 --- a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs +++ b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuBackButton.cs @@ -8,10 +8,12 @@ namespace UnityEditor.Experimental.EditorVR.Menus { - internal class SpatialMenuBackButton : MonoBehaviour, IControlHaptics, IRayEnterHandler, IRayExitHandler + class SpatialMenuBackButton : MonoBehaviour, IControlHaptics, IRayEnterHandler, IRayExitHandler { +#pragma warning disable 649 [SerializeField] Button m_Button; +#pragma warning restore 649 Image m_ButtonImage; Vector3 m_VisibleLocalScale; diff --git a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs index 8860816f7..5e47fbe98 100644 --- a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs +++ b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSectionTitleElement.cs @@ -7,22 +7,17 @@ namespace UnityEditor.Experimental.EditorVR { - sealed internal class SpatialMenuSectionTitleElement : SpatialMenuElement + sealed class SpatialMenuSectionTitleElement : SpatialMenuElement { +#pragma warning disable 649 [Header("Haptic Pulses")] [SerializeField] HapticPulse m_HighlightPulse; +#pragma warning restore 649 - [SerializeField] - HapticPulse m_TooltipDisplayPulse; - - Vector2 m_ExpandedTooltipDisplaySize; Coroutine m_VisibilityCoroutine; - Coroutine m_TooltipVisualsVisibilityCoroutine; Vector3 m_TextOriginalLocalPosition; bool m_Highlighted; - Vector3 m_OriginalBordersLohocalScale; - float m_BordersOriginalAlpha; bool m_Visible; public override bool visible @@ -108,7 +103,7 @@ public void SetupInternal(Transform parentTransform, Action selectedAction, Stri void OnEnable() { - // Cacheing position here, as layout groups were altering the position when originally cacheing in Start() + // Caching position here, as layout groups were altering the position when originally caching in Start() m_TextOriginalLocalPosition = m_Text.transform.localPosition; } @@ -146,8 +141,8 @@ IEnumerator AnimateVisibility(bool fadeIn) IEnumerator AnimateHighlight(bool isHighlighted) { + const float targetAlpha = 1f; var currentAlpha = m_CanvasGroup.alpha; - var targetAlpha = 1f; var alphaTransitionAmount = 0f; var textTransform = m_Text.transform; var textCurrentLocalPosition = textTransform.localPosition; diff --git a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs index e11eb162d..b8f28d4d5 100644 --- a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs +++ b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuSubMenuElement.cs @@ -9,8 +9,9 @@ namespace UnityEditor.Experimental.EditorVR { - sealed internal class SpatialMenuSubMenuElement : SpatialMenuElement + sealed class SpatialMenuSubMenuElement : SpatialMenuElement { +#pragma warning disable 649 [SerializeField] Image m_BackgroundImage; @@ -43,6 +44,7 @@ sealed internal class SpatialMenuSubMenuElement : SpatialMenuElement [SerializeField] HapticPulse m_TooltipDisplayPulse; +#pragma warning restore 649 RectTransform m_RectTransform; Vector2 m_OriginalSize; diff --git a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs index 504ecda17..0ec975670 100644 --- a/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs +++ b/Menus/SpatialUI/SpatialMenu/Scripts/SpatialMenuUI.cs @@ -26,6 +26,7 @@ public sealed class SpatialMenuUI : SpatialUIView, IAdaptPosition, IDetectGazeDi const string k_ExternalRayBasedInputModeName = "Ray Input Mode"; const string k_TriggerRotationInputModeName = "Thumb Rotation Input Mode"; +#pragma warning disable 649 [Tooltip("Scales the amount of delay before the menu will reposition itself (higher is faster)")] [SerializeField] float m_AdaptiveRepositionRate = 1f; @@ -112,6 +113,7 @@ public sealed class SpatialMenuUI : SpatialUIView, IAdaptPosition, IDetectGazeDi [SerializeField] Renderer m_ReturnToPreviousBackgroundRenderer; +#pragma warning restore 649 readonly List m_CurrentlyDisplayedMenuElements = new List(); diff --git a/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs b/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs index 652ba0ba8..ff712d432 100644 --- a/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs +++ b/Menus/SpatialUI/SpatialMenu/SpatialMenu.cs @@ -5,6 +5,7 @@ using UnityEditor.Experimental.EditorVR.Core; using UnityEditor.Experimental.EditorVR.Extensions; using UnityEditor.Experimental.EditorVR.Menus; +using UnityEditor.Experimental.EditorVR.Utilities; using UnityEngine; using UnityEngine.InputNew; @@ -57,15 +58,19 @@ public enum SpatialMenuState NavigatingSubMenuContent, } + static readonly List k_SpatialMenuData = new List(); + static readonly List k_AllSpatialMenuRayOrigins = new List(); + static readonly List k_SpatialMenuProviders = new List(); + static SpatialMenu s_ControllingSpatialMenu; static SpatialMenuUI s_SpatialMenuUI; - static readonly List s_SpatialMenuData = new List(); - static readonly List s_AllSpatialMenuRayOrigins = new List(); static int s_SubMenuElementCount; static SpatialMenuData s_SubMenuData; - static readonly List s_SpatialMenuProviders = new List(); static SpatialMenuState s_SpatialMenuState; + static int subMenuElementCount { get { return s_SubMenuData.spatialMenuElements.Count; } } + +#pragma warning disable 649 [SerializeField] SpatialMenuUI m_SpatialMenuUiPrefab; @@ -81,6 +86,7 @@ public enum SpatialMenuState [SerializeField] HapticPulse m_NavigateBackPulse; +#pragma warning restore 649 bool m_Visible; @@ -109,8 +115,6 @@ public enum SpatialMenuState Coroutine m_CircularTriggerSelectionCyclingCoroutine; Transform m_RayOrigin; - int subMenuElementCount { get { return s_SubMenuData.spatialMenuElements.Count; } } - bool visible { set @@ -154,7 +158,7 @@ SpatialMenuState spatialMenuState s_SubMenuData = null; break; case SpatialMenuState.NavigatingSubMenuContent: - s_SubMenuData = s_SpatialMenuData.FirstOrDefault(x => x.highlighted); + s_SubMenuData = k_SpatialMenuData.FirstOrDefault(x => x.highlighted); this.Pulse(Node.None, m_MenuOpenPulse); break; case SpatialMenuState.Hidden: @@ -184,8 +188,8 @@ public Transform rayOrigin // has begun pointing at the spatial UI, which will override the input typs to ray-based interaction // (taking the opposite hand, and pointing it at the menu) - if (!s_AllSpatialMenuRayOrigins.Contains(m_RayOrigin)) - s_AllSpatialMenuRayOrigins.Add(m_RayOrigin); + if (!k_AllSpatialMenuRayOrigins.Contains(m_RayOrigin)) + k_AllSpatialMenuRayOrigins.Add(m_RayOrigin); } } @@ -230,8 +234,8 @@ void CreateUI() { if (s_SpatialMenuUI == null) { - s_SpatialMenuUI = this.InstantiateUI(m_SpatialMenuUiPrefab.gameObject, VRView.cameraRig, rayOrigin: rayOrigin).GetComponent(); - s_SpatialMenuUI.spatialMenuData = s_SpatialMenuData; // set shared reference to menu name/type, elements, and highlighted state + s_SpatialMenuUI = this.InstantiateUI(m_SpatialMenuUiPrefab.gameObject, CameraUtils.GetCameraRig(), rayOrigin: rayOrigin).GetComponent(); + s_SpatialMenuUI.spatialMenuData = k_SpatialMenuData; // set shared reference to menu name/type, elements, and highlighted state s_SpatialMenuUI.Setup(); s_SpatialMenuUI.returnToPreviousMenuLevel = ReturnToPreviousMenuLevel; s_SpatialMenuUI.changeMenuState = ChangeMenuState; @@ -249,26 +253,26 @@ void ChangeMenuState(SpatialMenuState state) void RefreshProviderData() { - foreach (var provider in s_SpatialMenuProviders) + foreach (var provider in k_SpatialMenuProviders) { foreach (var menuData in provider.spatialMenuData) { // Prevent menus/tools/etc that are instantiated multiple times from adding their contents to the Spatial Menu - if (!s_SpatialMenuData.Any(existingData => String.Equals(existingData.spatialMenuName, menuData.spatialMenuName))) - s_SpatialMenuData.Add(menuData); + if (!k_SpatialMenuData.Any(existingData => String.Equals(existingData.spatialMenuName, menuData.spatialMenuName))) + k_SpatialMenuData.Add(menuData); } } } public static void AddProvider(ISpatialMenuProvider provider) { - if (s_SpatialMenuProviders.Contains(provider)) + if (k_SpatialMenuProviders.Contains(provider)) return; - s_SpatialMenuProviders.Add(provider); + k_SpatialMenuProviders.Add(provider); foreach (var menuElementSet in provider.spatialMenuData) - s_SpatialMenuData.Add(menuElementSet); + k_SpatialMenuData.Add(menuElementSet); } void ReturnToPreviousMenuLevel() @@ -288,7 +292,7 @@ bool IsAimingAtUI() var divergenceThresholdConvertedToDot = Mathf.Sin(Mathf.Deg2Rad * kDivergenceThreshold); var spatialMenuUITransformPosition = s_SpatialMenuUI.adaptiveTransform != null ? s_SpatialMenuUI.adaptiveTransform.position : Vector3.zero; var viewerScale = this.GetViewerScale(); - foreach (var origin in s_AllSpatialMenuRayOrigins) + foreach (var origin in k_AllSpatialMenuRayOrigins) { if (origin == null) continue; @@ -377,7 +381,7 @@ public void ProcessInput(ActionMapInput input, ConsumeControlDelegate consumeCon spatialMenuState = SpatialMenuState.NavigatingTopLevel; s_SpatialMenuUI.spatialInterfaceInputMode = SpatialUIView.SpatialInterfaceInputMode.Neutral; - foreach (var data in s_SpatialMenuData) + foreach (var data in k_SpatialMenuData) { foreach (var element in data.spatialMenuElements) { @@ -510,7 +514,7 @@ IEnumerator TimedCircularTriggerSelection(bool selectNextItem = true) if (s_SpatialMenuState == SpatialMenuState.NavigatingTopLevel) { // User should return to the previously highligted position at this depth of the SpatialMenu - var menuElementCount = s_SpatialMenuData.Count; + var menuElementCount = k_SpatialMenuData.Count; m_HighlightedTopLevelMenuElementPosition = (int)Mathf.Repeat(m_HighlightedTopLevelMenuElementPosition + elementPositionOffset, menuElementCount); s_SpatialMenuUI.HighlightElementInCurrentlyDisplayedMenuSection(m_HighlightedTopLevelMenuElementPosition); } diff --git a/Menus/SpatialUI/SpatialMenu/SpatialMenu.prefab b/Menus/SpatialUI/SpatialMenu/SpatialMenu.prefab index 600ea9922..f42f0e479 100644 --- a/Menus/SpatialUI/SpatialMenu/SpatialMenu.prefab +++ b/Menus/SpatialUI/SpatialMenu/SpatialMenu.prefab @@ -8,13 +8,13 @@ Prefab: m_TransformParent: {fileID: 0} m_Modifications: [] m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1789767321393858} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1100553494013754 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -32,7 +32,7 @@ GameObject: --- !u!1 &1112413024793914 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -50,7 +50,7 @@ GameObject: --- !u!1 &1167666850991522 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -68,7 +68,7 @@ GameObject: --- !u!1 &1180071595364628 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -85,7 +85,7 @@ GameObject: --- !u!1 &1184627898333674 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -103,7 +103,7 @@ GameObject: --- !u!1 &1195714904063034 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -120,7 +120,7 @@ GameObject: --- !u!1 &1203179547476858 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -138,7 +138,7 @@ GameObject: --- !u!1 &1205473772546618 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -154,7 +154,7 @@ GameObject: --- !u!1 &1219554578632820 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -171,7 +171,7 @@ GameObject: --- !u!1 &1227203177949250 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -188,7 +188,7 @@ GameObject: --- !u!1 &1233386638406084 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -204,7 +204,7 @@ GameObject: --- !u!1 &1233422500995160 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -219,7 +219,7 @@ GameObject: --- !u!1 &1272734456080470 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -237,7 +237,7 @@ GameObject: --- !u!1 &1273622485587828 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -254,7 +254,7 @@ GameObject: --- !u!1 &1274656067595294 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -271,7 +271,7 @@ GameObject: --- !u!1 &1277153794634440 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -289,7 +289,7 @@ GameObject: --- !u!1 &1295077930898288 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -306,7 +306,7 @@ GameObject: --- !u!1 &1300809084655000 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -324,7 +324,7 @@ GameObject: --- !u!1 &1301053133300318 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -341,7 +341,7 @@ GameObject: --- !u!1 &1305635621771908 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -357,7 +357,7 @@ GameObject: --- !u!1 &1326737399539730 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -373,7 +373,7 @@ GameObject: --- !u!1 &1356799442503534 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -389,7 +389,7 @@ GameObject: --- !u!1 &1357420933447400 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -405,7 +405,7 @@ GameObject: --- !u!1 &1379329578636810 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -421,7 +421,7 @@ GameObject: --- !u!1 &1395476816687846 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -438,7 +438,7 @@ GameObject: --- !u!1 &1414634757489756 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -455,7 +455,7 @@ GameObject: --- !u!1 &1435546683708450 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -473,7 +473,7 @@ GameObject: --- !u!1 &1458985483663066 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -493,7 +493,7 @@ GameObject: --- !u!1 &1466752255878076 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -510,7 +510,7 @@ GameObject: --- !u!1 &1500944215905864 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -528,7 +528,7 @@ GameObject: --- !u!1 &1523037002661318 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -544,7 +544,7 @@ GameObject: --- !u!1 &1567518669920742 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -561,7 +561,7 @@ GameObject: --- !u!1 &1593906124877426 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -577,7 +577,7 @@ GameObject: --- !u!1 &1619526992205204 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -594,7 +594,7 @@ GameObject: --- !u!1 &1639457602434946 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -611,7 +611,7 @@ GameObject: --- !u!1 &1665864322566654 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -627,7 +627,7 @@ GameObject: --- !u!1 &1700245641566830 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -645,7 +645,7 @@ GameObject: --- !u!1 &1711548897315602 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -663,7 +663,7 @@ GameObject: --- !u!1 &1772043744471934 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -680,7 +680,7 @@ GameObject: --- !u!1 &1789767321393858 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -698,7 +698,7 @@ GameObject: --- !u!1 &1798841829712098 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -715,7 +715,7 @@ GameObject: --- !u!1 &1806313844801810 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -732,7 +732,7 @@ GameObject: --- !u!1 &1817812135287234 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -749,7 +749,7 @@ GameObject: --- !u!1 &1821103848994524 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -765,14 +765,13 @@ GameObject: --- !u!1 &1841478483736260 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: - component: {fileID: 224486766248788386} - component: {fileID: 222410835482764198} - component: {fileID: 114341117930592022} - - component: {fileID: 114252869383233080} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -783,7 +782,7 @@ GameObject: --- !u!1 &1880850998658600 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -800,7 +799,7 @@ GameObject: --- !u!1 &1889579951090354 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -816,7 +815,7 @@ GameObject: --- !u!1 &1921282646507046 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -833,7 +832,7 @@ GameObject: --- !u!1 &1921343652756424 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -851,7 +850,7 @@ GameObject: --- !u!1 &1947402031500864 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -868,7 +867,7 @@ GameObject: --- !u!1 &1994094993956278 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -887,7 +886,7 @@ GameObject: --- !u!4 &4383374797326700 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1639457602434946} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} @@ -900,7 +899,7 @@ Transform: --- !u!4 &4527969265960412 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1167666850991522} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} @@ -913,7 +912,7 @@ Transform: --- !u!4 &4542884266341674 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1789767321393858} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} @@ -927,7 +926,7 @@ Transform: --- !u!4 &4739251096752402 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1700245641566830} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} @@ -940,7 +939,7 @@ Transform: --- !u!4 &4919626380897530 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1233422500995160} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -954,7 +953,7 @@ Transform: --- !u!23 &23071393728006646 MeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1700245641566830} m_Enabled: 1 @@ -989,7 +988,7 @@ MeshRenderer: --- !u!23 &23229450323539760 MeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1167666850991522} m_Enabled: 1 @@ -1024,7 +1023,7 @@ MeshRenderer: --- !u!23 &23379497321438040 MeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1639457602434946} m_Enabled: 1 @@ -1059,28 +1058,28 @@ MeshRenderer: --- !u!33 &33928354841272442 MeshFilter: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1639457602434946} m_Mesh: {fileID: 4300002, guid: 80a33ce6a01849b4c90e3c4f89eece6e, type: 3} --- !u!33 &33947068209222504 MeshFilter: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1167666850991522} m_Mesh: {fileID: 4300002, guid: 80a33ce6a01849b4c90e3c4f89eece6e, type: 3} --- !u!33 &33989077769578214 MeshFilter: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1700245641566830} m_Mesh: {fileID: 4300002, guid: 80a33ce6a01849b4c90e3c4f89eece6e, type: 3} --- !u!65 &65606694971233430 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1167666850991522} m_Material: {fileID: 0} @@ -1092,7 +1091,7 @@ BoxCollider: --- !u!65 &65625413401782078 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1700245641566830} m_Material: {fileID: 0} @@ -1105,7 +1104,7 @@ BoxCollider: Animator: serializedVersion: 3 m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1789767321393858} m_Enabled: 1 @@ -1115,21 +1114,21 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 - m_WarningMessage: + m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &114002022183059760 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921282646507046} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 2d2943dc425a33f4dab13d3c016056be, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.784} m_RaycastTarget: 0 @@ -1149,14 +1148,14 @@ MonoBehaviour: --- !u!114 &114005941796262990 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1500944215905864} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -1241,11 +1240,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -1262,14 +1261,14 @@ MonoBehaviour: --- !u!114 &114068057976362324 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1274656067595294} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ed1eb3dce3c685c459b96539ee8ca373, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -1289,14 +1288,14 @@ MonoBehaviour: --- !u!114 &114070379327497002 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1395476816687846} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 240dbcd1c06072744822ab12290794d9, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -1316,14 +1315,14 @@ MonoBehaviour: --- !u!114 &114072379139525796 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1466752255878076} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9607843, g: 0.972549, b: 0.9764706, a: 0} m_RaycastTarget: 0 @@ -1343,14 +1342,14 @@ MonoBehaviour: --- !u!114 &114089193658416310 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1227203177949250} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 60e1e87a5f9d9724da2253994e29aa96, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.84705883} m_RaycastTarget: 0 @@ -1370,14 +1369,14 @@ MonoBehaviour: --- !u!114 &114110241011445372 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1180071595364628} m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -1397,14 +1396,14 @@ MonoBehaviour: --- !u!114 &114110306753894748 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1711548897315602} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -1489,11 +1488,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -1510,14 +1509,14 @@ MonoBehaviour: --- !u!114 &114113052369344922 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1295077930898288} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: f67ae259a3636124a8e12340e957bd8c, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} m_RaycastTarget: 0 @@ -1537,14 +1536,14 @@ MonoBehaviour: --- !u!114 &114140821908583270 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1272734456080470} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -1629,11 +1628,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -1650,14 +1649,14 @@ MonoBehaviour: --- !u!114 &114142542478025904 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1947402031500864} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} m_RaycastTarget: 0 @@ -1677,14 +1676,14 @@ MonoBehaviour: --- !u!114 &114182017653333906 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1356799442503534} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 @@ -1699,48 +1698,30 @@ MonoBehaviour: --- !u!114 &114231560380091448 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1435546683708450} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &114252869383233080 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1841478483736260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b7a9df544ea7234aab8eabdf5255edc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Text: {fileID: 0} - m_Icon: {fileID: 0} - m_CanvasGroup: {fileID: 0} - m_Button: {fileID: 0} - m_TransitionDuration: 0.75 - m_FadeInZOffset: 0.05 - m_HighlightedZOffset: -0.005 --- !u!114 &114257101746610200 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1619526992205204} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ed1eb3dce3c685c459b96539ee8ca373, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -1760,14 +1741,14 @@ MonoBehaviour: --- !u!114 &114266648109553236 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1994094993956278} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: c419899bd2ad1bb4abce2564782a69fe, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -1787,14 +1768,14 @@ MonoBehaviour: --- !u!114 &114270911610076706 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1458985483663066} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 88fd014d780d83c429af66de62a08984, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Text: {fileID: 114341117930592022} m_Icon: {fileID: 114110241011445372} m_CanvasGroup: {fileID: 225934889071316070} @@ -1816,14 +1797,14 @@ MonoBehaviour: --- !u!114 &114287606223497240 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1772043744471934} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9607843, g: 0.972549, b: 0.9764706, a: 1} m_RaycastTarget: 0 @@ -1843,14 +1824,14 @@ MonoBehaviour: --- !u!114 &114341117930592022 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1841478483736260} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -1935,11 +1916,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -1956,14 +1937,14 @@ MonoBehaviour: --- !u!114 &114350635836965230 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1203179547476858} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -2048,11 +2029,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2069,14 +2050,14 @@ MonoBehaviour: --- !u!114 &114398504241669226 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300809084655000} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -2161,11 +2142,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2182,14 +2163,14 @@ MonoBehaviour: --- !u!114 &114466967359545752 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1806313844801810} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: f67ae259a3636124a8e12340e957bd8c, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.784} m_RaycastTarget: 0 @@ -2209,14 +2190,14 @@ MonoBehaviour: --- !u!114 &114535207342256264 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1458985483663066} m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: 0 @@ -2228,26 +2209,26 @@ MonoBehaviour: --- !u!114 &114540607636211068 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1994094993956278} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b63282da68b4bb04ea8b3ba33176f755, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Button: {fileID: 114992225727225036} --- !u!114 &114563697617559756 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1184627898333674} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 @@ -2267,14 +2248,14 @@ MonoBehaviour: --- !u!114 &114592072207196238 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1184627898333674} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -2308,27 +2289,27 @@ MonoBehaviour: --- !u!114 &114607621919326614 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1458985483663066} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 0 --- !u!114 &114625835396149692 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1219554578632820} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 2d2943dc425a33f4dab13d3c016056be, type: 2} m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 0 @@ -2348,14 +2329,14 @@ MonoBehaviour: --- !u!114 &114647540470155398 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1593906124877426} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 @@ -2370,14 +2351,14 @@ MonoBehaviour: --- !u!114 &114668343779454750 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1817812135287234} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 240dbcd1c06072744822ab12290794d9, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -2397,14 +2378,14 @@ MonoBehaviour: --- !u!114 &114682360463952086 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921343652756424} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9607843, g: 0.972549, b: 0.9764706, a: 0} m_RaycastTarget: 0 @@ -2424,14 +2405,14 @@ MonoBehaviour: --- !u!114 &114688323868771050 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1112413024793914} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -2516,11 +2497,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2537,14 +2518,14 @@ MonoBehaviour: --- !u!114 &114688441406442830 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1880850998658600} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: ed1eb3dce3c685c459b96539ee8ca373, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -2564,14 +2545,14 @@ MonoBehaviour: --- !u!114 &114695413876674338 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1273622485587828} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 240dbcd1c06072744822ab12290794d9, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -2591,14 +2572,14 @@ MonoBehaviour: --- !u!114 &114709031476322508 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921343652756424} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: 14 m_MinHeight: -1 @@ -2610,14 +2591,14 @@ MonoBehaviour: --- !u!114 &114748702323181232 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1277153794634440} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 @@ -2702,11 +2683,11 @@ MonoBehaviour: lineCount: 1 pageCount: 1 materialCount: 1 - m_havePropertiesChanged: 1 + m_havePropertiesChanged: 0 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 1 + m_isInputParsingRequired: 0 m_inputSource: 0 m_hasFontAssetChanged: 0 m_subTextObjects: @@ -2723,14 +2704,14 @@ MonoBehaviour: --- !u!114 &114766331221287290 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1301053133300318} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 2d2943dc425a33f4dab13d3c016056be, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.784} m_RaycastTarget: 0 @@ -2750,14 +2731,14 @@ MonoBehaviour: --- !u!114 &114766411159850340 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1798841829712098} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 @@ -2772,14 +2753,14 @@ MonoBehaviour: --- !u!114 &114787561362810040 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1195714904063034} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 240dbcd1c06072744822ab12290794d9, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 @@ -2799,14 +2780,14 @@ MonoBehaviour: --- !u!114 &114824445102826170 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1100553494013754} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9607843, g: 0.972549, b: 0.9764706, a: 0} m_RaycastTarget: 0 @@ -2826,14 +2807,14 @@ MonoBehaviour: --- !u!114 &114832596498635208 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1567518669920742} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9607843, g: 0.972549, b: 0.9764706, a: 0} m_RaycastTarget: 0 @@ -2853,14 +2834,14 @@ MonoBehaviour: --- !u!114 &114853078162925174 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1100553494013754} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: 14 m_MinHeight: -1 @@ -2872,14 +2853,14 @@ MonoBehaviour: --- !u!114 &114876492015779046 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1414634757489756} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: f67ae259a3636124a8e12340e957bd8c, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.784} m_RaycastTarget: 0 @@ -2899,14 +2880,14 @@ MonoBehaviour: --- !u!114 &114973006485777900 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1789767321393858} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9dfe219337f521f4fb2ffd308d7239cd, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_HighlightUIElementPulse: {fileID: 11400000, guid: 8a40320bd3d9301459e26bf8738e37d5, type: 2} m_SustainedHoverUIElementPulse: {fileID: 11400000, guid: ee3076deadaac0745b2d123bff3ecbff, @@ -2943,14 +2924,14 @@ MonoBehaviour: --- !u!114 &114992225727225036 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1994094993956278} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Navigation: m_Mode: 3 m_SelectOnUp: {fileID: 0} @@ -2984,231 +2965,231 @@ MonoBehaviour: --- !u!222 &222010570768860182 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1274656067595294} m_CullTransparentMesh: 0 --- !u!222 &222036933358093812 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1458985483663066} m_CullTransparentMesh: 0 --- !u!222 &222037462304790792 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1195714904063034} m_CullTransparentMesh: 0 --- !u!222 &222052148543118472 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1711548897315602} m_CullTransparentMesh: 0 --- !u!222 &222080348542090188 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921343652756424} m_CullTransparentMesh: 0 --- !u!222 &222080635339507934 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1395476816687846} m_CullTransparentMesh: 0 --- !u!222 &222081985112720752 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1277153794634440} m_CullTransparentMesh: 0 --- !u!222 &222180448025661912 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1817812135287234} m_CullTransparentMesh: 0 --- !u!222 &222195251210118544 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1295077930898288} m_CullTransparentMesh: 0 --- !u!222 &222219595255065918 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921282646507046} m_CullTransparentMesh: 0 --- !u!222 &222225534845604226 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1880850998658600} m_CullTransparentMesh: 0 --- !u!222 &222282616278139350 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1947402031500864} m_CullTransparentMesh: 0 --- !u!222 &222316811783924928 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1619526992205204} m_CullTransparentMesh: 0 --- !u!222 &222346186339005736 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1100553494013754} m_CullTransparentMesh: 0 --- !u!222 &222410835482764198 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1841478483736260} m_CullTransparentMesh: 0 --- !u!222 &222464042117265976 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1219554578632820} m_CullTransparentMesh: 0 --- !u!222 &222489279067223474 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1227203177949250} m_CullTransparentMesh: 0 --- !u!222 &222542218356098660 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1301053133300318} m_CullTransparentMesh: 0 --- !u!222 &222559017132937192 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1500944215905864} m_CullTransparentMesh: 0 --- !u!222 &222590621383925658 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1272734456080470} m_CullTransparentMesh: 0 --- !u!222 &222606635235524210 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1273622485587828} m_CullTransparentMesh: 0 --- !u!222 &222642583600497626 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1994094993956278} m_CullTransparentMesh: 0 --- !u!222 &222701402812537284 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1466752255878076} m_CullTransparentMesh: 0 --- !u!222 &222722995419107430 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1772043744471934} m_CullTransparentMesh: 0 --- !u!222 &222735561373639684 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1806313844801810} m_CullTransparentMesh: 0 --- !u!222 &222797797449595646 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300809084655000} m_CullTransparentMesh: 0 --- !u!222 &222798026097765224 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1414634757489756} m_CullTransparentMesh: 0 --- !u!222 &222808842622463178 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1203179547476858} m_CullTransparentMesh: 0 --- !u!222 &222819008519039708 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1184627898333674} m_CullTransparentMesh: 0 --- !u!222 &222835521798606090 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1180071595364628} m_CullTransparentMesh: 0 --- !u!222 &222849847623911862 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1567518669920742} m_CullTransparentMesh: 0 --- !u!222 &222936416776786808 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1112413024793914} m_CullTransparentMesh: 0 --- !u!223 &223651440663421936 Canvas: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1435546683708450} m_Enabled: 1 @@ -3228,7 +3209,7 @@ Canvas: --- !u!224 &224030936000024160 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1567518669920742} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3238,15 +3219,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2808.47, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224036076621701292 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1458985483663066} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3270,7 +3251,7 @@ RectTransform: --- !u!224 &224111038989425402 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1414634757489756} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3288,7 +3269,7 @@ RectTransform: --- !u!224 &224113578593577414 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1219554578632820} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3307,7 +3288,7 @@ RectTransform: --- !u!224 &224134866915377078 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1994094993956278} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} @@ -3325,7 +3306,7 @@ RectTransform: --- !u!224 &224146312335543504 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1817812135287234} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3335,15 +3316,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5880.4697, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2048, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224184909171542130 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1272734456080470} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3353,15 +3334,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2048, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 104.54, y: 0.23697662} m_Pivot: {x: -0, y: 0.5} --- !u!224 &224190174565545938 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1227203177949250} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3379,7 +3360,7 @@ RectTransform: --- !u!224 &224228011050465958 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1466752255878076} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3389,15 +3370,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2048, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224247657960272906 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1356799442503534} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3427,7 +3408,7 @@ RectTransform: --- !u!224 &224271201765720720 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1274656067595294} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3445,7 +3426,7 @@ RectTransform: --- !u!224 &224300064097416046 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1772043744471934} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3455,15 +3436,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2422.54, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 512, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224321282137255222 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921282646507046} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3481,7 +3462,7 @@ RectTransform: --- !u!224 &224322273703202234 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1711548897315602} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3499,7 +3480,7 @@ RectTransform: --- !u!224 &224327553836790678 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1295077930898288} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3517,7 +3498,7 @@ RectTransform: --- !u!224 &224337629223322718 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1821103848994524} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3536,7 +3517,7 @@ RectTransform: --- !u!224 &224342491541870430 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1112413024793914} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3546,15 +3527,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2692.54, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 115.93, y: 0.23697662} m_Pivot: {x: -0, y: 0.5} --- !u!224 &224347770413473538 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1921343652756424} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3564,15 +3545,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2685.54, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 14, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224366625210285114 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1665864322566654} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3591,7 +3572,7 @@ RectTransform: --- !u!224 &224447873391472764 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1277153794634440} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3609,7 +3590,7 @@ RectTransform: --- !u!224 &224485917898400554 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1395476816687846} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3619,15 +3600,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3832.47, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2048, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224486766248788386 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1841478483736260} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3645,7 +3626,7 @@ RectTransform: --- !u!224 &224500006906110670 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1798841829712098} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3664,7 +3645,7 @@ RectTransform: --- !u!224 &224509468640289672 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1806313844801810} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3682,7 +3663,7 @@ RectTransform: --- !u!224 &224540336975017752 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1523037002661318} m_LocalRotation: {x: -0, y: -0, z: -1, w: 0} @@ -3702,7 +3683,7 @@ RectTransform: --- !u!224 &224540962560687654 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1619526992205204} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3720,7 +3701,7 @@ RectTransform: --- !u!224 &224548596711576928 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1233386638406084} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -3740,7 +3721,7 @@ RectTransform: --- !u!224 &224555829213721632 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1100553494013754} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3750,15 +3731,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2159.54, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 14, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224559641809215596 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1184627898333674} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} @@ -3776,7 +3757,7 @@ RectTransform: --- !u!224 &224601283646472078 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1947402031500864} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3794,7 +3775,7 @@ RectTransform: --- !u!224 &224615028383360606 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1326737399539730} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3814,7 +3795,7 @@ RectTransform: --- !u!224 &224615861497641564 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1880850998658600} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3832,7 +3813,7 @@ RectTransform: --- !u!224 &224630210355111636 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1357420933447400} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3852,7 +3833,7 @@ RectTransform: --- !u!224 &224675786090746602 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1301053133300318} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3870,7 +3851,7 @@ RectTransform: --- !u!224 &224684741921168796 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1305635621771908} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -3889,7 +3870,7 @@ RectTransform: --- !u!224 &224693976502204386 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1195714904063034} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -3899,15 +3880,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1024, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2048, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224722201347996720 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1435546683708450} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} @@ -3936,7 +3917,7 @@ RectTransform: --- !u!224 &224745935742958738 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1889579951090354} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3956,7 +3937,7 @@ RectTransform: --- !u!224 &224749180625870246 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1593906124877426} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3974,7 +3955,7 @@ RectTransform: --- !u!224 &224815385255047506 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1379329578636810} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -3995,7 +3976,7 @@ RectTransform: --- !u!224 &224816296302703472 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1203179547476858} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -4005,15 +3986,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8952.609, y: -0.025} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0.28000003, y: 0.05324} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224817053415320576 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1500944215905864} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -4031,7 +4012,7 @@ RectTransform: --- !u!224 &224817057685963520 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1180071595364628} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -4049,7 +4030,7 @@ RectTransform: --- !u!224 &224840657696305458 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300809084655000} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -4067,7 +4048,7 @@ RectTransform: --- !u!224 &224947154261700256 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1273622485587828} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -4077,15 +4058,15 @@ RectTransform: m_Father: {fileID: 224247657960272906} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 7928.4697, y: -0.024999999} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2048, y: 0.23697662} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224958406879500158 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1205473772546618} m_LocalRotation: {x: -0, y: -0, z: 1, w: 0} @@ -4104,7 +4085,7 @@ RectTransform: --- !u!225 &225114405593246312 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1272734456080470} m_Enabled: 1 @@ -4115,7 +4096,7 @@ CanvasGroup: --- !u!225 &225156185928477662 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1435546683708450} m_Enabled: 1 @@ -4126,7 +4107,7 @@ CanvasGroup: --- !u!225 &225183854367423912 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1305635621771908} m_Enabled: 1 @@ -4137,7 +4118,7 @@ CanvasGroup: --- !u!225 &225274552353809374 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1357420933447400} m_Enabled: 1 @@ -4148,7 +4129,7 @@ CanvasGroup: --- !u!225 &225321002424039612 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300809084655000} m_Enabled: 0 @@ -4159,7 +4140,7 @@ CanvasGroup: --- !u!225 &225359692758184068 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1889579951090354} m_Enabled: 1 @@ -4170,7 +4151,7 @@ CanvasGroup: --- !u!225 &225435354822137148 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1277153794634440} m_Enabled: 0 @@ -4181,7 +4162,7 @@ CanvasGroup: --- !u!225 &225605059610888044 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1233386638406084} m_Enabled: 1 @@ -4192,7 +4173,7 @@ CanvasGroup: --- !u!225 &225638466700717382 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1821103848994524} m_Enabled: 1 @@ -4203,7 +4184,7 @@ CanvasGroup: --- !u!225 &225655317635401780 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1711548897315602} m_Enabled: 0 @@ -4214,7 +4195,7 @@ CanvasGroup: --- !u!225 &225680815904369598 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1203179547476858} m_Enabled: 1 @@ -4225,7 +4206,7 @@ CanvasGroup: --- !u!225 &225723222503434812 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1500944215905864} m_Enabled: 0 @@ -4236,7 +4217,7 @@ CanvasGroup: --- !u!225 &225744566652108476 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1798841829712098} m_Enabled: 1 @@ -4247,7 +4228,7 @@ CanvasGroup: --- !u!225 &225780937225563892 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1379329578636810} m_Enabled: 1 @@ -4258,7 +4239,7 @@ CanvasGroup: --- !u!225 &225810307688447136 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1523037002661318} m_Enabled: 1 @@ -4269,7 +4250,7 @@ CanvasGroup: --- !u!225 &225833651207951742 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1665864322566654} m_Enabled: 1 @@ -4280,7 +4261,7 @@ CanvasGroup: --- !u!225 &225911941916197240 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1326737399539730} m_Enabled: 1 @@ -4291,7 +4272,7 @@ CanvasGroup: --- !u!225 &225934889071316070 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1458985483663066} m_Enabled: 1 @@ -4302,7 +4283,7 @@ CanvasGroup: --- !u!225 &225940011404902294 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1112413024793914} m_Enabled: 1 @@ -4313,7 +4294,7 @@ CanvasGroup: --- !u!225 &225999258119391654 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1205473772546618} m_Enabled: 1 @@ -4324,7 +4305,7 @@ CanvasGroup: --- !u!320 &320579960660821910 PlayableDirector: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1789767321393858} m_Enabled: 1 diff --git a/Menus/SpatialUI/SpatialMenu/SpatialMenuInput.asset b/Menus/SpatialUI/SpatialMenu/SpatialMenuInput.asset index ac44e6a5a..140b28d36 100644 --- a/Menus/SpatialUI/SpatialMenu/SpatialMenuInput.asset +++ b/Menus/SpatialUI/SpatialMenu/SpatialMenuInput.asset @@ -3,7 +3,7 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -184,7 +184,7 @@ MonoBehaviour: --- !u!114 &114038252636922082 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -204,7 +204,7 @@ MonoBehaviour: --- !u!114 &114128505005920440 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -224,7 +224,7 @@ MonoBehaviour: --- !u!114 &114174747458807318 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -244,7 +244,7 @@ MonoBehaviour: --- !u!114 &114386344967141356 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -264,7 +264,7 @@ MonoBehaviour: --- !u!114 &114443014895448148 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -284,7 +284,7 @@ MonoBehaviour: --- !u!114 &114467101554797360 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -304,7 +304,7 @@ MonoBehaviour: --- !u!114 &114489182058450978 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -324,7 +324,7 @@ MonoBehaviour: --- !u!114 &114492067934372108 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -344,7 +344,7 @@ MonoBehaviour: --- !u!114 &114541121747763440 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -364,7 +364,7 @@ MonoBehaviour: --- !u!114 &114542949849372224 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -384,7 +384,7 @@ MonoBehaviour: --- !u!114 &114676899699001354 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -404,7 +404,7 @@ MonoBehaviour: --- !u!114 &114743369696059576 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -424,7 +424,7 @@ MonoBehaviour: --- !u!114 &114843569382359436 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -444,7 +444,7 @@ MonoBehaviour: --- !u!114 &114892861181435544 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -464,7 +464,7 @@ MonoBehaviour: --- !u!114 &114937817894461440 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -484,7 +484,7 @@ MonoBehaviour: --- !u!114 &114971311725607160 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/Menus/ToolsMenu/Scripts/HintIcon.cs b/Menus/ToolsMenu/Scripts/HintIcon.cs index 4505aa424..e7ff7ec51 100644 --- a/Menus/ToolsMenu/Scripts/HintIcon.cs +++ b/Menus/ToolsMenu/Scripts/HintIcon.cs @@ -9,6 +9,7 @@ namespace UnityEditor.Experimental.EditorVR.Menus { public class HintIcon : MonoBehaviour { +#pragma warning disable 649 [SerializeField] bool m_HideOnInitialize = true; @@ -32,6 +33,7 @@ public class HintIcon : MonoBehaviour [SerializeField] bool m_SlightlyRandomizeHideDuration = true; +#pragma warning restore 649 readonly Vector3 k_HiddenScale = Vector3.zero; diff --git a/Menus/ToolsMenu/Scripts/HintLine.cs b/Menus/ToolsMenu/Scripts/HintLine.cs index 76d9fc325..592fb9d4b 100644 --- a/Menus/ToolsMenu/Scripts/HintLine.cs +++ b/Menus/ToolsMenu/Scripts/HintLine.cs @@ -9,6 +9,7 @@ public class HintLine : MonoBehaviour { const string k_ShaderLineRadiusPropertyName = "_lineRadius"; +#pragma warning disable 649 [SerializeField] VRLineRenderer m_ScrollLineRenderer; @@ -20,6 +21,7 @@ public class HintLine : MonoBehaviour [SerializeField] MeshRenderer m_MeshRenderer; +#pragma warning restore 649 Coroutine m_ScrollArrowPulseCoroutine; float m_PulseDuration; diff --git a/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs b/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs index 3a9701471..8696f21dc 100644 --- a/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs +++ b/Menus/ToolsMenu/Scripts/ToolsMenuUI.cs @@ -19,6 +19,7 @@ sealed class ToolsMenuUI : MonoBehaviour, IUsesViewerScale, IInstantiateUI, const float k_RaySelectIconHighlightedZOffset = -0.0075f; const float k_SpatialSelectIconHighlightedZOffset = -0.02f; +#pragma warning disable 649 [SerializeField] Transform m_ButtonContainer; @@ -31,6 +32,7 @@ sealed class ToolsMenuUI : MonoBehaviour, IUsesViewerScale, IInstantiateUI, [SerializeField] Transform m_ButtonTooltipTarget; +#pragma warning restore 649 bool m_AllButtonsVisible; List m_OrderedButtons; diff --git a/Menus/ToolsMenu/ToolsMenu.cs b/Menus/ToolsMenu/ToolsMenu.cs index 35dcc8a60..bad650708 100644 --- a/Menus/ToolsMenu/ToolsMenu.cs +++ b/Menus/ToolsMenu/ToolsMenu.cs @@ -18,6 +18,7 @@ sealed class ToolsMenu : MonoBehaviour, IToolsMenu, IConnectInterfaces, IInstant const int k_ActiveToolOrderPosition = 1; // A active-tool button position used in this particular ToolButton implementation const int k_MaxButtonCount = 16; +#pragma warning disable 649 [SerializeField] Sprite m_MainMenuIcon; @@ -38,6 +39,7 @@ sealed class ToolsMenu : MonoBehaviour, IToolsMenu, IConnectInterfaces, IInstant [SerializeField] HapticPulse m_HidingPulse; // The pulse performed when ending a spatial selection +#pragma warning restore 649 float m_AllowToolToggleBeforeThisTime; Vector3 m_SpatialScrollStartPosition; diff --git a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFaceMask.mat b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFaceMask.mat index 540f0e2bc..dc8786610 100644 --- a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFaceMask.mat +++ b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFaceMask.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: ToolsMenuButtonFaceMask m_Shader: {fileID: 4800000, guid: da29182e4499c6740bf4e5dc3198313a, type: 3} diff --git a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFrame.mat b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFrame.mat index 3997b3388..1481fcab0 100644 --- a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFrame.mat +++ b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonFrame.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: ToolsMenuButtonFrame m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3} diff --git a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonUIContent.mat b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonUIContent.mat index 79a559152..804295126 100644 --- a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonUIContent.mat +++ b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenuButtonUIContent.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: ToolsMenuButtonUIContent m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0} diff --git a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenulButton.mat b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenulButton.mat index 3ed13f525..f945ef881 100644 --- a/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenulButton.mat +++ b/Menus/ToolsMenu/ToolsMenuButton/Materials/ToolsMenulButton.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: ToolsMenulButton m_Shader: {fileID: 4800000, guid: c8cf0b95851289d40aecbbb604f214fd, type: 3} diff --git a/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs b/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs index 87985cfdb..12a317e5b 100644 --- a/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs +++ b/Menus/ToolsMenu/ToolsMenuButton/ToolsMenuButton.cs @@ -21,6 +21,7 @@ sealed class ToolsMenuButton : MonoBehaviour, IToolsMenuButton, ITooltip, IToolt const string k_MaterialStencilRefProperty = "_StencilRef"; readonly Vector3 k_ToolButtonActivePosition = new Vector3(0f, 0f, -0.035f); +#pragma warning disable 649 [SerializeField] GradientButton m_GradientButton; @@ -71,6 +72,7 @@ sealed class ToolsMenuButton : MonoBehaviour, IToolsMenuButton, ITooltip, IToolt [SerializeField] Image m_ButtonIcon; +#pragma warning restore 649 Coroutine m_PositionCoroutine; Coroutine m_VisibilityCoroutine; diff --git a/Menus/UndoMenu/Scripts/UndoMenuUI.cs b/Menus/UndoMenu/Scripts/UndoMenuUI.cs index 977ca675f..d5e76bb88 100644 --- a/Menus/UndoMenu/Scripts/UndoMenuUI.cs +++ b/Menus/UndoMenu/Scripts/UndoMenuUI.cs @@ -13,11 +13,13 @@ sealed class UndoMenuUI : MonoBehaviour, IConnectInterfaces const float k_UndoPerformedAlpha = 1f; const string k_MaterialColorProperty = "_Color"; +#pragma warning disable 649 [SerializeField] MeshRenderer m_UndoButtonMeshRenderer; [SerializeField] MeshRenderer m_RedoButtonMeshRenderer; +#pragma warning restore 649 Material m_UndoButtonMaterial; Material m_RedoButtonMaterial; diff --git a/Menus/UndoMenu/UndoMenu.cs b/Menus/UndoMenu/UndoMenu.cs index 84250801d..162a0a5a8 100644 --- a/Menus/UndoMenu/UndoMenu.cs +++ b/Menus/UndoMenu/UndoMenu.cs @@ -18,6 +18,7 @@ sealed class UndoMenu : MonoBehaviour, IInstantiateUI, IUsesMenuOrigins, ICustom const string k_FeedbackHintForJoystickController = "Click + flick left/right to undo/redo"; const string k_FeedbackHintForTrackpadController = "Click left/right side to undo/redo"; +#pragma warning disable 649 [SerializeField] ActionMap m_ActionMap; @@ -26,6 +27,7 @@ sealed class UndoMenu : MonoBehaviour, IInstantiateUI, IUsesMenuOrigins, ICustom [SerializeField] HapticPulse m_UndoPulse; +#pragma warning restore 649 UndoMenuUI m_UndoMenuUI; Transform m_AlternateMenuOrigin; diff --git a/Models/Touch/Materials/TouchController.mat b/Models/Touch/Materials/TouchController.mat index 68eb9987f..60d40a1e9 100644 --- a/Models/Touch/Materials/TouchController.mat +++ b/Models/Touch/Materials/TouchController.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: TouchController m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} diff --git a/Prefabs/Materials/PlayerFloorUI.mat b/Prefabs/Materials/PlayerFloorUI.mat index a94081705..49e9aa949 100644 --- a/Prefabs/Materials/PlayerFloorUI.mat +++ b/Prefabs/Materials/PlayerFloorUI.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: PlayerFloorUI m_Shader: {fileID: 4800000, guid: 9d6919ea6d73f5c45bf292736fa16b22, type: 3} diff --git a/Prefabs/PlayerFloor.prefab b/Prefabs/PlayerFloor.prefab index 0df076f90..373f7179a 100644 --- a/Prefabs/PlayerFloor.prefab +++ b/Prefabs/PlayerFloor.prefab @@ -8,13 +8,13 @@ Prefab: m_TransformParent: {fileID: 0} m_Modifications: [] m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1888626590568660} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1394033343498954 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -31,7 +31,7 @@ GameObject: --- !u!1 &1532482544846278 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -48,7 +48,7 @@ GameObject: --- !u!1 &1679206615039672 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -65,7 +65,7 @@ GameObject: --- !u!1 &1774817519231244 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -82,7 +82,7 @@ GameObject: --- !u!1 &1888626590568660 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -98,7 +98,7 @@ GameObject: --- !u!114 &114283512606783486 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1774817519231244} m_Enabled: 1 @@ -125,7 +125,7 @@ MonoBehaviour: --- !u!114 &114630769121397118 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1532482544846278} m_Enabled: 1 @@ -152,7 +152,7 @@ MonoBehaviour: --- !u!114 &114819756679057214 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1888626590568660} m_Enabled: 1 @@ -166,7 +166,7 @@ MonoBehaviour: --- !u!114 &114951793832757314 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1394033343498954} m_Enabled: 1 @@ -279,28 +279,28 @@ MonoBehaviour: --- !u!222 &222279327045359662 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1532482544846278} m_CullTransparentMesh: 0 --- !u!222 &222339222715468306 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1394033343498954} m_CullTransparentMesh: 0 --- !u!222 &222789207530312680 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1774817519231244} m_CullTransparentMesh: 0 --- !u!223 &223163636628142684 Canvas: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1679206615039672} m_Enabled: 1 @@ -320,7 +320,7 @@ Canvas: --- !u!224 &224029610478736454 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1774817519231244} m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} @@ -338,7 +338,7 @@ RectTransform: --- !u!224 &224047032386534596 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1394033343498954} m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} @@ -356,7 +356,7 @@ RectTransform: --- !u!224 &224137146816351996 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1888626590568660} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} @@ -375,7 +375,7 @@ RectTransform: --- !u!224 &224362450763144242 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1532482544846278} m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} @@ -393,7 +393,7 @@ RectTransform: --- !u!224 &224603395735895866 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1679206615039672} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} @@ -414,7 +414,7 @@ RectTransform: --- !u!225 &225315863781914820 CanvasGroup: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1679206615039672} m_Enabled: 1 diff --git a/Prefabs/Proxies/LeftTouch.prefab b/Prefabs/Proxies/LeftTouch.prefab index 5b0e65ed8..8f6bddd12 100644 --- a/Prefabs/Proxies/LeftTouch.prefab +++ b/Prefabs/Proxies/LeftTouch.prefab @@ -3,7 +3,7 @@ --- !u!1 &118082 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -20,7 +20,7 @@ GameObject: --- !u!4 &436998 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 118082} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -52,13 +52,13 @@ Prefab: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 118082} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1000011111799672 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -73,7 +73,7 @@ GameObject: --- !u!1 &1000011958545574 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -88,7 +88,7 @@ GameObject: --- !u!1 &1000012440443120 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -103,7 +103,7 @@ GameObject: --- !u!1 &1000013074843682 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -118,7 +118,7 @@ GameObject: --- !u!1 &1000013561259994 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -133,7 +133,7 @@ GameObject: --- !u!1 &1031038971204598 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -148,7 +148,7 @@ GameObject: --- !u!1 &1042355208459200 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -164,7 +164,7 @@ GameObject: --- !u!1 &1083798442779764 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -182,7 +182,7 @@ GameObject: --- !u!1 &1122636758918012 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -198,7 +198,7 @@ GameObject: --- !u!1 &1145093136087720 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -213,7 +213,7 @@ GameObject: --- !u!1 &1148149682412176 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -228,7 +228,7 @@ GameObject: --- !u!1 &1199262531601306 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -244,7 +244,7 @@ GameObject: --- !u!1 &1202186852734250 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -264,7 +264,7 @@ GameObject: --- !u!1 &1225097643088602 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -280,7 +280,7 @@ GameObject: --- !u!1 &1261998114856134 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -295,7 +295,7 @@ GameObject: --- !u!1 &1272537213511044 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -311,7 +311,7 @@ GameObject: --- !u!1 &1295154688639734 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -327,7 +327,7 @@ GameObject: --- !u!1 &1313597953055958 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -343,7 +343,7 @@ GameObject: --- !u!1 &1348510442696396 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -359,7 +359,7 @@ GameObject: --- !u!1 &1351591593002910 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -375,7 +375,7 @@ GameObject: --- !u!1 &1409653755696854 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -391,7 +391,7 @@ GameObject: --- !u!1 &1424909599579642 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -407,7 +407,7 @@ GameObject: --- !u!1 &1434861168218356 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -422,7 +422,7 @@ GameObject: --- !u!1 &1446987022763856 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -438,7 +438,7 @@ GameObject: --- !u!1 &1494494711544910 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -456,7 +456,7 @@ GameObject: --- !u!1 &1518805742753350 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -472,7 +472,7 @@ GameObject: --- !u!1 &1532967703125270 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -488,7 +488,7 @@ GameObject: --- !u!1 &1560332605839088 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -506,7 +506,7 @@ GameObject: --- !u!1 &1572681453968620 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -522,7 +522,7 @@ GameObject: --- !u!1 &1683650976280660 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -538,7 +538,7 @@ GameObject: --- !u!1 &1685548030556672 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -554,7 +554,7 @@ GameObject: --- !u!1 &1694942832401130 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -572,7 +572,7 @@ GameObject: --- !u!1 &1720596793936536 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -588,7 +588,7 @@ GameObject: --- !u!1 &1738933694265162 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -604,7 +604,7 @@ GameObject: --- !u!1 &1755913869265462 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -620,7 +620,7 @@ GameObject: --- !u!1 &1778558274338634 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -636,7 +636,7 @@ GameObject: --- !u!1 &1839275883648232 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -652,7 +652,7 @@ GameObject: --- !u!1 &1841102929241702 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -667,7 +667,7 @@ GameObject: --- !u!1 &1874736252931534 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -683,7 +683,7 @@ GameObject: --- !u!1 &1881711034871878 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -699,7 +699,7 @@ GameObject: --- !u!1 &1909141750602428 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -715,7 +715,7 @@ GameObject: --- !u!1 &1959474420817224 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -731,7 +731,7 @@ GameObject: --- !u!1 &1974418527491720 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -746,7 +746,7 @@ GameObject: --- !u!1 &1987981435592376 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -762,7 +762,7 @@ GameObject: --- !u!1 &1997236882483478 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -778,7 +778,7 @@ GameObject: --- !u!4 &4000010810114962 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011111799672} m_LocalRotation: {x: -0.258819, y: -0, z: -0, w: 0.9659259} @@ -791,7 +791,7 @@ Transform: --- !u!4 &4000011559331518 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013074843682} m_LocalRotation: {x: -0, y: 0.06975647, z: -0, w: 0.9975641} @@ -804,7 +804,7 @@ Transform: --- !u!4 &4000011600309478 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013561259994} m_LocalRotation: {x: 0, y: 0.06975647, z: 0, w: 0.9975641} @@ -817,7 +817,7 @@ Transform: --- !u!4 &4000012123783760 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011958545574} m_LocalRotation: {x: -0.258819, y: 0, z: 0, w: 0.9659259} @@ -830,7 +830,7 @@ Transform: --- !u!4 &4000012197213606 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000012440443120} m_LocalRotation: {x: 0.7053843, y: 0.049325276, z: -0.049325276, w: 0.7053843} @@ -843,7 +843,7 @@ Transform: --- !u!4 &4010449334111106 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1409653755696854} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -856,7 +856,7 @@ Transform: --- !u!4 &4015653583509020 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1261998114856134} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} @@ -879,7 +879,7 @@ Transform: --- !u!4 &4089756949643502 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1199262531601306} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -892,7 +892,7 @@ Transform: --- !u!4 &4091161274382070 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1560332605839088} m_LocalRotation: {x: 0.05660452, y: -0.05795374, z: -0.0046757394, w: 0.9967023} @@ -905,7 +905,7 @@ Transform: --- !u!4 &4092355242464378 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1083798442779764} m_LocalRotation: {x: 0.017080953, y: -0.07918932, z: 0.52647054, w: 0.84632504} @@ -918,7 +918,7 @@ Transform: --- !u!4 &4111399277264726 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1148149682412176} m_LocalRotation: {x: 0, y: -0.70108956, z: -0, w: 0.71307325} @@ -931,7 +931,7 @@ Transform: --- !u!4 &4159979405415350 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1042355208459200} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -944,7 +944,7 @@ Transform: --- !u!4 &4194542147713924 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202186852734250} m_LocalRotation: {x: 0.0027868259, y: 0.70437866, z: -0.0031505642, w: 0.7098119} @@ -958,7 +958,7 @@ Transform: --- !u!4 &4220717783946280 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1225097643088602} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -971,7 +971,7 @@ Transform: --- !u!4 &4235044476408660 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1348510442696396} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -984,7 +984,7 @@ Transform: --- !u!4 &4286102610206736 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1572681453968620} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -997,7 +997,7 @@ Transform: --- !u!4 &4293181446164032 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1313597953055958} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -1010,7 +1010,7 @@ Transform: --- !u!4 &4341713318948048 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1272537213511044} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1023,7 +1023,7 @@ Transform: --- !u!4 &4354039934152740 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1434861168218356} m_LocalRotation: {x: 0.05660452, y: -0.05795374, z: -0.0046757394, w: 0.9967023} @@ -1036,7 +1036,7 @@ Transform: --- !u!4 &4357091700479226 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1881711034871878} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1049,7 +1049,7 @@ Transform: --- !u!4 &4372131932281040 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1997236882483478} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1062,7 +1062,7 @@ Transform: --- !u!4 &4381468331200168 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1738933694265162} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1075,7 +1075,7 @@ Transform: --- !u!4 &4382725640501402 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1839275883648232} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1090,7 +1090,7 @@ Transform: --- !u!4 &4478939524425066 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1959474420817224} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1103,7 +1103,7 @@ Transform: --- !u!4 &4496462074706534 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1909141750602428} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1116,7 +1116,7 @@ Transform: --- !u!4 &4571383871527714 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1122636758918012} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1129,7 +1129,7 @@ Transform: --- !u!4 &4575699823027442 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1494494711544910} m_LocalRotation: {x: -0.05795374, y: -0.05660452, z: 0.9967023, w: 0.0046757394} @@ -1142,7 +1142,7 @@ Transform: --- !u!4 &4595178183017066 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1778558274338634} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1155,7 +1155,7 @@ Transform: --- !u!4 &4657524821524270 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1841102929241702} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1173,7 +1173,7 @@ Transform: --- !u!4 &4684371104985676 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1446987022763856} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1186,7 +1186,7 @@ Transform: --- !u!4 &4714899788659012 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1685548030556672} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1199,7 +1199,7 @@ Transform: --- !u!4 &4744096678037134 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1532967703125270} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1212,7 +1212,7 @@ Transform: --- !u!4 &4746119600345352 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1295154688639734} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1225,7 +1225,7 @@ Transform: --- !u!4 &4763947974474172 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1694942832401130} m_LocalRotation: {x: -0.18065539, y: -0.13555649, z: -0.067166515, w: 0.97184193} @@ -1238,7 +1238,7 @@ Transform: --- !u!4 &4767710818838020 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1755913869265462} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1251,7 +1251,7 @@ Transform: --- !u!4 &4815247604116656 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1720596793936536} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1264,7 +1264,7 @@ Transform: --- !u!4 &4818017014546798 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1031038971204598} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: -8.659561e-17} @@ -1286,7 +1286,7 @@ Transform: --- !u!4 &4848242655045768 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1145093136087720} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1306,7 +1306,7 @@ Transform: --- !u!4 &4909077083915922 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1424909599579642} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1319,7 +1319,7 @@ Transform: --- !u!4 &4936562262949646 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1351591593002910} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1332,7 +1332,7 @@ Transform: --- !u!4 &4943079062831654 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1518805742753350} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1345,7 +1345,7 @@ Transform: --- !u!4 &4949239788665564 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1987981435592376} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1358,7 +1358,7 @@ Transform: --- !u!4 &4965990656987822 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874736252931534} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1371,7 +1371,7 @@ Transform: --- !u!4 &4970763114919696 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1683650976280660} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1384,7 +1384,7 @@ Transform: --- !u!4 &4980036500909732 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1974418527491720} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1402,7 +1402,7 @@ Transform: --- !u!65 &65193994980138744 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1694942832401130} m_Material: {fileID: 0} @@ -1414,7 +1414,7 @@ BoxCollider: --- !u!65 &65333418718937850 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1494494711544910} m_Material: {fileID: 0} @@ -1426,7 +1426,7 @@ BoxCollider: --- !u!65 &65553206853656982 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1083798442779764} m_Material: {fileID: 0} @@ -1438,7 +1438,7 @@ BoxCollider: --- !u!65 &65778755178880748 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1560332605839088} m_Material: {fileID: 0} @@ -1451,7 +1451,7 @@ BoxCollider: Animator: serializedVersion: 3 m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1839275883648232} m_Enabled: 1 @@ -1468,7 +1468,7 @@ Animator: --- !u!114 &114042444041108572 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1694942832401130} m_Enabled: 1 @@ -1480,7 +1480,7 @@ MonoBehaviour: --- !u!114 &114074799120930262 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202186852734250} m_Enabled: 1 @@ -1496,7 +1496,7 @@ MonoBehaviour: --- !u!114 &114075385818788246 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1494494711544910} m_Enabled: 1 @@ -1513,7 +1513,7 @@ MonoBehaviour: --- !u!114 &114104992321073894 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202186852734250} m_Enabled: 1 @@ -1529,7 +1529,7 @@ MonoBehaviour: --- !u!114 &114106165723935488 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1560332605839088} m_Enabled: 1 @@ -1541,7 +1541,7 @@ MonoBehaviour: --- !u!114 &114106875107596868 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1560332605839088} m_Enabled: 1 @@ -1557,7 +1557,7 @@ MonoBehaviour: --- !u!114 &114120601380093898 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202186852734250} m_Enabled: 1 @@ -1569,7 +1569,7 @@ MonoBehaviour: --- !u!114 &114122375193218136 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1122636758918012} m_Enabled: 1 @@ -1584,7 +1584,7 @@ MonoBehaviour: --- !u!114 &114136978357662110 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1909141750602428} m_Enabled: 1 @@ -1599,7 +1599,7 @@ MonoBehaviour: --- !u!114 &114199798348552534 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1083798442779764} m_Enabled: 1 @@ -1615,7 +1615,7 @@ MonoBehaviour: --- !u!114 &114225759855791224 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1685548030556672} m_Enabled: 1 @@ -1630,7 +1630,7 @@ MonoBehaviour: --- !u!114 &114309355936498838 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 118082} m_Enabled: 1 @@ -1642,7 +1642,7 @@ MonoBehaviour: --- !u!114 &114392724270294454 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1313597953055958} m_Enabled: 1 @@ -1657,7 +1657,7 @@ MonoBehaviour: --- !u!114 &114407763370231628 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1532967703125270} m_Enabled: 1 @@ -1672,7 +1672,7 @@ MonoBehaviour: --- !u!114 &114439686717765142 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874736252931534} m_Enabled: 1 @@ -1687,7 +1687,7 @@ MonoBehaviour: --- !u!114 &114469775710449708 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1778558274338634} m_Enabled: 1 @@ -1702,7 +1702,7 @@ MonoBehaviour: --- !u!114 &114537877412473130 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1683650976280660} m_Enabled: 1 @@ -1717,7 +1717,7 @@ MonoBehaviour: --- !u!114 &114571919349088310 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1295154688639734} m_Enabled: 1 @@ -1732,7 +1732,7 @@ MonoBehaviour: --- !u!114 &114619971803520516 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1083798442779764} m_Enabled: 1 @@ -1744,7 +1744,7 @@ MonoBehaviour: --- !u!114 &114687905252439258 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1348510442696396} m_Enabled: 1 @@ -1759,7 +1759,7 @@ MonoBehaviour: --- !u!114 &114687980677338928 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1694942832401130} m_Enabled: 1 @@ -1776,7 +1776,7 @@ MonoBehaviour: --- !u!114 &114731220867396932 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1225097643088602} m_Enabled: 1 @@ -1791,7 +1791,7 @@ MonoBehaviour: --- !u!114 &114763340425461004 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1959474420817224} m_Enabled: 1 @@ -1806,7 +1806,7 @@ MonoBehaviour: --- !u!114 &114806500800932090 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1351591593002910} m_Enabled: 1 @@ -1821,7 +1821,7 @@ MonoBehaviour: --- !u!114 &114823887704118574 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202186852734250} m_Enabled: 1 @@ -1837,7 +1837,7 @@ MonoBehaviour: --- !u!114 &114836126798842038 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1424909599579642} m_Enabled: 1 @@ -1852,7 +1852,7 @@ MonoBehaviour: --- !u!114 &114836500792196986 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1446987022763856} m_Enabled: 1 @@ -1867,7 +1867,7 @@ MonoBehaviour: --- !u!114 &114901275176387432 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1572681453968620} m_Enabled: 1 @@ -1882,7 +1882,7 @@ MonoBehaviour: --- !u!114 &114903647544746382 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1409653755696854} m_Enabled: 1 @@ -1897,7 +1897,7 @@ MonoBehaviour: --- !u!114 &114923600632512448 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1494494711544910} m_Enabled: 1 @@ -1909,7 +1909,7 @@ MonoBehaviour: --- !u!114 &114942772046743868 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 118082} m_Enabled: 1 @@ -1989,7 +1989,7 @@ MonoBehaviour: --- !u!136 &136198343651702156 CapsuleCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1202186852734250} m_Material: {fileID: 0} @@ -2002,7 +2002,7 @@ CapsuleCollider: --- !u!137 &137089646687881470 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1720596793936536} m_Enabled: 1 @@ -2050,7 +2050,7 @@ SkinnedMeshRenderer: --- !u!137 &137382939731345304 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1881711034871878} m_Enabled: 1 @@ -2098,7 +2098,7 @@ SkinnedMeshRenderer: --- !u!137 &137588399108629260 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1755913869265462} m_Enabled: 1 @@ -2146,7 +2146,7 @@ SkinnedMeshRenderer: --- !u!137 &137621640269852704 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1272537213511044} m_Enabled: 1 @@ -2195,7 +2195,7 @@ SkinnedMeshRenderer: --- !u!137 &137635776594977400 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1199262531601306} m_Enabled: 1 @@ -2243,7 +2243,7 @@ SkinnedMeshRenderer: --- !u!137 &137660841235518242 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1518805742753350} m_Enabled: 1 @@ -2291,7 +2291,7 @@ SkinnedMeshRenderer: --- !u!137 &137661752164736704 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1987981435592376} m_Enabled: 1 @@ -2339,7 +2339,7 @@ SkinnedMeshRenderer: --- !u!137 &137669335909359596 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1042355208459200} m_Enabled: 1 @@ -2387,7 +2387,7 @@ SkinnedMeshRenderer: --- !u!137 &137774818743731158 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1997236882483478} m_Enabled: 1 @@ -2435,7 +2435,7 @@ SkinnedMeshRenderer: --- !u!137 &137873452163751114 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1738933694265162} m_Enabled: 1 diff --git a/Prefabs/Proxies/LeftTouchOpenVR.prefab b/Prefabs/Proxies/LeftTouchOpenVR.prefab index ec5d6919e..0bd929258 100644 --- a/Prefabs/Proxies/LeftTouchOpenVR.prefab +++ b/Prefabs/Proxies/LeftTouchOpenVR.prefab @@ -8,13 +8,13 @@ Prefab: m_TransformParent: {fileID: 0} m_Modifications: [] m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1121674342063006} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1013607899913950 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -30,7 +30,7 @@ GameObject: --- !u!1 &1046655783306662 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -48,7 +48,7 @@ GameObject: --- !u!1 &1050292414166982 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -64,7 +64,7 @@ GameObject: --- !u!1 &1058892736116868 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -79,7 +79,7 @@ GameObject: --- !u!1 &1121674342063006 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -96,7 +96,7 @@ GameObject: --- !u!1 &1123560211306398 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -112,7 +112,7 @@ GameObject: --- !u!1 &1144656803809694 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -127,7 +127,7 @@ GameObject: --- !u!1 &1149156901974238 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -143,7 +143,7 @@ GameObject: --- !u!1 &1169806121900716 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -159,7 +159,7 @@ GameObject: --- !u!1 &1201007286429266 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -177,7 +177,7 @@ GameObject: --- !u!1 &1209970598471202 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -193,7 +193,7 @@ GameObject: --- !u!1 &1263089632666750 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -209,7 +209,7 @@ GameObject: --- !u!1 &1280035726240652 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -224,7 +224,7 @@ GameObject: --- !u!1 &1348408477637974 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -240,7 +240,7 @@ GameObject: --- !u!1 &1353036593663564 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -255,7 +255,7 @@ GameObject: --- !u!1 &1416630652921950 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -271,7 +271,7 @@ GameObject: --- !u!1 &1422528590480176 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -287,7 +287,7 @@ GameObject: --- !u!1 &1445727278413028 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -305,7 +305,7 @@ GameObject: --- !u!1 &1453671198657168 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -321,7 +321,7 @@ GameObject: --- !u!1 &1469381329759766 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -337,7 +337,7 @@ GameObject: --- !u!1 &1510159293463522 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -352,7 +352,7 @@ GameObject: --- !u!1 &1538513224550784 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -367,7 +367,7 @@ GameObject: --- !u!1 &1579443144653770 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -385,7 +385,7 @@ GameObject: --- !u!1 &1649164098859922 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -401,7 +401,7 @@ GameObject: --- !u!1 &1662010023507826 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -416,7 +416,7 @@ GameObject: --- !u!1 &1671144174825412 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -431,7 +431,7 @@ GameObject: --- !u!1 &1672145890804834 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -446,7 +446,7 @@ GameObject: --- !u!1 &1680665963817664 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -462,7 +462,7 @@ GameObject: --- !u!1 &1715539251632554 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -478,7 +478,7 @@ GameObject: --- !u!1 &1740601363590830 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -494,7 +494,7 @@ GameObject: --- !u!1 &1742960811670908 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -510,7 +510,7 @@ GameObject: --- !u!1 &1751369473305092 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -526,7 +526,7 @@ GameObject: --- !u!1 &1756763165991220 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -542,7 +542,7 @@ GameObject: --- !u!1 &1759733644573092 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -562,7 +562,7 @@ GameObject: --- !u!1 &1762723619229684 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -578,7 +578,7 @@ GameObject: --- !u!1 &1768556897632508 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -593,7 +593,7 @@ GameObject: --- !u!1 &1778209516209752 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -608,7 +608,7 @@ GameObject: --- !u!1 &1790805474432342 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -623,7 +623,7 @@ GameObject: --- !u!1 &1793495244650328 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -639,7 +639,7 @@ GameObject: --- !u!1 &1794941353031764 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -654,7 +654,7 @@ GameObject: --- !u!1 &1804604099819376 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -670,7 +670,7 @@ GameObject: --- !u!1 &1831483560001774 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -686,7 +686,7 @@ GameObject: --- !u!1 &1884866308761034 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -702,7 +702,7 @@ GameObject: --- !u!1 &1907223750729250 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -718,7 +718,7 @@ GameObject: --- !u!1 &1908361758102278 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -734,7 +734,7 @@ GameObject: --- !u!1 &1949306497839854 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -750,7 +750,7 @@ GameObject: --- !u!1 &1984809999253018 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -766,7 +766,7 @@ GameObject: --- !u!4 &4020329916160388 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1759733644573092} m_LocalRotation: {x: 0.0027868259, y: 0.70437866, z: -0.0031505642, w: 0.7098119} @@ -780,7 +780,7 @@ Transform: --- !u!4 &4023413159980300 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1149156901974238} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -793,7 +793,7 @@ Transform: --- !u!4 &4066961127535540 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1058892736116868} m_LocalRotation: {x: -0, y: 0.06975648, z: 0.0000000018626449, w: 0.9975641} @@ -806,7 +806,7 @@ Transform: --- !u!4 &4102747747765830 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1742960811670908} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -819,7 +819,7 @@ Transform: --- !u!4 &4157365850931230 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1790805474432342} m_LocalRotation: {x: 0.05660452, y: -0.05795374, z: -0.0046757394, w: 0.9967023} @@ -832,7 +832,7 @@ Transform: --- !u!4 &4174088344953920 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1353036593663564} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -850,7 +850,7 @@ Transform: --- !u!4 &4229316772646118 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1123560211306398} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -863,7 +863,7 @@ Transform: --- !u!4 &4236309684297632 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1144656803809694} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -883,7 +883,7 @@ Transform: --- !u!4 &4239119024398352 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1469381329759766} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -896,7 +896,7 @@ Transform: --- !u!4 &4243107362209348 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1762723619229684} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -909,7 +909,7 @@ Transform: --- !u!4 &4253614850656894 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1768556897632508} m_LocalRotation: {x: 0.34028876, y: -0.0113096535, z: 0.015475078, w: 0.9401257} @@ -928,7 +928,7 @@ Transform: --- !u!4 &4263165527348130 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1778209516209752} m_LocalRotation: {x: -0, y: 0.06975648, z: 0.0000000018626449, w: 0.9975641} @@ -941,7 +941,7 @@ Transform: --- !u!4 &4293653976301238 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1804604099819376} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -954,7 +954,7 @@ Transform: --- !u!4 &4298354039062494 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1280035726240652} m_LocalRotation: {x: 0.7053843, y: 0.04932528, z: -0.049325276, w: 0.7053844} @@ -967,7 +967,7 @@ Transform: --- !u!4 &4313174890007098 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1201007286429266} m_LocalRotation: {x: -0.05795374, y: -0.05660452, z: 0.9967023, w: 0.0046757394} @@ -980,7 +980,7 @@ Transform: --- !u!4 &4372420982755758 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1649164098859922} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -993,7 +993,7 @@ Transform: --- !u!4 &4381589195837748 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1793495244650328} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1006,7 +1006,7 @@ Transform: --- !u!4 &4397591939547504 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1121674342063006} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1020,7 +1020,7 @@ Transform: --- !u!4 &4400012549497698 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1263089632666750} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1033,7 +1033,7 @@ Transform: --- !u!4 &4405220346199876 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1445727278413028} m_LocalRotation: {x: 0.05660452, y: -0.05795374, z: -0.0046757394, w: 0.9967023} @@ -1046,7 +1046,7 @@ Transform: --- !u!4 &4432175222989066 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1579443144653770} m_LocalRotation: {x: -0.18065539, y: -0.13555649, z: -0.067166515, w: 0.97184193} @@ -1059,7 +1059,7 @@ Transform: --- !u!4 &4436425140232480 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1422528590480176} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1072,7 +1072,7 @@ Transform: --- !u!4 &4474193252606204 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1209970598471202} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1087,7 +1087,7 @@ Transform: --- !u!4 &4483952456240326 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1046655783306662} m_LocalRotation: {x: 0.017080953, y: -0.07918932, z: 0.52647054, w: 0.84632504} @@ -1100,7 +1100,7 @@ Transform: --- !u!4 &4499731403072604 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1672145890804834} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1118,7 +1118,7 @@ Transform: --- !u!4 &4564990402923940 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1680665963817664} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1131,7 +1131,7 @@ Transform: --- !u!4 &4568643925683780 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1949306497839854} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1144,7 +1144,7 @@ Transform: --- !u!4 &4601081929867384 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1671144174825412} m_LocalRotation: {x: -0.258819, y: -0, z: 9.3132246e-10, w: 0.9659259} @@ -1157,7 +1157,7 @@ Transform: --- !u!4 &4605068871939530 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1756763165991220} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1170,7 +1170,7 @@ Transform: --- !u!4 &4612923875818978 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1538513224550784} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: -8.659561e-17} @@ -1192,7 +1192,7 @@ Transform: --- !u!4 &4633752641419380 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1751369473305092} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1205,7 +1205,7 @@ Transform: --- !u!4 &4662693333746860 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1050292414166982} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1218,7 +1218,7 @@ Transform: --- !u!4 &4694679444484640 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1510159293463522} m_LocalRotation: {x: -0.258819, y: -0, z: 9.3132246e-10, w: 0.9659259} @@ -1231,7 +1231,7 @@ Transform: --- !u!4 &4695048620482832 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1715539251632554} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1244,7 +1244,7 @@ Transform: --- !u!4 &4695888008615210 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1831483560001774} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1257,7 +1257,7 @@ Transform: --- !u!4 &4696115423704748 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1662010023507826} m_LocalRotation: {x: 0, y: -0.70108956, z: -0, w: 0.71307325} @@ -1270,7 +1270,7 @@ Transform: --- !u!4 &4697260078660576 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1908361758102278} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1283,7 +1283,7 @@ Transform: --- !u!4 &4743018359654694 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1794941353031764} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} @@ -1306,7 +1306,7 @@ Transform: --- !u!4 &4808454800292888 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1740601363590830} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1319,7 +1319,7 @@ Transform: --- !u!4 &4810648905539360 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1416630652921950} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1332,7 +1332,7 @@ Transform: --- !u!4 &4848455111299618 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1884866308761034} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1345,7 +1345,7 @@ Transform: --- !u!4 &4869248030240662 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1169806121900716} m_LocalRotation: {x: -0.06975647, y: 0.9975641, z: -0, w: 0} @@ -1358,7 +1358,7 @@ Transform: --- !u!4 &4877027548724176 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1907223750729250} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -1371,7 +1371,7 @@ Transform: --- !u!4 &4913539177496826 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1984809999253018} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1384,7 +1384,7 @@ Transform: --- !u!4 &4928533023283438 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1013607899913950} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1397,7 +1397,7 @@ Transform: --- !u!4 &4943616850635436 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1348408477637974} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1410,7 +1410,7 @@ Transform: --- !u!4 &4990549808052852 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1453671198657168} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1423,7 +1423,7 @@ Transform: --- !u!65 &65282047422969612 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1201007286429266} m_Material: {fileID: 0} @@ -1435,7 +1435,7 @@ BoxCollider: --- !u!65 &65682869811567062 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1046655783306662} m_Material: {fileID: 0} @@ -1447,7 +1447,7 @@ BoxCollider: --- !u!65 &65939888487244674 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1579443144653770} m_Material: {fileID: 0} @@ -1459,7 +1459,7 @@ BoxCollider: --- !u!65 &65991035576453012 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1445727278413028} m_Material: {fileID: 0} @@ -1472,7 +1472,7 @@ BoxCollider: Animator: serializedVersion: 3 m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1209970598471202} m_Enabled: 1 @@ -1489,7 +1489,7 @@ Animator: --- !u!114 &114017681480795020 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1169806121900716} m_Enabled: 1 @@ -1504,7 +1504,7 @@ MonoBehaviour: --- !u!114 &114020008404741980 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1907223750729250} m_Enabled: 1 @@ -1519,7 +1519,7 @@ MonoBehaviour: --- !u!114 &114021416959014764 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1046655783306662} m_Enabled: 1 @@ -1535,7 +1535,7 @@ MonoBehaviour: --- !u!114 &114022392123060016 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1762723619229684} m_Enabled: 1 @@ -1550,7 +1550,7 @@ MonoBehaviour: --- !u!114 &114186850542647012 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1453671198657168} m_Enabled: 1 @@ -1565,7 +1565,7 @@ MonoBehaviour: --- !u!114 &114218589314108716 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1759733644573092} m_Enabled: 1 @@ -1577,7 +1577,7 @@ MonoBehaviour: --- !u!114 &114229739499269288 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1201007286429266} m_Enabled: 1 @@ -1594,7 +1594,7 @@ MonoBehaviour: --- !u!114 &114295302584021820 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1445727278413028} m_Enabled: 1 @@ -1606,7 +1606,7 @@ MonoBehaviour: --- !u!114 &114376778346400760 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1201007286429266} m_Enabled: 1 @@ -1618,7 +1618,7 @@ MonoBehaviour: --- !u!114 &114435091606135668 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1649164098859922} m_Enabled: 1 @@ -1633,7 +1633,7 @@ MonoBehaviour: --- !u!114 &114446743560801818 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1445727278413028} m_Enabled: 1 @@ -1649,7 +1649,7 @@ MonoBehaviour: --- !u!114 &114447601155289340 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1050292414166982} m_Enabled: 1 @@ -1664,7 +1664,7 @@ MonoBehaviour: --- !u!114 &114450263387222974 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1579443144653770} m_Enabled: 1 @@ -1676,7 +1676,7 @@ MonoBehaviour: --- !u!114 &114481979518844240 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1759733644573092} m_Enabled: 1 @@ -1692,7 +1692,7 @@ MonoBehaviour: --- !u!114 &114484375061917944 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1793495244650328} m_Enabled: 1 @@ -1707,7 +1707,7 @@ MonoBehaviour: --- !u!114 &114491183559307382 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1759733644573092} m_Enabled: 1 @@ -1723,7 +1723,7 @@ MonoBehaviour: --- !u!114 &114491676092453580 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1422528590480176} m_Enabled: 1 @@ -1738,7 +1738,7 @@ MonoBehaviour: --- !u!114 &114526722291284348 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1715539251632554} m_Enabled: 1 @@ -1753,7 +1753,7 @@ MonoBehaviour: --- !u!114 &114570317682448510 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1742960811670908} m_Enabled: 1 @@ -1768,7 +1768,7 @@ MonoBehaviour: --- !u!114 &114596704848120584 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1751369473305092} m_Enabled: 1 @@ -1783,7 +1783,7 @@ MonoBehaviour: --- !u!114 &114666460488969602 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1759733644573092} m_Enabled: 1 @@ -1799,7 +1799,7 @@ MonoBehaviour: --- !u!114 &114667529111250030 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1149156901974238} m_Enabled: 1 @@ -1814,7 +1814,7 @@ MonoBehaviour: --- !u!114 &114831531447913008 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1121674342063006} m_Enabled: 1 @@ -1826,7 +1826,7 @@ MonoBehaviour: --- !u!114 &114833777186243194 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1263089632666750} m_Enabled: 1 @@ -1841,7 +1841,7 @@ MonoBehaviour: --- !u!114 &114877499809311850 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1469381329759766} m_Enabled: 1 @@ -1856,7 +1856,7 @@ MonoBehaviour: --- !u!114 &114890707693554528 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1831483560001774} m_Enabled: 1 @@ -1871,7 +1871,7 @@ MonoBehaviour: --- !u!114 &114892244392075110 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1756763165991220} m_Enabled: 1 @@ -1886,7 +1886,7 @@ MonoBehaviour: --- !u!114 &114913910753299044 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1984809999253018} m_Enabled: 1 @@ -1901,7 +1901,7 @@ MonoBehaviour: --- !u!114 &114915788822637850 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1579443144653770} m_Enabled: 1 @@ -1918,7 +1918,7 @@ MonoBehaviour: --- !u!114 &114916313602062744 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1046655783306662} m_Enabled: 1 @@ -1930,7 +1930,7 @@ MonoBehaviour: --- !u!114 &114926072655415978 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1121674342063006} m_Enabled: 1 @@ -2010,7 +2010,7 @@ MonoBehaviour: --- !u!136 &136326093677881858 CapsuleCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1759733644573092} m_Material: {fileID: 0} @@ -2023,7 +2023,7 @@ CapsuleCollider: --- !u!137 &137245147954044454 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1740601363590830} m_Enabled: 1 @@ -2071,7 +2071,7 @@ SkinnedMeshRenderer: --- !u!137 &137256214325169206 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1804604099819376} m_Enabled: 1 @@ -2120,7 +2120,7 @@ SkinnedMeshRenderer: --- !u!137 &137352977537638996 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1348408477637974} m_Enabled: 1 @@ -2168,7 +2168,7 @@ SkinnedMeshRenderer: --- !u!137 &137387464655982552 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1013607899913950} m_Enabled: 1 @@ -2216,7 +2216,7 @@ SkinnedMeshRenderer: --- !u!137 &137398818643841204 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1416630652921950} m_Enabled: 1 @@ -2264,7 +2264,7 @@ SkinnedMeshRenderer: --- !u!137 &137434884236293406 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1908361758102278} m_Enabled: 1 @@ -2312,7 +2312,7 @@ SkinnedMeshRenderer: --- !u!137 &137601350072277780 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1949306497839854} m_Enabled: 1 @@ -2360,7 +2360,7 @@ SkinnedMeshRenderer: --- !u!137 &137691012764697278 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1884866308761034} m_Enabled: 1 @@ -2408,7 +2408,7 @@ SkinnedMeshRenderer: --- !u!137 &137783667269960454 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1123560211306398} m_Enabled: 1 @@ -2456,7 +2456,7 @@ SkinnedMeshRenderer: --- !u!137 &137969461006097562 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1680665963817664} m_Enabled: 1 diff --git a/Prefabs/Proxies/RightTouch.prefab b/Prefabs/Proxies/RightTouch.prefab index 220a14a1d..036e2d9d9 100644 --- a/Prefabs/Proxies/RightTouch.prefab +++ b/Prefabs/Proxies/RightTouch.prefab @@ -3,7 +3,7 @@ --- !u!1 &141214 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -20,7 +20,7 @@ GameObject: --- !u!4 &401760 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 141214} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -52,13 +52,13 @@ Prefab: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 141214} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1000010902826424 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -73,7 +73,7 @@ GameObject: --- !u!1 &1000011728326988 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -88,7 +88,7 @@ GameObject: --- !u!1 &1000013093051286 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -103,7 +103,7 @@ GameObject: --- !u!1 &1000013401176380 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -118,7 +118,7 @@ GameObject: --- !u!1 &1000013806026548 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -133,7 +133,7 @@ GameObject: --- !u!1 &1005848784311688 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -149,7 +149,7 @@ GameObject: --- !u!1 &1075225135487756 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -165,7 +165,7 @@ GameObject: --- !u!1 &1097431607461160 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -181,7 +181,7 @@ GameObject: --- !u!1 &1137090502453960 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -197,7 +197,7 @@ GameObject: --- !u!1 &1150131010631960 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -212,7 +212,7 @@ GameObject: --- !u!1 &1150673465062974 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -230,7 +230,7 @@ GameObject: --- !u!1 &1158696048999856 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -245,7 +245,7 @@ GameObject: --- !u!1 &1158790607797268 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -263,7 +263,7 @@ GameObject: --- !u!1 &1161437425677644 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -279,7 +279,7 @@ GameObject: --- !u!1 &1186380334687238 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -295,7 +295,7 @@ GameObject: --- !u!1 &1197275204241102 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -311,7 +311,7 @@ GameObject: --- !u!1 &1230513834025656 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -327,7 +327,7 @@ GameObject: --- !u!1 &1233936287937872 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -343,7 +343,7 @@ GameObject: --- !u!1 &1253741596773166 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -358,7 +358,7 @@ GameObject: --- !u!1 &1257924916287186 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -374,7 +374,7 @@ GameObject: --- !u!1 &1270860684327054 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -390,7 +390,7 @@ GameObject: --- !u!1 &1327913336508108 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -405,7 +405,7 @@ GameObject: --- !u!1 &1350724557845080 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -421,7 +421,7 @@ GameObject: --- !u!1 &1354246959799404 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -441,7 +441,7 @@ GameObject: --- !u!1 &1369601225623450 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -459,7 +459,7 @@ GameObject: --- !u!1 &1398705686299148 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -475,7 +475,7 @@ GameObject: --- !u!1 &1438604499360920 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -490,7 +490,7 @@ GameObject: --- !u!1 &1442115720587582 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -506,7 +506,7 @@ GameObject: --- !u!1 &1518033752911412 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -522,7 +522,7 @@ GameObject: --- !u!1 &1519692768916538 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -538,7 +538,7 @@ GameObject: --- !u!1 &1534898526410036 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -554,7 +554,7 @@ GameObject: --- !u!1 &1593208168887254 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -570,7 +570,7 @@ GameObject: --- !u!1 &1664486717501344 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -585,7 +585,7 @@ GameObject: --- !u!1 &1709957570693898 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -601,7 +601,7 @@ GameObject: --- !u!1 &1737130671896222 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -617,7 +617,7 @@ GameObject: --- !u!1 &1784013462903384 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -632,7 +632,7 @@ GameObject: --- !u!1 &1805439301474714 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -650,7 +650,7 @@ GameObject: --- !u!1 &1858875676224310 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -666,7 +666,7 @@ GameObject: --- !u!1 &1876231781455492 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -682,7 +682,7 @@ GameObject: --- !u!1 &1892711114474286 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -698,7 +698,7 @@ GameObject: --- !u!1 &1923358430747190 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -714,7 +714,7 @@ GameObject: --- !u!1 &1929222051200978 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -730,7 +730,7 @@ GameObject: --- !u!1 &1967411513287734 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -746,7 +746,7 @@ GameObject: --- !u!1 &1987276695526044 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -762,7 +762,7 @@ GameObject: --- !u!1 &1993913996661480 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -778,7 +778,7 @@ GameObject: --- !u!4 &4000010594257346 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013401176380} m_LocalRotation: {x: 0, y: -0.06975647, z: 0, w: 0.9975641} @@ -791,7 +791,7 @@ Transform: --- !u!4 &4000013218449236 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013806026548} m_LocalRotation: {x: -0.258819, y: -0, z: -0, w: 0.9659259} @@ -804,7 +804,7 @@ Transform: --- !u!4 &4000013278877548 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000013093051286} m_LocalRotation: {x: 0.7053843, y: -0.049325276, z: 0.049325276, w: 0.7053843} @@ -817,7 +817,7 @@ Transform: --- !u!4 &4000013824268610 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000010902826424} m_LocalRotation: {x: -0.258819, y: 0, z: 0, w: 0.9659259} @@ -830,7 +830,7 @@ Transform: --- !u!4 &4000014173169826 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1000011728326988} m_LocalRotation: {x: -0, y: -0.06975647, z: -0, w: 0.9975641} @@ -843,7 +843,7 @@ Transform: --- !u!4 &4050085195557600 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1233936287937872} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -856,7 +856,7 @@ Transform: --- !u!4 &4120935013021772 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1858875676224310} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -869,7 +869,7 @@ Transform: --- !u!4 &4123461771605112 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1876231781455492} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -882,7 +882,7 @@ Transform: --- !u!4 &4126803399466278 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1438604499360920} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: -8.659561e-17} @@ -904,7 +904,7 @@ Transform: --- !u!4 &4132596029922228 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1097431607461160} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -917,7 +917,7 @@ Transform: --- !u!4 &4141045235645334 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1150673465062974} m_LocalRotation: {x: 0.056604527, y: 0.05795374, z: 0.004675739, w: 0.9967023} @@ -930,7 +930,7 @@ Transform: --- !u!4 &4144220702821868 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1993913996661480} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: -0.000000013062143, w: -0.00000018679738} @@ -943,7 +943,7 @@ Transform: --- !u!4 &4193693584349866 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1442115720587582} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -956,7 +956,7 @@ Transform: --- !u!4 &4201774794186484 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1270860684327054} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -969,7 +969,7 @@ Transform: --- !u!4 &4213088615859462 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1892711114474286} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -982,7 +982,7 @@ Transform: --- !u!4 &4262851930533278 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354246959799404} m_LocalRotation: {x: -0.003149668, y: 0.7098123, z: 0.002783398, w: 0.7043784} @@ -996,7 +996,7 @@ Transform: --- !u!4 &4299850320256762 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1257924916287186} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1009,7 +1009,7 @@ Transform: --- !u!4 &4303942671141876 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1805439301474714} m_LocalRotation: {x: 0.056604527, y: 0.05795374, z: 0.004675739, w: 0.9967023} @@ -1022,7 +1022,7 @@ Transform: --- !u!4 &4309331764344058 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1197275204241102} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1035,7 +1035,7 @@ Transform: --- !u!4 &4323038109076564 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1664486717501344} m_LocalRotation: {x: -4.5059287e-17, y: -0.70108956, z: -6.5911624e-17, w: 0.71307325} @@ -1048,7 +1048,7 @@ Transform: --- !u!4 &4392599575704444 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1593208168887254} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -1061,7 +1061,7 @@ Transform: --- !u!4 &4415140144413600 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1150131010631960} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1081,7 +1081,7 @@ Transform: --- !u!4 &4428473521008618 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1987276695526044} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1094,7 +1094,7 @@ Transform: --- !u!4 &4428499584343618 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1737130671896222} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1107,7 +1107,7 @@ Transform: --- !u!4 &4435916632384040 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1784013462903384} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1125,7 +1125,7 @@ Transform: --- !u!4 &4446969229174396 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1929222051200978} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -1138,7 +1138,7 @@ Transform: --- !u!4 &4461677150117254 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1519692768916538} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1151,7 +1151,7 @@ Transform: --- !u!4 &4468861945253596 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1398705686299148} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1166,7 +1166,7 @@ Transform: --- !u!4 &4519651820907242 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1709957570693898} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1179,7 +1179,7 @@ Transform: --- !u!4 &4590480200574912 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1534898526410036} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1192,7 +1192,7 @@ Transform: --- !u!4 &4595526221329018 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1518033752911412} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1205,7 +1205,7 @@ Transform: --- !u!4 &4609009495890344 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1137090502453960} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1218,7 +1218,7 @@ Transform: --- !u!4 &4700744897584782 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1327913336508108} m_LocalRotation: {x: 0.07876507, y: 0.01894126, z: 0.5343878, w: 0.8413483} @@ -1231,7 +1231,7 @@ Transform: --- !u!4 &4714105738963836 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1230513834025656} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1244,7 +1244,7 @@ Transform: --- !u!4 &4737845126328112 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1158696048999856} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} @@ -1267,7 +1267,7 @@ Transform: --- !u!4 &4740462098850048 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1967411513287734} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -1280,7 +1280,7 @@ Transform: --- !u!4 &4741300536469656 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1253741596773166} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1298,7 +1298,7 @@ Transform: --- !u!4 &4772095215456836 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1075225135487756} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1311,7 +1311,7 @@ Transform: --- !u!4 &4819480960601886 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1350724557845080} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1324,7 +1324,7 @@ Transform: --- !u!4 &4861379918189578 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1158790607797268} m_LocalRotation: {x: -0.17913595, y: 0.14914332, z: 0.022661837, w: 0.97218984} @@ -1337,7 +1337,7 @@ Transform: --- !u!4 &4865833572681538 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1923358430747190} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1350,7 +1350,7 @@ Transform: --- !u!4 &4868360366993678 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1186380334687238} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1363,7 +1363,7 @@ Transform: --- !u!4 &4949098236580280 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1005848784311688} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -1376,7 +1376,7 @@ Transform: --- !u!4 &4967554931155654 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1369601225623450} m_LocalRotation: {x: 0.07876507, y: 0.01894126, z: 0.5343878, w: 0.8413483} @@ -1389,7 +1389,7 @@ Transform: --- !u!4 &4975842997142516 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1161437425677644} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -1402,7 +1402,7 @@ Transform: --- !u!65 &65459743621227226 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1158790607797268} m_Material: {fileID: 0} @@ -1414,7 +1414,7 @@ BoxCollider: --- !u!65 &65790928518198970 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1369601225623450} m_Material: {fileID: 0} @@ -1426,7 +1426,7 @@ BoxCollider: --- !u!65 &65852169674020222 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1150673465062974} m_Material: {fileID: 0} @@ -1438,7 +1438,7 @@ BoxCollider: --- !u!65 &65981701301502606 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1805439301474714} m_Material: {fileID: 0} @@ -1451,7 +1451,7 @@ BoxCollider: Animator: serializedVersion: 3 m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1398705686299148} m_Enabled: 1 @@ -1468,7 +1468,7 @@ Animator: --- !u!114 &114115039550712136 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1923358430747190} m_Enabled: 1 @@ -1483,7 +1483,7 @@ MonoBehaviour: --- !u!114 &114144232768918692 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354246959799404} m_Enabled: 1 @@ -1499,7 +1499,7 @@ MonoBehaviour: --- !u!114 &114146401256077078 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1442115720587582} m_Enabled: 1 @@ -1514,7 +1514,7 @@ MonoBehaviour: --- !u!114 &114151593935219754 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354246959799404} m_Enabled: 1 @@ -1530,7 +1530,7 @@ MonoBehaviour: --- !u!114 &114160435961296996 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1369601225623450} m_Enabled: 1 @@ -1546,7 +1546,7 @@ MonoBehaviour: --- !u!114 &114165319659903594 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1709957570693898} m_Enabled: 1 @@ -1561,7 +1561,7 @@ MonoBehaviour: --- !u!114 &114214439590146602 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1858875676224310} m_Enabled: 1 @@ -1576,7 +1576,7 @@ MonoBehaviour: --- !u!114 &114217440721163064 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1519692768916538} m_Enabled: 1 @@ -1591,7 +1591,7 @@ MonoBehaviour: --- !u!114 &114234204927649004 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354246959799404} m_Enabled: 1 @@ -1603,7 +1603,7 @@ MonoBehaviour: --- !u!114 &114263219804559234 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1150673465062974} m_Enabled: 1 @@ -1615,7 +1615,7 @@ MonoBehaviour: --- !u!114 &114294948195862080 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1534898526410036} m_Enabled: 1 @@ -1630,7 +1630,7 @@ MonoBehaviour: --- !u!114 &114356962429680012 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1987276695526044} m_Enabled: 1 @@ -1645,7 +1645,7 @@ MonoBehaviour: --- !u!114 &114371224785607966 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 141214} m_Enabled: 1 @@ -1725,7 +1725,7 @@ MonoBehaviour: --- !u!114 &114393778609686160 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1005848784311688} m_Enabled: 1 @@ -1740,7 +1740,7 @@ MonoBehaviour: --- !u!114 &114430790308988334 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 141214} m_Enabled: 1 @@ -1752,7 +1752,7 @@ MonoBehaviour: --- !u!114 &114477311298177296 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1967411513287734} m_Enabled: 1 @@ -1767,7 +1767,7 @@ MonoBehaviour: --- !u!114 &114504767995776134 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1233936287937872} m_Enabled: 1 @@ -1782,7 +1782,7 @@ MonoBehaviour: --- !u!114 &114554780637870098 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354246959799404} m_Enabled: 1 @@ -1798,7 +1798,7 @@ MonoBehaviour: --- !u!114 &114593974785552794 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1593208168887254} m_Enabled: 1 @@ -1813,7 +1813,7 @@ MonoBehaviour: --- !u!114 &114616434717012976 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1929222051200978} m_Enabled: 1 @@ -1828,7 +1828,7 @@ MonoBehaviour: --- !u!114 &114651106060554268 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1161437425677644} m_Enabled: 1 @@ -1843,7 +1843,7 @@ MonoBehaviour: --- !u!114 &114677039945447526 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1805439301474714} m_Enabled: 1 @@ -1859,7 +1859,7 @@ MonoBehaviour: --- !u!114 &114721097397684990 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1075225135487756} m_Enabled: 1 @@ -1874,7 +1874,7 @@ MonoBehaviour: --- !u!114 &114747652218319094 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1350724557845080} m_Enabled: 1 @@ -1889,7 +1889,7 @@ MonoBehaviour: --- !u!114 &114757071004709214 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1369601225623450} m_Enabled: 1 @@ -1901,7 +1901,7 @@ MonoBehaviour: --- !u!114 &114781435029337812 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1805439301474714} m_Enabled: 1 @@ -1913,7 +1913,7 @@ MonoBehaviour: --- !u!114 &114785413795988170 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1158790607797268} m_Enabled: 1 @@ -1930,7 +1930,7 @@ MonoBehaviour: --- !u!114 &114797330353378208 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1137090502453960} m_Enabled: 1 @@ -1945,7 +1945,7 @@ MonoBehaviour: --- !u!114 &114818693513810646 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1993913996661480} m_Enabled: 1 @@ -1960,7 +1960,7 @@ MonoBehaviour: --- !u!114 &114864354679307248 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1158790607797268} m_Enabled: 1 @@ -1972,7 +1972,7 @@ MonoBehaviour: --- !u!114 &114954792296329226 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1150673465062974} m_Enabled: 1 @@ -1989,7 +1989,7 @@ MonoBehaviour: --- !u!136 &136882614972082170 CapsuleCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354246959799404} m_Material: {fileID: 0} @@ -2002,7 +2002,7 @@ CapsuleCollider: --- !u!137 &137053190810926704 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1097431607461160} m_Enabled: 1 @@ -2050,7 +2050,7 @@ SkinnedMeshRenderer: --- !u!137 &137124385760650122 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1197275204241102} m_Enabled: 1 @@ -2098,7 +2098,7 @@ SkinnedMeshRenderer: --- !u!137 &137135476691345580 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1876231781455492} m_Enabled: 1 @@ -2147,7 +2147,7 @@ SkinnedMeshRenderer: --- !u!137 &137256447395258168 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1270860684327054} m_Enabled: 1 @@ -2195,7 +2195,7 @@ SkinnedMeshRenderer: --- !u!137 &137266879967115598 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1230513834025656} m_Enabled: 1 @@ -2243,7 +2243,7 @@ SkinnedMeshRenderer: --- !u!137 &137295908091608730 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1892711114474286} m_Enabled: 1 @@ -2291,7 +2291,7 @@ SkinnedMeshRenderer: --- !u!137 &137384519796214532 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1518033752911412} m_Enabled: 1 @@ -2339,7 +2339,7 @@ SkinnedMeshRenderer: --- !u!137 &137570146333118910 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1737130671896222} m_Enabled: 1 @@ -2387,7 +2387,7 @@ SkinnedMeshRenderer: --- !u!137 &137860676430645794 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1186380334687238} m_Enabled: 1 @@ -2435,7 +2435,7 @@ SkinnedMeshRenderer: --- !u!137 &137917119107452386 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1257924916287186} m_Enabled: 1 diff --git a/Prefabs/Proxies/RightTouchOpenVR.prefab b/Prefabs/Proxies/RightTouchOpenVR.prefab index 4d93a9971..168071331 100644 --- a/Prefabs/Proxies/RightTouchOpenVR.prefab +++ b/Prefabs/Proxies/RightTouchOpenVR.prefab @@ -8,13 +8,13 @@ Prefab: m_TransformParent: {fileID: 0} m_Modifications: [] m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1523256443734892} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1004669452273820 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -30,7 +30,7 @@ GameObject: --- !u!1 &1059154825281568 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -46,7 +46,7 @@ GameObject: --- !u!1 &1081293603496134 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -62,7 +62,7 @@ GameObject: --- !u!1 &1082573214156024 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -78,7 +78,7 @@ GameObject: --- !u!1 &1212151519367658 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -94,7 +94,7 @@ GameObject: --- !u!1 &1230358172930540 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -110,7 +110,7 @@ GameObject: --- !u!1 &1230595922584620 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -126,7 +126,7 @@ GameObject: --- !u!1 &1256076955954310 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -141,7 +141,7 @@ GameObject: --- !u!1 &1265269784871290 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -157,7 +157,7 @@ GameObject: --- !u!1 &1276142292023468 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -175,7 +175,7 @@ GameObject: --- !u!1 &1300317305236888 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -191,7 +191,7 @@ GameObject: --- !u!1 &1300727566292708 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -207,7 +207,7 @@ GameObject: --- !u!1 &1310876574352590 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -222,7 +222,7 @@ GameObject: --- !u!1 &1311200378102564 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -237,7 +237,7 @@ GameObject: --- !u!1 &1346335321641892 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -253,7 +253,7 @@ GameObject: --- !u!1 &1358144050439746 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -268,7 +268,7 @@ GameObject: --- !u!1 &1375005451987192 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -283,7 +283,7 @@ GameObject: --- !u!1 &1389113628653208 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -301,7 +301,7 @@ GameObject: --- !u!1 &1397649965331254 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -317,7 +317,7 @@ GameObject: --- !u!1 &1398662719640768 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -333,7 +333,7 @@ GameObject: --- !u!1 &1404765211522878 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -348,7 +348,7 @@ GameObject: --- !u!1 &1489487933936840 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -364,7 +364,7 @@ GameObject: --- !u!1 &1523256443734892 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -381,7 +381,7 @@ GameObject: --- !u!1 &1571403491183624 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -397,7 +397,7 @@ GameObject: --- !u!1 &1585823021358844 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -413,7 +413,7 @@ GameObject: --- !u!1 &1589431354275110 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -429,7 +429,7 @@ GameObject: --- !u!1 &1596791305360918 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -447,7 +447,7 @@ GameObject: --- !u!1 &1598100167736768 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -463,7 +463,7 @@ GameObject: --- !u!1 &1640381821328388 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -479,7 +479,7 @@ GameObject: --- !u!1 &1668967570677920 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -495,7 +495,7 @@ GameObject: --- !u!1 &1695441185812742 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -511,7 +511,7 @@ GameObject: --- !u!1 &1717647672430186 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -527,7 +527,7 @@ GameObject: --- !u!1 &1744041827634116 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -542,7 +542,7 @@ GameObject: --- !u!1 &1756550066817936 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -557,7 +557,7 @@ GameObject: --- !u!1 &1802177967822326 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -572,7 +572,7 @@ GameObject: --- !u!1 &1827281207666842 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -588,7 +588,7 @@ GameObject: --- !u!1 &1833285544795360 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -603,7 +603,7 @@ GameObject: --- !u!1 &1833602971288856 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -618,7 +618,7 @@ GameObject: --- !u!1 &1858766135871422 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -634,7 +634,7 @@ GameObject: --- !u!1 &1874255680932674 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -654,7 +654,7 @@ GameObject: --- !u!1 &1884805618760934 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -670,7 +670,7 @@ GameObject: --- !u!1 &1891931915061114 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -686,7 +686,7 @@ GameObject: --- !u!1 &1905885652100770 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -701,7 +701,7 @@ GameObject: --- !u!1 &1916842633872340 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -716,7 +716,7 @@ GameObject: --- !u!1 &1940169755506398 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -734,7 +734,7 @@ GameObject: --- !u!1 &1944088577171534 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -750,7 +750,7 @@ GameObject: --- !u!1 &1962913295011080 GameObject: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -766,7 +766,7 @@ GameObject: --- !u!4 &4005889465213416 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1640381821328388} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -779,7 +779,7 @@ Transform: --- !u!4 &4056806496174470 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1695441185812742} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: -0.000000013062143, w: -0.00000018679738} @@ -792,7 +792,7 @@ Transform: --- !u!4 &4075327793272532 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1230595922584620} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -805,7 +805,7 @@ Transform: --- !u!4 &4087876391306780 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1230358172930540} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -818,7 +818,7 @@ Transform: --- !u!4 &4116854624871162 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1858766135871422} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -831,7 +831,7 @@ Transform: --- !u!4 &4123612427290732 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874255680932674} m_LocalRotation: {x: -0.003149668, y: 0.7098123, z: 0.002783398, w: 0.7043784} @@ -845,7 +845,7 @@ Transform: --- !u!4 &4182888507544958 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1802177967822326} m_LocalRotation: {x: 0.7053843, y: -0.049325276, z: 0.04932528, w: 0.7053843} @@ -858,7 +858,7 @@ Transform: --- !u!4 &4220067225726358 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1375005451987192} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} @@ -881,7 +881,7 @@ Transform: --- !u!4 &4229993619938756 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1596791305360918} m_LocalRotation: {x: 0.056604527, y: 0.05795374, z: 0.004675739, w: 0.9967023} @@ -894,7 +894,7 @@ Transform: --- !u!4 &4232457299302766 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1346335321641892} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -907,7 +907,7 @@ Transform: --- !u!4 &4242311232206074 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1585823021358844} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -920,7 +920,7 @@ Transform: --- !u!4 &4259604204601724 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1310876574352590} m_LocalRotation: {x: 0.34028777, y: 0.0113129085, z: -0.015474446, w: 0.94012594} @@ -939,7 +939,7 @@ Transform: --- !u!4 &4265941804760648 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1404765211522878} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -957,7 +957,7 @@ Transform: --- !u!4 &4275253748442240 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1397649965331254} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -970,7 +970,7 @@ Transform: --- !u!4 &4286406122114976 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1905885652100770} m_LocalRotation: {x: -0.258819, y: -0, z: -4.6566134e-10, w: 0.9659259} @@ -983,7 +983,7 @@ Transform: --- !u!4 &4297694078927738 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1004669452273820} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -996,7 +996,7 @@ Transform: --- !u!4 &4312418380685016 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1059154825281568} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1009,7 +1009,7 @@ Transform: --- !u!4 &4314296935398236 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300727566292708} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1022,7 +1022,7 @@ Transform: --- !u!4 &4319904545768872 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1944088577171534} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1037,7 +1037,7 @@ Transform: --- !u!4 &4340855915195298 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1265269784871290} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1050,7 +1050,7 @@ Transform: --- !u!4 &4349839082530818 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1081293603496134} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -1063,7 +1063,7 @@ Transform: --- !u!4 &4386011025919524 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1398662719640768} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -1076,7 +1076,7 @@ Transform: --- !u!4 &4392979907288068 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1756550066817936} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: -8.659561e-17} @@ -1098,7 +1098,7 @@ Transform: --- !u!4 &4419786898047702 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1212151519367658} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1111,7 +1111,7 @@ Transform: --- !u!4 &4449091758499836 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1358144050439746} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1129,7 +1129,7 @@ Transform: --- !u!4 &4497999718139404 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1884805618760934} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1142,7 +1142,7 @@ Transform: --- !u!4 &4509256393421740 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1598100167736768} m_LocalRotation: {x: 0.06975647, y: 0.9975641, z: 0, w: 0} @@ -1155,7 +1155,7 @@ Transform: --- !u!4 &4546336978305340 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1082573214156024} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1168,7 +1168,7 @@ Transform: --- !u!4 &4599552818975300 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300317305236888} m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} @@ -1181,7 +1181,7 @@ Transform: --- !u!4 &4605918937442712 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1668967570677920} m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} @@ -1194,7 +1194,7 @@ Transform: --- !u!4 &4617753192742486 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1523256443734892} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1208,7 +1208,7 @@ Transform: --- !u!4 &4618432556778024 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1389113628653208} m_LocalRotation: {x: -0.17913595, y: 0.14914332, z: 0.022661837, w: 0.97218984} @@ -1221,7 +1221,7 @@ Transform: --- !u!4 &4634274355736766 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1744041827634116} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -1241,7 +1241,7 @@ Transform: --- !u!4 &4701842204964542 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1827281207666842} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1254,7 +1254,7 @@ Transform: --- !u!4 &4708024812184322 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1311200378102564} m_LocalRotation: {x: -4.5059287e-17, y: -0.70108956, z: -6.5911624e-17, w: 0.71307325} @@ -1267,7 +1267,7 @@ Transform: --- !u!4 &4739231913698558 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1940169755506398} m_LocalRotation: {x: 0.07876507, y: 0.01894126, z: 0.5343878, w: 0.8413483} @@ -1280,7 +1280,7 @@ Transform: --- !u!4 &4739441083625398 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1276142292023468} m_LocalRotation: {x: 0.056604527, y: 0.05795374, z: 0.004675739, w: 0.9967023} @@ -1293,7 +1293,7 @@ Transform: --- !u!4 &4799468984284310 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1833602971288856} m_LocalRotation: {x: -0.000000029802322, y: -0.06975648, z: 0.0000000018626451, @@ -1307,7 +1307,7 @@ Transform: --- !u!4 &4824644894463188 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1717647672430186} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1320,7 +1320,7 @@ Transform: --- !u!4 &4866118000331932 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1916842633872340} m_LocalRotation: {x: -0.258819, y: -0, z: -4.6566134e-10, w: 0.9659259} @@ -1333,7 +1333,7 @@ Transform: --- !u!4 &4882697647327558 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1256076955954310} m_LocalRotation: {x: -0.000000029802322, y: -0.06975648, z: 0.0000000018626451, @@ -1347,7 +1347,7 @@ Transform: --- !u!4 &4923778637095892 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1833285544795360} m_LocalRotation: {x: 0.07876507, y: 0.01894126, z: 0.5343878, w: 0.8413483} @@ -1360,7 +1360,7 @@ Transform: --- !u!4 &4931755424072790 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1589431354275110} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1373,7 +1373,7 @@ Transform: --- !u!4 &4935076605609942 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1891931915061114} m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} @@ -1386,7 +1386,7 @@ Transform: --- !u!4 &4957872136414150 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1489487933936840} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1399,7 +1399,7 @@ Transform: --- !u!4 &4980108489728468 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1571403491183624} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1412,7 +1412,7 @@ Transform: --- !u!4 &4980958811979122 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1962913295011080} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -1425,7 +1425,7 @@ Transform: --- !u!65 &65645417938629278 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1596791305360918} m_Material: {fileID: 0} @@ -1437,7 +1437,7 @@ BoxCollider: --- !u!65 &65652449211325790 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1940169755506398} m_Material: {fileID: 0} @@ -1449,7 +1449,7 @@ BoxCollider: --- !u!65 &65819152491953944 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1276142292023468} m_Material: {fileID: 0} @@ -1461,7 +1461,7 @@ BoxCollider: --- !u!65 &65968421824177942 BoxCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1389113628653208} m_Material: {fileID: 0} @@ -1474,7 +1474,7 @@ BoxCollider: Animator: serializedVersion: 3 m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1944088577171534} m_Enabled: 1 @@ -1491,7 +1491,7 @@ Animator: --- !u!114 &114032048618342948 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1276142292023468} m_Enabled: 1 @@ -1503,7 +1503,7 @@ MonoBehaviour: --- !u!114 &114067799735170948 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1891931915061114} m_Enabled: 1 @@ -1518,7 +1518,7 @@ MonoBehaviour: --- !u!114 &114119452087568442 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1389113628653208} m_Enabled: 1 @@ -1530,7 +1530,7 @@ MonoBehaviour: --- !u!114 &114122849436668294 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1389113628653208} m_Enabled: 1 @@ -1547,7 +1547,7 @@ MonoBehaviour: --- !u!114 &114128233377198556 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1230595922584620} m_Enabled: 1 @@ -1562,7 +1562,7 @@ MonoBehaviour: --- !u!114 &114158651688308136 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1940169755506398} m_Enabled: 1 @@ -1578,7 +1578,7 @@ MonoBehaviour: --- !u!114 &114160022324085170 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1858766135871422} m_Enabled: 1 @@ -1593,7 +1593,7 @@ MonoBehaviour: --- !u!114 &114180644782525004 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1398662719640768} m_Enabled: 1 @@ -1608,7 +1608,7 @@ MonoBehaviour: --- !u!114 &114181912130766552 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1585823021358844} m_Enabled: 1 @@ -1623,7 +1623,7 @@ MonoBehaviour: --- !u!114 &114229475745225828 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1940169755506398} m_Enabled: 1 @@ -1635,7 +1635,7 @@ MonoBehaviour: --- !u!114 &114242146399915576 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1884805618760934} m_Enabled: 1 @@ -1650,7 +1650,7 @@ MonoBehaviour: --- !u!114 &114246993504168904 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874255680932674} m_Enabled: 1 @@ -1666,7 +1666,7 @@ MonoBehaviour: --- !u!114 &114331393344479226 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1523256443734892} m_Enabled: 1 @@ -1746,7 +1746,7 @@ MonoBehaviour: --- !u!114 &114374282034907428 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1523256443734892} m_Enabled: 1 @@ -1758,7 +1758,7 @@ MonoBehaviour: --- !u!114 &114374814748694916 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874255680932674} m_Enabled: 1 @@ -1774,7 +1774,7 @@ MonoBehaviour: --- !u!114 &114414424634211024 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1397649965331254} m_Enabled: 1 @@ -1789,7 +1789,7 @@ MonoBehaviour: --- !u!114 &114494648423173430 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1081293603496134} m_Enabled: 1 @@ -1804,7 +1804,7 @@ MonoBehaviour: --- !u!114 &114501672211928808 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1212151519367658} m_Enabled: 1 @@ -1819,7 +1819,7 @@ MonoBehaviour: --- !u!114 &114552424188776510 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1640381821328388} m_Enabled: 1 @@ -1834,7 +1834,7 @@ MonoBehaviour: --- !u!114 &114641856822819510 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1230358172930540} m_Enabled: 1 @@ -1849,7 +1849,7 @@ MonoBehaviour: --- !u!114 &114659390789333790 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1276142292023468} m_Enabled: 1 @@ -1866,7 +1866,7 @@ MonoBehaviour: --- !u!114 &114664260787613270 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1695441185812742} m_Enabled: 1 @@ -1881,7 +1881,7 @@ MonoBehaviour: --- !u!114 &114667663321992456 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1668967570677920} m_Enabled: 1 @@ -1896,7 +1896,7 @@ MonoBehaviour: --- !u!114 &114697781153637380 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300317305236888} m_Enabled: 1 @@ -1911,7 +1911,7 @@ MonoBehaviour: --- !u!114 &114749624403577488 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1300727566292708} m_Enabled: 1 @@ -1926,7 +1926,7 @@ MonoBehaviour: --- !u!114 &114781060718220892 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1596791305360918} m_Enabled: 1 @@ -1942,7 +1942,7 @@ MonoBehaviour: --- !u!114 &114791300422754232 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1346335321641892} m_Enabled: 1 @@ -1957,7 +1957,7 @@ MonoBehaviour: --- !u!114 &114804913368841552 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874255680932674} m_Enabled: 1 @@ -1973,7 +1973,7 @@ MonoBehaviour: --- !u!114 &114864846006039090 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1598100167736768} m_Enabled: 1 @@ -1988,7 +1988,7 @@ MonoBehaviour: --- !u!114 &114917541663066898 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874255680932674} m_Enabled: 1 @@ -2000,7 +2000,7 @@ MonoBehaviour: --- !u!114 &114998847366586044 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1596791305360918} m_Enabled: 1 @@ -2012,7 +2012,7 @@ MonoBehaviour: --- !u!136 &136243378981334904 CapsuleCollider: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1874255680932674} m_Material: {fileID: 0} @@ -2025,7 +2025,7 @@ CapsuleCollider: --- !u!137 &137034442852996544 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1059154825281568} m_Enabled: 1 @@ -2073,7 +2073,7 @@ SkinnedMeshRenderer: --- !u!137 &137049207766417360 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1489487933936840} m_Enabled: 1 @@ -2121,7 +2121,7 @@ SkinnedMeshRenderer: --- !u!137 &137050152289606164 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1571403491183624} m_Enabled: 1 @@ -2169,7 +2169,7 @@ SkinnedMeshRenderer: --- !u!137 &137060639317806984 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1589431354275110} m_Enabled: 1 @@ -2217,7 +2217,7 @@ SkinnedMeshRenderer: --- !u!137 &137272724241667846 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1004669452273820} m_Enabled: 1 @@ -2265,7 +2265,7 @@ SkinnedMeshRenderer: --- !u!137 &137608865302087796 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1962913295011080} m_Enabled: 1 @@ -2314,7 +2314,7 @@ SkinnedMeshRenderer: --- !u!137 &137644539707614746 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1717647672430186} m_Enabled: 1 @@ -2362,7 +2362,7 @@ SkinnedMeshRenderer: --- !u!137 &137750340071255144 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1265269784871290} m_Enabled: 1 @@ -2410,7 +2410,7 @@ SkinnedMeshRenderer: --- !u!137 &137868210150696092 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1082573214156024} m_Enabled: 1 @@ -2458,7 +2458,7 @@ SkinnedMeshRenderer: --- !u!137 &137919000248738318 SkinnedMeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1827281207666842} m_Enabled: 1 diff --git a/Prefabs/UI/Materials/ToolsMenuSecondaryButton.mat b/Prefabs/UI/Materials/ToolsMenuSecondaryButton.mat index 0f8343e8c..9920ec00a 100644 --- a/Prefabs/UI/Materials/ToolsMenuSecondaryButton.mat +++ b/Prefabs/UI/Materials/ToolsMenuSecondaryButton.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: ToolsMenuSecondaryButton m_Shader: {fileID: 4800000, guid: c8cf0b95851289d40aecbbb604f214fd, type: 3} diff --git a/Scripts/Core/Contexts/EditingContextManager.cs b/Scripts/Core/Contexts/EditingContextManager.cs index 25fcf2034..029b0b767 100644 --- a/Scripts/Core/Contexts/EditingContextManager.cs +++ b/Scripts/Core/Contexts/EditingContextManager.cs @@ -17,25 +17,29 @@ namespace UnityEditor.Experimental.EditorVR.Core #endif sealed class EditingContextManager : MonoBehaviour { +#pragma warning disable 649 [SerializeField] UnityObject m_DefaultContext; +#pragma warning restore 649 - internal const string k_SettingsPath = "ProjectSettings/EditingContextManagerSettings.asset"; - internal const string k_UserSettingsPath = "Library/EditingContextManagerSettings.asset"; + internal const string settingsPath = "ProjectSettings/EditingContextManagerSettings.asset"; + internal const string userSettingsPath = "Library/EditingContextManagerSettings.asset"; const string k_AutoOpen = "EditorXR.EditingContextManager.AutoOpen"; const string k_LaunchOnExitPlaymode = "EditorXR.EditingContextManager.LaunchOnExitPlaymode"; IEditingContext m_CurrentContext; - internal static EditingContextManager s_Instance; static InputManager s_InputManager; static List s_AvailableContexts; static EditingContextManagerSettings s_Settings; static UnityObject s_DefaultContext; + +#if UNITY_EDITOR static bool s_AutoOpened; static bool s_UserWasPresent; static bool s_EnableXRFailed; +#endif string[] m_ContextNames; int m_SelectedContextIndex; @@ -45,6 +49,8 @@ sealed class EditingContextManager : MonoBehaviour Rect m_ContextPopupRect = new Rect(5, 0, 100, 20); // Position will be set based on window size Rect m_ContextLabelRect = new Rect(5, 0, 100, 20); // Position will be set based on window size + internal static EditingContextManager instance { get; private set; } + internal static IEditingContext defaultContext { get @@ -102,13 +108,15 @@ static void OnVRViewEnabled() Resources.UnloadUnusedAssets(); InitializeInputManager(); if (!Application.isPlaying) - s_Instance = ObjectUtils.CreateGameObjectWithComponent(); + instance = ObjectUtils.CreateGameObjectWithComponent(); } static void OnVRViewDisabled() { +#if UNITY_EDITOR s_AutoOpened = false; - ObjectUtils.Destroy(s_Instance.gameObject); +#endif + ObjectUtils.Destroy(instance.gameObject); if (s_InputManager) ObjectUtils.Destroy(s_InputManager.gameObject); } @@ -351,7 +359,7 @@ void Awake() if (Application.isPlaying) { OnVRViewEnabled(); - s_Instance = this; + instance = this; SetEditingContext((IEditingContext)m_DefaultContext); } } @@ -447,8 +455,8 @@ List GetPreviousEditingContexts() internal static EditingContextManagerSettings LoadProjectSettings() { EditingContextManagerSettings settings = ScriptableObject.CreateInstance(); - if (File.Exists(k_SettingsPath)) - JsonUtility.FromJsonOverwrite(File.ReadAllText(k_SettingsPath), settings); + if (File.Exists(settingsPath)) + JsonUtility.FromJsonOverwrite(File.ReadAllText(settingsPath), settings); return settings; } @@ -456,11 +464,11 @@ internal static EditingContextManagerSettings LoadProjectSettings() internal static EditingContextManagerSettings LoadUserSettings() { EditingContextManagerSettings settings; - if (File.Exists(k_UserSettingsPath) - && File.GetLastWriteTime(k_UserSettingsPath) > File.GetLastWriteTime(k_SettingsPath)) + if (File.Exists(userSettingsPath) + && File.GetLastWriteTime(userSettingsPath) > File.GetLastWriteTime(settingsPath)) { settings = ScriptableObject.CreateInstance(); - JsonUtility.FromJsonOverwrite(File.ReadAllText(k_UserSettingsPath), settings); + JsonUtility.FromJsonOverwrite(File.ReadAllText(userSettingsPath), settings); } else settings = LoadProjectSettings(); @@ -471,24 +479,24 @@ internal static EditingContextManagerSettings LoadUserSettings() internal static void ResetProjectSettings() { #if UNITY_EDITOR - File.Delete(k_UserSettingsPath); + File.Delete(userSettingsPath); if (EditorUtility.DisplayDialog("Delete Project Settings?", "Would you like to remove the project-wide settings, too?", "Yes", "No")) - File.Delete(k_SettingsPath); + File.Delete(settingsPath); #endif } internal static void SaveProjectSettings(EditingContextManagerSettings settings) { #if UNITY_EDITOR - File.WriteAllText(k_SettingsPath, JsonUtility.ToJson(settings, true)); + File.WriteAllText(settingsPath, JsonUtility.ToJson(settings, true)); #endif } internal static void SaveUserSettings(EditingContextManagerSettings settings) { #if UNITY_EDITOR - File.WriteAllText(k_UserSettingsPath, JsonUtility.ToJson(settings, true)); + File.WriteAllText(userSettingsPath, JsonUtility.ToJson(settings, true)); #endif } diff --git a/Scripts/Core/Contexts/EditorVR.asset b/Scripts/Core/Contexts/EditorVR.asset index 774b501c4..48389a061 100644 --- a/Scripts/Core/Contexts/EditorVR.asset +++ b/Scripts/Core/Contexts/EditorVR.asset @@ -3,7 +3,7 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/Scripts/Core/Contexts/EditorXRContext.cs b/Scripts/Core/Contexts/EditorXRContext.cs index 3dbd59b33..7aee45e06 100644 --- a/Scripts/Core/Contexts/EditorXRContext.cs +++ b/Scripts/Core/Contexts/EditorXRContext.cs @@ -10,6 +10,9 @@ namespace UnityEditor.Experimental.EditorVR.Core [CreateAssetMenu(menuName = "EditorXR/Editing Context")] class EditorXRContext : ScriptableObject, IEditingContext { + static EditorVR s_Instance; // Used only by PreferencesGUI + +#pragma warning disable 649 [SerializeField] float m_RenderScale = 1f; @@ -51,9 +54,9 @@ class EditorXRContext : ScriptableObject, IEditingContext [SerializeField] [HideInInspector] List m_HiddenTypeNames; +#pragma warning restore 649 EditorVR m_Instance; - static EditorVR s_Instance; // Used only by PreferencesGUI public bool copyMainCameraSettings { get { return m_CopyMainCameraSettings; } } diff --git a/Scripts/Core/Contexts/Minimal.asset b/Scripts/Core/Contexts/Minimal.asset index 81cd9139c..730c5047e 100644 --- a/Scripts/Core/Contexts/Minimal.asset +++ b/Scripts/Core/Contexts/Minimal.asset @@ -3,7 +3,7 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/Scripts/Core/EditorVR.Rays.cs b/Scripts/Core/EditorVR.Rays.cs index b25eac0eb..72000a6ff 100644 --- a/Scripts/Core/EditorVR.Rays.cs +++ b/Scripts/Core/EditorVR.Rays.cs @@ -12,11 +12,13 @@ namespace UnityEditor.Experimental.EditorVR.Core { partial class EditorVR { +#pragma warning disable 649 [SerializeField] DefaultProxyRay m_ProxyRayPrefab; [SerializeField] ProxyExtras m_ProxyExtras; +#pragma warning restore 649 class Rays : Nested, IInterfaceConnector, IForEachRayOrigin, IConnectInterfaces, IStandardIgnoreList { diff --git a/Scripts/Core/EditorVR.UI.cs b/Scripts/Core/EditorVR.UI.cs index b13063b68..3e92dafda 100644 --- a/Scripts/Core/EditorVR.UI.cs +++ b/Scripts/Core/EditorVR.UI.cs @@ -9,8 +9,10 @@ namespace UnityEditor.Experimental.EditorVR.Core { partial class EditorVR { +#pragma warning disable 649 [SerializeField] Camera m_EventCameraPrefab; +#pragma warning restore 649 class UI : Nested, IInterfaceConnector, IConnectInterfaces { @@ -137,7 +139,7 @@ bool GetManipulatorDragState() return false; } - internal void UpdateManipulatorVisibilites() + internal void UpdateManipulatorVisibilities() { var manipulatorsVisible = m_ManipulatorsHiddenRequests.Count == 0; foreach (var controller in m_ManipulatorControllers) diff --git a/Scripts/Core/EditorVR.Viewer.cs b/Scripts/Core/EditorVR.Viewer.cs index 765951d28..787af689c 100644 --- a/Scripts/Core/EditorVR.Viewer.cs +++ b/Scripts/Core/EditorVR.Viewer.cs @@ -11,6 +11,7 @@ namespace UnityEditor.Experimental.EditorVR.Core { partial class EditorVR { +#pragma warning disable 649 [SerializeField] GameObject m_PlayerModelPrefab; @@ -19,6 +20,7 @@ partial class EditorVR [SerializeField] GameObject m_PreviewCameraPrefab; +#pragma warning restore 649 class Viewer : Nested, IInterfaceConnector, ISerializePreferences, IConnectInterfaces { @@ -85,7 +87,9 @@ public Viewer() IUsesViewerScaleMethods.setViewerScale = SetViewerScale; IGetVRPlayerObjectsMethods.getVRPlayerObjects = () => m_VRPlayerObjects; +#if UNITY_EDITOR VRView.hmdStatusChange += OnHMDStatusChange; +#endif preserveCameraRig = true; @@ -96,7 +100,9 @@ internal override void OnDestroy() { base.OnDestroy(); +#if UNITY_EDITOR VRView.hmdStatusChange -= OnHMDStatusChange; +#endif var cameraRig = CameraUtils.GetCameraRig(); if (cameraRig) @@ -180,12 +186,15 @@ internal void InitializeCamera() cameraRig.localPosition = Vector3.zero; } +#if UNITY_EDITOR var hmdOnlyLayerMask = 0; +#endif if (!Application.isPlaying && evr.m_PreviewCameraPrefab) { var go = ObjectUtils.Instantiate(evr.m_PreviewCameraPrefab); go.transform.SetParent(CameraUtils.GetCameraRig(), false); +#if UNITY_EDITOR customPreviewCamera = go.GetComponentInChildren(); if (customPreviewCamera != null) { @@ -194,7 +203,9 @@ internal void InitializeCamera() hmdOnlyLayerMask = customPreviewCamera.hmdOnlyLayerMask; this.ConnectInterfaces(customPreviewCamera); } +#endif } + #if UNITY_EDITOR VRView.cullingMask = UnityEditor.Tools.visibleLayers | hmdOnlyLayerMask; #endif @@ -202,8 +213,10 @@ internal void InitializeCamera() internal void UpdateCamera() { +#if UNITY_EDITOR if (customPreviewCamera != null) customPreviewCamera.enabled = VRView.showDeviceView && VRView.customPreviewCamera != null; +#endif } internal void AddPlayerFloor() diff --git a/Scripts/Core/EditorVR.cs b/Scripts/Core/EditorVR.cs index 1368192ab..4cb91adf7 100644 --- a/Scripts/Core/EditorVR.cs +++ b/Scripts/Core/EditorVR.cs @@ -423,7 +423,7 @@ void Update() GetNestedModule().UpdateMenuVisibilities(); - GetNestedModule().UpdateManipulatorVisibilites(); + GetNestedModule().UpdateManipulatorVisibilities(); } void ProcessInput(HashSet processedInputs, ConsumeControlDelegate consumeControl) @@ -536,10 +536,7 @@ internal void SetHideFlags(HideFlags hideFlags) manager.gameObject.hideFlags = hideFlags; } - foreach (var manager in Resources.FindObjectsOfTypeAll()) - { - manager.gameObject.hideFlags = hideFlags; - } + EditingContextManager.instance.gameObject.hideFlags = hideFlags; foreach (var child in GetComponentsInChildren(true)) { diff --git a/Scripts/Core/VRView.cs b/Scripts/Core/VRView.cs index 05aab4cec..2069ed870 100644 --- a/Scripts/Core/VRView.cs +++ b/Scripts/Core/VRView.cs @@ -32,7 +32,6 @@ sealed class VRView #if UNITY_EDITOR DrawCameraMode m_RenderMode = DrawCameraMode.Textured; -#endif // To allow for alternate previews (e.g. smoothing) public static Camera customPreviewCamera @@ -42,10 +41,9 @@ public static Camera customPreviewCamera { if (s_ActiveView != null) { -#if UNITY_EDITOR + if (s_ExistingSceneMainCamera && !s_ActiveView.m_CustomPreviewCamera && EditingContextManager.defaultContext.copyMainCameraImageEffectsToPresentationCamera) CopyImagesEffectsToCamera(value); -#endif s_ActiveView.m_CustomPreviewCamera = value; } @@ -59,10 +57,9 @@ public static Camera customPreviewCamera LayerMask? m_CullingMask; RenderTexture m_TargetTexture; + bool m_ShowDeviceView; -#if UNITY_EDITOR EditorWindow[] m_EditorWindows; -#endif static VRView s_ActiveView; @@ -114,6 +111,7 @@ public static LayerMask cullingMask s_ActiveView.m_CullingMask = value; } } +#endif public static Vector3 headCenteredOrigin { @@ -127,11 +125,13 @@ public static Vector3 headCenteredOrigin } } +#if UNITY_EDITOR public static event Action viewEnabled; public static event Action viewDisabled; public static event Action beforeOnGUI; public static event Action afterOnGUI; public static event Action hmdStatusChange; +#endif public Rect guiRect { get; private set; } @@ -141,17 +141,6 @@ public static Vector3 headCenteredOrigin public static bool MiddleMouseButtonHeld; public static bool RightMouseButtonHeld; - public static Coroutine StartCoroutine(IEnumerator routine) - { - if (s_ActiveView != null && s_ActiveView.m_CameraRig) - { - var mb = s_ActiveView.m_CameraRig.GetComponent(); - return mb.StartCoroutine(routine); - } - - return null; - } - public static void CreateCameraRig(ref Camera camera, ref Transform cameraRig) { var hideFlags = Application.isPlaying ? HideFlags.None : k_HideFlags; diff --git a/Scripts/Data/AssetData.cs b/Scripts/Data/AssetData.cs index 4d255f7d0..034ee8027 100644 --- a/Scripts/Data/AssetData.cs +++ b/Scripts/Data/AssetData.cs @@ -6,7 +6,9 @@ namespace UnityEditor.Experimental.EditorVR.Data { sealed class AssetData : ListViewItemData { - const string k_TemplateName = "AssetGridItem"; + public const string PrefabTypeString = "Prefab"; + public const string ModelTypeString = "Model"; + static readonly string k_TemplateName = "AssetGridItem"; public string guid { get; private set; } @@ -43,13 +45,21 @@ void UpdateType() if (type == "GameObject") { #if UNITY_EDITOR +#if UNITY_2018_3_OR_NEWER + switch (PrefabUtility.GetPrefabAssetType(asset)) +#else switch (PrefabUtility.GetPrefabType(asset)) +#endif { +#if UNITY_2018_3_OR_NEWER + case PrefabAssetType.Model: +#else case PrefabType.ModelPrefab: - type = "Model"; +#endif + type = ModelTypeString; break; default: - type = "Prefab"; + type = PrefabTypeString; break; } #endif diff --git a/Scripts/Data/DefaultScriptReferences.cs b/Scripts/Data/DefaultScriptReferences.cs index 14227d964..385471b23 100644 --- a/Scripts/Data/DefaultScriptReferences.cs +++ b/Scripts/Data/DefaultScriptReferences.cs @@ -14,11 +14,13 @@ public class DefaultScriptReferences : ScriptableObject const string k_ResourcesFolder = "Resources"; const string k_Path = k_ParentFolder + "/" + k_ResourcesFolder + "/DefaultScriptReferences.asset"; +#pragma warning disable 649 [SerializeField] GameObject m_ScriptPrefab; [SerializeField] List m_EditingContexts; +#pragma warning restore 649 Dictionary m_TypePrefabs = new Dictionary(); @@ -102,7 +104,11 @@ static void UpdateScriptReferences() if (!Directory.Exists(directory)) Directory.CreateDirectory(directory); +#if UNITY_2018_3_OR_NEWER + defaultScriptReferences.m_ScriptPrefab = PrefabUtility.SaveAsPrefabAsset(prefabsRoot, Path.ChangeExtension(k_Path, "prefab")); +#else defaultScriptReferences.m_ScriptPrefab = PrefabUtility.CreatePrefab(Path.ChangeExtension(k_Path, "prefab"), prefabsRoot); +#endif defaultScriptReferences.m_EditingContexts = EditingContextManager.GetEditingContextAssets().ConvertAll(ec => (ScriptableObject)ec); AssetDatabase.CreateAsset(defaultScriptReferences, k_Path); diff --git a/Scripts/Handles/LinearHandle.cs b/Scripts/Handles/LinearHandle.cs index 8aa5f061c..3b9f316d4 100644 --- a/Scripts/Handles/LinearHandle.cs +++ b/Scripts/Handles/LinearHandle.cs @@ -17,12 +17,14 @@ internal class LinearHandleEventData : HandleEventData public LinearHandleEventData(Transform rayOrigin, bool direct) : base(rayOrigin, direct) {} } +#pragma warning disable 649 [SerializeField] bool m_OrientDragPlaneToRay = true; [FlagsProperty] [SerializeField] AxisFlags m_Constraints; +#pragma warning restore 649 readonly Dictionary m_LastPositions = new Dictionary(k_DefaultCapacity); diff --git a/Scripts/Handles/PlaneHandle.cs b/Scripts/Handles/PlaneHandle.cs index d8ae6f994..160782194 100644 --- a/Scripts/Handles/PlaneHandle.cs +++ b/Scripts/Handles/PlaneHandle.cs @@ -17,9 +17,11 @@ class PlaneHandleEventData : HandleEventData public PlaneHandleEventData(Transform rayOrigin, bool direct) : base(rayOrigin, direct) {} } +#pragma warning disable 649 [FlagsProperty] [SerializeField] AxisFlags m_Constraints; +#pragma warning restore 649 Plane m_Plane; readonly Dictionary m_LastPositions = new Dictionary(k_DefaultCapacity); diff --git a/Scripts/Handles/RadialHandle.cs b/Scripts/Handles/RadialHandle.cs index 5a82dfd2e..28d8d230f 100644 --- a/Scripts/Handles/RadialHandle.cs +++ b/Scripts/Handles/RadialHandle.cs @@ -14,8 +14,10 @@ internal class RadialHandleEventData : HandleEventData public RadialHandleEventData(Transform rayOrigin, bool direct) : base(rayOrigin, direct) {} } +#pragma warning disable 649 [SerializeField] float m_TurnSpeed; +#pragma warning restore 649 Plane m_Plane; readonly Dictionary m_LastPositions = new Dictionary(k_DefaultCapacity); diff --git a/Scripts/Handles/UI/DropDown.cs b/Scripts/Handles/UI/DropDown.cs index 3f0c22b17..f1464c058 100644 --- a/Scripts/Handles/UI/DropDown.cs +++ b/Scripts/Handles/UI/DropDown.cs @@ -18,33 +18,10 @@ namespace UnityEditor.Experimental.EditorVR.UI { sealed class DropDown : MonoBehaviour { - Coroutine m_ShowDropdownCoroutine; - Coroutine m_HideDropdownCoroutine; - float m_HiddenDropdownItemYSpacing; - float m_VisibleDropdownItemYSpacing; - float m_VisibleBackgroundMeshLocalYScale; - float m_PreviousXRotation; - Vector3 m_OptionsPanelOriginalLocalPosition; - - public string[] options - { - get { return m_Options; } - set - { - m_Options = value; - SetupOptions(); - } - } - +#pragma warning disable 649 [SerializeField] string[] m_Options; - public bool multiSelect - { - get { return m_MultiSelect; } - set { m_MultiSelect = value; } - } - [SerializeField] bool m_MultiSelect; @@ -71,19 +48,25 @@ public bool multiSelect [SerializeField] Transform m_BackgroundMeshTransform; - public int value - { - get { return m_Value; } - set - { - m_Value = value; - UpdateLabel(); - } - } - [SerializeField] int m_Value; + [SerializeField] + int[] m_Values = new int[0]; +#pragma warning restore 649 + + Coroutine m_ShowDropdownCoroutine; + Coroutine m_HideDropdownCoroutine; + float m_HiddenDropdownItemYSpacing; + float m_VisibleDropdownItemYSpacing; + float m_VisibleBackgroundMeshLocalYScale; + float m_PreviousXRotation; + Vector3 m_OptionsPanelOriginalLocalPosition; + + Toggle[] m_Toggles; + + public event Action valueChanged; + public int[] values { get { return m_Values; } @@ -95,12 +78,31 @@ public int[] values } } - [SerializeField] - int[] m_Values = new int[0]; + public bool multiSelect + { + get { return m_MultiSelect; } + set { m_MultiSelect = value; } + } - Toggle[] m_Toggles; + public int value + { + get { return m_Value; } + set + { + m_Value = value; + UpdateLabel(); + } + } - public event Action valueChanged; + public string[] options + { + get { return m_Options; } + set + { + m_Options = value; + SetupOptions(); + } + } void Awake() { diff --git a/Scripts/Handles/UI/KeyboardButton.cs b/Scripts/Handles/UI/KeyboardButton.cs index 45c2d1a07..ff4b912cd 100644 --- a/Scripts/Handles/UI/KeyboardButton.cs +++ b/Scripts/Handles/UI/KeyboardButton.cs @@ -1,13 +1,12 @@ using System; using System.Collections; using TMPro; -using UnityEngine; -using UnityEngine.UI; +using UnityEditor.Experimental.EditorVR.Extensions; using UnityEditor.Experimental.EditorVR.Handles; using UnityEditor.Experimental.EditorVR.Helpers; using UnityEditor.Experimental.EditorVR.Utilities; using UnityEditor.Experimental.EditorVR.Workspaces; -using UnityEditor.Experimental.EditorVR.Extensions; +using UnityEngine; namespace UnityEditor.Experimental.EditorVR.UI { @@ -30,41 +29,10 @@ public enum SelectionState const float k_KeyResponsePositionAmplitude = 0.02f; const float k_KeyResponseScaleAmplitude = 0.08f; - public TextMeshProUGUI textComponent - { - get { return m_TextComponent; } - set { m_TextComponent = value; } - } - +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_TextComponent; - public Material targetMeshMaterial - { - get { return m_TargetMeshMaterial; } - } - - Material m_TargetMeshMaterial; - - public Color targetMeshBaseColor - { - get { return m_TargetMeshBaseColor; } - } - - Color m_TargetMeshBaseColor; - - public CanvasGroup canvasGroup - { - get - { - return !m_CanvasGroup - ? GetComponentInChildren(true) - : m_CanvasGroup; - } - } - - CanvasGroup m_CanvasGroup; - [SerializeField] char m_Character; @@ -87,6 +55,13 @@ public CanvasGroup canvasGroup [SerializeField] WorkspaceButton m_WorkspaceButton; +#pragma warning restore 649 + + Material m_TargetMeshMaterial; + + Color m_TargetMeshBaseColor; + + CanvasGroup m_CanvasGroup; float m_HoldStartTime; float m_RepeatWaitTime; @@ -102,6 +77,32 @@ public CanvasGroup canvasGroup Func m_PressOnHover; Func m_InTransition; + public TextMeshProUGUI textComponent + { + get { return m_TextComponent; } + set { m_TextComponent = value; } + } + + public Material targetMeshMaterial + { + get { return m_TargetMeshMaterial; } + } + + public Color targetMeshBaseColor + { + get { return m_TargetMeshBaseColor; } + } + + public CanvasGroup canvasGroup + { + get + { + return !m_CanvasGroup + ? GetComponentInChildren(true) + : m_CanvasGroup; + } + } + void Awake() { var targetMeshTransform = m_TargetMesh.transform; diff --git a/Scripts/Helpers/EditorMonoBehaviour.cs b/Scripts/Helpers/EditorMonoBehaviour.cs index 4258aae16..ceb5a7da9 100644 --- a/Scripts/Helpers/EditorMonoBehaviour.cs +++ b/Scripts/Helpers/EditorMonoBehaviour.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System.Collections; +using UnityEngine; namespace UnityEditor.Experimental.EditorVR.Helpers { @@ -7,5 +8,21 @@ namespace UnityEditor.Experimental.EditorVR.Helpers /// sealed class EditorMonoBehaviour : MonoBehaviour { + public static EditorMonoBehaviour instance; + + void Awake() + { + instance = this; + } + + public static Coroutine StartEditorCoroutine(IEnumerator routine) + { + // Avoid null-coalescing operator for UnityObject + // ReSharper disable once ConvertIfStatementToReturnStatement + if (instance) + return instance.StartCoroutine(routine); + + return null; + } } } diff --git a/Scripts/Helpers/EditorWindowCapture.cs b/Scripts/Helpers/EditorWindowCapture.cs index 6eff0ce6b..16c220d28 100644 --- a/Scripts/Helpers/EditorWindowCapture.cs +++ b/Scripts/Helpers/EditorWindowCapture.cs @@ -1,5 +1,4 @@ -#if UNITY_EDITOR -using System; +using System; using System.Reflection; using UnityEngine; using Object = UnityEngine.Object; @@ -10,6 +9,7 @@ namespace UnityEditor.Experimental.EditorVR.Helpers { +#if UNITY_EDITOR /// /// Captures a RenderTexture representing an Editor window /// @@ -19,11 +19,13 @@ sealed class EditorWindowCapture : MonoBehaviour // Mouse events are expected to be relative to the window, but our quad only displays the inner GUI static readonly Vector2 k_WindowOffset = new Vector2(0, 22f); +#pragma warning disable 649 [SerializeField] string m_WindowClass; [SerializeField] Rect m_Position = new Rect(0f, 0f, 600f, 400f); +#pragma warning restore 649 EditorWindow m_Window; Object m_GuiView; @@ -177,5 +179,9 @@ public void SendEvent(Transform rayOrigin, Transform workspace, EventType type) public static extern int SendMessage(IntPtr hWnd, int uMsg, int wParam, IntPtr lParam); #endif } -} +#else + sealed class EditorWindowCapture : MonoBehaviour + { + } #endif +} diff --git a/Scripts/Helpers/EditorWindowCaptureUpdater.cs b/Scripts/Helpers/EditorWindowCaptureUpdater.cs index 1ca2ac302..53c0f1616 100644 --- a/Scripts/Helpers/EditorWindowCaptureUpdater.cs +++ b/Scripts/Helpers/EditorWindowCaptureUpdater.cs @@ -1,10 +1,10 @@ -#if UNITY_EDITOR -using UnityEngine; +using UnityEngine; using UnityEngine.UI; using UnityEditor.Experimental.EditorVR.Utilities; namespace UnityEditor.Experimental.EditorVR.Helpers { +#if UNITY_EDITOR /// /// Updates a RawImage texture with data from an EditorWindowCapture /// @@ -88,5 +88,20 @@ void LateUpdate() } } } -} +#else + sealed class EditorWindowCaptureUpdater : MonoBehaviour + { + [SerializeField] + EditorWindowCapture m_EditorWindowCapture; + + [SerializeField] + RawImage m_RawImage; + + [SerializeField] + Material m_Material; + + [SerializeField] + bool m_LockAspect; + } #endif +} diff --git a/Scripts/Helpers/PlayerBody.cs b/Scripts/Helpers/PlayerBody.cs index 147ee1c1b..fa313d17e 100644 --- a/Scripts/Helpers/PlayerBody.cs +++ b/Scripts/Helpers/PlayerBody.cs @@ -4,11 +4,13 @@ namespace UnityEditor.Experimental.EditorVR.Helpers { public class PlayerBody : MonoBehaviour { +#pragma warning disable 649 [SerializeField] Collider m_OverShoulderTrigger; [SerializeField] Collider m_AboveHeadTrigger; +#pragma warning restore 649 public Collider overShoulderTrigger { get { return m_OverShoulderTrigger; } } diff --git a/Scripts/Helpers/PlayerFloor.cs b/Scripts/Helpers/PlayerFloor.cs index cb8b920f6..2905ed612 100644 --- a/Scripts/Helpers/PlayerFloor.cs +++ b/Scripts/Helpers/PlayerFloor.cs @@ -12,6 +12,7 @@ public class PlayerFloor : MonoBehaviour, IUsesViewerScale, IDetectGazeDivergenc const float k_XOffset = 0.05f; const float k_ZOffset = 0.025f; +#pragma warning disable 649 [SerializeField] CanvasGroup m_CanvasGroup; @@ -20,6 +21,7 @@ public class PlayerFloor : MonoBehaviour, IUsesViewerScale, IDetectGazeDivergenc [SerializeField] float m_Delay = 2f; +#pragma warning restore 649 Vector3 m_FloorPosition; Transform m_Camera; diff --git a/Scripts/Helpers/VRSmoothCamera.cs b/Scripts/Helpers/VRSmoothCamera.cs index f51fae24c..2672cf39f 100644 --- a/Scripts/Helpers/VRSmoothCamera.cs +++ b/Scripts/Helpers/VRSmoothCamera.cs @@ -4,6 +4,7 @@ namespace UnityEditor.Experimental.EditorVR.Helpers { +#if UNITY_EDITOR /// /// A preview camera that provides for smoothing of the position and look vector /// @@ -11,30 +12,19 @@ namespace UnityEditor.Experimental.EditorVR.Helpers [RequiresLayer(k_HMDOnlyLayer)] sealed class VRSmoothCamera : MonoBehaviour, IPreviewCamera { - /// - /// The camera drawing the preview - /// - public Camera previewCamera { get { return m_SmoothCamera; } } - - Camera m_SmoothCamera; - - /// - /// The actual HMD camera (will be provided by system) - /// The VRView's camera, whose settings are copied by the SmoothCamera - /// - public Camera vrCamera - { - private get { return m_VRCamera; } - set { m_VRCamera = value; } - } + static readonly List k_HiddenEnabled = new List(); + const string k_HMDOnlyLayer = "HMDOnly"; + static readonly Rect k_DefaultCameraRect = new Rect(0f, 0f, 1f, 1f); +#pragma warning disable 649 [SerializeField] Camera m_VRCamera; [SerializeField] int m_TargetDisplay; - [SerializeField, Range(1, 180)] + [Range(1, 180)] + [SerializeField] int m_FieldOfView = 40; [SerializeField] @@ -42,9 +32,9 @@ public Camera vrCamera [SerializeField] float m_SmoothingMultiplier = 3; +#pragma warning restore 649 - const string k_HMDOnlyLayer = "HMDOnly"; - readonly Rect k_DefaultCameraRect = new Rect(0f, 0f, 1f, 1f); + Camera m_SmoothCamera; RenderTexture m_RenderTexture; @@ -52,7 +42,20 @@ public Camera vrCamera Quaternion m_Rotation; int m_HMDOnlyLayerMask; - static readonly List k_HiddenEnabled = new List(); + /// + /// The camera drawing the preview + /// + public Camera previewCamera { get { return m_SmoothCamera; } } + + /// + /// The actual HMD camera (will be provided by system) + /// The VRView's camera, whose settings are copied by the SmoothCamera + /// + public Camera vrCamera + { + private get { return m_VRCamera; } + set { m_VRCamera = value; } + } /// /// A layer mask that controls what will always render in the HMD and not in the preview @@ -139,4 +142,25 @@ void LateUpdate() } } } +#else + sealed class VRSmoothCamera : MonoBehaviour + { +#pragma warning disable 649 + [SerializeField] + Camera m_VRCamera; + + [SerializeField] + int m_TargetDisplay; + + [SerializeField] + int m_FieldOfView = 40; + + [SerializeField] + float m_PullBackDistance = 0.8f; + + [SerializeField] + float m_SmoothingMultiplier = 3; +#pragma warning restore 649 + } +#endif } diff --git a/Scripts/ListView/ListViewController.cs b/Scripts/ListView/ListViewController.cs index cc599cc82..dbc1d488e 100644 --- a/Scripts/ListView/ListViewController.cs +++ b/Scripts/ListView/ListViewController.cs @@ -9,26 +9,7 @@ public abstract class ListViewController : ListViewControl where TData : ListViewItemData where TItem : ListViewItem { - public virtual List data - { - get { return m_Data; } - set - { - if (m_Data != null) - { - foreach (var item in m_ListItems.Values) // Clear out visuals for old data - { - RecycleItem(item.data.template, item); - } - - m_ListItems.Clear(); - } - - m_Data = value; - scrollOffset = 0; - } - } - +#pragma warning disable 649 [Header("Unassigned haptic pulses will not be performed")] [SerializeField] HapticPulse m_ItemClickPulse; @@ -47,6 +28,7 @@ public virtual List data [SerializeField] HapticPulse m_ItemDragEndPulse; +#pragma warning restore 649 protected List m_Data; @@ -54,6 +36,26 @@ public virtual List data protected readonly Dictionary m_ListItems = new Dictionary(); protected readonly Dictionary m_GrabbedRows = new Dictionary(); + public virtual List data + { + get { return m_Data; } + set + { + if (m_Data != null) + { + foreach (var item in m_ListItems.Values) // Clear out visuals for old data + { + RecycleItem(item.data.template, item); + } + + m_ListItems.Clear(); + } + + m_Data = value; + scrollOffset = 0; + } + } + protected override float listHeight { get { return m_Data.Count * itemSize.z; } } protected override void Setup() diff --git a/Scripts/ListView/ListViewControllerBase.cs b/Scripts/ListView/ListViewControllerBase.cs index 9ae649f38..f84d17e7e 100644 --- a/Scripts/ListView/ListViewControllerBase.cs +++ b/Scripts/ListView/ListViewControllerBase.cs @@ -8,12 +8,7 @@ namespace ListView { public abstract class ListViewControllerBase : MonoBehaviour, IScrollHandler, IControlHaptics { - public float scrollOffset - { - get { return m_ScrollOffset; } - set { m_ScrollOffset = value; } - } - +#pragma warning disable 649 [Tooltip("Distance (in meters) we have scrolled from initial position")] [SerializeField] protected float m_ScrollOffset; @@ -40,28 +35,13 @@ public float scrollOffset [SerializeField] protected float m_SettleSpeed = 0.4f; - public float scrollSpeed - { - get { return m_ScrollSpeed; } - set { m_ScrollSpeed = value; } - } - [SerializeField] float m_ScrollSpeed = 0.3f; +#pragma warning restore 649 - protected bool m_Settling; event Action settlingCompleted; - public Vector3 itemSize - { - get - { - if (!m_ItemSize.HasValue && m_Templates.Length > 0) - m_ItemSize = GetObjectSize(m_Templates[0]); - - return m_ItemSize ?? Vector3.zero; - } - } + protected bool m_Settling; protected Vector3? m_ItemSize; @@ -77,6 +57,29 @@ public Vector3 itemSize protected abstract float listHeight { get; } + public float scrollOffset + { + get { return m_ScrollOffset; } + set { m_ScrollOffset = value; } + } + + public float scrollSpeed + { + get { return m_ScrollSpeed; } + set { m_ScrollSpeed = value; } + } + + public Vector3 itemSize + { + get + { + if (!m_ItemSize.HasValue && m_Templates.Length > 0) + m_ItemSize = GetObjectSize(m_Templates[0]); + + return m_ItemSize ?? Vector3.zero; + } + } + public virtual Vector3 size { set diff --git a/Scripts/ListView/ListViewScroller.cs b/Scripts/ListView/ListViewScroller.cs index 71e8a65f6..18d605da6 100644 --- a/Scripts/ListView/ListViewScroller.cs +++ b/Scripts/ListView/ListViewScroller.cs @@ -4,8 +4,10 @@ public class ListViewScroller : MonoBehaviour, IScrollHandler { +#pragma warning disable 649 [SerializeField] ListViewControllerBase m_ListView; +#pragma warning restore 649 public void OnScroll(PointerEventData eventData) { diff --git a/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs b/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs index 58549ad7e..e94a1fdf4 100644 --- a/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs +++ b/Scripts/Modules/AdaptivePositionModule/AdaptivePositionModule.cs @@ -9,8 +9,10 @@ namespace UnityEditor.Experimental.EditorVR.Modules { public sealed class AdaptivePositionModule : MonoBehaviour, IDetectGazeDivergence, IUsesViewerScale, IControlHaptics, ISystemModule { +#pragma warning disable 649 [SerializeField] HapticPulse m_MovingPulse; // The pulse performed while moving an element to a new target position in the user's FOV +#pragma warning restore 649 bool m_TestInFocus; Transform m_GazeTransform; diff --git a/Scripts/Modules/DeviceInputModule.cs b/Scripts/Modules/DeviceInputModule.cs index d342f5d88..d169ac361 100644 --- a/Scripts/Modules/DeviceInputModule.cs +++ b/Scripts/Modules/DeviceInputModule.cs @@ -1,8 +1,4 @@ -#if !UNITY_2017_2_OR_NEWER -#pragma warning disable 649 // "never assigned to" warning -#endif - -using System; +using System; using System.Collections.Generic; using System.Linq; using UnityEditor.Experimental.EditorVR.Utilities; @@ -20,11 +16,13 @@ class InputProcessor public int order; } +#pragma warning disable 649 [SerializeField] ActionMap m_TrackedObjectActionMap; [SerializeField] ActionMap m_StandardToolActionMap; +#pragma warning restore 649 PlayerHandle m_PlayerHandle; diff --git a/Scripts/Modules/FeedbackModule/FeedbackModule.cs b/Scripts/Modules/FeedbackModule/FeedbackModule.cs index 42bfdb148..93b9d1b50 100644 --- a/Scripts/Modules/FeedbackModule/FeedbackModule.cs +++ b/Scripts/Modules/FeedbackModule/FeedbackModule.cs @@ -36,14 +36,17 @@ public bool enabled } } +#pragma warning disable 649 [SerializeField] GameObject m_SettingsMenuItemPrefab; +#pragma warning restore 649 readonly List m_Toggles = new List(); Preferences m_Preferences; readonly List m_FeedbackReceivers = new List(); + readonly Dictionary> m_FeedbackRequestPool = new Dictionary>(); public GameObject settingsMenuItemPrefab { get { return m_SettingsMenuItemPrefab; } } @@ -80,8 +83,6 @@ public GameObject settingsMenuItemInstance public Transform rayOrigin { get { return null; } } - readonly Dictionary> m_FeedbackRequestPool = new Dictionary>(); - void Awake() { IRequestFeedbackMethods.addFeedbackRequest = AddFeedbackRequest; diff --git a/Scripts/Modules/HapticsModule/HapticPulse.cs b/Scripts/Modules/HapticsModule/HapticPulse.cs index 2959804d0..4d03ad851 100644 --- a/Scripts/Modules/HapticsModule/HapticPulse.cs +++ b/Scripts/Modules/HapticsModule/HapticPulse.cs @@ -5,6 +5,7 @@ namespace UnityEditor.Experimental.EditorVR.Core [CreateAssetMenu(menuName = "EditorXR/Haptic Pulse", fileName = "NewHapticPulse.asset")] public class HapticPulse : ScriptableObject { +#pragma warning disable 649 [SerializeField] [Range(0.001f, 1f)] float m_Duration = 0.25f; @@ -18,6 +19,7 @@ public class HapticPulse : ScriptableObject [SerializeField] bool m_FadeOut; +#pragma warning restore 649 // Don't allow public setting of value; use inspector-set values public float duration diff --git a/Scripts/Modules/HierarchyModule.cs b/Scripts/Modules/HierarchyModule.cs index 093922bc9..bcd0d4b65 100644 --- a/Scripts/Modules/HierarchyModule.cs +++ b/Scripts/Modules/HierarchyModule.cs @@ -1,5 +1,4 @@ -#if UNITY_EDITOR -using System; +using System; using System.Collections.Generic; using System.Linq; using UnityEditor.Experimental.EditorVR.Core; @@ -7,6 +6,7 @@ namespace UnityEditor.Experimental.EditorVR.Modules { +#if UNITY_EDITOR sealed class HierarchyModule : MonoBehaviour, ISystemModule, ISelectionChanged { readonly List m_HierarchyLists = new List(); @@ -260,5 +260,9 @@ static void InstanceIDToComponentTypes(int instanceID, HashSet types, Ha } } } -} +#else + sealed class HierarchyModule : MonoBehaviour + { + } #endif +} diff --git a/Scripts/Modules/HighlightModule/HighlightModule.cs b/Scripts/Modules/HighlightModule/HighlightModule.cs index e54b608c8..76189bb69 100644 --- a/Scripts/Modules/HighlightModule/HighlightModule.cs +++ b/Scripts/Modules/HighlightModule/HighlightModule.cs @@ -19,11 +19,13 @@ struct HighlightData static readonly Dictionary k_BakedMeshes = new Dictionary(); +#pragma warning disable 649 [SerializeField] Material m_DefaultHighlightMaterial; [SerializeField] Material m_RayHighlightMaterial; +#pragma warning restore 649 readonly Dictionary> m_Highlights = new Dictionary>(); readonly Dictionary> m_NodeMap = new Dictionary>(); diff --git a/Scripts/Modules/IntersectionModule/IntersectionTester.cs b/Scripts/Modules/IntersectionModule/IntersectionTester.cs index 2c628874b..9c379effd 100644 --- a/Scripts/Modules/IntersectionModule/IntersectionTester.cs +++ b/Scripts/Modules/IntersectionModule/IntersectionTester.cs @@ -4,11 +4,13 @@ namespace UnityEditor.Experimental.EditorVR.Modules { sealed class IntersectionTester : MonoBehaviour { +#pragma warning disable 649 [SerializeField] Transform[] m_RayTransforms; [SerializeField] bool m_ShowRays; +#pragma warning restore 649 bool m_Active = true; Ray[] m_Rays; @@ -70,6 +72,7 @@ public Vector3[] vertices } } + //TODO: What's up with this? #if !UNITY_EDITOR #pragma warning disable 109 #endif diff --git a/Scripts/Modules/KeyboardModule.cs b/Scripts/Modules/KeyboardModule.cs index 13c7ed4a7..1cab52d9f 100644 --- a/Scripts/Modules/KeyboardModule.cs +++ b/Scripts/Modules/KeyboardModule.cs @@ -9,6 +9,7 @@ namespace UnityEditor.Experimental.EditorVR.Modules { sealed class KeyboardModule : MonoBehaviour, ISystemModule, IRayVisibilitySettings, IForEachRayOrigin, IConnectInterfaces { +#pragma warning disable 649 [SerializeField] KeyboardMallet m_KeyboardMalletPrefab; @@ -17,6 +18,7 @@ sealed class KeyboardModule : MonoBehaviour, ISystemModule, IRayVisibilitySettin [SerializeField] KeyboardUI m_StandardKeyboardPrefab; +#pragma warning restore 649 readonly Dictionary m_KeyboardMallets = new Dictionary(); KeyboardUI m_NumericKeyboard; diff --git a/Scripts/Modules/LockModule/LockModule.cs b/Scripts/Modules/LockModule/LockModule.cs index d53ca540b..a835e766e 100644 --- a/Scripts/Modules/LockModule/LockModule.cs +++ b/Scripts/Modules/LockModule/LockModule.cs @@ -19,10 +19,15 @@ public void ExecuteAction() } } + const float k_MaxHoverTime = 2.0f; + +#pragma warning disable 649 [SerializeField] Sprite m_LockIcon; + [SerializeField] Sprite m_UnlockIcon; +#pragma warning restore 649 readonly LockModuleAction m_LockModuleAction = new LockModuleAction(); public List actions { get; private set; } @@ -34,7 +39,6 @@ public void ExecuteAction() GameObject m_CurrentHoverObject; Transform m_HoverRayOrigin; float m_HoverDuration; - const float k_MaxHoverTime = 2.0f; void Awake() { diff --git a/Scripts/Modules/MultipleRayInputModule/MultipleRayInputModule.cs b/Scripts/Modules/MultipleRayInputModule/MultipleRayInputModule.cs index f21db79b6..0fa15d597 100644 --- a/Scripts/Modules/MultipleRayInputModule/MultipleRayInputModule.cs +++ b/Scripts/Modules/MultipleRayInputModule/MultipleRayInputModule.cs @@ -178,13 +178,15 @@ void HideScrollFeedback() static LayerMask s_LayerMask; +#pragma warning disable 649 + [SerializeField] + ActionMap m_UIActionMap; +#pragma warning restore 649 + readonly Dictionary m_RaycastSources = new Dictionary(); Camera m_EventCamera; - [SerializeField] - ActionMap m_UIActionMap; - public Camera eventCamera { get { return m_EventCamera; } diff --git a/Scripts/Modules/ProjectFolderModule.cs b/Scripts/Modules/ProjectFolderModule.cs index 6146c48f2..20f285d52 100644 --- a/Scripts/Modules/ProjectFolderModule.cs +++ b/Scripts/Modules/ProjectFolderModule.cs @@ -1,4 +1,3 @@ -#if UNITY_EDITOR using System; using System.Collections; using System.Collections.Generic; @@ -9,6 +8,7 @@ namespace UnityEditor.Experimental.EditorVR.Modules { +#if UNITY_EDITOR sealed class ProjectFolderModule : MonoBehaviour, ISystemModule { // Maximum time (in ms) before yielding in CreateFolderData: should be target frame time @@ -188,5 +188,9 @@ static AssetData CreateAssetData(HierarchyProperty hp, HashSet assetType return new AssetData(hp.name, hp.guid, typeName); } } -} +#else + sealed class ProjectFolderModule : MonoBehaviour + { + } #endif +} diff --git a/Scripts/Modules/SceneObjectModule.cs b/Scripts/Modules/SceneObjectModule.cs index 12ed0fcee..9bcf96bd2 100644 --- a/Scripts/Modules/SceneObjectModule.cs +++ b/Scripts/Modules/SceneObjectModule.cs @@ -1,8 +1,4 @@ -#if !UNITY_2017_2_OR_NEWER -#pragma warning disable 649 // "never assigned to" warning -#endif - -using System; +using System; using System.Collections; using UnityEditor.Experimental.EditorVR.Utilities; using UnityEngine; diff --git a/Scripts/Modules/SelectionModule/SelectionModule.cs b/Scripts/Modules/SelectionModule/SelectionModule.cs index 12a839cc5..55fa775b4 100644 --- a/Scripts/Modules/SelectionModule/SelectionModule.cs +++ b/Scripts/Modules/SelectionModule/SelectionModule.cs @@ -10,8 +10,10 @@ namespace UnityEditor.Experimental.EditorVR.Modules sealed class SelectionModule : MonoBehaviour, ISystemModule, IUsesGameObjectLocking, ISelectionChanged, IControlHaptics, IRayToNode, IContainsVRPlayerCompletely { +#pragma warning disable 649 [SerializeField] HapticPulse m_HoverPulse; +#pragma warning restore 649 GameObject m_CurrentGroupRoot; readonly Dictionary m_GroupMap = new Dictionary(); // Maps objects to their group parent @@ -135,7 +137,11 @@ GameObject GetGroupRoot(GameObject hoveredObject) return groupParent; #if UNITY_EDITOR +#if UNITY_2018_3_OR_NEWER + var groupRoot = PrefabUtility.GetOutermostPrefabInstanceRoot(hoveredObject); +#else var groupRoot = PrefabUtility.FindPrefabRoot(hoveredObject); +#endif if (groupRoot) return groupRoot; diff --git a/Scripts/Modules/SnappingModule/SnappingModule.cs b/Scripts/Modules/SnappingModule/SnappingModule.cs index 72dae19c3..e88d41cb3 100644 --- a/Scripts/Modules/SnappingModule/SnappingModule.cs +++ b/Scripts/Modules/SnappingModule/SnappingModule.cs @@ -39,6 +39,7 @@ sealed class SnappingModule : MonoBehaviour, ISystemModule, IUsesViewerScale, IS const string k_MaterialColorLeftProperty = "_ColorLeft"; const string k_MaterialColorRightProperty = "_ColorRight"; +#pragma warning disable 649 [SerializeField] GameObject m_GroundPlane; @@ -50,6 +51,7 @@ sealed class SnappingModule : MonoBehaviour, ISystemModule, IUsesViewerScale, IS [SerializeField] Material m_ButtonHighlightMaterial; +#pragma warning restore 649 class SnappingState { diff --git a/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs b/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs index 316796bef..6b93f2724 100644 --- a/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs +++ b/Scripts/Modules/SnappingModule/SnappingModuleSettingsUI.cs @@ -5,6 +5,7 @@ namespace UnityEditor.Experimental.EditorVR { public class SnappingModuleSettingsUI : MonoBehaviour { +#pragma warning disable 649 [SerializeField] Toggle m_SnappingEnabled; @@ -28,6 +29,7 @@ public class SnappingModuleSettingsUI : MonoBehaviour [SerializeField] Toggle m_DirectSnappingEnabled; +#pragma warning restore 649 public Toggle snappingEnabled { diff --git a/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs b/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs index 226a5e4bb..be0c6c5c5 100644 --- a/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs +++ b/Scripts/Modules/SpatialHintModule/SpatialHintUI.cs @@ -10,6 +10,7 @@ public class SpatialHintUI : MonoBehaviour, IUsesViewerScale, IControlHaptics, I { readonly Color k_PrimaryArrowColor = Color.white; +#pragma warning disable 649 [Header("Scroll Visuals")] [SerializeField] CanvasGroup m_ScrollVisualsCanvasGroup; @@ -32,6 +33,7 @@ public class SpatialHintUI : MonoBehaviour, IUsesViewerScale, IControlHaptics, I [SerializeField] HintIcon[] m_SecondaryDirectionalHintArrows; +#pragma warning restore 649 bool m_Visible; bool m_PreScrollArrowsVisible; diff --git a/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs b/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs index d1c48b5e1..cc738465a 100644 --- a/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs +++ b/Scripts/Modules/SpatialScrollModule/SpatialScrollModule.cs @@ -7,12 +7,6 @@ namespace UnityEditor.Experimental.EditorVR.Modules public sealed class SpatialScrollModule : MonoBehaviour, ISystemModule, IUsesViewerScale, IControlHaptics, IControlSpatialHinting, IRayVisibilitySettings, INodeToRay { - [SerializeField] - HapticPulse m_ActivationPulse; // The pulse performed when initial activating spatial selection - - // Collection housing objects whose scroll data is being processed - readonly List m_ScrollCallers = new List(); - public class SpatialScrollData : INodeToRay { public SpatialScrollData(IControlSpatialScrolling caller, Node node, Vector3 startingPosition, Vector3 currentPosition, float repeatingScrollLengthRange, int scrollableItemCount, int maxItemCount = -1, bool centerVisuals = true) @@ -104,6 +98,14 @@ public void UpdateExistingScrollData(Vector3 newPosition) } } +#pragma warning disable 649 + [SerializeField] + HapticPulse m_ActivationPulse; // The pulse performed when initial activating spatial selection +#pragma warning restore 649 + + // Collection housing objects whose scroll data is being processed + readonly List m_ScrollCallers = new List(); + internal SpatialScrollData PerformScroll(IControlSpatialScrolling caller, Node node, Vector3 startingPosition, Vector3 currentPosition, float repeatingScrollLengthRange, int scrollableItemCount, int maxItemCount = -1, bool centerScrollVisuals = true) { // Continue processing of spatial scrolling for a given caller, diff --git a/Scripts/Modules/TooltipModule/TooltipModule.cs b/Scripts/Modules/TooltipModule/TooltipModule.cs index 48a9da974..ca25673f2 100644 --- a/Scripts/Modules/TooltipModule/TooltipModule.cs +++ b/Scripts/Modules/TooltipModule/TooltipModule.cs @@ -8,27 +8,6 @@ namespace UnityEditor.Experimental.EditorVR.Modules { sealed class TooltipModule : MonoBehaviour, ISystemModule, IUsesViewerScale { - const float k_Delay = 0; // In case we want to bring back a delay - const float k_TransitionDuration = 0.1f; - const float k_UVScale = 100f; - const float k_UVScrollSpeed = 1.5f; - const float k_Offset = 0.05f; - const float k_TextOrientationWeight = 0.1f; - const float k_ChangeTransitionDuration = 0.1f; - - const int k_PoolInitialCapacity = 16; - - static readonly Quaternion k_FlipYRotation = Quaternion.AngleAxis(180f, Vector3.up); - static readonly Quaternion k_FlipZRotation = Quaternion.AngleAxis(180f, Vector3.forward); - - static readonly Vector3[] k_Corners = new Vector3[4]; - - [SerializeField] - GameObject m_TooltipPrefab; - - [SerializeField] - GameObject m_TooltipCanvasPrefab; - class TooltipData { public float startTime; @@ -65,6 +44,29 @@ public void Reset() } } + const float k_Delay = 0; // In case we want to bring back a delay + const float k_TransitionDuration = 0.1f; + const float k_UVScale = 100f; + const float k_UVScrollSpeed = 1.5f; + const float k_Offset = 0.05f; + const float k_TextOrientationWeight = 0.1f; + const float k_ChangeTransitionDuration = 0.1f; + + const int k_PoolInitialCapacity = 16; + + static readonly Quaternion k_FlipYRotation = Quaternion.AngleAxis(180f, Vector3.up); + static readonly Quaternion k_FlipZRotation = Quaternion.AngleAxis(180f, Vector3.forward); + + static readonly Vector3[] k_Corners = new Vector3[4]; + +#pragma warning disable 649 + [SerializeField] + GameObject m_TooltipPrefab; + + [SerializeField] + GameObject m_TooltipCanvasPrefab; +#pragma warning restore 649 + readonly Dictionary m_Tooltips = new Dictionary(); readonly Queue m_TooltipPool = new Queue(k_PoolInitialCapacity); readonly Queue m_TooltipDataPool = new Queue(k_PoolInitialCapacity); diff --git a/Scripts/Modules/TooltipModule/TooltipUI.cs b/Scripts/Modules/TooltipModule/TooltipUI.cs index 765b03c5c..73e941366 100644 --- a/Scripts/Modules/TooltipModule/TooltipUI.cs +++ b/Scripts/Modules/TooltipModule/TooltipUI.cs @@ -16,6 +16,7 @@ sealed class TooltipUI : MonoBehaviour, IWillRender const float k_IconTextMinSpacing = 4; const float k_IconTextSpacing = 14; +#pragma warning disable 649 [SerializeField] RawImage m_DottedLine; @@ -52,6 +53,7 @@ sealed class TooltipUI : MonoBehaviour, IWillRender [SerializeField] SkinnedMeshRenderer m_BackgroundOutlineRenderer; +#pragma warning restore 649 int m_OriginalRightPaddingAmount; int m_OriginalTopPaddingAmount; diff --git a/Scripts/Proxies/AffordanceTooltipPlacement.cs b/Scripts/Proxies/AffordanceTooltipPlacement.cs index dbf3afc8d..6339d39e4 100644 --- a/Scripts/Proxies/AffordanceTooltipPlacement.cs +++ b/Scripts/Proxies/AffordanceTooltipPlacement.cs @@ -7,6 +7,7 @@ sealed class AffordanceTooltipPlacement : MonoBehaviour, ITooltipPlacement { const FacingDirection k_AllDirections = (FacingDirection)0xFFF; +#pragma warning disable 649 [SerializeField] Transform m_TooltipTarget; @@ -19,6 +20,7 @@ sealed class AffordanceTooltipPlacement : MonoBehaviour, ITooltipPlacement [FlagsProperty] [SerializeField] FacingDirection m_FacingDirection = k_AllDirections; +#pragma warning restore 649 public Transform tooltipTarget { get { return m_TooltipTarget; } } public Transform tooltipSource { get { return m_TooltipSource; } } diff --git a/Scripts/Proxies/Data/Affordance.cs b/Scripts/Proxies/Data/Affordance.cs index 514600af7..3c7573867 100644 --- a/Scripts/Proxies/Data/Affordance.cs +++ b/Scripts/Proxies/Data/Affordance.cs @@ -10,6 +10,7 @@ namespace UnityEditor.Experimental.EditorVR.Proxies [Serializable] class Affordance { +#pragma warning disable 649 [SerializeField] VRInputDevice.VRControl m_Control; @@ -25,6 +26,7 @@ class Affordance [SerializeField] AffordanceTooltip[] m_Tooltips; +#pragma warning restore 649 public VRInputDevice.VRControl control { get { return m_Control; } } public Transform[] transforms { get { return m_Transforms; } } diff --git a/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs b/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs index 0c0ecfc5d..c2b34b72c 100644 --- a/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs +++ b/Scripts/Proxies/Data/AffordanceAnimationDefinition.cs @@ -10,6 +10,7 @@ namespace UnityEditor.Experimental.EditorVR.Core [Serializable] public class AffordanceAnimationDefinition { +#pragma warning disable 649 [FlagsProperty] [SerializeField] AxisFlags m_TranslateAxes; @@ -26,6 +27,7 @@ public class AffordanceAnimationDefinition [SerializeField] bool m_ReverseForRightHand; +#pragma warning restore 649 /// /// The axes on which to perform translation of an affordance diff --git a/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs b/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs index 71eb10c84..ad22dd505 100644 --- a/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs +++ b/Scripts/Proxies/Data/AffordanceVisibilityDefinition.cs @@ -9,6 +9,7 @@ namespace UnityEditor.Experimental.EditorVR.Core [Serializable] public class AffordanceVisibilityDefinition { +#pragma warning disable 649 [SerializeField] ProxyAffordanceMap.VisibilityControlType m_VisibilityType; @@ -26,6 +27,7 @@ public class AffordanceVisibilityDefinition [SerializeField] Material m_HiddenMaterial; +#pragma warning restore 649 /// /// The hidden color of the material diff --git a/Scripts/Proxies/Data/ProxyAffordanceMap.cs b/Scripts/Proxies/Data/ProxyAffordanceMap.cs index 80cba6228..86bc4a593 100644 --- a/Scripts/Proxies/Data/ProxyAffordanceMap.cs +++ b/Scripts/Proxies/Data/ProxyAffordanceMap.cs @@ -15,6 +15,7 @@ public enum VisibilityControlType MaterialSwap } +#pragma warning disable 649 [Header("Non-Interactive Input-Device Body Elements")] [SerializeField] AffordanceVisibilityDefinition m_BodyVisibilityDefinition; @@ -29,6 +30,7 @@ public enum VisibilityControlType [Header("Custom Affordance Overrides")] [SerializeField] AffordanceDefinition[] m_AffordanceDefinitions; +#pragma warning restore 649 /// /// Collection of affordance definitions representing a proxy diff --git a/Scripts/Proxies/Data/ProxyExtras.cs b/Scripts/Proxies/Data/ProxyExtras.cs index e1b44c675..5fc8cd736 100644 --- a/Scripts/Proxies/Data/ProxyExtras.cs +++ b/Scripts/Proxies/Data/ProxyExtras.cs @@ -10,6 +10,7 @@ namespace UnityEditor.Experimental.EditorVR.Helpers [CreateAssetMenu(menuName = "EditorXR/Proxy Extras")] sealed class ProxyExtras : ScriptableObject { +#pragma warning disable 649 [Serializable] struct ProxyExtraData { @@ -24,6 +25,12 @@ struct ProxyExtraData public GameObject prefab; } + [SerializeField] + ProxyExtraData[] m_Extras; +#pragma warning restore 649 + + Dictionary> m_Data; + public Dictionary> data { get @@ -48,10 +55,5 @@ public Dictionary> data return m_Data; } } - - Dictionary> m_Data; - - [SerializeField] - ProxyExtraData[] m_Extras; } } diff --git a/Scripts/Proxies/DefaultProxyRay.cs b/Scripts/Proxies/DefaultProxyRay.cs index e5372337d..08f86f7fa 100644 --- a/Scripts/Proxies/DefaultProxyRay.cs +++ b/Scripts/Proxies/DefaultProxyRay.cs @@ -15,6 +15,7 @@ struct DefaultRayVisibilitySettings public bool coneVisible; } +#pragma warning disable 649 [SerializeField] VRLineRenderer m_LineRenderer; @@ -26,6 +27,7 @@ struct DefaultRayVisibilitySettings [SerializeField] MeshFilter m_Cone; +#pragma warning restore 649 Vector3 m_TipStartScale; Transform m_ConeTransform; diff --git a/Scripts/Proxies/ProxyAnimator.cs b/Scripts/Proxies/ProxyAnimator.cs index aff23f741..af2ef4474 100644 --- a/Scripts/Proxies/ProxyAnimator.cs +++ b/Scripts/Proxies/ProxyAnimator.cs @@ -27,8 +27,10 @@ public void Apply(Transform transform) } } +#pragma warning disable 649 [SerializeField] ActionMap m_ProxyActionMap; +#pragma warning restore 649 Affordance[] m_Affordances; AffordanceDefinition[] m_AffordanceDefinitions; diff --git a/Scripts/Proxies/ProxyNode.cs b/Scripts/Proxies/ProxyNode.cs index 1963eb366..1401c8f9a 100644 --- a/Scripts/Proxies/ProxyNode.cs +++ b/Scripts/Proxies/ProxyNode.cs @@ -328,6 +328,7 @@ public void OnDestroy() static readonly ProxyFeedbackRequest k_ShakeFeedbackRequest = new ProxyFeedbackRequest { showBody = true }; +#pragma warning disable 649 [SerializeField] float m_FadeInDuration = 0.5f; @@ -365,6 +366,7 @@ public void OnDestroy() [Tooltip("Affordance objects that store transform, renderer, and tooltip references")] [SerializeField] Affordance[] m_Affordances; +#pragma warning restore 649 readonly Dictionary m_AffordanceData = new Dictionary(); readonly List> m_BodyData = new List>(); diff --git a/Scripts/Proxies/Vive/ViveProxy.cs b/Scripts/Proxies/Vive/ViveProxy.cs index 7aaa0b8e1..d40442f6f 100644 --- a/Scripts/Proxies/Vive/ViveProxy.cs +++ b/Scripts/Proxies/Vive/ViveProxy.cs @@ -12,11 +12,13 @@ namespace UnityEditor.Experimental.EditorVR.Proxies { sealed class ViveProxy : TwoHandedProxyBase { +#pragma warning disable 649 [SerializeField] GameObject m_LeftHandTouchProxyPrefab; [SerializeField] GameObject m_RightHandTouchProxyPrefab; +#pragma warning restore 649 bool m_IsOculus; diff --git a/Scripts/Proxies/ViveProxyHelper.cs b/Scripts/Proxies/ViveProxyHelper.cs index ff3d667d5..8121add7a 100644 --- a/Scripts/Proxies/ViveProxyHelper.cs +++ b/Scripts/Proxies/ViveProxyHelper.cs @@ -5,6 +5,7 @@ namespace UnityEditor.Experimental.EditorVR.Proxies { class ViveProxyHelper : MonoBehaviour { +#pragma warning disable 649 [Serializable] public class AffordanceTooltipPlacementOverride { @@ -20,6 +21,7 @@ public class AffordanceTooltipPlacementOverride [SerializeField] AffordanceTooltipPlacementOverride[] m_LeftPlacementOverrides; +#pragma warning restore 649 /// /// Tooltip placement arrays to be replaced on the right hand controller diff --git a/Scripts/Runtime/SerializedObject.cs b/Scripts/Runtime/SerializedObject.cs index 3b413b66e..b0571397b 100644 --- a/Scripts/Runtime/SerializedObject.cs +++ b/Scripts/Runtime/SerializedObject.cs @@ -5,7 +5,7 @@ namespace UnityEditor.Experimental.EditorVR { public class SerializedObject { - public GameObject targetObject; + public Object targetObject; } } #endif diff --git a/Scripts/UI/CuboidLayout.cs b/Scripts/UI/CuboidLayout.cs index 8e9c95746..cc0c01b7c 100644 --- a/Scripts/UI/CuboidLayout.cs +++ b/Scripts/UI/CuboidLayout.cs @@ -1,7 +1,7 @@ using UnityEditor.Experimental.EditorVR.Extensions; +using UnityEditor.Experimental.EditorVR.Utilities; using UnityEngine; using UnityEngine.EventSystems; -using UnityEditor.Experimental.EditorVR.Utilities; namespace UnityEditor.Experimental.EditorVR.UI { @@ -11,6 +11,7 @@ sealed class CuboidLayout : UIBehaviour const float k_LayerHeight = 0.004f; const float k_ExtraSpace = 0.00055f; // To avoid Z-fighting +#pragma warning disable 649 [SerializeField] RectTransform[] m_TargetTransforms; @@ -23,6 +24,7 @@ sealed class CuboidLayout : UIBehaviour [SerializeField] GameObject m_HighlightCubePrefab; +#pragma warning restore 649 Transform[] m_CubeTransforms; Transform[] m_HighlightCubeTransforms; diff --git a/Scripts/UI/DefaultToggleGroup.cs b/Scripts/UI/DefaultToggleGroup.cs index 2dc595922..a6da0d06e 100644 --- a/Scripts/UI/DefaultToggleGroup.cs +++ b/Scripts/UI/DefaultToggleGroup.cs @@ -5,8 +5,10 @@ namespace UnityEditor.Experimental.EditorVR.UI { sealed class DefaultToggleGroup : MonoBehaviour { +#pragma warning disable 649 [SerializeField] Toggle m_DefaultToggle; +#pragma warning restore 649 public Toggle defaultToggle { get { return m_DefaultToggle; } } } diff --git a/Scripts/UI/GradientButton.cs b/Scripts/UI/GradientButton.cs index 80742c8cb..15a4dc288 100644 --- a/Scripts/UI/GradientButton.cs +++ b/Scripts/UI/GradientButton.cs @@ -22,6 +22,105 @@ sealed class GradientButton : MonoBehaviour, IPointerEnterHandler, IPointerExitH const string k_MaterialColorTopProperty = "_ColorTop"; const string k_MaterialColorBottomProperty = "_ColorBottom"; +#pragma warning disable 649 + [SerializeField] + GradientPair m_NormalGradientPair; + + [SerializeField] + GradientPair m_HighlightGradientPair; + + // The inner-button's background gradient MeshRenderer + [SerializeField] + Renderer m_ButtonMeshRenderer; + + // Transform-root of the contents in the icon container (icons, text, etc) + [SerializeField] + Transform m_IconContainer; + + // Transform-root of the contents that will be scaled when button is highlighted + [SerializeField] + Transform m_ContentContainer; + + // The canvas group managing the drawing of elements in the icon container + [SerializeField] + CanvasGroup m_CanvasGroup; + +#if INCLUDE_TEXT_MESH_PRO + [SerializeField] + TextMeshProUGUI m_Text; +#endif + + [SerializeField] + Image m_Icon; + + // Alternate icon sprite, shown when the main icon sprite isn't; If set, this button will swap icon sprites OnClick + [SerializeField] + Sprite m_AlternateIconSprite; + + [SerializeField] + Color m_NormalContentColor; + + [SerializeField] + Color m_DisabledColor = Color.gray; + + // The color that elements in the HighlightItems collection should inherit during the highlighted state + [SerializeField] + Color m_HighlightItemColor = UnityBrandColorScheme.light; + + // Collection of items that will change appearance during the highlighted state (color/position/etc) + [SerializeField] + Graphic[] m_HighlightItems; + + [SerializeField] + bool m_Interactable; + + [SerializeField] + float m_IconHighlightedLocalZOffset = -0.0015f; + + [SerializeField] + float m_BeginHighlightDuration = 0.25f; + + [SerializeField] + float m_EndHighlightDuration = 0.167f; + + [Header("Animated Reveal Settings")] + [Tooltip("Default value is 0.25")] + + // If AnimatedReveal is enabled, wait this duration before performing the reveal + [SerializeField] + [Range(0f, 2f)] + float m_DelayBeforeReveal = 0.25f; + + [SerializeField] + float m_HighlightZScaleMultiplier = 2f; + + [SerializeField] + float m_ContainerContentsAnimationSpeedMultiplier = 1f; +#pragma warning restore 649 + + Sprite m_IconSprite; + + bool m_Pressed; + bool m_Highlighted; + bool m_Visible; + + Material m_ButtonMaterial; + Vector3 m_OriginalIconLocalPosition; + Vector3 m_OriginalContentContainerLocalScale; + Vector3 m_HighlightContentContainerLocalScale; + Vector3 m_IconHighlightedLocalPosition; + Vector3 m_IconPressedLocalPosition; + Sprite m_OriginalIconSprite; + Vector3 m_OriginalLocalScale; + + // The initial button reveal coroutines, before highlighting occurs + Coroutine m_VisibilityCoroutine; + Coroutine m_ContentVisibilityCoroutine; + + // The visibility & highlight coroutines + Coroutine m_HighlightCoroutine; + Coroutine m_IconHighlightCoroutine; + public event Action click; public event Action hoverEnter; public event Action hoverExit; @@ -35,8 +134,6 @@ public Sprite iconSprite } } - Sprite m_IconSprite; - public bool pressed { get { return m_Pressed; } @@ -53,8 +150,6 @@ public bool pressed } } - bool m_Pressed; - public bool highlighted { get { return m_Highlighted; } @@ -81,8 +176,6 @@ public bool highlighted } } - bool m_Highlighted; - public bool alternateIconVisible { set @@ -111,8 +204,6 @@ public bool visible } } - bool m_Visible; - public float containerContentsAnimationSpeedMultiplier { set { m_ContainerContentsAnimationSpeedMultiplier = value; } } public float iconHighlightedLocalZOffset @@ -130,104 +221,12 @@ public GradientPair normalGradientPair set { m_NormalGradientPair = value; } } - [SerializeField] - GradientPair m_NormalGradientPair; - public GradientPair highlightGradientPair { get { return m_HighlightGradientPair; } set { m_HighlightGradientPair = value; } } - [SerializeField] - GradientPair m_HighlightGradientPair; - - // The inner-button's background gradient MeshRenderer - [SerializeField] - Renderer m_ButtonMeshRenderer; - - // Transform-root of the contents in the icon container (icons, text, etc) - [SerializeField] - Transform m_IconContainer; - - // Transform-root of the contents that will be scaled when button is highlighted - [SerializeField] - Transform m_ContentContainer; - - // The canvas group managing the drawing of elements in the icon container - [SerializeField] - CanvasGroup m_CanvasGroup; - -#if INCLUDE_TEXT_MESH_PRO - [SerializeField] - TextMeshProUGUI m_Text; -#endif - - [SerializeField] - Image m_Icon; - - // Alternate icon sprite, shown when the main icon sprite isn't; If set, this button will swap icon sprites OnClick - [SerializeField] - Sprite m_AlternateIconSprite; - - [SerializeField] - Color m_NormalContentColor; - - [SerializeField] - Color m_DisabledColor = Color.gray; - - // The color that elements in the HighlightItems collection should inherit during the highlighted state - [SerializeField] - Color m_HighlightItemColor = UnityBrandColorScheme.light; - - // Collection of items that will change appearance during the highlighted state (color/position/etc) - [SerializeField] - Graphic[] m_HighlightItems; - - [SerializeField] - bool m_Interactable; - - [SerializeField] - float m_IconHighlightedLocalZOffset = -0.0015f; - - [SerializeField] - float m_BeginHighlightDuration = 0.25f; - - [SerializeField] - float m_EndHighlightDuration = 0.167f; - - [Header("Animated Reveal Settings")] - [Tooltip("Default value is 0.25")] - - // If AnimatedReveal is enabled, wait this duration before performing the reveal - [SerializeField] - [Range(0f, 2f)] - float m_DelayBeforeReveal = 0.25f; - - [SerializeField] - float m_HighlightZScaleMultiplier = 2f; - - [SerializeField] - float m_ContainerContentsAnimationSpeedMultiplier = 1f; - - Material m_ButtonMaterial; - Vector3 m_OriginalIconLocalPosition; - Vector3 m_OriginalContentContainerLocalScale; - Vector3 m_HighlightContentContainerLocalScale; - Vector3 m_IconHighlightedLocalPosition; - Vector3 m_IconPressedLocalPosition; - Sprite m_OriginalIconSprite; - Vector3 m_OriginalLocalScale; - - // The initial button reveal coroutines, before highlighting occurs - Coroutine m_VisibilityCoroutine; - Coroutine m_ContentVisibilityCoroutine; - Coroutine m_HighlighCoroutine; - - // The visibility & highlight coroutines - Coroutine m_HighlightCoroutine; - Coroutine m_IconHighlightCoroutine; - public bool interactable { get { return m_Interactable; } diff --git a/Scripts/UI/GridCellSizeAdjuster.cs b/Scripts/UI/GridCellSizeAdjuster.cs index 4575fa3b0..09b594c80 100644 --- a/Scripts/UI/GridCellSizeAdjuster.cs +++ b/Scripts/UI/GridCellSizeAdjuster.cs @@ -5,13 +5,15 @@ namespace UnityEditor.Experimental.EditorVR.Helpers { sealed class GridCellSizeAdjuster : MonoBehaviour { - RectTransform m_LayoutGroupTransform; - +#pragma warning disable 649 [SerializeField] GridLayoutGroup m_LayoutGroup; [SerializeField] float m_XScalePadding = 0.01f; +#pragma warning restore 649 + + RectTransform m_LayoutGroupTransform; void Awake() { diff --git a/Scripts/UI/InputField.cs b/Scripts/UI/InputField.cs index 29dfe66f9..33b89e1cd 100644 --- a/Scripts/UI/InputField.cs +++ b/Scripts/UI/InputField.cs @@ -1,7 +1,3 @@ -#if !UNITY_2017_2_OR_NEWER -#pragma warning disable 649 // "never assigned to" warning -#endif - using System; using System.Collections; using System.Collections.Generic; @@ -31,6 +27,7 @@ public class OnChangeEvent : UnityEvent const float k_MoveKeyboardTime = 0.2f; +#pragma warning disable 649 [SerializeField] [FlagsProperty] SelectionFlags m_SelectionFlags = SelectionFlags.Ray | SelectionFlags.Direct; @@ -47,6 +44,7 @@ public class OnChangeEvent : UnityEvent [HideInInspector] [SerializeField] // Serialized so that this remains set after cloning protected string m_Text = string.Empty; +#pragma warning restore 649 bool m_KeyboardOpen; diff --git a/Scripts/UI/KeyboardMallet.cs b/Scripts/UI/KeyboardMallet.cs index ae3d57b00..b6f207dfc 100644 --- a/Scripts/UI/KeyboardMallet.cs +++ b/Scripts/UI/KeyboardMallet.cs @@ -6,25 +6,27 @@ namespace UnityEditor.Experimental.EditorVR.UI { sealed class KeyboardMallet : MonoBehaviour { +#pragma warning disable 649 [SerializeField] - private Transform m_StemOrigin; + Transform m_StemOrigin; [SerializeField] - private float m_StemLength = 0.06f; + float m_StemLength = 0.06f; [SerializeField] - private float m_StemWidth = 0.003125f; + float m_StemWidth = 0.003125f; [SerializeField] - private Transform m_Bulb; + Transform m_Bulb; [SerializeField] - private float m_BulbRadius; + float m_BulbRadius; [SerializeField] - private Collider m_BulbCollider; + Collider m_BulbCollider; +#pragma warning restore 649 - private KeyboardButton m_CurrentButton; + KeyboardButton m_CurrentButton; Coroutine m_ShowHideCoroutine; @@ -96,7 +98,7 @@ public void CheckForKeyCollision() } } - private IEnumerator HideMallet() + IEnumerator HideMallet() { m_Open = false; @@ -125,7 +127,7 @@ private IEnumerator HideMallet() m_ShowHideCoroutine = null; } - private IEnumerator ShowMallet() + IEnumerator ShowMallet() { var stemScale = m_StemOrigin.localScale; var currentLength = m_StemOrigin.localScale.y; diff --git a/Scripts/UI/KeyboardUI.cs b/Scripts/UI/KeyboardUI.cs index e732dc8ac..df0c27385 100644 --- a/Scripts/UI/KeyboardUI.cs +++ b/Scripts/UI/KeyboardUI.cs @@ -19,6 +19,7 @@ sealed class KeyboardUI : MonoBehaviour const float k_HorizontalThreshold = 0.7f; static Color s_HandleDragColor = UnityBrandColorScheme.green; +#pragma warning disable 649 [SerializeField] List m_Buttons = new List(); @@ -33,6 +34,7 @@ sealed class KeyboardUI : MonoBehaviour [SerializeField] SmoothMotion m_SmoothMotion; +#pragma warning restore 649 bool m_EligibleForDrag; bool m_CurrentlyHorizontal; diff --git a/Scripts/UI/SubmenuFace.cs b/Scripts/UI/SubmenuFace.cs index 95009fd0e..89a4177d3 100644 --- a/Scripts/UI/SubmenuFace.cs +++ b/Scripts/UI/SubmenuFace.cs @@ -2,12 +2,12 @@ using UnityEditor.Experimental.EditorVR.Core; using UnityEditor.Experimental.EditorVR.Helpers; using UnityEngine; -using UnityEngine.Events; namespace UnityEditor.Experimental.EditorVR.Menus { class SubmenuFace : MonoBehaviour, IControlHaptics, IRayToNode { +#pragma warning disable 649 [SerializeField] MainMenuButton m_BackButton; @@ -16,6 +16,7 @@ class SubmenuFace : MonoBehaviour, IControlHaptics, IRayToNode [SerializeField] HapticPulse m_ButtonHoverPulse; +#pragma warning restore 649 public GradientPair gradientPair { get; set; } diff --git a/Scripts/UI/UITransformCopy.cs b/Scripts/UI/UITransformCopy.cs index f74a1bb8f..4adf3823a 100644 --- a/Scripts/UI/UITransformCopy.cs +++ b/Scripts/UI/UITransformCopy.cs @@ -9,6 +9,7 @@ sealed class UITransformCopy : MonoBehaviour Transform m_TargetTransform; +#pragma warning disable 649 [SerializeField] RectTransform m_SourceRectTransform; @@ -16,7 +17,7 @@ sealed class UITransformCopy : MonoBehaviour float m_XPositionPadding = 0.005f; [SerializeField] - float m_YPositionPadding = 0f; + float m_YPositionPadding; [SerializeField] float m_ZPositionPadding = 0.00055f; @@ -25,10 +26,11 @@ sealed class UITransformCopy : MonoBehaviour float m_XScalePadding = 0.01f; [SerializeField] - float m_YScalePadding = 0f; + float m_YScalePadding; [SerializeField] bool m_ParentUnderSource = true; +#pragma warning restore 649 void Awake() { diff --git a/Scripts/Utilities/IntersectionUtils.cs b/Scripts/Utilities/IntersectionUtils.cs index 81649279c..c4183992a 100644 --- a/Scripts/Utilities/IntersectionUtils.cs +++ b/Scripts/Utilities/IntersectionUtils.cs @@ -275,11 +275,23 @@ public static void SetupCollisionTester(MeshCollider collisionTester, Transform var mf = obj.GetComponent(); if (mf) { - if (collisionTester.sharedMesh != mf.sharedMesh) - { - collisionTester.sharedMesh = mf.sharedMesh; - collisionTester.transform.localScale = Vector3.one; - } + var mesh = mf.sharedMesh; + +#if !UNITY_EDITOR + // Player builds throw errors for non-readable meshes + if (!mesh.isReadable) + return; +#endif + + // Non-triangle meshes cause physics error + if (mesh.GetTopology(0) != MeshTopology.Triangles) + return; + + if (collisionTester.sharedMesh == mesh) + return; + + collisionTester.sharedMesh = mf.sharedMesh; + collisionTester.transform.localScale = Vector3.one; return; } diff --git a/Scripts/Utilities/ObjectUtils.cs b/Scripts/Utilities/ObjectUtils.cs index 2b950bbb3..78efc129b 100644 --- a/Scripts/Utilities/ObjectUtils.cs +++ b/Scripts/Utilities/ObjectUtils.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using UnityEditor.Experimental.EditorVR.Core; +using UnityEditor.Experimental.EditorVR.Helpers; using UnityEngine; using UnityObject = UnityEngine.Object; @@ -342,7 +342,7 @@ public static void Destroy(UnityObject o, float t = 0f, bool withUndo = false) } else { - VRView.StartCoroutine(DestroyInSeconds(o, t)); + EditorMonoBehaviour.StartEditorCoroutine(DestroyInSeconds(o, t)); } } #endif diff --git a/Scripts/Utilities/TransformCopy.cs b/Scripts/Utilities/TransformCopy.cs index 1c7828d6e..94bf0df04 100644 --- a/Scripts/Utilities/TransformCopy.cs +++ b/Scripts/Utilities/TransformCopy.cs @@ -10,17 +10,18 @@ enum Space Local } +#pragma warning disable 649 [SerializeField] Transform m_SourceTransform; [SerializeField] - float m_XPositionPadding = 0f; + float m_XPositionPadding; [SerializeField] - float m_YPositionPadding = 0f; + float m_YPositionPadding; [SerializeField] - float m_ZPositionPadding = 0f; + float m_ZPositionPadding; [SerializeField] bool m_ParentUnderSource = true; @@ -29,7 +30,8 @@ enum Space Space m_Space; [SerializeField] - bool m_ForceAlwaysUpdate = false; + bool m_ForceAlwaysUpdate; +#pragma warning restore 649 Vector3 m_Padding; diff --git a/Tests/Editor/CompilationTest.cs b/Tests/Editor/CompilationTest.cs index 90d2b978a..87a3ee814 100644 --- a/Tests/Editor/CompilationTest.cs +++ b/Tests/Editor/CompilationTest.cs @@ -41,6 +41,10 @@ static void TestCompile(string[] defines) var references = new List(); ObjectUtils.ForEachAssembly(assembly => { +#if NET_4_6 + if (assembly.IsDynamic) + return; +#endif // Ignore project assemblies because they will cause conflicts if (assembly.FullName.StartsWith("Assembly-CSharp", StringComparison.OrdinalIgnoreCase)) return; diff --git a/Tests/Editor/Unit/Core/EditingContextManagerTests.cs b/Tests/Editor/Unit/Core/EditingContextManagerTests.cs index b3d33587f..184e8f956 100644 --- a/Tests/Editor/Unit/Core/EditingContextManagerTests.cs +++ b/Tests/Editor/Unit/Core/EditingContextManagerTests.cs @@ -1,11 +1,11 @@ -using System.IO; -using UnityEngine; +using NUnit.Framework; using System.Collections.Generic; +using System.IO; using System.Threading; -using NUnit.Framework; using UnityEditor.Experimental.EditorVR.Core; -using UnityEditor.Experimental.EditorVR.Utilities; using UnityEditor.Experimental.EditorVR.Tools; +using UnityEditor.Experimental.EditorVR.Utilities; +using UnityEngine; namespace UnityEditor.Experimental.EditorVR.Tests.Core { @@ -21,7 +21,7 @@ public class EditingContextManagerTests [OneTimeSetUp] public void Setup() { - manager = EditingContextManager.s_Instance; + manager = EditingContextManager.instance; go = new GameObject("context test object"); var transformTool = go.AddComponent(); var createPrimitiveTool = go.AddComponent(); @@ -97,8 +97,8 @@ public void LoadProjectSettings_IfAssetFound() [Test] public void LoadProjectSettings_IfAssetNotFound() { - if (File.Exists(EditingContextManager.k_SettingsPath)) - File.Delete(EditingContextManager.k_SettingsPath); + if (File.Exists(EditingContextManager.settingsPath)) + File.Delete(EditingContextManager.settingsPath); var loaded = EditingContextManager.LoadProjectSettings(); Assert.IsInstanceOf(loaded); @@ -126,8 +126,8 @@ public void LoadUserSettings_OlderThanProjectSettings() [Test] public void LoadUserSettings_ProjectSettingsFallback() { - if (File.Exists(EditingContextManager.k_UserSettingsPath)) - File.Delete(EditingContextManager.k_UserSettingsPath); + if (File.Exists(EditingContextManager.userSettingsPath)) + File.Delete(EditingContextManager.userSettingsPath); var projectSettings = EditingContextManager.LoadProjectSettings(); var userSettings = EditingContextManager.LoadUserSettings(); @@ -138,7 +138,7 @@ public void LoadUserSettings_ProjectSettingsFallback() [Test] public void SaveProjectSettings_UpdatesProjectSettingsFile() { - var path = EditingContextManager.k_SettingsPath; + var path = EditingContextManager.settingsPath; var lastModTime = File.GetLastWriteTime(path); Thread.Sleep(1000); // Wait one second to make sure modified time is later EditingContextManager.SaveProjectSettings(settings); @@ -150,7 +150,7 @@ public void SaveProjectSettings_UpdatesProjectSettingsFile() [Test] public void SaveUserSettings_UpdatesUserSettingsFile() { - var path = EditingContextManager.k_UserSettingsPath; + var path = EditingContextManager.userSettingsPath; var lastModTime = File.GetLastWriteTime(path); EditingContextManager.SaveUserSettings(newSettings); diff --git a/Tools/AnnotationTool/AnnotationTool.cs b/Tools/AnnotationTool/AnnotationTool.cs index 9e281d85f..a8e24f809 100644 --- a/Tools/AnnotationTool/AnnotationTool.cs +++ b/Tools/AnnotationTool/AnnotationTool.cs @@ -88,6 +88,7 @@ public float pressureSmoothing public delegate void AnnotationFinishedCallback(MeshFilter meshFilter); public static AnnotationFinishedCallback AnnotationFinished; +#pragma warning disable 649 [SerializeField] ActionMap m_ActionMap; @@ -102,6 +103,7 @@ public float pressureSmoothing [SerializeField] AnnotationContextMenu m_MenuPrefab; +#pragma warning restore 649 Action m_BrushSizeChanged; diff --git a/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs b/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs index 8a2d36ccb..fa11ff322 100644 --- a/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs +++ b/Tools/AnnotationTool/UserInterface/AnnotationContextMenu.cs @@ -8,6 +8,7 @@ namespace UnityEditor.Experimental.EditorVR.Tools { sealed class AnnotationContextMenu : MonoBehaviour, IMenu { +#pragma warning disable 649 [SerializeField] Button m_CloseButton; @@ -31,6 +32,7 @@ sealed class AnnotationContextMenu : MonoBehaviour, IMenu [SerializeField] Slider m_ColorSlider; +#pragma warning restore 649 AnnotationTool.Preferences m_Preferences; bool m_InsideUIUpdate; diff --git a/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs b/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs index 1a966bed0..f9183337e 100644 --- a/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs +++ b/Tools/AnnotationTool/UserInterface/AnnotationPointer.cs @@ -9,8 +9,10 @@ public class AnnotationPointer : MonoBehaviour const float k_BottomRadius = 0.01f; const float k_YScale = 2.5f; +#pragma warning disable 649 [SerializeField] Material m_ConeMaterial; +#pragma warning restore 649 Material m_ConeMaterialInstance; diff --git a/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs b/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs index b8854fefb..97b799a9e 100644 --- a/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs +++ b/Tools/AnnotationTool/UserInterface/BrushSizeUI.cs @@ -12,11 +12,13 @@ public class BrushSizeUI : MonoBehaviour, IAlternateMenu const float k_MinSize = 0.625f; const float k_MaxSize = 12.5f; +#pragma warning disable 649 [SerializeField] RectTransform m_SliderHandle; [SerializeField] Slider m_Slider; +#pragma warning restore 649 Image m_SliderHandleImage; MenuHideFlags m_MenuHideFlags; diff --git a/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs b/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs index dd59bab89..42d08215b 100644 --- a/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs +++ b/Tools/AnnotationTool/UserInterface/ColorPickerActivator.cs @@ -8,6 +8,7 @@ namespace UnityEditor.Experimental.EditorVR.Tools { public class ColorPickerActivator : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler { +#pragma warning disable 649 [SerializeField] Transform m_TargetScale; @@ -16,6 +17,7 @@ public class ColorPickerActivator : MonoBehaviour, IPointerClickHandler, IPointe [SerializeField] float m_PickerOffset = 0.045f; +#pragma warning restore 649 Coroutine m_HighlightCoroutine; diff --git a/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs b/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs index b5a91edee..8cd359bf9 100644 --- a/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs +++ b/Tools/AnnotationTool/UserInterface/ColorPickerUI.cs @@ -9,6 +9,7 @@ namespace UnityEditor.Experimental.EditorVR.Tools { public class ColorPickerUI : MonoBehaviour, IPointerExitHandler { +#pragma warning disable 649 [SerializeField] float m_FadeTime; @@ -29,6 +30,7 @@ public class ColorPickerUI : MonoBehaviour, IPointerExitHandler [SerializeField] Slider m_BrightnessSlider; +#pragma warning restore 649 Vector3 m_PickerTargetPosition; diff --git a/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs b/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs index a2aed308a..480bbb210 100644 --- a/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs +++ b/Tools/CreatePrimitiveTool/CreatePrimitiveMenu.cs @@ -12,6 +12,7 @@ sealed class CreatePrimitiveMenu : MonoBehaviour, IMenu, IControlHaptics, IRayTo const string k_BottomGradientProperty = "_ColorBottom"; const string k_TopGradientProperty = "_ColorTop"; +#pragma warning disable 649 [SerializeField] Renderer m_TitleIcon; @@ -23,6 +24,7 @@ sealed class CreatePrimitiveMenu : MonoBehaviour, IMenu, IControlHaptics, IRayTo [SerializeField] HapticPulse m_ButtonHoverPulse; +#pragma warning restore 649 Material m_TitleIconMaterial; @@ -54,7 +56,7 @@ void Awake() } } - private void OnDestroy() + void OnDestroy() { foreach (var button in m_Buttons) { diff --git a/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs b/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs index 074555c32..2d82ca694 100644 --- a/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs +++ b/Tools/CreatePrimitiveTool/CreatePrimitiveMenuButtonUI.cs @@ -4,11 +4,13 @@ namespace UnityEditor.Experimental.EditorVR.Tools { public sealed class CreatePrimitiveMenuButtonUI : MonoBehaviour { +#pragma warning disable 649 [SerializeField] Transform m_ShapeTransform; [SerializeField] RectTransform m_BackgroundGradientTransform; +#pragma warning restore 649 Vector3 m_OriginalShapeLocalScale; Vector2 m_OriginalBackgroundSizeDelta; diff --git a/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs b/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs index 9ff020bf9..abc09b7dd 100644 --- a/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs +++ b/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs @@ -11,11 +11,13 @@ sealed class CreatePrimitiveTool : MonoBehaviour, ITool, IStandardActionMap, ICo IUsesRayOrigin, IUsesSpatialHash, IUsesViewerScale, ISelectTool, IIsHoveringOverUI, IIsMainMenuVisible, IRayVisibilitySettings, IMenuIcon, IRequestFeedback, IUsesNode { +#pragma warning disable 649 [SerializeField] CreatePrimitiveMenu m_MenuPrefab; [SerializeField] Sprite m_Icon; +#pragma warning restore 649 const float k_DrawDistance = 0.075f; diff --git a/Tools/LocomotionTool/LocomotionTool.cs b/Tools/LocomotionTool/LocomotionTool.cs index bc32dbfdd..dcba39577 100644 --- a/Tools/LocomotionTool/LocomotionTool.cs +++ b/Tools/LocomotionTool/LocomotionTool.cs @@ -15,6 +15,19 @@ sealed class LocomotionTool : MonoBehaviour, ITool, ILocomotor, IUsesRayOrigin, ICustomActionMap, ILinkedObject, IUsesViewerScale, ISettingsMenuItemProvider, ISerializePreferences, IUsesDeviceType, IGetVRPlayerObjects, IBlockUIInteraction, IRequestFeedback, IUsesNode { + [Serializable] + class Preferences + { + [SerializeField] + bool m_BlinkMode; + + public bool blinkMode + { + get { return m_BlinkMode; } + set { m_BlinkMode = value; } + } + } + const float k_FastMoveSpeed = 20f; const float k_SlowMoveSpeed = 1f; const float k_RotationDamping = 0.2f; @@ -39,6 +52,7 @@ sealed class LocomotionTool : MonoBehaviour, ITool, ILocomotor, IUsesRayOrigin, static readonly Vector3 k_RingOffset = new Vector3(0f, -0.3f, 0.5f); +#pragma warning disable 649 [SerializeField] GameObject m_BlinkVisualsPrefab; @@ -53,19 +67,7 @@ sealed class LocomotionTool : MonoBehaviour, ITool, ILocomotor, IUsesRayOrigin, [SerializeField] GameObject m_RingPrefab; - - [Serializable] - class Preferences - { - [SerializeField] - bool m_BlinkMode; - - public bool blinkMode - { - get { return m_BlinkMode; } - set { m_BlinkMode = value; } - } - } +#pragma warning restore 649 Preferences m_Preferences; diff --git a/Tools/LocomotionTool/Materials/MouseRing.mat b/Tools/LocomotionTool/Materials/MouseRing.mat index 06dbfa8c5..7930a8b1e 100644 --- a/Tools/LocomotionTool/Materials/MouseRing.mat +++ b/Tools/LocomotionTool/Materials/MouseRing.mat @@ -4,7 +4,7 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: MouseRing m_Shader: {fileID: 4800000, guid: 3e9085b7912f83b429d22d692d5a9ee6, type: 3} diff --git a/Tools/LocomotionTool/Prefabs/MouseRing.prefab b/Tools/LocomotionTool/Prefabs/MouseRing.prefab index dce767a9b..e1741a9a2 100644 --- a/Tools/LocomotionTool/Prefabs/MouseRing.prefab +++ b/Tools/LocomotionTool/Prefabs/MouseRing.prefab @@ -8,13 +8,13 @@ Prefab: m_TransformParent: {fileID: 0} m_Modifications: [] m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} + m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1016627027887716} - m_IsPrefabAsset: 1 + m_IsPrefabParent: 1 --- !u!1 &1008401149803514 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -30,7 +30,7 @@ GameObject: --- !u!1 &1016627027887716 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -46,7 +46,7 @@ GameObject: --- !u!1 &1090340357476196 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -65,7 +65,7 @@ GameObject: --- !u!1 &1328650779239964 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -81,7 +81,7 @@ GameObject: --- !u!1 &1836989390546332 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -100,7 +100,7 @@ GameObject: --- !u!1 &1944055665656854 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: @@ -117,7 +117,7 @@ GameObject: --- !u!4 &4423089383561558 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1016627027887716} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -135,7 +135,7 @@ Transform: --- !u!4 &4972223272525874 Transform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1944055665656854} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} @@ -148,7 +148,7 @@ Transform: --- !u!23 &23246761121398968 MeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1944055665656854} m_Enabled: 1 @@ -183,7 +183,7 @@ MeshRenderer: --- !u!23 &23841250678452536 MeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1090340357476196} m_Enabled: 1 @@ -218,7 +218,7 @@ MeshRenderer: --- !u!23 &23871069099155120 MeshRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1836989390546332} m_Enabled: 1 @@ -253,28 +253,28 @@ MeshRenderer: --- !u!33 &33531849480412544 MeshFilter: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1944055665656854} m_Mesh: {fileID: 4300000, guid: 498f14ab1163af6468122abf48c1dd1f, type: 3} --- !u!33 &33571489695139260 MeshFilter: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1836989390546332} m_Mesh: {fileID: 0} --- !u!33 &33977139505398006 MeshFilter: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1090340357476196} m_Mesh: {fileID: 0} --- !u!114 &114033411654485852 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1836989390546332} m_Enabled: 1 @@ -387,7 +387,7 @@ MonoBehaviour: --- !u!114 &114490602417851340 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1090340357476196} m_Enabled: 0 @@ -500,7 +500,7 @@ MonoBehaviour: --- !u!114 &114503225711615434 MonoBehaviour: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1016627027887716} m_Enabled: 1 @@ -523,7 +523,7 @@ MonoBehaviour: --- !u!120 &120104367754099358 LineRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1328650779239964} m_Enabled: 1 @@ -615,7 +615,7 @@ LineRenderer: --- !u!120 &120365078463437576 LineRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1008401149803514} m_Enabled: 1 @@ -707,21 +707,21 @@ LineRenderer: --- !u!222 &222899156740542904 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1836989390546332} m_CullTransparentMesh: 0 --- !u!222 &222987229076722046 CanvasRenderer: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1090340357476196} m_CullTransparentMesh: 0 --- !u!224 &224127037996617504 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1836989390546332} m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} @@ -739,7 +739,7 @@ RectTransform: --- !u!224 &224206752488166720 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1008401149803514} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -757,7 +757,7 @@ RectTransform: --- !u!224 &224360248343482970 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1090340357476196} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} @@ -775,7 +775,7 @@ RectTransform: --- !u!224 &224666350362365124 RectTransform: m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1328650779239964} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} diff --git a/Tools/LocomotionTool/Scripts/BlinkVisuals.cs b/Tools/LocomotionTool/Scripts/BlinkVisuals.cs index 1d5c069ec..ffb9d9114 100644 --- a/Tools/LocomotionTool/Scripts/BlinkVisuals.cs +++ b/Tools/LocomotionTool/Scripts/BlinkVisuals.cs @@ -9,6 +9,7 @@ public class BlinkVisuals : MonoBehaviour, IUsesViewerScale, IRaycast { const float k_Epsilon = 0.001f; +#pragma warning disable 649 [SerializeField] float m_LineWidth = 1f; @@ -47,6 +48,7 @@ public class BlinkVisuals : MonoBehaviour, IUsesViewerScale, IRaycast [SerializeField] GameObject m_ArcLocator; +#pragma warning restore 649 float m_SpherePosition; VRLineRenderer m_LineRenderer; diff --git a/Tools/LocomotionTool/Scripts/Ring.cs b/Tools/LocomotionTool/Scripts/Ring.cs index 3283be116..06616f65f 100644 --- a/Tools/LocomotionTool/Scripts/Ring.cs +++ b/Tools/LocomotionTool/Scripts/Ring.cs @@ -5,6 +5,7 @@ public class Ring : MonoBehaviour { +#pragma warning disable 649 [SerializeField] Transform m_RingTransform; @@ -40,6 +41,7 @@ public class Ring : MonoBehaviour [SerializeField] LineRenderer m_LineB; +#pragma warning restore 649 readonly Gradient m_OrigGradient = new Gradient(); readonly Gradient m_CurrentGradient = new Gradient(); diff --git a/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs b/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs index ed188be4c..3ea97d32b 100644 --- a/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs +++ b/Tools/LocomotionTool/Scripts/ViewerScaleVisuals.cs @@ -13,6 +13,7 @@ namespace UnityEditor.Experimental.EditorVR.Tools { sealed class ViewerScaleVisuals : MonoBehaviour, IUsesViewerScale { +#pragma warning disable 649 [SerializeField] float m_IconTranslateCoefficient = -0.16f; @@ -35,6 +36,7 @@ sealed class ViewerScaleVisuals : MonoBehaviour, IUsesViewerScale [SerializeField] GameObject m_IconPrefab; +#pragma warning restore 649 float m_LineWidth; diff --git a/Tools/SelectionTool/SelectionTool.cs b/Tools/SelectionTool/SelectionTool.cs index 05bb42b6f..d2fff1871 100644 --- a/Tools/SelectionTool/SelectionTool.cs +++ b/Tools/SelectionTool/SelectionTool.cs @@ -39,6 +39,7 @@ public bool sphereMode const float k_BLockSelectDragThreshold = 0.01f; static readonly Quaternion k_TooltipRotation = Quaternion.AngleAxis(90, Vector3.right); +#pragma warning disable 649 [SerializeField] Sprite m_Icon; @@ -53,6 +54,7 @@ public bool sphereMode [SerializeField] GameObject m_SettingsMenuItemPrefab; +#pragma warning restore 649 Preferences m_Preferences; diff --git a/Tools/TransformTool/TransformTool.cs b/Tools/TransformTool/TransformTool.cs index 34aa771f3..2bb7829e6 100644 --- a/Tools/TransformTool/TransformTool.cs +++ b/Tools/TransformTool/TransformTool.cs @@ -158,28 +158,7 @@ public void ExecuteAction() } } - public List actions - { - get - { - if (!this.IsSharedUpdater(this)) - return null; - - if (m_Actions == null) - { - m_Actions = new List - { - m_PivotModeToggleAction, - m_PivotRotationToggleAction, - m_ManipulatorToggleAction - }; - } - return m_Actions; - } - } - - List m_Actions; - +#pragma warning disable 649 [SerializeField] Sprite m_OriginCenterIcon; @@ -212,6 +191,9 @@ public List actions [SerializeField] HapticPulse m_RotatePulse; +#pragma warning restore 649 + + List m_Actions; BaseManipulator m_CurrentManipulator; @@ -254,6 +236,26 @@ public List actions public event Action objectsDropped; public event Action objectsTransferred; + public List actions + { + get + { + if (!this.IsSharedUpdater(this)) + return null; + + if (m_Actions == null) + { + m_Actions = new List + { + m_PivotModeToggleAction, + m_PivotRotationToggleAction, + m_ManipulatorToggleAction + }; + } + return m_Actions; + } + } + public bool manipulatorVisible { private get; set; } public bool manipulatorDragging diff --git a/Tools/VacuumTool/VacuumTool.cs b/Tools/VacuumTool/VacuumTool.cs index 0c9141dc8..2a57d25c6 100644 --- a/Tools/VacuumTool/VacuumTool.cs +++ b/Tools/VacuumTool/VacuumTool.cs @@ -10,8 +10,10 @@ namespace UnityEditor.Experimental.EditorVR.Tools sealed class VacuumTool : MonoBehaviour, ITool, ICustomActionMap, IUsesRayOrigin, IUsesViewerScale, IRequestFeedback, IUsesNode { +#pragma warning disable 649 [SerializeField] ActionMap m_ActionMap; +#pragma warning restore 649 float m_LastClickTime; readonly Dictionary m_VacuumingCoroutines = new Dictionary(); diff --git a/Workspaces/Base/Workspace.cs b/Workspaces/Base/Workspace.cs index 729d0bca2..7f0fa9ac5 100644 --- a/Workspaces/Base/Workspace.cs +++ b/Workspaces/Base/Workspace.cs @@ -12,14 +12,15 @@ abstract class Workspace : MonoBehaviour, IWorkspace, IInstantiateUI, IUsesStenc IUsesViewerScale, IControlHaptics, IRayToNode { const float k_MaxFrameSize = 100f; // Because BlendShapes cap at 100, our workspace maxes out at 100m wide + protected const float k_DoubleFaceMargin = FaceMargin * 2; public static readonly Vector3 DefaultBounds = new Vector3(0.7f, 0f, 0.4f); public static readonly Vector3 MinBounds = new Vector3(0.677f, 0f, 0.1f); public const float FaceMargin = 0.025f; - protected float DoubleFaceMargin = FaceMargin * 2; public const float HighlightMargin = 0.002f; +#pragma warning disable 649 [SerializeField] Vector3 m_MinBounds = MinBounds; @@ -40,6 +41,7 @@ abstract class Workspace : MonoBehaviour, IWorkspace, IInstantiateUI, IUsesStenc [SerializeField] protected HapticPulse m_MovePulse; +#pragma warning restore 649 Bounds m_ContentBounds; BoxCollider m_OuterCollider; diff --git a/Workspaces/Base/WorkspaceUI.cs b/Workspaces/Base/WorkspaceUI.cs index 8ff20d456..53c7658fd 100644 --- a/Workspaces/Base/WorkspaceUI.cs +++ b/Workspaces/Base/WorkspaceUI.cs @@ -138,6 +138,7 @@ public void OnDragging() static readonly Vector3 k_BaseFrontPanelRotation = Vector3.zero; static readonly Vector3 k_MaxFrontPanelRotation = new Vector3(90f, 0f, 0f); +#pragma warning disable 649 [SerializeField] Transform m_SceneContainer; @@ -245,6 +246,7 @@ public void OnDragging() [SerializeField] WorkspaceButton m_ResizeButton; +#pragma warning restore 649 BoxCollider m_FrameCollider; Bounds m_Bounds; diff --git a/Workspaces/Common/Scripts/EditorWindowWorkspace.cs b/Workspaces/Common/Scripts/EditorWindowWorkspace.cs index 540f2c2c5..94d357684 100644 --- a/Workspaces/Common/Scripts/EditorWindowWorkspace.cs +++ b/Workspaces/Common/Scripts/EditorWindowWorkspace.cs @@ -1,14 +1,16 @@ -#if UNITY_EDITOR -using UnityEditor.Experimental.EditorVR.Handles; +using UnityEditor.Experimental.EditorVR.Handles; using UnityEditor.Experimental.EditorVR.Helpers; using UnityEngine; namespace UnityEditor.Experimental.EditorVR.Workspaces { +#if UNITY_EDITOR abstract class EditorWindowWorkspace : Workspace { +#pragma warning disable 649 [SerializeField] GameObject m_CaptureWindowPrefab; +#pragma warning restore 649 Transform m_CaptureWindow; @@ -65,5 +67,11 @@ void OnDragEnded(BaseHandle handle, HandleEventData eventData) m_Capture.SendEvent(eventData.rayOrigin, transform, EventType.MouseUp); } } -} +#else + abstract class EditorWindowWorkspace : Workspace + { + [SerializeField] + GameObject m_CaptureWindowPrefab; + } #endif +} diff --git a/Workspaces/Common/Scripts/FilterButtonUI.cs b/Workspaces/Common/Scripts/FilterButtonUI.cs index 87683c6c5..7c2a0c6a7 100644 --- a/Workspaces/Common/Scripts/FilterButtonUI.cs +++ b/Workspaces/Common/Scripts/FilterButtonUI.cs @@ -16,11 +16,7 @@ sealed class FilterButtonUI : MonoBehaviour, IPointerEnterHandler, IPointerExitH const float k_HoverAlpha = 1; const float k_NormalAlpha = 0.95f; - public Button button - { - get { return m_Button; } - } - +#pragma warning disable 649 [SerializeField] Button m_Button; @@ -40,9 +36,15 @@ public Button button [SerializeField] Text m_Text; #endif +#pragma warning restore 649 Transform m_InteractingRayOrigin; + public Button button + { + get { return m_Button; } + } + #if INCLUDE_TEXT_MESH_PRO public TextMeshProUGUI text { get { return m_Text; } } #else diff --git a/Workspaces/Common/Scripts/FilterUI.cs b/Workspaces/Common/Scripts/FilterUI.cs index 618db811c..40b139f26 100644 --- a/Workspaces/Common/Scripts/FilterUI.cs +++ b/Workspaces/Common/Scripts/FilterUI.cs @@ -17,6 +17,7 @@ sealed class FilterUI : MonoBehaviour, IUsesStencilRef const string k_AllText = "All"; const string k_MaterialStencilRefProperty = "_StencilRef"; +#pragma warning disable 649 #if INCLUDE_TEXT_MESH_PRO [SerializeField] TextMeshProUGUI m_SummaryText; @@ -60,11 +61,7 @@ sealed class FilterUI : MonoBehaviour, IUsesStencilRef [SerializeField] WorkspaceButton m_SummaryButton; - - public string searchQuery - { - get { return m_SearchQuery; } - } +#pragma warning restore 649 string m_SearchQuery = string.Empty; @@ -77,6 +74,11 @@ public string searchQuery List m_FilterTypes; Material m_BackgroundMaterial; + public string searchQuery + { + get { return m_SearchQuery; } + } + public List filterList { set diff --git a/Workspaces/Common/Scripts/WorkspaceButton.cs b/Workspaces/Common/Scripts/WorkspaceButton.cs index 843d5e6d0..42c40fccd 100644 --- a/Workspaces/Common/Scripts/WorkspaceButton.cs +++ b/Workspaces/Common/Scripts/WorkspaceButton.cs @@ -16,6 +16,79 @@ sealed class WorkspaceButton : MonoBehaviour, IRayEnterHandler, IRayExitHandler, const string k_MaterialColorTopProperty = "_ColorTop"; const string k_MaterialColorBottomProperty = "_ColorBottom"; +#pragma warning disable 649 + [SerializeField] + bool m_AutoHighlight = true; + + [Header("Extras")] + [SerializeField] + Color m_CustomHighlightColor = UnityBrandColorScheme.light; + + [SerializeField] + Sprite m_AlternateIconSprite; + + [SerializeField] + MeshRenderer m_ButtonMeshRenderer; + + [SerializeField] + CanvasGroup m_CanvasGroup; + + [SerializeField] + Image m_Icon; + + [SerializeField] + Transform m_IconContainer; + + [SerializeField] + Button m_Button; + + [SerializeField] + bool m_SwapIconsOnClick = true; + + [SerializeField] + Graphic[] m_HighlightItems; + + [SerializeField] + bool m_GrayscaleGradient; + + [Header("Animated Reveal Settings")] + [SerializeField] + bool m_AnimatedReveal; + + [Tooltip("Default value is 0.25")] + [SerializeField] + [Range(0f, 2f)] + float m_DelayBeforeReveal = 0.25f; +#pragma warning restore 649 + + Sprite m_IconSprite; + + bool m_Pressed; + bool m_Highlighted; + + GradientPair m_OriginalGradientPair; + GradientPair m_HighlightGradientPair; + Vector3 m_IconDirection; + Material m_ButtonMaterial; + Material m_ButtonMaskMaterial; + Vector3 m_OriginalIconLocalPosition; + Vector3 m_HiddenLocalScale; + Vector3 m_IconHighlightedLocalPosition; + Vector3 m_IconPressedLocalPosition; + Vector3 m_IconLookDirection; + Color m_OriginalColor; + Sprite m_OriginalIconSprite; + float m_VisibleLocalZScale; + Transform m_InteractingRayOrigin; + + // The initial button reveal coroutines, before highlighting + Coroutine m_VisibilityCoroutine; + Coroutine m_ContentVisibilityCoroutine; + + // The already visible, highlight coroutines + Coroutine m_HighlightCoroutine; + Coroutine m_IconHighlightCoroutine; + public event Action clicked; public event Action hovered; @@ -25,9 +98,6 @@ public bool autoHighlight set { m_AutoHighlight = value; } } - [SerializeField] - bool m_AutoHighlight = true; - public Sprite iconSprite { set @@ -37,18 +107,12 @@ public Sprite iconSprite } } - Sprite m_IconSprite; - public Color customHighlightColor { get { return m_CustomHighlightColor; } set { m_CustomHighlightColor = value; } } - [Header("Extras")] - [SerializeField] - Color m_CustomHighlightColor = UnityBrandColorScheme.light; - public bool pressed { get { return m_Pressed; } @@ -65,8 +129,6 @@ public bool pressed } } - bool m_Pressed; - public bool highlighted { set @@ -91,8 +153,6 @@ public bool highlighted } } - bool m_Highlighted; - public bool alternateIconVisible { set @@ -103,67 +163,8 @@ public bool alternateIconVisible get { return m_Icon.sprite == m_AlternateIconSprite; } } - [SerializeField] - Sprite m_AlternateIconSprite; - public MeshRenderer buttonMeshRenderer { get { return m_ButtonMeshRenderer; } } - [SerializeField] - MeshRenderer m_ButtonMeshRenderer; - - [SerializeField] - CanvasGroup m_CanvasGroup; - - [SerializeField] - Image m_Icon; - - [SerializeField] - Transform m_IconContainer; - - [SerializeField] - Button m_Button; - - [SerializeField] - bool m_SwapIconsOnClick = true; - - [SerializeField] - Graphic[] m_HighlightItems; - - [SerializeField] - bool m_GrayscaleGradient; - - [Header("Animated Reveal Settings")] - [SerializeField] - bool m_AnimatedReveal; - - [Tooltip("Default value is 0.25")] - [SerializeField] - [Range(0f, 2f)] - float m_DelayBeforeReveal = 0.25f; - - GradientPair m_OriginalGradientPair; - GradientPair m_HighlightGradientPair; - Vector3 m_IconDirection; - Material m_ButtonMaterial; - Material m_ButtonMaskMaterial; - Vector3 m_OriginalIconLocalPosition; - Vector3 m_HiddenLocalScale; - Vector3 m_IconHighlightedLocalPosition; - Vector3 m_IconPressedLocalPosition; - Vector3 m_IconLookDirection; - Color m_OriginalColor; - Sprite m_OriginalIconSprite; - float m_VisibleLocalZScale; - Transform m_InteractingRayOrigin; - - // The initial button reveal coroutines, before highlighting - Coroutine m_VisibilityCoroutine; - Coroutine m_ContentVisibilityCoroutine; - - // The already visible, highlight coroutines - Coroutine m_HighlightCoroutine; - Coroutine m_IconHighlightCoroutine; - public Button button { get { return m_Button; } } public byte stencilRef { get; set; } diff --git a/Workspaces/Common/Scripts/WorkspaceHighlight.cs b/Workspaces/Common/Scripts/WorkspaceHighlight.cs index 0bc2fa49f..bb96b6509 100644 --- a/Workspaces/Common/Scripts/WorkspaceHighlight.cs +++ b/Workspaces/Common/Scripts/WorkspaceHighlight.cs @@ -14,8 +14,10 @@ sealed class WorkspaceHighlight : MonoBehaviour Coroutine m_HighlightCoroutine; Material m_TopHighlightMaterial; +#pragma warning disable 649 [SerializeField] MeshRenderer m_TopHighlightRenderer; +#pragma warning restore 649 public bool visible { diff --git a/Workspaces/Common/Scripts/ZoomSliderUI.cs b/Workspaces/Common/Scripts/ZoomSliderUI.cs index 0087c5765..048a64700 100644 --- a/Workspaces/Common/Scripts/ZoomSliderUI.cs +++ b/Workspaces/Common/Scripts/ZoomSliderUI.cs @@ -6,13 +6,15 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class ZoomSliderUI : MonoBehaviour { - public Slider zoomSlider { get { return m_ZoomSlider; } } - +#pragma warning disable 649 [SerializeField] Slider m_ZoomSlider; +#pragma warning restore 649 public event Action sliding; + public Slider zoomSlider { get { return m_ZoomSlider; } } + public void ZoomSlider(float value) { if (sliding != null) diff --git a/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs b/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs index 5b8def728..a66211c1a 100644 --- a/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs +++ b/Workspaces/ConsoleWorkspace/ConsoleWorkspace.cs @@ -1,10 +1,12 @@ -#if UNITY_EDITOR -namespace UnityEditor.Experimental.EditorVR.Workspaces +namespace UnityEditor.Experimental.EditorVR.Workspaces { +#if UNITY_EDITOR [MainMenuItem("Console", "Workspaces", "View errors, warnings and other messages")] [SpatialMenuItem("Console", "Workspaces", "View errors, warnings and other messages")] +#else + [EditorOnlyWorkspace] +#endif sealed class ConsoleWorkspace : EditorWindowWorkspace { } } -#endif diff --git a/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs b/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs index 287033c12..84fc4829a 100644 --- a/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs +++ b/Workspaces/HierarchyWorkspace/HierarchyWorkspace.cs @@ -14,6 +14,7 @@ class HierarchyWorkspace : Workspace, IFilterUI, IUsesHierarchyData, ISelectionC { protected const string k_Locked = "Locked"; +#pragma warning disable 649 [SerializeField] GameObject m_ContentPrefab; @@ -25,6 +26,7 @@ class HierarchyWorkspace : Workspace, IFilterUI, IUsesHierarchyData, ISelectionC [SerializeField] GameObject m_CreateEmptyPrefab; +#pragma warning restore 649 HierarchyUI m_HierarchyUI; protected FilterUI m_FilterUI; @@ -151,8 +153,8 @@ protected override void OnBoundsChanged() var size = contentBounds.size; var listView = m_HierarchyUI.listView; size.y = float.MaxValue; // Add height for dropdowns - size.x -= DoubleFaceMargin; // Shrink the content width, so that there is space allowed to grab and scroll - size.z -= DoubleFaceMargin; // Reduce the height of the inspector contents as to fit within the bounds of the workspace + size.x -= k_DoubleFaceMargin; // Shrink the content width, so that there is space allowed to grab and scroll + size.z -= k_DoubleFaceMargin; // Reduce the height of the inspector contents as to fit within the bounds of the workspace listView.size = size; } diff --git a/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs b/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs index 07a374bf8..4ef850cd5 100644 --- a/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs +++ b/Workspaces/HierarchyWorkspace/Scripts/HierarchyListItem.cs @@ -16,6 +16,7 @@ sealed class HierarchyListItem : DraggableListItem, IUsesVie const float k_ExpandArrowRotateSpeed = 0.4f; +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_Text; @@ -67,6 +68,7 @@ sealed class HierarchyListItem : DraggableListItem, IUsesVie [Tooltip("The fraction of the cube height to use for stacking grabbed rows")] [SerializeField] float m_StackingFraction = 0.3f; +#pragma warning restore 649 Color m_NormalColor; Color m_NormalTextColor; @@ -241,7 +243,11 @@ public void UpdateSelf(float width, int depth, bool? expanded, bool selected, bo UpdateArrow(expanded); #if UNITY_EDITOR +#if UNITY_2018_3_OR_NEWER + var isPrefab = gameObject && PrefabUtility.GetPrefabInstanceStatus(gameObject) == PrefabInstanceStatus.Connected; +#else var isPrefab = gameObject && PrefabUtility.GetPrefabType(gameObject) == PrefabType.PrefabInstance; +#endif #else var isPrefab = false; #endif diff --git a/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs b/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs index 1ac651edd..a562cff4f 100644 --- a/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs +++ b/Workspaces/HierarchyWorkspace/Scripts/HierarchyListViewController.cs @@ -1,7 +1,7 @@ -using System; +using ListView; +using System; using System.Collections.Generic; using System.Linq; -using ListView; using UnityEditor.Experimental.EditorVR.Handles; using UnityEditor.Experimental.EditorVR.Utilities; using UnityEngine; @@ -12,6 +12,7 @@ sealed class HierarchyListViewController : NestedListViewController, IUsesGameObjectLocking, IUsesStencilRef { const string k_MaterialStencilRef = "_StencilRef"; @@ -215,9 +216,11 @@ protected override InspectorListItem GetItem(InspectorData listData) var noClipHighlightMaterials = new[] { m_NoClipHighlightMaterial, m_NoClipHighlightMaskMaterial }; item.SetMaterials(m_RowCubeMaterial, m_BackingCubeMaterial, m_UIMaterial, m_UIMaskMaterial, m_NoClipBackingCubeMaterial, highlightMaterials, noClipHighlightMaterials); +#if UNITY_EDITOR var numberItem = item as InspectorNumberItem; if (numberItem) numberItem.arraySizeChanged += OnArraySizeChanged; +#endif item.setup = true; } @@ -308,4 +311,35 @@ void OnDestroy() ObjectUtils.Destroy(m_NoClipHighlightMaskMaterial); } } +#else + sealed class InspectorListViewController : NestedListViewController + { + [SerializeField] + Material m_RowCubeMaterial; + + [SerializeField] + Material m_BackingCubeMaterial; + + [SerializeField] + Material m_UIMaterial; + + [SerializeField] + Material m_UIMaskMaterial; + + [SerializeField] + Material m_NoClipBackingCubeMaterial; + + [SerializeField] + Material m_HighlightMaterial; + + [SerializeField] + Material m_HighlightMaskMaterial; + + [SerializeField] + Material m_NoClipHighlightMaterial; + + [SerializeField] + Material m_NoClipHighlightMaskMaterial; + } +#endif } diff --git a/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs b/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs index be40b91e1..d3ad35b81 100644 --- a/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs +++ b/Workspaces/InspectorWorkspace/Scripts/InspectorUI.cs @@ -3,30 +3,46 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { +#if UNITY_EDITOR sealed class InspectorUI : MonoBehaviour { - public InspectorListViewController listView - { - get { return m_ListView; } - } - +#pragma warning disable 649 [SerializeField] InspectorListViewController m_ListView; - public LinearHandle scrollHandle - { - get { return m_ScrollHandle; } - } - [SerializeField] LinearHandle m_ScrollHandle; + [SerializeField] + RectTransform m_ListPanel; +#pragma warning restore 649 + public RectTransform listPanel { get { return m_ListPanel; } } + public LinearHandle scrollHandle + { + get { return m_ScrollHandle; } + } + + public InspectorListViewController listView + { + get { return m_ListView; } + } + } +#else + sealed class InspectorUI : MonoBehaviour + { + [SerializeField] + InspectorListViewController m_ListView; + + [SerializeField] + LinearHandle m_ScrollHandle; + [SerializeField] RectTransform m_ListPanel; } +#endif } diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs index b09eb3818..12ce81cbe 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorArrayHeaderItem.cs @@ -9,8 +9,10 @@ sealed class InspectorArrayHeaderItem : InspectorPropertyItem static readonly Quaternion k_ExpandedRotation = Quaternion.AngleAxis(90f, Vector3.forward); static readonly Quaternion k_NormalRotation = Quaternion.identity; +#pragma warning disable 649 [SerializeField] Button m_ExpandArrow; +#pragma warning restore 649 public override void UpdateSelf(float width, int depth, bool expanded) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs index b11241188..f7fa690e0 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoolItem.cs @@ -1,13 +1,15 @@ -using UnityEngine; -using UnityEditor.Experimental.EditorVR.Data; +using UnityEditor.Experimental.EditorVR.Data; +using UnityEngine; using UnityEngine.UI; namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class InspectorBoolItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] Toggle m_Toggle; +#pragma warning restore 649 public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs index 06967cf21..bb572f0bf 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorBoundsItem.cs @@ -8,11 +8,13 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class InspectorBoundsItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] NumericInputField[] m_CenterFields; [SerializeField] NumericInputField[] m_ExtentsFields; +#pragma warning restore 649 public override void Setup(InspectorData data) { @@ -95,19 +97,19 @@ protected override object GetDropObjectForFieldBlock(Transform fieldBlock) { object dropObject = null; #if UNITY_EDITOR - var inputfields = fieldBlock.GetComponentsInChildren(); + var inputFields = fieldBlock.GetComponentsInChildren(); - if (inputfields.Length > 3) // If we've grabbed all of the fields + if (inputFields.Length > 3) // If we've grabbed all of the fields dropObject = m_SerializedProperty.boundsValue; - if (inputfields.Length > 1) // If we've grabbed one vector + if (inputFields.Length > 1) // If we've grabbed one vector { - if (m_CenterFields.Intersect(inputfields).Any()) + if (m_CenterFields.Intersect(inputFields).Any()) dropObject = m_SerializedProperty.boundsValue.center; else dropObject = m_SerializedProperty.boundsValue.extents; } - else if (inputfields.Length > 0) // If we've grabbed a single field - dropObject = inputfields[0].text; + else if (inputFields.Length > 0) // If we've grabbed a single field + dropObject = inputFields[0].text; #endif return dropObject; diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs index 6d071ee6e..89453523a 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorComponentItem.cs @@ -13,6 +13,7 @@ sealed class InspectorComponentItem : InspectorListItem static readonly Quaternion k_ExpandedRotation = Quaternion.AngleAxis(90f, Vector3.forward); static readonly Quaternion k_NormalRotation = Quaternion.identity; +#pragma warning disable 649 [SerializeField] Button m_ExpandArrow; @@ -24,6 +25,7 @@ sealed class InspectorComponentItem : InspectorListItem [SerializeField] TextMeshProUGUI m_NameText; +#pragma warning restore 649 public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs index cbff68213..98e6bce43 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorDropDownItem.cs @@ -14,8 +14,10 @@ sealed class InspectorDropDownItem : InspectorPropertyItem const string k_Nothing = "Nothing"; const string k_Everything = "Everything"; +#pragma warning disable 649 [SerializeField] DropDown m_DropDown; +#pragma warning restore 649 public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs index 81fc61af4..2a0bc9dd5 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorHeaderItem.cs @@ -9,8 +9,10 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { +#if UNITY_EDITOR sealed class InspectorHeaderItem : InspectorListItem { +#pragma warning disable 649 [SerializeField] RawImage m_Icon; @@ -23,11 +25,6 @@ sealed class InspectorHeaderItem : InspectorListItem [SerializeField] Toggle m_StaticToggle; - public Toggle lockToggle - { - get { return m_LockToggle; } - } - [SerializeField] Toggle m_LockToggle; @@ -39,6 +36,12 @@ public Toggle lockToggle [SerializeField] MeshRenderer m_Button; +#pragma warning restore 649 + + public Toggle lockToggle + { + get { return m_LockToggle; } + } GameObject m_TargetGameObject; @@ -187,4 +190,32 @@ public void UpdateHeaderUI() #endif } } +#else + sealed class InspectorHeaderItem : InspectorListItem + { + [SerializeField] + RawImage m_Icon; + + [SerializeField] + Toggle m_ActiveToggle; + + [SerializeField] + StandardInputField m_NameField; + + [SerializeField] + Toggle m_StaticToggle; + + [SerializeField] + Toggle m_LockToggle; + + [SerializeField] + DropDown m_TagDropDown; + + [SerializeField] + DropDown m_LayerDropDown; + + [SerializeField] + MeshRenderer m_Button; + } +#endif } diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs index f5c43f368..e7be75371 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorListItem.cs @@ -15,10 +15,7 @@ abstract class InspectorListItem : DraggableListItem, ISetHi const float k_Indent = 0.02f; const float k_HorizThreshold = 0.85f; - protected CuboidLayout m_CuboidLayout; - - protected InputField[] m_InputFields; - +#pragma warning disable 649 [SerializeField] BaseHandle m_Cube; @@ -30,6 +27,11 @@ abstract class InspectorListItem : DraggableListItem, ISetHi [SerializeField] Material m_DropHighlightMaterial; +#pragma warning restore 649 + + protected CuboidLayout m_CuboidLayout; + + protected InputField[] m_InputFields; ClipText[] m_ClipTexts; diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs index 0f8640faa..660be9cd2 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorNumberItem.cs @@ -8,14 +8,19 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class InspectorNumberItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] NumericInputField m_InputField; [SerializeField] WorkspaceButton[] m_IncrementDecrementButtons; +#pragma warning restore 649 public SerializedPropertyType propertyType { get; private set; } + +#if UNITY_EDITOR public event Action arraySizeChanged; +#endif public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs index 223005963..0ce6a7982 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorObjectFieldItem.cs @@ -7,13 +7,16 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { +#if UNITY_EDITOR sealed class InspectorObjectFieldItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_FieldLabel; [SerializeField] MeshRenderer m_Button; +#pragma warning restore 649 Type m_ObjectType; string m_ObjectTypeName; @@ -112,4 +115,14 @@ bool IsAssignable(Object obj) return obj == null || obj.GetType().IsAssignableFrom(m_ObjectType); } } +#else + sealed class InspectorObjectFieldItem : InspectorPropertyItem + { + [SerializeField] + TextMeshProUGUI m_FieldLabel; + + [SerializeField] + MeshRenderer m_Button; + } +#endif } diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs index b61d7c8f2..60fe9ebab 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorPropertyItem.cs @@ -7,25 +7,27 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { abstract class InspectorPropertyItem : InspectorListItem { +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_Label; + [SerializeField] + Transform m_TooltipTarget; + + [SerializeField] + Transform m_TooltipSource; +#pragma warning restore 649 + public Transform tooltipTarget { get { return m_TooltipTarget; } } - [SerializeField] - Transform m_TooltipTarget; - public Transform tooltipSource { get { return m_TooltipSource; } } - [SerializeField] - Transform m_TooltipSource; - public TextAlignment tooltipAlignment { get { return TextAlignment.Right; } diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs index 6e101c4f3..f9b27b37b 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorRectItem.cs @@ -14,6 +14,18 @@ sealed class InspectorRectItem : InspectorPropertyItem [SerializeField] NumericInputField[] m_SizeFields; + public NumericInputField[] centerFields + { + get { return m_CenterFields; } + set { m_CenterFields = value; } + } + + public NumericInputField[] sizeFields + { + get { return m_SizeFields; } + set { m_SizeFields = value; } + } + public override void Setup(InspectorData data) { base.Setup(data); diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs index e5ff5effa..6d0f68374 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorStringItem.cs @@ -6,8 +6,10 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class InspectorStringItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] StandardInputField m_InputField; +#pragma warning restore 649 public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs index 493e616d7..2bab38115 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorUnimplementedItem.cs @@ -7,8 +7,10 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class InspectorUnimplementedItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_TypeLabel; +#pragma warning restore 649 public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs index bc12a8d76..9251f2813 100644 --- a/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs +++ b/Workspaces/InspectorWorkspace/Scripts/ListItems/InspectorVectorItem.cs @@ -7,11 +7,13 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class InspectorVectorItem : InspectorPropertyItem { +#pragma warning disable 649 [SerializeField] GameObject ZGroup; [SerializeField] GameObject WGroup; +#pragma warning restore 649 public override void Setup(InspectorData data) { diff --git a/Workspaces/InspectorWorkspace/Scripts/LockUI.cs b/Workspaces/InspectorWorkspace/Scripts/LockUI.cs index e3ff9614b..a0ab5dfe7 100644 --- a/Workspaces/InspectorWorkspace/Scripts/LockUI.cs +++ b/Workspaces/InspectorWorkspace/Scripts/LockUI.cs @@ -8,6 +8,7 @@ sealed class LockUI : MonoBehaviour, IUsesStencilRef { const string k_MaterialStencilRefProperty = "_StencilRef"; +#pragma warning disable 649 [SerializeField] Image m_LockImage; @@ -19,6 +20,7 @@ sealed class LockUI : MonoBehaviour, IUsesStencilRef [SerializeField] WorkspaceButton m_Button; +#pragma warning restore 649 public byte stencilRef { get; set; } diff --git a/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs b/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs index 197753dee..52227be82 100644 --- a/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs +++ b/Workspaces/LockedObjectsWorkspace/LockedObjectsWorkspace.cs @@ -10,8 +10,10 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces [SpatialMenuItem("Locked Objects", "Workspaces", "View all locked objects in your scene(s)")] class LockedObjectsWorkspace : HierarchyWorkspace, IUsesGameObjectLocking { +#pragma warning disable 649 [SerializeField] GameObject m_UnlockAllPrefab; +#pragma warning restore 649 string m_BaseSearchQuery; string m_CachedSearchQuery; diff --git a/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs b/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs index d35e181a1..682785b9a 100644 --- a/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs +++ b/Workspaces/MiniWorldWorkspace/MiniWorldWorkspace.cs @@ -34,6 +34,37 @@ public string tooltipText } } + [Serializable] + class Preferences + { + [SerializeField] + Vector3 m_MiniWorldRefeferenceScale; + + [SerializeField] + Vector3 m_MiniWorldReferencePosition; + + [SerializeField] + float m_ZoomSliderValue; + + public Vector3 miniWorldRefeferenceScale + { + get { return m_MiniWorldRefeferenceScale; } + set { m_MiniWorldRefeferenceScale = value; } + } + + public Vector3 miniWorldReferencePosition + { + get { return m_MiniWorldReferencePosition; } + set { m_MiniWorldReferencePosition = value; } + } + + public float zoomSliderValue + { + get { return m_ZoomSliderValue; } + set { m_ZoomSliderValue = value; } + } + } + static readonly float k_InitReferenceYOffset = DefaultBounds.y / 2.05f; // Show more space above ground than below static readonly Vector3 k_LocatePlayerOffset = new Vector3(0.1385f, 0.035f, -0.05f); @@ -55,6 +86,7 @@ public string tooltipText const float k_ZoomSliderMin = 0.5f; const float k_ZoomSliderMax = 200f; +#pragma warning disable 649 [SerializeField] GameObject m_ContentPrefab; @@ -72,37 +104,7 @@ public string tooltipText [SerializeField] HapticPulse m_EnterExitPulse; - - [Serializable] - class Preferences - { - [SerializeField] - Vector3 m_MiniWorldRefeferenceScale; - - [SerializeField] - Vector3 m_MiniWorldReferencePosition; - - [SerializeField] - float m_ZoomSliderValue; - - public Vector3 miniWorldRefeferenceScale - { - get { return m_MiniWorldRefeferenceScale; } - set { m_MiniWorldRefeferenceScale = value; } - } - - public Vector3 miniWorldReferencePosition - { - get { return m_MiniWorldReferencePosition; } - set { m_MiniWorldReferencePosition = value; } - } - - public float zoomSliderValue - { - get { return m_ZoomSliderValue; } - set { m_ZoomSliderValue = value; } - } - } +#pragma warning restore 649 MiniWorldUI m_MiniWorldUI; MiniWorld m_MiniWorld; diff --git a/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs b/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs index ee96b6efa..08822b06d 100644 --- a/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs +++ b/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldRenderer.cs @@ -12,10 +12,19 @@ sealed class MiniWorldRenderer : MonoBehaviour, IScriptReference const string k_MiniWorldCameraTag = "MiniWorldCamera"; const float k_MinScale = 0.001f; + static int s_DefaultLayer; + +#pragma warning disable 649 [SerializeField] Shader m_ClipShader; +#pragma warning restore 649 - static int s_DefaultLayer; + List m_IgnoreList = new List(); + + Camera m_MiniCamera; + + int[] m_IgnoredObjectLayer; + bool[] m_IgnoreObjectRendererEnabled; public List ignoreList { @@ -31,13 +40,6 @@ public List ignoreList } } - List m_IgnoreList = new List(); - - Camera m_MiniCamera; - - int[] m_IgnoredObjectLayer; - bool[] m_IgnoreObjectRendererEnabled; - public MiniWorld miniWorld { private get; set; } public LayerMask cullingMask { private get; set; } diff --git a/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs b/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs index f9be34a98..1811012b2 100644 --- a/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs +++ b/Workspaces/MiniWorldWorkspace/Scripts/MiniWorldUI.cs @@ -4,20 +4,22 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { class MiniWorldUI : MonoBehaviour { +#pragma warning disable 649 + [SerializeField] + Renderer m_Grid; + + [SerializeField] + Transform m_BoundsCube; +#pragma warning restore 649 + public Renderer grid { get { return m_Grid; } } - [SerializeField] - private Renderer m_Grid; - public Transform boundsCube { get { return m_BoundsCube; } } - - [SerializeField] - private Transform m_BoundsCube; } } diff --git a/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs b/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs index 72041ac5c..63497dac5 100644 --- a/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs +++ b/Workspaces/MiniWorldWorkspace/Scripts/ResetUI.cs @@ -4,12 +4,14 @@ namespace UnityEditor.Experimental.EditorVR.UI { sealed class ResetUI : MonoBehaviour { +#pragma warning disable 649 + [SerializeField] + UnityEngine.UI.Button m_ResetButton; +#pragma warning restore 649 + public UnityEngine.UI.Button resetButton { get { return m_ResetButton; } } - - [SerializeField] - UnityEngine.UI.Button m_ResetButton; } } diff --git a/Workspaces/PolyWorkspace/PolyWorkspace.cs b/Workspaces/PolyWorkspace/PolyWorkspace.cs index 1cb972a62..7d9cfd096 100644 --- a/Workspaces/PolyWorkspace/PolyWorkspace.cs +++ b/Workspaces/PolyWorkspace/PolyWorkspace.cs @@ -58,6 +58,7 @@ public float scaleFactor } } +#pragma warning disable 649 [SerializeField] GameObject m_ContentPrefab; @@ -66,6 +67,7 @@ public float scaleFactor [SerializeField] GameObject m_SliderPrefab; +#pragma warning restore 649 bool m_Scrolling; @@ -409,8 +411,8 @@ protected override void OnBoundsChanged() { var size = contentBounds.size; var gridView = m_PolyUI.gridView; - size.x -= DoubleFaceMargin; // Shrink the content width, so that there is space allowed to grab and scroll - size.z -= DoubleFaceMargin; // Reduce the height of the inspector contents as to fit within the bounds of the workspace + size.x -= k_DoubleFaceMargin; // Shrink the content width, so that there is space allowed to grab and scroll + size.z -= k_DoubleFaceMargin; // Reduce the height of the inspector contents as to fit within the bounds of the workspace gridView.size = size; } diff --git a/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs b/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs index f8ef93d52..e6051a266 100644 --- a/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs +++ b/Workspaces/PolyWorkspace/Scripts/PolyGridAsset.cs @@ -142,7 +142,6 @@ public class PolyThumbnail { public string url; } -#else - #pragma warning restore 618 + #pragma warning restore 649 #endif } diff --git a/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs b/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs index d62f80945..3292f3e10 100644 --- a/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs +++ b/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs @@ -33,6 +33,7 @@ class PolyGridItem : DraggableListItem, IPlaceSceneObject const int k_AutoHidePreviewComplexity = 10000; +#pragma warning disable 649 #if INCLUDE_TEXT_MESH_PRO [SerializeField] TextMeshProUGUI m_Text; @@ -56,6 +57,7 @@ class PolyGridItem : DraggableListItem, IPlaceSceneObject [HideInInspector] [SerializeField] // Serialized so that this remains set after cloning Transform m_PreviewObjectTransform; +#pragma warning restore 649 bool m_Setup; bool m_AutoHidePreview; diff --git a/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs b/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs index 42af5b92d..3b6b69364 100644 --- a/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs +++ b/Workspaces/PolyWorkspace/Scripts/PolyGridViewController.cs @@ -13,6 +13,7 @@ class PolyGridViewController : ListViewController, IPlaceSceneObjec const float k_CheckAssignDelayTime = 0.125f; +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_Text; @@ -57,14 +58,15 @@ sealed class AssetGridItem : DraggableListItem, IPlaceSceneObjec [SerializeField] // Serialized so that this remains set after cloning GameObject m_Icon; - GameObject m_IconPrefab; - [HideInInspector] [SerializeField] // Serialized so that this remains set after cloning Transform m_PreviewObjectTransform; [SerializeField] bool m_IncludeRaySelectForDrop; +#pragma warning restore 649 + + GameObject m_IconPrefab; bool m_Setup; bool m_AutoHidePreview; @@ -244,10 +246,11 @@ void InstantiatePreview() if (m_PreviewObjectTransform) ObjectUtils.Destroy(m_PreviewObjectTransform.gameObject); - if (!data.preview) + var preview = data.preview; + if (!preview) return; - m_PreviewObjectTransform = Instantiate(data.preview).transform; + m_PreviewObjectTransform = Instantiate(preview).transform; m_PreviewObjectTransform.position = Vector3.zero; m_PreviewObjectTransform.rotation = Quaternion.identity; @@ -330,22 +333,26 @@ protected override void OnDragStarted(BaseHandle handle, HandleEventData eventDa var clone = Instantiate(gameObject, transform.position, transform.rotation, transform.parent); var cloneItem = clone.GetComponent(); + var type = data.type; if (cloneItem.m_PreviewObjectTransform) { m_PreviewObjectClone = cloneItem.m_PreviewObjectTransform; #if UNITY_EDITOR - var originalPosition = m_PreviewObjectClone.position; - var originalRotation = m_PreviewObjectClone.rotation; - var originalScale = m_PreviewObjectClone.localScale; - var restoreParent = m_PreviewObjectClone.parent; - m_PreviewObjectClone.SetParent(null); // HACK: MergePrefab deactivates the root transform when calling ConnectGameObjectToPrefab, which is EditorVR in this case - m_PreviewObjectClone = PrefabUtility.ConnectGameObjectToPrefab(m_PreviewObjectClone.gameObject, data.preview).transform; - m_PreviewObjectClone.SetParent(restoreParent); - m_PreviewObjectClone.position = originalPosition; - m_PreviewObjectClone.rotation = originalRotation; - m_PreviewObjectClone.localScale = originalScale; - cloneItem.m_PreviewObjectTransform = m_PreviewObjectClone; + if (type == AssetData.PrefabTypeString || type == AssetData.ModelTypeString) + { + var originalPosition = m_PreviewObjectClone.position; + var originalRotation = m_PreviewObjectClone.rotation; + var originalScale = m_PreviewObjectClone.localScale; + var restoreParent = m_PreviewObjectClone.parent; + ObjectUtils.Destroy(m_PreviewObjectClone.gameObject); + m_PreviewObjectClone = ((GameObject)PrefabUtility.InstantiatePrefab(data.asset)).transform; + m_PreviewObjectClone.SetParent(restoreParent, false); + m_PreviewObjectClone.position = originalPosition; + m_PreviewObjectClone.rotation = originalRotation; + m_PreviewObjectClone.localScale = originalScale; + cloneItem.m_PreviewObjectTransform = m_PreviewObjectClone; + } #endif cloneItem.m_Cube.gameObject.SetActive(false); @@ -368,13 +375,11 @@ protected override void OnDragStarted(BaseHandle handle, HandleEventData eventDa smoothMotion.enabled = false; // setup our assignment dependency list with any known types - AssetDropUtils.AssignmentDependencies.TryGetValue(data.type, out m_AssignmentDependencyTypes); + AssetDropUtils.AssignmentDependencies.TryGetValue(type, out m_AssignmentDependencyTypes); StartCoroutine(ShowGrabbedObject()); } - - float PreviouslyFoundResult(GameObject go) { float previous; @@ -573,8 +578,8 @@ void HandleAssetDropByType(Transform rayOrigin, AssetGridItem gridItem) { switch (data.type) { - case "Prefab": - case "Model": + case AssetData.PrefabTypeString: + case AssetData.ModelTypeString: PlaceModelOrPrefab(gridItem.transform, data); break; case "AnimationClip": diff --git a/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs b/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs index e2a80dca2..f75846c07 100644 --- a/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs +++ b/Workspaces/ProjectWorkspace/Scripts/AssetGridViewController.cs @@ -1,6 +1,6 @@ +using ListView; using System; using System.Collections.Generic; -using ListView; using UnityEditor.Experimental.EditorVR.Data; using UnityEditor.Experimental.EditorVR.Utilities; using UnityEngine; @@ -11,20 +11,7 @@ sealed class AssetGridViewController : ListViewController m_IconDictionary = new Dictionary(); - Action m_OnRecyleComplete; + Action m_OnRecycleComplete; + + public float scaleFactor + { + get { return m_ScaleFactor; } + set + { + m_LastHiddenItemOffset = Mathf.Infinity; // Allow any change in scale to change visibility states + m_ScaleFactor = value; + } + } public Func matchesFilter { private get; set; } @@ -50,7 +52,7 @@ protected override float listHeight return 0; var numRows = Mathf.CeilToInt(m_Data.Count / m_NumPerRow); - return Mathf.Clamp(numRows, 1, Int32.MaxValue) * itemSize.z; + return Mathf.Clamp(numRows, 1, int.MaxValue) * itemSize.z; } } @@ -75,7 +77,7 @@ public override Vector3 size void Awake() { - m_OnRecyleComplete = OnRecycleComplete; + m_OnRecycleComplete = OnRecycleComplete; } protected override void Setup() @@ -165,7 +167,7 @@ void RecycleGridItem(AssetData data) m_ListItems.Remove(index); - item.SetVisibility(false, m_OnRecyleComplete); + item.SetVisibility(false, m_OnRecycleComplete); } void OnRecycleComplete(AssetGridItem gridItem) diff --git a/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs b/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs index 2aa0e9b74..6e26a93df 100644 --- a/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs +++ b/Workspaces/ProjectWorkspace/Scripts/FolderListItem.cs @@ -14,6 +14,7 @@ sealed class FolderListItem : ListViewItem const float k_ExpandArrowRotateSpeed = 0.4f; +#pragma warning disable 649 [SerializeField] TextMeshProUGUI m_Text; @@ -34,6 +35,7 @@ sealed class FolderListItem : ListViewItem [SerializeField] Color m_SelectedColor; +#pragma warning restore 649 Color m_NormalColor; diff --git a/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs b/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs index 91d5e1243..f849f9a88 100644 --- a/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs +++ b/Workspaces/ProjectWorkspace/Scripts/ProjectUI.cs @@ -5,6 +5,7 @@ namespace UnityEditor.Experimental.EditorVR.Workspaces { sealed class ProjectUI : MonoBehaviour { +#pragma warning disable 649 [SerializeField] FolderListViewController m_FolderListView; @@ -22,6 +23,7 @@ sealed class ProjectUI : MonoBehaviour [SerializeField] WorkspaceHighlight m_FolderPanelHighlight; +#pragma warning restore 649 public FolderListViewController folderListView { get { return m_FolderListView; } } public LinearHandle folderScrollHandle { get { return m_FolderScrollHandle; } }