diff --git a/Assets/Resources/Games/meatGrinder.prefab b/Assets/Resources/Games/meatGrinder.prefab
index 5eeadbce5..f4a19b986 100644
--- a/Assets/Resources/Games/meatGrinder.prefab
+++ b/Assets/Resources/Games/meatGrinder.prefab
@@ -1,5 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &94407889856619213
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7113627674537123824}
+ - component: {fileID: 8490229799144356405}
+ m_Layer: 0
+ m_Name: CartGuyParent
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7113627674537123824
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 94407889856619213}
+ 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:
+ - {fileID: 6108272155782336078}
+ m_Father: {fileID: 544937591884515791}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &8490229799144356405
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 94407889856619213}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: c7183f353e3748244a41bf3306b3f07e, 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
--- !u!1 &132672732590890907
GameObject:
m_ObjectHideFlags: 0
@@ -11,7 +65,7 @@ GameObject:
- component: {fileID: 6108272155782336078}
- component: {fileID: 2660979752167028621}
m_Layer: 0
- m_Name: Cart Guy
+ m_Name: CartGuy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -31,8 +85,8 @@ Transform:
m_Children:
- {fileID: 9137826182641448076}
- {fileID: 6696015552443844136}
- m_Father: {fileID: 544937591884515791}
- m_RootOrder: 4
+ m_Father: {fileID: 7113627674537123824}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &2660979752167028621
Animator:
@@ -1218,7 +1272,7 @@ Transform:
- {fileID: 4773680412020886884}
- {fileID: 7318783844351071632}
- {fileID: 4341155700984804648}
- - {fileID: 6108272155782336078}
+ - {fileID: 7113627674537123824}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1239,7 +1293,12 @@ MonoBehaviour:
MeatBase: {fileID: 151360738741628551}
BossAnim: {fileID: 8611037719571569512}
TackAnim: {fileID: 8591333713642157499}
+ CartGuyParentAnim: {fileID: 8490229799144356405}
+ CartGuyAnim: {fileID: 2660979752167028621}
bossAnnoyed: 0
+ cartBeat: 1.7976931348623157e+308
+ cartLength: 0
+ cartSpider: 0
--- !u!1 &3432557403964010436
GameObject:
m_ObjectHideFlags: 0
@@ -2328,7 +2387,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 57
- m_Sprite: {fileID: -782445393, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
+ m_Sprite: {fileID: -874638833, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/Cart Guy.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuy.controller
similarity index 97%
rename from Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/Cart Guy.controller
rename to Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuy.controller
index f68cdf61d..685decf38 100644
--- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/Cart Guy.controller
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuy.controller
@@ -35,7 +35,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: CartguyIdle
+ m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -61,7 +61,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: CartguyPhone
+ m_Name: Phone
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -86,7 +86,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Cart Guy
+ m_Name: CartGuy
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
@@ -109,7 +109,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: CartguyBop
+ m_Name: Bop
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/Cart Guy.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuy.controller.meta
similarity index 100%
rename from Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/Cart Guy.controller.meta
rename to Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuy.controller.meta
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuyParent.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuyParent.controller
new file mode 100644
index 000000000..de7ae2687
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuyParent.controller
@@ -0,0 +1,101 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-4704827389909949502
+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: -1965619301899192355}
+ m_Position: {x: 270, y: 50, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -920925156090114162}
+ m_Position: {x: 270, y: 110, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 290, y: 180, z: 0}
+ m_EntryPosition: {x: 290, y: -10, z: 0}
+ m_ExitPosition: {x: 290, y: 230, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -1965619301899192355}
+--- !u!1102 &-1965619301899192355
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Idle
+ 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: 0}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-920925156090114162
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: 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: 5f7ba746186c39e43b7ec0f886a6c9fd, 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: CartGuyParent
+ serializedVersion: 5
+ m_AnimatorParameters: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -4704827389909949502}
+ 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}
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuyParent.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuyParent.controller.meta
new file mode 100644
index 000000000..ad43a415f
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartGuyParent.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c7183f353e3748244a41bf3306b3f07e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyBop.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyBop.anim
index 8e5bd3a1a..7d5af03b1 100644
--- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyBop.anim
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyBop.anim
@@ -240,7 +240,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyIdle.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyIdle.anim
index d7942dec2..d12e5eb5b 100644
--- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyIdle.anim
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyIdle.anim
@@ -13,109 +13,25 @@ AnimationClip:
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
- m_EulerCurves:
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: {x: 0, y: 0, 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: CartguyHead
- m_PositionCurves:
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: {x: 0, y: 0, z: -0.07427993}
- 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: CartguyBody
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: {x: -3.06, y: 5.78, z: -0.07427993}
- 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: CartguyHead
+ m_EulerCurves: []
+ m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves:
- - curve:
- - time: 0
- value: {fileID: -874638833, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
- attribute: m_Sprite
- path: CartguyBody
- classID: 212
- script: {fileID: 0}
+ 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: 1470480962
- attribute: 0
- script: {fileID: 0}
- typeID: 212
- customType: 23
- isPPtrCurve: 1
- - serializedVersion: 2
- path: 1470480962
- attribute: 1
- script: {fileID: 0}
- typeID: 4
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 738082668
- attribute: 1
- script: {fileID: 0}
- typeID: 4
- customType: 0
- isPPtrCurve: 0
- - serializedVersion: 2
- path: 738082668
- attribute: 4
- script: {fileID: 0}
- typeID: 4
- customType: 4
- isPPtrCurve: 0
- pptrCurveMapping:
- - {fileID: -874638833, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3}
+ genericBindings: []
+ pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.016666668
+ m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -130,209 +46,8 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves:
- - 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
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.x
- path: CartguyBody
- classID: 4
- script: {fileID: 0}
- - 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
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.y
- path: CartguyBody
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: -0.07427993
- 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: CartguyBody
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: -3.06
- 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: CartguyHead
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 5.78
- 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: CartguyHead
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: -0.07427993
- 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: CartguyHead
- classID: 4
- script: {fileID: 0}
- - 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
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: localEulerAnglesRaw.x
- path: CartguyHead
- classID: 4
- script: {fileID: 0}
- - 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
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: localEulerAnglesRaw.y
- path: CartguyHead
- classID: 4
- script: {fileID: 0}
- - 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
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: localEulerAnglesRaw.z
- path: CartguyHead
- classID: 4
- script: {fileID: 0}
- m_EulerEditorCurves:
- - curve:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalEulerAngles.x
- path: CartguyHead
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalEulerAngles.y
- path: CartguyHead
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve: []
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalEulerAngles.z
- path: CartguyHead
- classID: 4
- script: {fileID: 0}
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyMove.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyMove.anim
new file mode 100644
index 000000000..519f0da75
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyMove.anim
@@ -0,0 +1,169 @@
+%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: CartguyMove
+ serializedVersion: 6
+ 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: -15.5, y: -4.5, z: 0.07427993}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 32.5, 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: 1
+ value: {x: 17, y: -4.5, z: 0.07427993}
+ inSlope: {x: 32.5, 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: CartGuy
+ 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: 1110194031
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1
+ 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:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -15.5
+ inSlope: 0
+ outSlope: 32.5
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 17
+ inSlope: 32.5
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path: CartGuy
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -4.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: -4.5
+ 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: CartGuy
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.07427993
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0.07427993
+ 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: CartGuy
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyMove.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyMove.anim.meta
new file mode 100644
index 000000000..c447bd30a
--- /dev/null
+++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Cart Guy/CartguyMove.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f7ba746186c39e43b7ec0f886a6c9fd
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
index e2b1176bc..824d1c370 100644
--- a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
+++ b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs
@@ -69,13 +69,25 @@ namespace HeavenStudio.Games.Loaders
preFunction = delegate { MeatGrinder.PrePassTurn(eventCaller.currentEntity.beat); },
preFunctionLength = 1
},
- new GameAction("expressions", "Tack Expressions")
+ new GameAction("tackExpressions", "Tack Expressions")
{
function = delegate { MeatGrinder.instance.TackExpression(eventCaller.currentEntity["expression"]); },
parameters = new List() {
new Param("expression", MeatGrinder.TackExpressions.Content, "Expression", "The expression Tack will display"),
}
},
+ new GameAction("cartGuy", "Cart Guy")
+ {
+ function = delegate {
+ var e = eventCaller.currentEntity;
+ MeatGrinder.instance.CartGuy(e.beat, e.length, e["spider"]);
+ },
+ resizable = true,
+ defaultLength = 8,
+ parameters = new List() {
+ new Param("spider", false, "Spider", "Put a spider in the box?"),
+ }
+ },
}
// ,
// new List() { "pco", "normal", "repeat" },
@@ -109,10 +121,15 @@ namespace HeavenStudio.Games
[Header("Animators")]
public Animator BossAnim;
public Animator TackAnim;
+ [SerializeField] Animator CartGuyParentAnim;
+ [SerializeField] Animator CartGuyAnim;
[Header("Variables")]
private bool bossBop = true;
public bool bossAnnoyed = false;
+ public double cartBeat = double.MaxValue;
+ public float cartLength = 0;
+ public bool cartSpider = false;
const string sfxName = "meatGrinder/";
public static MeatGrinder instance;
@@ -162,6 +179,13 @@ namespace HeavenStudio.Games
}
passedTurns.Clear();
}
+
+ if (cartLength != 0) {
+ // CartGuyParentAnim.gameObject.SetActive(true);
+ if (cartSpider) CartGuyAnim.Play("Phone", 0, 0);
+ float beatPos = Conductor.instance.GetPositionFromBeat(cartBeat, cartLength);
+ CartGuyParentAnim.DoNormalizedAnimation("Move", beatPos);
+ }
}
public override void OnBeatPulse(double beat)
@@ -170,6 +194,9 @@ namespace HeavenStudio.Games
{
BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f);
}
+ if (!cartSpider && CartGuyParentAnim.gameObject.activeSelf) {
+ CartGuyAnim.DoScaledAnimationAsync("Bop", 0.5f);
+ }
}
public override void OnGameSwitch(double beat)
@@ -184,6 +211,15 @@ namespace HeavenStudio.Games
foreach (var meat in queuedMeats) MeatToss(meat.beat, meat["bacon"]);
queuedMeats.Clear();
}
+ OnPlay(beat);
+ }
+
+ public override void OnPlay(double beat)
+ {
+ RiqEntity cg = GameManager.instance.Beatmap.Entities.Find(c => c.datamodel == "meatGrinder/cartGuy");
+ if (cg != null) {
+ CartGuy(cg.beat, cg.length, cg["spider"]);
+ }
}
private List GetRelevantMeatCallsBetweenBeat(double beat, double endBeat)
@@ -216,6 +252,13 @@ namespace HeavenStudio.Games
Debug.Log(anim);
}
+ public void CartGuy(double beat, float length, bool spider)
+ {
+ cartBeat = beat;
+ cartLength = length;
+ cartSpider = spider;
+ }
+
public static void PreInterval(double beat, float length, bool autoPassTurn)
{
SoundByte.PlayOneShotGame(sfxName + "startSignal", beat - 1, forcePlay: true);