Merge branch 'develop'

StampedeStudios · Jul 9, 2023 · 980a384 · 980a384
2 parents 0a4c27e + d073e83
commit 980a384
Show file tree

Hide file tree

Showing 73 changed files with 20,822 additions and 215 deletions.
diff --git a/Assets/Animations/CompanionTargetAnimation.anim b/Assets/Animations/CompanionTargetAnimation.anim
@@ -0,0 +1,83 @@
+%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: CompanionTargetAnimation
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -1379665135, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - time: 0.083333336
+      value: {fileID: -455810661, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - time: 0.16666667
+      value: {fileID: 22492597, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - time: 0.25
+      value: {fileID: 185705721, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - time: 0.33333334
+      value: {fileID: 464375257, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - time: 0.41666666
+      value: {fileID: -2106008760, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -1379665135, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - {fileID: -455810661, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - {fileID: 22492597, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - {fileID: 185705721, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - {fileID: 464375257, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+    - {fileID: -2106008760, guid: d7704f5871137cd46a7444806379c6d6, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    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: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/Assets/Animations/CompanionTargetAnimation.anim.meta b/Assets/Animations/CompanionTargetAnimation.anim.meta
diff --git a/Assets/Animations/CompanionTargetAnimator.controller b/Assets/Animations/CompanionTargetAnimator.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-372773677673694402
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CompanionTargetAnimation
+  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: d409f82b7762fdb4e8c13a068e0faf56, 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: CompanionTargetAnimator
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 319476510940761801}
+    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 &319476510940761801
+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: -372773677673694402}
+    m_Position: {x: 30, y: 200, 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: -372773677673694402}
diff --git a/Assets/Animations/CompanionTargetAnimator.controller.meta b/Assets/Animations/CompanionTargetAnimator.controller.meta
diff --git a/Assets/Animations/DoorAnimation.anim b/Assets/Animations/DoorAnimation.anim
@@ -0,0 +1,86 @@
+%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: DoorAnimation
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -1848089815, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - time: 0.083333336
+      value: {fileID: -240730209, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - time: 0.16666667
+      value: {fileID: -632572298, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - time: 0.25
+      value: {fileID: 995230434, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - time: 0.33333334
+      value: {fileID: 751556923, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - time: 0.41666666
+      value: {fileID: 371845608, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - time: 0.5
+      value: {fileID: 460020846, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -1848089815, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - {fileID: -240730209, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - {fileID: -632572298, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - {fileID: 995230434, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - {fileID: 751556923, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - {fileID: 371845608, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+    - {fileID: 460020846, guid: 0f0ab5644596fb047a29fe852777bc13, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5833333
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    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: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/Assets/Animations/DoorAnimation.anim.meta b/Assets/Animations/DoorAnimation.anim.meta