diff --git a/Assets/XR/Settings/OpenXRPackageSettings.asset b/Assets/XR/Settings/OpenXRPackageSettings.asset index f31425c..b5cc52d 100644 --- a/Assets/XR/Settings/OpenXRPackageSettings.asset +++ b/Assets/XR/Settings/OpenXRPackageSettings.asset @@ -612,8 +612,18 @@ MonoBehaviour: features: - {fileID: 8736661028334727731} - {fileID: 3598254934845347770} + - {fileID: -9214271668543163027} + - {fileID: -7680076135584121790} - {fileID: 1170704673688743257} + - {fileID: -1187533949232362847} + - {fileID: -949347770443697596} + - {fileID: -1529727133502117446} - {fileID: 5153017048313567732} + - {fileID: 265326132771859475} + - {fileID: 2834828863856360103} + - {fileID: -2851827796942056979} + - {fileID: -8128959895479975907} + - {fileID: -1926258647260940646} - {fileID: 6481653220666705815} - {fileID: 7393116930172532905} - {fileID: 744375598501864353} @@ -1285,8 +1295,8 @@ MonoBehaviour: features: - {fileID: 7011443450567333355} - {fileID: -671281728444007487} - - {fileID: 7055518550748799546} - - {fileID: 5091991234558418143} + - {fileID: 6956056911768161135} + - {fileID: -1734471456787174204} - {fileID: 8980318060753866109} - {fileID: -6559185765804338520} - {fileID: -4756202077021157709} @@ -1297,7 +1307,7 @@ MonoBehaviour: - {fileID: 348827886137839178} - {fileID: -7499073031166464939} - {fileID: 7666556398442971420} - - {fileID: 1118878472687837173} + - {fileID: 431653824124869831} - {fileID: 3985858319333531581} - {fileID: -6511185071715886993} - {fileID: -4363231183632145407} @@ -1703,7 +1713,7 @@ MonoBehaviour: nameUi: 'Android XR: AR Anchor' version: 0.1.0 featureIdInternal: com.unity.openxr.feature.arfoundation-androidxr-anchor - openxrExtensionStrings: XR_ANDROID_trackables XR_ANDROID_device_anchor_persistence + openxrExtensionStrings: XR_ANDROID_trackables company: Unity Technologies priority: 0 targetOpenXRApiVersion: @@ -2672,7 +2682,7 @@ MonoBehaviour: nameUi: 'Android XR: AR Anchor' version: 0.1.0 featureIdInternal: com.unity.openxr.feature.arfoundation-androidxr-anchor - openxrExtensionStrings: XR_ANDROID_trackables XR_ANDROID_device_anchor_persistence + openxrExtensionStrings: XR_ANDROID_trackables company: Unity Technologies priority: 0 targetOpenXRApiVersion: diff --git a/Assets/_Scenes/GameScene.unity b/Assets/_Scenes/GameScene.unity index 02f3901..4ea8666 100644 --- a/Assets/_Scenes/GameScene.unity +++ b/Assets/_Scenes/GameScene.unity @@ -197,276 +197,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1031056870, guid: abc00000000005328151253783129040, type: 3} m_PrefabInstance: {fileID: 6608425} m_PrefabAsset: {fileID: 0} ---- !u!1 &27821159 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 27821160} - - component: {fileID: 27821165} - - component: {fileID: 27821164} - - component: {fileID: 27821163} - - component: {fileID: 27821162} - - component: {fileID: 27821161} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &27821160 +--- !u!4 &30598970 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} + m_PrefabInstance: {fileID: 104982398014678653} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27821159} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -500, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 797096992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &27821161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27821159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.Interactables.XRGrabInteractable - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayers: - m_Bits: 1 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_FocusMode: 1 - m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_AutoFindParentInteractableInHierarchy: 0 - m_ParentInteractableObject: {fileID: 0} - m_AttachTransform: {fileID: 0} - m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 - m_MatchAttachPosition: 1 - m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 - m_ReinitializeDynamicAttachEverySingleGrab: 1 - m_AttachEaseInTime: 0.15 - m_MovementType: 2 - m_PredictedVisualsTransform: {fileID: 0} - m_VelocityDamping: 1 - m_VelocityScale: 1 - m_AngularVelocityDamping: 1 - m_AngularVelocityScale: 1 - m_TrackPosition: 1 - m_SmoothPosition: 0 - m_SmoothPositionAmount: 8 - m_TightenPosition: 0.1 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 8 - m_TightenRotation: 0.1 - m_TrackScale: 1 - m_SmoothScale: 0 - m_SmoothScaleAmount: 8 - m_TightenScale: 0.1 - m_ThrowOnDetach: 1 - m_ThrowSmoothingDuration: 0.25 - m_ThrowSmoothingCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ThrowVelocityScale: 1.5 - m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 - m_RetainTransformParent: 1 - m_StartingSingleGrabTransformers: [] - m_StartingMultipleGrabTransformers: [] - m_AddDefaultGrabTransformers: 1 - m_FarAttachMode: 0 - m_LimitLinearVelocity: 0 - m_LimitAngularVelocity: 0 - m_MaxLinearVelocityDelta: 10 - m_MaxAngularVelocityDelta: 20 ---- !u!54 &27821162 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27821159} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &27821163 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27821159} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &27821164 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27821159} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &27821165 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 27821159} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &47849130 GameObject: m_ObjectHideFlags: 0 @@ -906,6 +641,11 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &115240218 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} + m_PrefabInstance: {fileID: 5700050917774472237} + m_PrefabAsset: {fileID: 0} --- !u!1001 &130511407 PrefabInstance: m_ObjectHideFlags: 0 @@ -2555,7 +2295,6 @@ GameObject: m_Component: - component: {fileID: 280381711} - component: {fileID: 280381710} - - component: {fileID: 280381712} m_Layer: 0 m_Name: CodingMode m_TagString: Untagged @@ -2595,22 +2334,6 @@ Transform: - {fileID: 797096992} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &280381712 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 280381709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 945a90d6fc5ecb048849ec7b83634441, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::CodingModeManager - socketA: {fileID: 1908705210} - socketB: {fileID: 2140477052} - moveProvider: {fileID: 561596346} - turnProvider: {fileID: 1959366462} --- !u!1 &290251385 GameObject: m_ObjectHideFlags: 0 @@ -3537,12 +3260,20 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 2131382343} m_Modifications: - target: {fileID: 1778810011869135508, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 2377890544361114799, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2377890544361114799, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_AnchoredPosition.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 2735167350974518192, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_IsActive value: 1 @@ -3551,13 +3282,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} - propertyPath: m_Pivot.x + - target: {fileID: 5607317499926819730, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5607317499926819730, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_Pivot.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_AnchorMax.x @@ -3577,11 +3316,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_LocalScale.x + value: 0.001 + objectReference: {fileID: 0} + - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_LocalScale.y + value: 0.001 + objectReference: {fileID: 0} + - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_LocalScale.z + value: 0.001 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalPosition.x @@ -3593,7 +3344,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.1 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalRotation.w @@ -3601,15 +3352,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_AnchoredPosition.x @@ -3617,7 +3368,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3631,8 +3382,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7101255417312058890, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1762986919} + - target: {fileID: 7101255417312058890, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_RenderMode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8024307489917671254, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 6251161303461897344, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + - {fileID: 8752852315224665744, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} @@ -3714,6 +3479,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030996972, guid: abc00000000006984399163773085844, type: 3} m_PrefabInstance: {fileID: 392613811} m_PrefabAsset: {fileID: 0} +--- !u!4 &401547933 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} + m_PrefabInstance: {fileID: 681754957034778666} + m_PrefabAsset: {fileID: 0} --- !u!1 &404289281 GameObject: m_ObjectHideFlags: 0 @@ -14191,17 +13961,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030996972, guid: abc00000000006984399163773085844, type: 3} m_PrefabInstance: {fileID: 549303092} m_PrefabAsset: {fileID: 0} ---- !u!114 &561596346 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8053059486601427065, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} - m_PrefabInstance: {fileID: 1063987680} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b1e8c997df241c1a67045eeac79b41b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &563363382 GameObject: m_ObjectHideFlags: 0 @@ -15414,6 +15173,11 @@ Transform: - {fileID: 459465073} m_Father: {fileID: 404289285} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &708395469 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} + m_PrefabInstance: {fileID: 2095262208529294143} + m_PrefabAsset: {fileID: 0} --- !u!1001 &717394379 PrefabInstance: m_ObjectHideFlags: 0 @@ -15948,11 +15712,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 217771467} - - {fileID: 27821160} - - {fileID: 1448674920} - - {fileID: 1204258460} - - {fileID: 1908705204} - - {fileID: 2140477046} + - {fileID: 1248085322} + - {fileID: 1273306983} + - {fileID: 1275427781} + - {fileID: 30598970} + - {fileID: 708395469} + - {fileID: 401547933} + - {fileID: 115240218} m_Father: {fileID: 280381711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -641301,15 +641067,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalRotation.w - value: -0.33709505 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalRotation.y - value: -0.9414707 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalRotation.z @@ -641321,7 +641087,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 500.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8806329115733545878, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -641329,7 +641095,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7917674758919744168, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + insertIndex: -1 + addedObject: {fileID: 1502744694} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 8806329115733545877, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} insertIndex: -1 @@ -643234,276 +643003,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1031056870, guid: abc00000000005328151253783129040, type: 3} m_PrefabInstance: {fileID: 1202724076} m_PrefabAsset: {fileID: 0} ---- !u!1 &1204258459 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1204258460} - - component: {fileID: 1204258465} - - component: {fileID: 1204258464} - - component: {fileID: 1204258463} - - component: {fileID: 1204258462} - - component: {fileID: 1204258461} - m_Layer: 0 - m_Name: Cube (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1204258460 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204258459} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 500, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 797096992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1204258461 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204258459} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.Interactables.XRGrabInteractable - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayers: - m_Bits: 1 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_FocusMode: 1 - m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_AutoFindParentInteractableInHierarchy: 0 - m_ParentInteractableObject: {fileID: 0} - m_AttachTransform: {fileID: 0} - m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 - m_MatchAttachPosition: 1 - m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 - m_ReinitializeDynamicAttachEverySingleGrab: 1 - m_AttachEaseInTime: 0.15 - m_MovementType: 2 - m_PredictedVisualsTransform: {fileID: 0} - m_VelocityDamping: 1 - m_VelocityScale: 1 - m_AngularVelocityDamping: 1 - m_AngularVelocityScale: 1 - m_TrackPosition: 1 - m_SmoothPosition: 0 - m_SmoothPositionAmount: 8 - m_TightenPosition: 0.1 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 8 - m_TightenRotation: 0.1 - m_TrackScale: 1 - m_SmoothScale: 0 - m_SmoothScaleAmount: 8 - m_TightenScale: 0.1 - m_ThrowOnDetach: 1 - m_ThrowSmoothingDuration: 0.25 - m_ThrowSmoothingCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ThrowVelocityScale: 1.5 - m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 - m_RetainTransformParent: 1 - m_StartingSingleGrabTransformers: [] - m_StartingMultipleGrabTransformers: [] - m_AddDefaultGrabTransformers: 1 - m_FarAttachMode: 0 - m_LimitLinearVelocity: 0 - m_LimitAngularVelocity: 0 - m_MaxLinearVelocityDelta: 10 - m_MaxAngularVelocityDelta: 20 ---- !u!54 &1204258462 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204258459} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &1204258463 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204258459} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1204258464 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204258459} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1204258465 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204258459} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1214286071 PrefabInstance: m_ObjectHideFlags: 0 @@ -644119,6 +643618,11 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &1248085322 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} + m_PrefabInstance: {fileID: 3640276467859821741} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1268772232 PrefabInstance: m_ObjectHideFlags: 0 @@ -644263,6 +643767,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030972377, guid: abc00000000003786820023133851172, type: 3} m_PrefabInstance: {fileID: 1272309740} m_PrefabAsset: {fileID: 0} +--- !u!4 &1273306983 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} + m_PrefabInstance: {fileID: 6633365218206243196} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1275427781 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} + m_PrefabInstance: {fileID: 4186822344475922601} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1295338065 PrefabInstance: m_ObjectHideFlags: 0 @@ -646330,276 +645844,6 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1448674919 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1448674920} - - component: {fileID: 1448674925} - - component: {fileID: 1448674924} - - component: {fileID: 1448674923} - - component: {fileID: 1448674922} - - component: {fileID: 1448674921} - m_Layer: 0 - m_Name: Cube (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1448674920 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448674919} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 797096992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1448674921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448674919} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.Interactables.XRGrabInteractable - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayers: - m_Bits: 1 - m_DistanceCalculationMode: 1 - m_SelectMode: 0 - m_FocusMode: 1 - m_CustomReticle: {fileID: 0} - m_AllowGazeInteraction: 0 - m_AllowGazeSelect: 0 - m_OverrideGazeTimeToSelect: 0 - m_GazeTimeToSelect: 0.5 - m_OverrideTimeToAutoDeselectGaze: 0 - m_TimeToAutoDeselectGaze: 3 - m_AllowGazeAssistance: 0 - m_FirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_FirstFocusEntered: - m_PersistentCalls: - m_Calls: [] - m_LastFocusExited: - m_PersistentCalls: - m_Calls: [] - m_FocusEntered: - m_PersistentCalls: - m_Calls: [] - m_FocusExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_AutoFindParentInteractableInHierarchy: 0 - m_ParentInteractableObject: {fileID: 0} - m_AttachTransform: {fileID: 0} - m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 - m_MatchAttachPosition: 1 - m_MatchAttachRotation: 1 - m_SnapToColliderVolume: 1 - m_ReinitializeDynamicAttachEverySingleGrab: 1 - m_AttachEaseInTime: 0.15 - m_MovementType: 2 - m_PredictedVisualsTransform: {fileID: 0} - m_VelocityDamping: 1 - m_VelocityScale: 1 - m_AngularVelocityDamping: 1 - m_AngularVelocityScale: 1 - m_TrackPosition: 1 - m_SmoothPosition: 0 - m_SmoothPositionAmount: 8 - m_TightenPosition: 0.1 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 8 - m_TightenRotation: 0.1 - m_TrackScale: 1 - m_SmoothScale: 0 - m_SmoothScaleAmount: 8 - m_TightenScale: 0.1 - m_ThrowOnDetach: 1 - m_ThrowSmoothingDuration: 0.25 - m_ThrowSmoothingCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ThrowVelocityScale: 1.5 - m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 - m_RetainTransformParent: 1 - m_StartingSingleGrabTransformers: [] - m_StartingMultipleGrabTransformers: [] - m_AddDefaultGrabTransformers: 1 - m_FarAttachMode: 0 - m_LimitLinearVelocity: 0 - m_LimitAngularVelocity: 0 - m_MaxLinearVelocityDelta: 10 - m_MaxAngularVelocityDelta: 20 ---- !u!54 &1448674922 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448674919} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &1448674923 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448674919} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1448674924 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448674919} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1448674925 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1448674919} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1455781479 GameObject: m_ObjectHideFlags: 0 @@ -646629,6 +645873,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0215a75a0f67e1b49a1b823cfc7b8503, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PlayerStatusManager + ignoreGaugeForDebug: 1 zlButtonAction: m_UseReference: 1 m_Action: @@ -646689,7 +645934,7 @@ MonoBehaviour: maxGauge: 10 currentGauge: 0 codingModeUI: {fileID: 797096988} - puzzleBoard: {fileID: 0} + puzzleBoard: {fileID: 3150725272858075539, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} buffDuration: 10 attackBuffMultiplier: 1.5 defenseBuffMultiplier: 0.5 @@ -647738,6 +646983,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030982700, guid: abc00000000000189546862358243856, type: 3} m_PrefabInstance: {fileID: 1492075425} m_PrefabAsset: {fileID: 0} +--- !u!224 &1502744694 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5730287519658216829, guid: 9305e37606b654a56b3c00dcc3ebd599, type: 3} + m_PrefabInstance: {fileID: 390328572} + m_PrefabAsset: {fileID: 0} --- !u!1 &1505456199 GameObject: m_ObjectHideFlags: 0 @@ -652730,195 +651980,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030980125, guid: abc00000000018323746879171259722, type: 3} m_PrefabInstance: {fileID: 1905434811} m_PrefabAsset: {fileID: 0} ---- !u!1 &1908705203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1908705204} - - component: {fileID: 1908705209} - - component: {fileID: 1908705208} - - component: {fileID: 1908705207} - - component: {fileID: 1908705206} - - component: {fileID: 1908705210} - m_Layer: 0 - m_Name: Slot_A - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1908705204 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1908705203} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -100, y: 150, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 797096992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1908705206 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1908705203} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &1908705207 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1908705203} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1908705208 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1908705203} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1908705209 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1908705203} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1908705210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1908705203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.Interactors.XRSocketInteractor - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 4294967295 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_AutoFindParentInteractableInHierarchy: 0 - m_ParentInteractableObject: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 0} - m_InteractableCantHoverMeshMaterial: {fileID: 0} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} --- !u!1001 &1915233328 PrefabInstance: m_ObjectHideFlags: 0 @@ -653588,17 +652649,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1959366462 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 583340563854170035, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} - m_PrefabInstance: {fileID: 1063987680} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9f365cf844c03449bc8973eead2c3c1, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1968677119 PrefabInstance: m_ObjectHideFlags: 0 @@ -654665,6 +653715,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 1030984666, guid: abc00000000010121329710331679939, type: 3} m_PrefabInstance: {fileID: 2054181621} m_PrefabAsset: {fileID: 0} +--- !u!1 &2055020697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2055020698} + m_Layer: 0 + m_Name: HPbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2055020698 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055020697} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -45.455997, y: 26.56644, z: 11.481} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2058181912 PrefabInstance: m_ObjectHideFlags: 0 @@ -655667,195 +654748,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7917674758919744168, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} m_PrefabInstance: {fileID: 1063987680} m_PrefabAsset: {fileID: 0} ---- !u!1 &2140477045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2140477046} - - component: {fileID: 2140477051} - - component: {fileID: 2140477050} - - component: {fileID: 2140477049} - - component: {fileID: 2140477048} - - component: {fileID: 2140477052} - m_Layer: 0 - m_Name: Slot_B - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2140477046 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140477045} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 100, y: 150, z: 0} - m_LocalScale: {x: 100, y: 100, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 797096992} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &2140477048 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140477045} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &2140477049 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140477045} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &2140477050 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140477045} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2140477051 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140477045} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &2140477052 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140477045} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.XR.Interaction.Toolkit::UnityEngine.XR.Interaction.Toolkit.Interactors.XRSocketInteractor - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 4294967295 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_AutoFindParentInteractableInHierarchy: 0 - m_ParentInteractableObject: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 0} - m_InteractableCantHoverMeshMaterial: {fileID: 0} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} --- !u!1001 &2147146540 PrefabInstance: m_ObjectHideFlags: 0 @@ -655940,31 +654832,43 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: - target: {fileID: 3381136080864684247, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_Name value: Block_C_Red objectReference: {fileID: 0} + - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalPosition.x - value: -2.612 + value: 720 objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 352 objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalPosition.z - value: 1.25258 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalRotation.y @@ -655976,7 +654880,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 6604251906483681177, guid: 7519d43bc4d9145b496310c767ba2c29, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -655997,31 +654901,43 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: - target: {fileID: 5032480607239006193, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_Name value: Block_C_Green objectReference: {fileID: 0} + - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalPosition.x - value: -3.278 + value: 377 objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 167 objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalPosition.z - value: 1.25258 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalRotation.y @@ -656033,7 +654949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 5507365752034444415, guid: 5ed6e594a34ea4d56a4ae0b7d3cea896, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -656231,27 +655147,39 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: + - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalPosition.x - value: -2.93 + value: 756 objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalPosition.z - value: 1.25258 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalRotation.y @@ -656263,7 +655191,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 8226480903751366698, guid: 90a15f797f7ea4462b3a28425697a622, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -656288,27 +655216,39 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: + - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalPosition.x - value: -2.175 + value: -796 objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 403 objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalPosition.z - value: 1.25258 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalRotation.y @@ -656320,7 +655260,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 1768866887463920207, guid: bbfff93834292479f8c9ed60140ee0c7, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -656423,27 +655363,39 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: + - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalPosition.x - value: -1.461 + value: -492 objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalPosition.z - value: 1.25258 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalRotation.y @@ -656455,7 +655407,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 4039009434348113054, guid: f17b1b6d08af54483bd0665b3079c767, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -656480,15 +655432,27 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: - target: {fileID: 8814118127558288880, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_Name value: PuzzleGridBoard objectReference: {fileID: 0} + - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalPosition.x - value: -2.46051 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalPosition.y @@ -656496,27 +655460,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalPosition.z - value: 1.76996 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 270 objectReference: {fileID: 0} - target: {fileID: 8881403597935108509, guid: 469b8fdf008b844589dcc60b237284c5, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -656537,31 +655501,43 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 797096992} m_Modifications: - target: {fileID: 2937587418227847789, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_Name value: Block_T_Blue objectReference: {fileID: 0} + - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} + propertyPath: m_LocalScale.x + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} + propertyPath: m_LocalScale.y + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} + propertyPath: m_LocalScale.z + value: 1000 + objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalPosition.x - value: -1.806 + value: -824 objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalPosition.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalPosition.z - value: 1.25258 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalRotation.y @@ -656573,7 +655549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 5734629024927422593, guid: 101d8fa7abab84ac7ac221ee7f1dba1a, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -656612,11 +655588,4 @@ SceneRoots: - {fileID: 1705698300682769448} - {fileID: 820786555} - {fileID: 858106771} - - {fileID: 390328572} - - {fileID: 3640276467859821741} - - {fileID: 6633365218206243196} - - {fileID: 4186822344475922601} - - {fileID: 104982398014678653} - - {fileID: 2095262208529294143} - - {fileID: 681754957034778666} - - {fileID: 5700050917774472237} + - {fileID: 2055020698} diff --git a/Assets/_Scripts/PlayerStatusManager.cs b/Assets/_Scripts/PlayerStatusManager.cs index d835286..a90505e 100644 --- a/Assets/_Scripts/PlayerStatusManager.cs +++ b/Assets/_Scripts/PlayerStatusManager.cs @@ -3,24 +3,41 @@ using UnityEngine.InputSystem; using UnityEngine.AI; using System.Collections.Generic; +/// +/// プレイヤーの共通ゲージ、時間停止(Codingモード)、UI、および各種バフの制限時間を管理するクラス +/// public class PlayerStatusManager : MonoBehaviour { public static PlayerStatusManager Instance { get; private set; } + [Header("デバッグ設定")] + [Tooltip("チェックを入れると、ゲージが溜まっていなくてもZLZRでCodingModeを開けます(テスト用)")] + [SerializeField] private bool ignoreGaugeForDebug = true; + + [Header("Codingモード用 入力設定")] [SerializeField] private InputActionProperty zlButtonAction; [SerializeField] private InputActionProperty zrButtonAction; + [Header("プレイヤー移動・操作制御用 入力設定")] + [Tooltip("プレイヤーの移動入力(例: LeftHand Move)のアクションを指定してください")] [SerializeField] private InputActionProperty moveAction; + [Tooltip("プレイヤーの視点回転入力(例: RightHand Turn)があれば指定してください(任意)")] [SerializeField] private InputActionProperty turnAction; + + [Header("パズル制限時間設定")] + [Tooltip("CodingModeパズルの制限時間(秒)")] [SerializeField] private float codingLimitDuration = 15f; private float codingTimer = 0f; + [Header("ゲージ設定")] [SerializeField] private float maxGauge = 100f; [SerializeField] private float currentGauge = 0f; + [Header("表示UI設定")] [SerializeField] private GameObject codingModeUI; [SerializeField] private PuzzleGridBoard puzzleBoard; // 盤面参照 + [Header("バフパラメータ設定")] [SerializeField] private float buffDuration = 10f; [SerializeField] private float attackBuffMultiplier = 1.5f; [SerializeField] private float defenseBuffMultiplier = 0.5f; @@ -46,6 +63,37 @@ public class PlayerStatusManager : MonoBehaviour else { Destroy(gameObject); } } + private void OnEnable() + { + EnableAction(zlButtonAction); + EnableAction(zrButtonAction); + EnableAction(moveAction); + EnableAction(turnAction); + } + + private void OnDisable() + { + DisableAction(zlButtonAction); + DisableAction(zrButtonAction); + DisableAction(moveAction); + DisableAction(turnAction); + } + + private void EnableAction(InputActionProperty property) + { + if (property.action != null) property.action.Enable(); + } + + private void DisableAction(InputActionProperty property) + { + if (property.action != null) property.action.Disable(); + } + + private void Start() + { + if (codingModeUI != null) codingModeUI.SetActive(false); + } + private void Update() { CheckComboInput(); @@ -56,6 +104,7 @@ public class PlayerStatusManager : MonoBehaviour } else { + // CodingMode中の制限時間カウントダウン codingTimer -= Time.deltaTime; if (codingTimer <= 0f) { @@ -75,21 +124,35 @@ public class PlayerStatusManager : MonoBehaviour { if (zlButtonAction.action == null || zrButtonAction.action == null) return; - bool zlPressed = zlButtonAction.action.triggered && zlButtonAction.action.ReadValue() > 0.5f; - bool zrPressed = zrButtonAction.action.triggered && zrButtonAction.action.ReadValue() > 0.5f; + // 入力値の読み取り + float zlVal = zlButtonAction.action.ReadValue(); + float zrVal = zrButtonAction.action.ReadValue(); - bool isComboTriggered = (zlPressed && zrButtonAction.action.ReadValue() > 0.5f) || - (zrPressed && zlButtonAction.action.ReadValue() > 0.5f); + bool zlPressed = zlButtonAction.action.triggered || zlVal > 0.5f; + bool zrPressed = zrButtonAction.action.triggered || zrVal > 0.5f; - if (isComboTriggered) + // 両方のトリガーが引かれているか + bool isBothHeld = zlVal > 0.5f && zrVal > 0.5f; + bool isAnyTriggered = zlButtonAction.action.triggered || zrButtonAction.action.triggered; + + if (isBothHeld && isAnyTriggered) { - if (!isCodingMode && currentGauge >= maxGauge) + if (!isCodingMode) { - StartCodingMode(); + // ゲージチェック(デバッグフラグがONならゲージ無視で起動) + if (ignoreGaugeForDebug || currentGauge >= maxGauge) + { + StartCodingMode(); + } + else + { + Debug.LogWarning($"⚠️ ゲージが足りないためCodingModeを開けません。現在: {currentGauge} / 必要: {maxGauge}"); + } } - else if (isCodingMode) + else { - CancelCodingMode(); // 手動キャンセルはゲージ維持 + // CodingMode中に再度同時押し ➔ キャンセルして無消費で復帰 + CancelCodingMode(); } } } @@ -97,12 +160,13 @@ public class PlayerStatusManager : MonoBehaviour private void StartCodingMode() { isCodingMode = true; - codingTimer = codingLimitDuration; // タイマーリセット + codingTimer = codingLimitDuration; if (puzzleBoard != null) puzzleBoard.ClearBoard(); - if (moveAction.action != null) moveAction.action.Disable(); - if (turnAction.action != null) turnAction.action.Disable(); + DisableAction(moveAction); + DisableAction(turnAction); + // 敵のアニメーション・NavMesh停止 foreach (var anim in FindObjectsByType(FindObjectsSortMode.None)) { if (anim == null || anim.gameObject == this.gameObject || anim.CompareTag("Player")) continue; @@ -130,13 +194,13 @@ public class PlayerStatusManager : MonoBehaviour private void FailCodingModeByTimeout() { - ResumeWorldState(consumeGauge: true); // 失敗したのでゲージは消費される + ResumeWorldState(consumeGauge: true); Debug.Log("💀 時間切れ! Codingモード失敗(バフなし・ゲージ消費)。"); } public void CancelCodingMode() { - ResumeWorldState(consumeGauge: false); // 手動キャンセルはゲージ消費なし + ResumeWorldState(consumeGauge: false); Debug.Log("↩️ Codingモード手動キャンセル。"); } @@ -148,8 +212,8 @@ public class PlayerStatusManager : MonoBehaviour foreach (var agent in pausedAgents) { if (agent != null && agent.enabled) agent.isStopped = false; } pausedAgents.Clear(); - if (moveAction.action != null) moveAction.action.Enable(); - if (turnAction.action != null) turnAction.action.Enable(); + EnableAction(moveAction); + EnableAction(turnAction); isCodingMode = false; if (codingModeUI != null) codingModeUI.SetActive(false); diff --git a/Assets/_Scripts/PuzzleBlock.cs b/Assets/_Scripts/PuzzleBlock.cs index 4e39bc3..cf14f0b 100644 --- a/Assets/_Scripts/PuzzleBlock.cs +++ b/Assets/_Scripts/PuzzleBlock.cs @@ -45,7 +45,7 @@ public class PuzzleBlock : MonoBehaviour { List rotated = new List(); // 現在のY回転を90度単位に丸める (0, 1, 2, 3) - int steps = Mathf.RoundToInt(transform.eulerAngles.y / 90f) % 4; + int steps = Mathf.RoundToInt(transform.eulerAngles.y / 180f) % 4; if (steps < 0) steps += 4; foreach (var cell in LocalCells) diff --git a/Packages/manifest.json b/Packages/manifest.json index 347ed4a..f320fd8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.inputsystem": "1.17.0", "com.unity.learn.iet-framework": "5.0.3", "com.unity.multiplayer.center": "1.0.1", + "com.unity.recorder": "5.1.6", "com.unity.render-pipelines.universal": "17.3.0", "com.unity.timeline": "1.8.12", "com.unity.visualeffectgraph": "17.3.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2d89559..91e038b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -15,6 +15,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.bindings.openimageio": { + "version": "1.0.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "1.2.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.27", "depth": 2, @@ -27,7 +36,7 @@ }, "com.unity.collections": { "version": "2.6.2", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.8.23", @@ -118,7 +127,7 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.6", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -130,6 +139,17 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.recorder": { + "version": "5.1.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.timeline": "1.8.7", + "com.unity.collections": "1.2.4", + "com.unity.bindings.openimageio": "1.0.2" + }, + "url": "https://packages.unity.com" + }, "com.unity.render-pipelines.core": { "version": "17.3.0", "depth": 1, @@ -197,7 +217,7 @@ }, "com.unity.test-framework.performance": { "version": "3.2.0", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.33",