Added carbine animations, fixed issue where you could skip dialogue b…

…y spamming quickly.
TSKsmiley · Apr 23, 2021 · efb3304 · efb3304
1 parent d4e8137
commit efb3304
Show file tree

Hide file tree

Showing 28 changed files with 1,976 additions and 45 deletions.
diff --git a/.idea/.idea.RedDead2D/.idea/contentModel.xml b/.idea/.idea.RedDead2D/.idea/contentModel.xml
diff --git a/.idea/.idea.RedDead2D/.idea/modules.xml b/.idea/.idea.RedDead2D/.idea/modules.xml
diff --git a/...ts/Sprites/Trees/New Trees/Materials.meta → ...ns/PlayerMovement/Carbine Animations.meta b/...ts/Sprites/Trees/New Trees/Materials.meta → ...ns/PlayerMovement/Carbine Animations.meta
diff --git a/Assets/Animations/PlayerMovement/Carbine Animations/Player_Idle_Carbine.anim b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Idle_Carbine.anim
@@ -0,0 +1,69 @@
+%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: Player_Idle_Carbine
+  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: -7747556388207716826, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 6
+  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: -7747556388207716826, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.16666667
+    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/PlayerMovement/Carbine Animations/Player_Idle_Carbine.anim.meta b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Idle_Carbine.anim.meta
diff --git a/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_down_Carbine.anim b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_down_Carbine.anim
@@ -0,0 +1,81 @@
+%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: Player_Walk_down_Carbine
+  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: -7747556388207716826, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.16666667
+      value: {fileID: -8416240307764015655, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.33333334
+      value: {fileID: -3035211886257476525, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 5134435798273077080, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 6
+  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: -7747556388207716826, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: -8416240307764015655, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: -3035211886257476525, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: 5134435798273077080, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.6666667
+    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/PlayerMovement/Carbine Animations/Player_Walk_down_Carbine.anim.meta b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_down_Carbine.anim.meta
diff --git a/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_left_Carbine.anim b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_left_Carbine.anim
@@ -0,0 +1,81 @@
+%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: Player_Walk_left_Carbine
+  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: 4377730861697149156, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.16666667
+      value: {fileID: 9012689654445395759, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.33333334
+      value: {fileID: 7493832726259502914, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.5
+      value: {fileID: -323775585673377579, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 6
+  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: 4377730861697149156, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: 9012689654445395759, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: 7493832726259502914, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: -323775585673377579, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.6666667
+    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/PlayerMovement/Carbine Animations/Player_Walk_left_Carbine.anim.meta b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_left_Carbine.anim.meta
diff --git a/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_right_Carbine.anim b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_right_Carbine.anim
@@ -0,0 +1,81 @@
+%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: Player_Walk_right_Carbine
+  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: 8892514986506337438, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.16666667
+      value: {fileID: -6725057986798836507, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.33333334
+      value: {fileID: -144522694009280423, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 6107612374469429393, guid: f5254bcaee510414fae4d9ba5ae4233f,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 6
+  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: 8892514986506337438, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: -6725057986798836507, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: -144522694009280423, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+    - {fileID: 6107612374469429393, guid: f5254bcaee510414fae4d9ba5ae4233f, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.6666667
+    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/PlayerMovement/Carbine Animations/Player_Walk_right_Carbine.anim.meta b/Assets/Animations/PlayerMovement/Carbine Animations/Player_Walk_right_Carbine.anim.meta