From b8c3a5d791edffcab5bcd4e34d25413266626bbe Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 08:02:16 -0400 Subject: [PATCH 01/14] Moving Floor Build --- .../Animations/Mavrik_Floor.controller | 72 ++++++ .../Animations/Mavrik_Floor.controller.meta | 8 + .../Animations/Mavrik_Floor_Move.anim | 213 ++++++++++++++++++ .../Animations/Mavrik_Floor_Move.anim.meta | 8 + Assets/Obstacles/Mavrik_Floor.prefab | 95 ++++++++ Assets/Obstacles/Mavrik_Floor.prefab.meta | 9 + Assets/Obstacles/Mavrik_Moving_Floor.prefab | 128 +++++++++++ .../Obstacles/Mavrik_Moving_Floor.prefab.meta | 7 + Assets/Scenes/TestControls.unity | 163 ++++++++++++++ 9 files changed, 703 insertions(+) create mode 100644 Assets/Obstacles/Animations/Mavrik_Floor.controller create mode 100644 Assets/Obstacles/Animations/Mavrik_Floor.controller.meta create mode 100644 Assets/Obstacles/Animations/Mavrik_Floor_Move.anim create mode 100644 Assets/Obstacles/Animations/Mavrik_Floor_Move.anim.meta create mode 100644 Assets/Obstacles/Mavrik_Floor.prefab create mode 100644 Assets/Obstacles/Mavrik_Floor.prefab.meta create mode 100644 Assets/Obstacles/Mavrik_Moving_Floor.prefab create mode 100644 Assets/Obstacles/Mavrik_Moving_Floor.prefab.meta diff --git a/Assets/Obstacles/Animations/Mavrik_Floor.controller b/Assets/Obstacles/Animations/Mavrik_Floor.controller new file mode 100644 index 00000000..a61da386 --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Floor.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-3977097835095266098 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Floor_Move + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4df7551e9741d614cb6a9d4f4b3b7406, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Floor + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6728651540556536851} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &6728651540556536851 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3977097835095266098} + m_Position: {x: 270, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3977097835095266098} diff --git a/Assets/Obstacles/Animations/Mavrik_Floor.controller.meta b/Assets/Obstacles/Animations/Mavrik_Floor.controller.meta new file mode 100644 index 00000000..eae40f6e --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Floor.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f5636b1ff083ec4b90fcb326292f161 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim b/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim new file mode 100644 index 00000000..79f064a1 --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Floor_Move + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 9.67} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3.8166666 + value: {x: 0, y: 0, z: -6.55} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 7.633333 + value: {x: 0, y: 0, z: 9.67} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 7.633333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 1 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.8166666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.633333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.8166666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.633333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 9.67 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.8166666 + value: -6.55 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.633333 + value: 9.67 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim.meta b/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim.meta new file mode 100644 index 00000000..7a0b5649 --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4df7551e9741d614cb6a9d4f4b3b7406 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Mavrik_Floor.prefab b/Assets/Obstacles/Mavrik_Floor.prefab new file mode 100644 index 00000000..03900224 --- /dev/null +++ b/Assets/Obstacles/Mavrik_Floor.prefab @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1977579826803422} + m_IsPrefabParent: 1 +--- !u!1 &1977579826803422 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4175081708114804} + - component: {fileID: 33473778465350852} + - component: {fileID: 23046709272025714} + - component: {fileID: 65511906868894760} + m_Layer: 0 + m_Name: Mavrik_Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4175081708114804 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1977579826803422} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23046709272025714 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1977579826803422} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2a12d3fc0532ba64e972160db18dfd99, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33473778465350852 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1977579826803422} + m_Mesh: {fileID: 4300000, guid: e2d5268c4a1f1ad41a3ddb37608c630d, type: 3} +--- !u!65 &65511906868894760 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1977579826803422} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 5.0003223, y: 0.2504834, z: 5.000693} + m_Center: {x: -2.4997997, y: -0.10384083, z: 2.500337} diff --git a/Assets/Obstacles/Mavrik_Floor.prefab.meta b/Assets/Obstacles/Mavrik_Floor.prefab.meta new file mode 100644 index 00000000..cb8e4413 --- /dev/null +++ b/Assets/Obstacles/Mavrik_Floor.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 82dd9495d55e381469aa18791816e641 +timeCreated: 1605066276 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Mavrik_Moving_Floor.prefab b/Assets/Obstacles/Mavrik_Moving_Floor.prefab new file mode 100644 index 00000000..25b1ff0e --- /dev/null +++ b/Assets/Obstacles/Mavrik_Moving_Floor.prefab @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5852534905605273225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9202412964388832783} + m_Layer: 0 + m_Name: Mavrik_Moving_Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9202412964388832783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5852534905605273225} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4068998512539540012} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4069329506645428568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9202412964388832783} + m_Modifications: + - target: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_Name + value: Mavrik_Floor + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, + type: 3} + insertIndex: -1 + addedObject: {fileID: 772773765679882743} + m_SourcePrefab: {fileID: 100100000, guid: 82dd9495d55e381469aa18791816e641, type: 3} +--- !u!4 &4068998512539540012 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, + type: 3} + m_PrefabInstance: {fileID: 4069329506645428568} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4070743036836625286 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, + type: 3} + m_PrefabInstance: {fileID: 4069329506645428568} + m_PrefabAsset: {fileID: 0} +--- !u!95 &772773765679882743 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4070743036836625286} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0f5636b1ff083ec4b90fcb326292f161, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Obstacles/Mavrik_Moving_Floor.prefab.meta b/Assets/Obstacles/Mavrik_Moving_Floor.prefab.meta new file mode 100644 index 00000000..d72073fc --- /dev/null +++ b/Assets/Obstacles/Mavrik_Moving_Floor.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8bb5b5825668a3a4d843e44289f40265 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index fc9619e4..f1f084be 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1232,6 +1232,99 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &751004779 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.x + value: 1.5589 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.z + value: 0.7636 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.3972 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.59106 + objectReference: {fileID: 0} + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: 'Test Big Moving FLoor ' + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5934096 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.4531 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.2790057 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.23374 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.97227633 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.23383503 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 27.046 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -2187,6 +2280,74 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &987683212 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor For Scale + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.122539 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.10725115 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.0186043 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &1028760414 GameObject: m_ObjectHideFlags: 0 @@ -5096,3 +5257,5 @@ SceneRoots: - {fileID: 1895921797} - {fileID: 1885907698} - {fileID: 196185785} + - {fileID: 751004779} + - {fileID: 987683212} From 25e6460039ce5dd86d1af866b36e5c0328c45928 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 08:07:31 -0400 Subject: [PATCH 02/14] Distinction between LR and UD --- ...r.prefab => Mavrik_Moving_Floor_LR.prefab} | 2 +- ...eta => Mavrik_Moving_Floor_LR.prefab.meta} | 0 .../Obstacles/Mavrik_Moving_Floor_UD.prefab | 128 ++++++++++++++++++ .../Mavrik_Moving_Floor_UD.prefab.meta | 7 + 4 files changed, 136 insertions(+), 1 deletion(-) rename Assets/Obstacles/{Mavrik_Moving_Floor.prefab => Mavrik_Moving_Floor_LR.prefab} (99%) rename Assets/Obstacles/{Mavrik_Moving_Floor.prefab.meta => Mavrik_Moving_Floor_LR.prefab.meta} (100%) create mode 100644 Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab create mode 100644 Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta diff --git a/Assets/Obstacles/Mavrik_Moving_Floor.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab similarity index 99% rename from Assets/Obstacles/Mavrik_Moving_Floor.prefab rename to Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab index 25b1ff0e..b9656e11 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 9202412964388832783} m_Layer: 0 - m_Name: Mavrik_Moving_Floor + m_Name: Mavrik_Moving_Floor_LR m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Obstacles/Mavrik_Moving_Floor.prefab.meta b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab.meta similarity index 100% rename from Assets/Obstacles/Mavrik_Moving_Floor.prefab.meta rename to Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab.meta diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab new file mode 100644 index 00000000..05260a29 --- /dev/null +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5852534905605273225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9202412964388832783} + m_Layer: 0 + m_Name: Mavrik_Moving_Floor_UD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9202412964388832783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5852534905605273225} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4068998512539540012} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4069329506645428568 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9202412964388832783} + m_Modifications: + - target: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_Name + value: Mavrik_Floor + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, + type: 3} + insertIndex: -1 + addedObject: {fileID: 772773765679882743} + m_SourcePrefab: {fileID: 100100000, guid: 82dd9495d55e381469aa18791816e641, type: 3} +--- !u!4 &4068998512539540012 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, + type: 3} + m_PrefabInstance: {fileID: 4069329506645428568} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4070743036836625286 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, + type: 3} + m_PrefabInstance: {fileID: 4069329506645428568} + m_PrefabAsset: {fileID: 0} +--- !u!95 &772773765679882743 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4070743036836625286} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0f5636b1ff083ec4b90fcb326292f161, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta new file mode 100644 index 00000000..2a5cad45 --- /dev/null +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e1810e9bda7d474f8a8848fdadc7393 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 3cc795772620c64512d1fe22e5d45f10311e1e08 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 08:25:14 -0400 Subject: [PATCH 03/14] Setting For Left right and Up Down Moving --- .../Animations/Mavrik_Floor_LR.controller | 130 ++++++++++ ...r.meta => Mavrik_Floor_LR.controller.meta} | 0 ...or_Move.anim => Mavrik_Floor_Move_LR.anim} | 2 +- ...im.meta => Mavrik_Floor_Move_LR.anim.meta} | 0 ...ller => Mavrik_Moving_Floor_UD.controller} | 94 +++---- .../Mavrik_Moving_Floor_UD.controller.meta | 8 + .../Mavrik_Moving_Floor_Up_Down.anim | 213 ++++++++++++++++ .../Mavrik_Moving_Floor_Up_Down.anim.meta | 8 + .../Obstacles/Mavrik_Moving_Floor_UD.prefab | 2 +- Assets/Scenes/TestControls.unity | 229 ++++++++---------- 10 files changed, 515 insertions(+), 171 deletions(-) create mode 100644 Assets/Obstacles/Animations/Mavrik_Floor_LR.controller rename Assets/Obstacles/Animations/{Mavrik_Floor.controller.meta => Mavrik_Floor_LR.controller.meta} (100%) rename Assets/Obstacles/Animations/{Mavrik_Floor_Move.anim => Mavrik_Floor_Move_LR.anim} (99%) rename Assets/Obstacles/Animations/{Mavrik_Floor_Move.anim.meta => Mavrik_Floor_Move_LR.anim.meta} (100%) rename Assets/Obstacles/Animations/{Mavrik_Floor.controller => Mavrik_Moving_Floor_UD.controller} (80%) create mode 100644 Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller.meta create mode 100644 Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim create mode 100644 Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim.meta diff --git a/Assets/Obstacles/Animations/Mavrik_Floor_LR.controller b/Assets/Obstacles/Animations/Mavrik_Floor_LR.controller new file mode 100644 index 00000000..474d6852 --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Floor_LR.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7431364050029510671 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Moving_Floor_Up_Down 0 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 244ad1d1eb84137438ce2cf220cdc9da, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3977097835095266098 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Floor_Move + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 4df7551e9741d614cb6a9d4f4b3b7406, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Floor_LR + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6728651540556536851} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1070515117007187131 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Moving_Floor_Up_Down + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 244ad1d1eb84137438ce2cf220cdc9da, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6728651540556536851 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3977097835095266098} + m_Position: {x: 270, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1070515117007187131} + m_Position: {x: 305, y: 165, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7431364050029510671} + m_Position: {x: 340, y: 230, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3977097835095266098} diff --git a/Assets/Obstacles/Animations/Mavrik_Floor.controller.meta b/Assets/Obstacles/Animations/Mavrik_Floor_LR.controller.meta similarity index 100% rename from Assets/Obstacles/Animations/Mavrik_Floor.controller.meta rename to Assets/Obstacles/Animations/Mavrik_Floor_LR.controller.meta diff --git a/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim b/Assets/Obstacles/Animations/Mavrik_Floor_Move_LR.anim similarity index 99% rename from Assets/Obstacles/Animations/Mavrik_Floor_Move.anim rename to Assets/Obstacles/Animations/Mavrik_Floor_Move_LR.anim index 79f064a1..f4c94ed5 100644 --- a/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim +++ b/Assets/Obstacles/Animations/Mavrik_Floor_Move_LR.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Mavrik_Floor_Move + m_Name: Mavrik_Floor_Move_LR serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Obstacles/Animations/Mavrik_Floor_Move.anim.meta b/Assets/Obstacles/Animations/Mavrik_Floor_Move_LR.anim.meta similarity index 100% rename from Assets/Obstacles/Animations/Mavrik_Floor_Move.anim.meta rename to Assets/Obstacles/Animations/Mavrik_Floor_Move_LR.anim.meta diff --git a/Assets/Obstacles/Animations/Mavrik_Floor.controller b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller similarity index 80% rename from Assets/Obstacles/Animations/Mavrik_Floor.controller rename to Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller index a61da386..54d7bb45 100644 --- a/Assets/Obstacles/Animations/Mavrik_Floor.controller +++ b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller @@ -1,13 +1,57 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-3977097835095266098 +--- !u!1107 &-5176972996995829154 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 122729859267083370} + m_Position: {x: 290, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 122729859267083370} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Moving_Floor_UD + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5176972996995829154} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &122729859267083370 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Mavrik_Floor_Move + m_Name: Mavrik_Moving_Floor_Up_Down m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -20,53 +64,9 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 4df7551e9741d614cb6a9d4f4b3b7406, type: 2} + m_Motion: {fileID: 7400000, guid: 244ad1d1eb84137438ce2cf220cdc9da, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Mavrik_Floor - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 6728651540556536851} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1107 &6728651540556536851 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -3977097835095266098} - m_Position: {x: 270, y: 100, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -3977097835095266098} diff --git a/Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller.meta b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller.meta new file mode 100644 index 00000000..3f05f936 --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_UD.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5203784c66786bb4f879451ecd293c19 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim new file mode 100644 index 00000000..1745e6e0 --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mavrik_Moving_Floor_Up_Down + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -0.12, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3.1666667 + value: {x: 0, y: 8.74, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 6.366667 + value: {x: 0, y: -0.12, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 6.366667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6.366667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 8.74 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6.366667 + value: -0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6.366667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim.meta b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim.meta new file mode 100644 index 00000000..3345e9fd --- /dev/null +++ b/Assets/Obstacles/Animations/Mavrik_Moving_Floor_Up_Down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 244ad1d1eb84137438ce2cf220cdc9da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab index 05260a29..ae1fbd69 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab @@ -115,7 +115,7 @@ Animator: m_GameObject: {fileID: 4070743036836625286} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0f5636b1ff083ec4b90fcb326292f161, type: 2} + m_Controller: {fileID: 9100000, guid: 5203784c66786bb4f879451ecd293c19, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index f1f084be..6f50e060 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1232,7 +1232,7 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &751004779 +--- !u!1001 &756557177 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -1240,82 +1240,67 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 772773765679882743, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} - propertyPath: m_LocalScale.x - value: 1.5589 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.z - value: 0.7636 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.3972 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.59106 - objectReference: {fileID: 0} - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: 'Test Big Moving FLoor ' - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.z - value: 0.5934096 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.4531 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 5203784c66786bb4f879451ecd293c19, type: 2} + - target: {fileID: 4068998512539540012, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalPosition.y - value: 0.2790057 + value: 0.43 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 5852534905605273225, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_UD + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.8392495 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.084350824 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalPosition.z - value: 0.23374 + value: -1.827397 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.w - value: 0.97227633 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.y - value: 0.23383503 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 27.046 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 @@ -1324,7 +1309,7 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -2280,74 +2265,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &987683212 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor For Scale - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.122539 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.10725115 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: -2.0186043 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &1028760414 GameObject: m_ObjectHideFlags: 0 @@ -2562,6 +2479,74 @@ Transform: - {fileID: 1663162369} m_Father: {fileID: 434066458} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1461727046 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_LR + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.372246 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.084350824 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: -3.3311427 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &1507380958 GameObject: m_ObjectHideFlags: 0 @@ -5257,5 +5242,5 @@ SceneRoots: - {fileID: 1895921797} - {fileID: 1885907698} - {fileID: 196185785} - - {fileID: 751004779} - - {fileID: 987683212} + - {fileID: 756557177} + - {fileID: 1461727046} From a5b64e99d56b6ddb64949b97a21bf96c43051400 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 08:28:23 -0400 Subject: [PATCH 04/14] Fixing scene --- Assets/Scenes/TAC Lab.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scenes/TAC Lab.unity b/Assets/Scenes/TAC Lab.unity index f9f34824..20ceaf4f 100644 --- a/Assets/Scenes/TAC Lab.unity +++ b/Assets/Scenes/TAC Lab.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028326, g: 0.22571333, b: 0.30692202, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: From 5ba2a7dee9fe680b81c4cf2689bcef878b9c96ad Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 08:34:09 -0400 Subject: [PATCH 05/14] Fixes to overides --- .../Obstacles/Mavrik_Moving_Floor_LR.prefab | 14 ++- .../Obstacles/Mavrik_Moving_Floor_UD.prefab | 2 +- Assets/Scenes/TestControls.unity | 108 ++++++++++++++---- 3 files changed, 96 insertions(+), 28 deletions(-) diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab index b9656e11..d8abb645 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab @@ -26,7 +26,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4068998512539540012} @@ -44,9 +44,17 @@ PrefabInstance: propertyPath: m_Name value: Mavrik_Floor objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalScale.x + value: 1.5589 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalScale.z + value: 0.7636 + objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 1.3972 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.y @@ -54,7 +62,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.59106 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab index ae1fbd69..37126ba9 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab @@ -50,7 +50,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.43 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 6f50e060..b1fff22d 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1232,6 +1232,75 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &752651539 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_LR (1) + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.068009 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.08435106 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.0062337 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 4070743036836625286, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1001 &756557177 PrefabInstance: m_ObjectHideFlags: 0 @@ -1240,16 +1309,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 772773765679882743, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_Controller - value: - objectReference: {fileID: 9100000, guid: 5203784c66786bb4f879451ecd293c19, type: 2} - - target: {fileID: 4068998512539540012, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.43 - objectReference: {fileID: 0} - target: {fileID: 5852534905605273225, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_Name @@ -1258,7 +1317,7 @@ PrefabInstance: - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalPosition.x - value: -0.8392495 + value: -2.565 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} @@ -1268,27 +1327,27 @@ PrefabInstance: - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalPosition.z - value: -1.827397 + value: 0.737 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.9578666 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.2872136 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} @@ -1298,7 +1357,7 @@ PrefabInstance: - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 33.382 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} @@ -2495,7 +2554,7 @@ PrefabInstance: - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalPosition.x - value: -2.372246 + value: -4.4812126 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} @@ -2505,27 +2564,27 @@ PrefabInstance: - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalPosition.z - value: -3.3311427 + value: 1.6904504 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.95816565 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.2862143 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} @@ -2535,7 +2594,7 @@ PrefabInstance: - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 33.263 objectReference: {fileID: 0} - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} @@ -5244,3 +5303,4 @@ SceneRoots: - {fileID: 196185785} - {fileID: 756557177} - {fileID: 1461727046} + - {fileID: 752651539} From 99819bdfeaa69d68ae2b3c3f0b8d786b50c9aa29 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 09:30:49 -0400 Subject: [PATCH 06/14] Added Spinning Sickles Fun little sickles --- Assets/Obstacles/Mavrik_Sword_Spinning.prefab | 303 ++++++++++++++++++ .../Mavrik_Sword_Spinning.prefab.meta | 7 + Assets/Obstacles/Mavrik_Sword_medium.prefab | 97 ++++++ .../Obstacles/Mavrik_Sword_medium.prefab.meta | 9 + Assets/Scenes/TestControls.unity | 139 ++++---- Assets/Scripts/Spin.cs | 29 ++ Assets/Scripts/Spin.cs.meta | 11 + 7 files changed, 525 insertions(+), 70 deletions(-) create mode 100644 Assets/Obstacles/Mavrik_Sword_Spinning.prefab create mode 100644 Assets/Obstacles/Mavrik_Sword_Spinning.prefab.meta create mode 100644 Assets/Obstacles/Mavrik_Sword_medium.prefab create mode 100644 Assets/Obstacles/Mavrik_Sword_medium.prefab.meta create mode 100644 Assets/Scripts/Spin.cs create mode 100644 Assets/Scripts/Spin.cs.meta diff --git a/Assets/Obstacles/Mavrik_Sword_Spinning.prefab b/Assets/Obstacles/Mavrik_Sword_Spinning.prefab new file mode 100644 index 00000000..77275aa4 --- /dev/null +++ b/Assets/Obstacles/Mavrik_Sword_Spinning.prefab @@ -0,0 +1,303 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1946705203569613395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3574066194851122020} + - component: {fileID: 1925271753506268451} + m_Layer: 0 + m_Name: Mavrik_Sword_Spinning + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3574066194851122020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946705203569613395} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1674005170711084260} + - {fileID: 1083514133312506310} + - {fileID: 686146779665115163} + - {fileID: 5551598098542832212} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1925271753506268451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946705203569613395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b08341faf2eacab4fab7b1cf26c86b25, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 2 +--- !u!1001 &687677053368700689 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3574066194851122020} + m_Modifications: + - target: {fileID: 1071554386029472, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_Name + value: Mavrik_Sword_medium_3 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.383 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.302 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.124 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.49858043 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5014155 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.5014156 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.49858046 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90.325 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} +--- !u!4 &686146779665115163 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, + type: 3} + m_PrefabInstance: {fileID: 687677053368700689} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1083074082464345804 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3574066194851122020} + m_Modifications: + - target: {fileID: 1071554386029472, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_Name + value: Mavrik_Sword_medium_2 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.383 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.302 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.133 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} +--- !u!4 &1083514133312506310 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, + type: 3} + m_PrefabInstance: {fileID: 1083074082464345804} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1672509656379661294 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3574066194851122020} + m_Modifications: + - target: {fileID: 1071554386029472, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_Name + value: 'Mavrik_Sword_medium_1 ' + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2842522 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.3015899 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} +--- !u!4 &1674005170711084260 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, + type: 3} + m_PrefabInstance: {fileID: 1672509656379661294} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5549997628934851934 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3574066194851122020} + m_Modifications: + - target: {fileID: 1071554386029472, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_Name + value: Mavrik_Sword_medium_4 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.511 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.302 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.002 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1f0dec2718af1624e8a3fd30453588a4, type: 3} +--- !u!4 &5551598098542832212 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4134707831580426, guid: 1f0dec2718af1624e8a3fd30453588a4, + type: 3} + m_PrefabInstance: {fileID: 5549997628934851934} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Obstacles/Mavrik_Sword_Spinning.prefab.meta b/Assets/Obstacles/Mavrik_Sword_Spinning.prefab.meta new file mode 100644 index 00000000..83c57ef7 --- /dev/null +++ b/Assets/Obstacles/Mavrik_Sword_Spinning.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4dc7aa08b379624c8c5295a57a26267 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Mavrik_Sword_medium.prefab b/Assets/Obstacles/Mavrik_Sword_medium.prefab new file mode 100644 index 00000000..b7251f1f --- /dev/null +++ b/Assets/Obstacles/Mavrik_Sword_medium.prefab @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1071554386029472} + m_IsPrefabParent: 1 +--- !u!1 &1071554386029472 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4134707831580426} + - component: {fileID: 33679651315416416} + - component: {fileID: 23072340870366182} + - component: {fileID: 64811454570802422} + m_Layer: 0 + m_Name: Mavrik_Sword_medium + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4134707831580426 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1071554386029472} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23072340870366182 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1071554386029472} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2a12d3fc0532ba64e972160db18dfd99, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33679651315416416 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1071554386029472} + m_Mesh: {fileID: 4300000, guid: b55e95df0419bb3478809c6738befe8e, type: 3} +--- !u!64 &64811454570802422 +MeshCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1071554386029472} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 1 + m_InflateMesh: 0 + m_SkinWidth: 0.01 + m_Mesh: {fileID: 43003313864153846, guid: d21bea4df3a24554aa7f28c15a331152, type: 2} diff --git a/Assets/Obstacles/Mavrik_Sword_medium.prefab.meta b/Assets/Obstacles/Mavrik_Sword_medium.prefab.meta new file mode 100644 index 00000000..ddb80f9c --- /dev/null +++ b/Assets/Obstacles/Mavrik_Sword_medium.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1f0dec2718af1624e8a3fd30453588a4 +timeCreated: 1606271840 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index b1fff22d..0f9928a5 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1232,75 +1232,6 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &752651539 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor_LR (1) - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.068009 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.08435106 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: -2.0062337 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 4070743036836625286, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1001 &756557177 PrefabInstance: m_ObjectHideFlags: 0 @@ -2606,6 +2537,74 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} +--- !u!1001 &1479721660 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1946705203569613395, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_Name + value: Mavrik_Sword_Spinning + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.0544503 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.049999952 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.085876 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} --- !u!1 &1507380958 GameObject: m_ObjectHideFlags: 0 @@ -5303,4 +5302,4 @@ SceneRoots: - {fileID: 196185785} - {fileID: 756557177} - {fileID: 1461727046} - - {fileID: 752651539} + - {fileID: 1479721660} diff --git a/Assets/Scripts/Spin.cs b/Assets/Scripts/Spin.cs new file mode 100644 index 00000000..560901b6 --- /dev/null +++ b/Assets/Scripts/Spin.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MAVRIC.GEEKCup +{ + + public class Spin : MonoBehaviour + { + [Range(0f, 10f)] + public float Speed = 1f; + + + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + transform.Rotate( 0f, Speed, 0f, Space.Self); + + } + } +} diff --git a/Assets/Scripts/Spin.cs.meta b/Assets/Scripts/Spin.cs.meta new file mode 100644 index 00000000..d16fd7ae --- /dev/null +++ b/Assets/Scripts/Spin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b08341faf2eacab4fab7b1cf26c86b25 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From eab4124525789210870c2630b720e47d6cea5b0c Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Sun, 21 Apr 2024 09:35:33 -0400 Subject: [PATCH 07/14] Final fixes --- Assets/Scenes/TestControls.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 0f9928a5..2cbfe5bb 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -2558,12 +2558,12 @@ PrefabInstance: - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} propertyPath: m_LocalPosition.y - value: 0.049999952 + value: 0.588 objectReference: {fileID: 0} - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} propertyPath: m_LocalPosition.z - value: -1.085876 + value: 0.888 objectReference: {fileID: 0} - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} From 4e455c0a453ed6882f7bbcefc0380f1ccd54f1b6 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Mon, 22 Apr 2024 08:56:15 -0400 Subject: [PATCH 08/14] Fixin stuffs --- Assets/Scenes/TestControls.unity | 70 -------------------------------- 1 file changed, 70 deletions(-) diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index b1fff22d..de47adfc 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1232,75 +1232,6 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &752651539 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor_LR (1) - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.068009 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.08435106 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: -2.0062337 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 4070743036836625286, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1001 &756557177 PrefabInstance: m_ObjectHideFlags: 0 @@ -5303,4 +5234,3 @@ SceneRoots: - {fileID: 196185785} - {fileID: 756557177} - {fileID: 1461727046} - - {fileID: 752651539} From f477607d05d330748d19e2713a6e0c5621906d14 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Mon, 22 Apr 2024 09:22:22 -0400 Subject: [PATCH 09/14] Editing and fixing center of sickles --- Assets/Scenes/TestControls.unity | 57 +++++++++++++++++++++++++++++++- Assets/Scripts/Spin.cs | 15 ++------- 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 2cbfe5bb..c78005a6 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -2545,6 +2545,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 686146779665115163, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.02 + objectReference: {fileID: 0} + - target: {fileID: 686146779665115163, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 686146779665115163, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.115 + objectReference: {fileID: 0} + - target: {fileID: 1083514133312506310, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.020999908 + objectReference: {fileID: 0} + - target: {fileID: 1083514133312506310, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1083514133312506310, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.119 + objectReference: {fileID: 0} + - target: {fileID: 1674005170711084260, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.143 + objectReference: {fileID: 0} + - target: {fileID: 1674005170711084260, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1946705203569613395, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} propertyPath: m_Name @@ -2563,7 +2603,7 @@ PrefabInstance: - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} propertyPath: m_LocalPosition.z - value: 0.888 + value: 0.895 objectReference: {fileID: 0} - target: {fileID: 3574066194851122020, guid: b4dc7aa08b379624c8c5295a57a26267, type: 3} @@ -2600,6 +2640,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5551598098542832212, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.104 + objectReference: {fileID: 0} + - target: {fileID: 5551598098542832212, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5551598098542832212, guid: b4dc7aa08b379624c8c5295a57a26267, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Spin.cs b/Assets/Scripts/Spin.cs index 560901b6..3140bcad 100644 --- a/Assets/Scripts/Spin.cs +++ b/Assets/Scripts/Spin.cs @@ -4,26 +4,15 @@ using UnityEngine; namespace MAVRIC.GEEKCup { - public class Spin : MonoBehaviour { [Range(0f, 10f)] public float Speed = 1f; - - - - // Start is called before the first frame update - void Start() - { - - } - + // Update is called once per frame void Update() { - - transform.Rotate( 0f, Speed, 0f, Space.Self); - + transform.Rotate( 0f, Speed, 0f, Space.Self); } } } From 13394322e209e3eaccff14eb1798ae85da4d3212 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Mon, 22 Apr 2024 09:47:46 -0400 Subject: [PATCH 10/14] fixed, added script and way more functionality. --- Assets/Moving.cs | 33 +++ Assets/Moving.cs.meta | 11 + Assets/Obstacles/Mavrik_Floor.prefab | 94 ++++--- .../Obstacles/Mavrik_Moving_Floor_LR.prefab | 35 +-- Assets/Scenes/TestControls.unity | 232 ++++++------------ 5 files changed, 176 insertions(+), 229 deletions(-) create mode 100644 Assets/Moving.cs create mode 100644 Assets/Moving.cs.meta diff --git a/Assets/Moving.cs b/Assets/Moving.cs new file mode 100644 index 00000000..1265a123 --- /dev/null +++ b/Assets/Moving.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace MAVRIC.GEEKCup +{ + public class MoveFloor : MonoBehaviour + { + [Range(0f, 10f)] + [SerializeField] private float speed = 1f; + + [Range(0f, 10f)] + [SerializeField] private float distance = 1f; + + [SerializeField] private Vector3 direction = Vector3.right; + + private Vector3 startPos; + + private void Start() + { + startPos = transform.position; + } + private void Update() + { + if (Vector3.Distance(startPos, transform.position) >= distance || Vector3.Distance(startPos, transform.position) <= -distance) + { + direction *= -1; + } + transform.Translate((direction * 0.5f) * (speed * Time.deltaTime), Space.Self); + } + } +} \ No newline at end of file diff --git a/Assets/Moving.cs.meta b/Assets/Moving.cs.meta new file mode 100644 index 00000000..c77c702b --- /dev/null +++ b/Assets/Moving.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4bab126a795d2f947be3865b060141b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Obstacles/Mavrik_Floor.prefab b/Assets/Obstacles/Mavrik_Floor.prefab index 03900224..7a2d7fcf 100644 --- a/Assets/Obstacles/Mavrik_Floor.prefab +++ b/Assets/Obstacles/Mavrik_Floor.prefab @@ -1,27 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1977579826803422} - m_IsPrefabParent: 1 --- !u!1 &1977579826803422 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4175081708114804} - component: {fileID: 33473778465350852} - component: {fileID: 23046709272025714} - component: {fileID: 65511906868894760} + - component: {fileID: 4307562666089112652} m_Layer: 0 m_Name: Mavrik_Floor m_TagString: Untagged @@ -31,29 +22,46 @@ GameObject: m_IsActive: 1 --- !u!4 &4175081708114804 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977579826803422} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33473778465350852 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977579826803422} + m_Mesh: {fileID: 4300000, guid: e2d5268c4a1f1ad41a3ddb37608c630d, type: 3} --- !u!23 &23046709272025714 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977579826803422} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 2a12d3fc0532ba64e972160db18dfd99, type: 2} m_StaticBatchInfo: @@ -63,9 +71,11 @@ MeshRenderer: 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 @@ -74,22 +84,40 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &33473778465350852 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1977579826803422} - m_Mesh: {fileID: 4300000, guid: e2d5268c4a1f1ad41a3ddb37608c630d, type: 3} + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &65511906868894760 BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977579826803422} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 5.0003223, y: 0.2504834, z: 5.000693} m_Center: {x: -2.4997997, y: -0.10384083, z: 2.500337} +--- !u!114 &4307562666089112652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977579826803422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bab126a795d2f947be3865b060141b4, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 + distance: 3.54 + direction: {x: 2, y: 0, z: 0} diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab index b9656e11..489cf355 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab @@ -50,7 +50,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.29 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.z @@ -87,11 +87,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, - type: 3} - insertIndex: -1 - addedObject: {fileID: 772773765679882743} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82dd9495d55e381469aa18791816e641, type: 3} --- !u!4 &4068998512539540012 stripped Transform: @@ -99,30 +95,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4069329506645428568} m_PrefabAsset: {fileID: 0} ---- !u!1 &4070743036836625286 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, - type: 3} - m_PrefabInstance: {fileID: 4069329506645428568} - m_PrefabAsset: {fileID: 0} ---- !u!95 &772773765679882743 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4070743036836625286} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0f5636b1ff083ec4b90fcb326292f161, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index f1f084be..deef7848 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -965,6 +965,74 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c5a8f57575aacb64984560694a4962a8, type: 3} +--- !u!1001 &213221933 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_LR + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.5716166 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.181 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.8398895 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &363616410 GameObject: m_ObjectHideFlags: 0 @@ -1232,99 +1300,6 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &751004779 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5589 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.z - value: 0.7636 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.3972 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.59106 - objectReference: {fileID: 0} - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: 'Test Big Moving FLoor ' - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalScale.z - value: 0.5934096 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: -3.4531 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.2790057 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.23374 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.97227633 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.23383503 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 27.046 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -2280,74 +2255,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1001 &987683212 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor For Scale - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.122539 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.10725115 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: -2.0186043 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &1028760414 GameObject: m_ObjectHideFlags: 0 @@ -5257,5 +5164,4 @@ SceneRoots: - {fileID: 1895921797} - {fileID: 1885907698} - {fileID: 196185785} - - {fileID: 751004779} - - {fileID: 987683212} + - {fileID: 213221933} From 1fcf2fa4b0203958f040de988ac852ee96f78cb0 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Mon, 22 Apr 2024 09:48:40 -0400 Subject: [PATCH 11/14] fixes --- .../Obstacles/Mavrik_Moving_Floor_UD.prefab | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab index 37126ba9..f4379f44 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab @@ -87,11 +87,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, - type: 3} - insertIndex: -1 - addedObject: {fileID: 772773765679882743} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82dd9495d55e381469aa18791816e641, type: 3} --- !u!4 &4068998512539540012 stripped Transform: @@ -99,30 +95,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4069329506645428568} m_PrefabAsset: {fileID: 0} ---- !u!1 &4070743036836625286 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, - type: 3} - m_PrefabInstance: {fileID: 4069329506645428568} - m_PrefabAsset: {fileID: 0} ---- !u!95 &772773765679882743 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4070743036836625286} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 5203784c66786bb4f879451ecd293c19, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 From 9ca0bf5ba9e8ec4315ab2ab26d57a1be86491889 Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Mon, 22 Apr 2024 09:50:47 -0400 Subject: [PATCH 12/14] Final changes for script --- Assets/Scenes/TestControls.unity | 89 +++++++------------------------- 1 file changed, 20 insertions(+), 69 deletions(-) diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index de47adfc..7768427b 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -1240,6 +1240,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 269829827239095572, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: distance + value: 0.96 + objectReference: {fileID: 0} + - target: {fileID: 269829827239095572, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: direction.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 269829827239095572, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: direction.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4068998512539540012, guid: 3e1810e9bda7d474f8a8848fdadc7393, + type: 3} + propertyPath: m_LocalPosition.y + value: 4.28 + objectReference: {fileID: 0} - target: {fileID: 5852534905605273225, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} propertyPath: m_Name @@ -2469,74 +2489,6 @@ Transform: - {fileID: 1663162369} m_Father: {fileID: 434066458} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1461727046 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor_LR - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.x - value: -4.4812126 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.084350824 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalPosition.z - value: 1.6904504 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.95816565 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.2862143 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 33.263 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} --- !u!1 &1507380958 GameObject: m_ObjectHideFlags: 0 @@ -5233,4 +5185,3 @@ SceneRoots: - {fileID: 1885907698} - {fileID: 196185785} - {fileID: 756557177} - - {fileID: 1461727046} From d1fe9789eb3aba55d81eecbbf07180297c4735a8 Mon Sep 17 00:00:00 2001 From: cbrown Date: Mon, 22 Apr 2024 14:43:40 -0400 Subject: [PATCH 13/14] Small fix to the MoveFloor script --- Assets/{Moving.cs => MoveFloor.cs} | 13 +- Assets/{Moving.cs.meta => MoveFloor.cs.meta} | 0 Assets/Obstacles/Mavrik_Floor.prefab | 16 -- .../Obstacles/Mavrik_Moving_Floor_LR.prefab | 38 ++++- .../Obstacles/Mavrik_Moving_Floor_UD.prefab | 97 +++++------ .../Mavrik_Moving_Floor_UD.prefab.meta | 2 +- Assets/Scenes/TestControls.unity | 160 ++++++++---------- 7 files changed, 150 insertions(+), 176 deletions(-) rename Assets/{Moving.cs => MoveFloor.cs} (69%) rename Assets/{Moving.cs.meta => MoveFloor.cs.meta} (100%) diff --git a/Assets/Moving.cs b/Assets/MoveFloor.cs similarity index 69% rename from Assets/Moving.cs rename to Assets/MoveFloor.cs index 1265a123..cec5552d 100644 --- a/Assets/Moving.cs +++ b/Assets/MoveFloor.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; +using Unity.Mathematics; using UnityEngine; namespace MAVRIC.GEEKCup @@ -13,6 +11,7 @@ namespace MAVRIC.GEEKCup [Range(0f, 10f)] [SerializeField] private float distance = 1f; + [PostNormalize] [SerializeField] private Vector3 direction = Vector3.right; private Vector3 startPos; @@ -21,13 +20,17 @@ namespace MAVRIC.GEEKCup { startPos = transform.position; } + private void Update() { - if (Vector3.Distance(startPos, transform.position) >= distance || Vector3.Distance(startPos, transform.position) <= -distance) + if (Vector3.Distance(startPos, transform.position) >= distance * 0.5f || Vector3.Distance(startPos, transform.position) <= -distance * 0.5f) { direction *= -1; } - transform.Translate((direction * 0.5f) * (speed * Time.deltaTime), Space.Self); + + var speedScaled = speed * Time.deltaTime; + + transform.Translate(direction.normalized * speedScaled, Space.Self); } } } \ No newline at end of file diff --git a/Assets/Moving.cs.meta b/Assets/MoveFloor.cs.meta similarity index 100% rename from Assets/Moving.cs.meta rename to Assets/MoveFloor.cs.meta diff --git a/Assets/Obstacles/Mavrik_Floor.prefab b/Assets/Obstacles/Mavrik_Floor.prefab index 7a2d7fcf..26696fde 100644 --- a/Assets/Obstacles/Mavrik_Floor.prefab +++ b/Assets/Obstacles/Mavrik_Floor.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 33473778465350852} - component: {fileID: 23046709272025714} - component: {fileID: 65511906868894760} - - component: {fileID: 4307562666089112652} m_Layer: 0 m_Name: Mavrik_Floor m_TagString: Untagged @@ -106,18 +105,3 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 5.0003223, y: 0.2504834, z: 5.000693} m_Center: {x: -2.4997997, y: -0.10384083, z: 2.500337} ---- !u!114 &4307562666089112652 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1977579826803422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4bab126a795d2f947be3865b060141b4, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 1 - distance: 3.54 - direction: {x: 2, y: 0, z: 0} diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab index 89b5f954..1f75c9e6 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_LR.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9202412964388832783} + - component: {fileID: 4286995637743126827} m_Layer: 0 m_Name: Mavrik_Moving_Floor_LR m_TagString: Untagged @@ -26,12 +27,27 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.3} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4068998512539540012} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4286995637743126827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5852534905605273225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bab126a795d2f947be3865b060141b4, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 + distance: 1 + direction: {x: 1, y: 0, z: 0} --- !u!1001 &4069329506645428568 PrefabInstance: m_ObjectHideFlags: 0 @@ -46,23 +62,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalScale.x - value: 1.5589 + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_LocalScale.y + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalScale.z - value: 0.7636 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.x - value: 1.3972 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.y - value: 1.29 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalPosition.z - value: 0.59106 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} propertyPath: m_LocalRotation.w @@ -92,6 +112,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab index f4379f44..a8d5aca0 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab @@ -1,86 +1,75 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5852534905605273225 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9202412964388832783} - m_Layer: 0 - m_Name: Mavrik_Moving_Floor_UD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9202412964388832783 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5852534905605273225} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4068998512539540012} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &4069329506645428568 +--- !u!1001 &588363746560620146 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 9202412964388832783} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1977579826803422, guid: 82dd9495d55e381469aa18791816e641, type: 3} - propertyPath: m_Name - value: Mavrik_Floor + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: direction.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 4286995637743126827, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: direction.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5852534905605273225, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_UD 1 + objectReference: {fileID: 0} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalPosition.y - value: 0.43 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, type: 3} + - target: {fileID: 9202412964388832783, guid: 8bb5b5825668a3a4d843e44289f40265, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -88,10 +77,4 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 82dd9495d55e381469aa18791816e641, type: 3} ---- !u!4 &4068998512539540012 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4175081708114804, guid: 82dd9495d55e381469aa18791816e641, - type: 3} - m_PrefabInstance: {fileID: 4069329506645428568} - m_PrefabAsset: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 8bb5b5825668a3a4d843e44289f40265, type: 3} diff --git a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta index 2a5cad45..75d52df2 100644 --- a/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta +++ b/Assets/Obstacles/Mavrik_Moving_Floor_UD.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e1810e9bda7d474f8a8848fdadc7393 +guid: b34cfc8e13e184f39aaabb834d9726eb PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 7768427b..f6a30638 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18028373, g: 0.22571398, b: 0.30692294, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1232,94 +1232,6 @@ Transform: m_Children: [] m_Father: {fileID: 2041401174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &756557177 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 269829827239095572, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: distance - value: 0.96 - objectReference: {fileID: 0} - - target: {fileID: 269829827239095572, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: direction.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 269829827239095572, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: direction.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4068998512539540012, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.28 - objectReference: {fileID: 0} - - target: {fileID: 5852534905605273225, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_Name - value: Mavrik_Moving_Floor_UD - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalPosition.x - value: -2.565 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.084350824 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.737 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.9578666 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.2872136 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 33.382 - objectReference: {fileID: 0} - - target: {fileID: 9202412964388832783, guid: 3e1810e9bda7d474f8a8848fdadc7393, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3e1810e9bda7d474f8a8848fdadc7393, type: 3} --- !u!1 &765144257 GameObject: m_ObjectHideFlags: 0 @@ -2454,6 +2366,74 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1178232459} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1261485309 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6418237261709279483, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_Name + value: Mavrik_Moving_Floor_UD + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.365 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.705 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b34cfc8e13e184f39aaabb834d9726eb, type: 3} --- !u!1 &1320667993 GameObject: m_ObjectHideFlags: 0 @@ -5184,4 +5164,4 @@ SceneRoots: - {fileID: 1895921797} - {fileID: 1885907698} - {fileID: 196185785} - - {fileID: 756557177} + - {fileID: 1261485309} From e6969d0805c1d0a30aeb1500ef7c8b23a56c51c8 Mon Sep 17 00:00:00 2001 From: cbrown Date: Mon, 22 Apr 2024 15:32:35 -0400 Subject: [PATCH 14/14] HOTFIX: Removed half distance check on MoveFloor component --- Assets/MoveFloor.cs | 2 +- Assets/Scenes/TestControls.unity | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/MoveFloor.cs b/Assets/MoveFloor.cs index cec5552d..855e8edf 100644 --- a/Assets/MoveFloor.cs +++ b/Assets/MoveFloor.cs @@ -23,7 +23,7 @@ namespace MAVRIC.GEEKCup private void Update() { - if (Vector3.Distance(startPos, transform.position) >= distance * 0.5f || Vector3.Distance(startPos, transform.position) <= -distance * 0.5f) + if (Vector3.Distance(startPos, transform.position) > distance || Vector3.Distance(startPos, transform.position) < -distance) { direction *= -1; } diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 46bf80ec..86a24dd3 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -2455,7 +2455,7 @@ PrefabInstance: - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, type: 3} propertyPath: m_LocalPosition.y - value: 0.6 + value: 1.1 objectReference: {fileID: 0} - target: {fileID: 8619819732418048125, guid: b34cfc8e13e184f39aaabb834d9726eb, type: 3}