diff --git a/Assets/Resources/Games/workingDough.prefab b/Assets/Resources/Games/workingDough.prefab index bd27740f5..bd20dee5c 100644 --- a/Assets/Resources/Games/workingDough.prefab +++ b/Assets/Resources/Games/workingDough.prefab @@ -3801,7 +3801,7 @@ Animator: m_GameObject: {fileID: 8291329675214913551} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 39e4675ef7325f14ab5567c566e301bd, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/Resources/Sfx/games/workingDough/rightBig.ogg b/Assets/Resources/Sfx/games/workingDough/rightBig.ogg new file mode 100644 index 000000000..94f4454f0 Binary files /dev/null and b/Assets/Resources/Sfx/games/workingDough/rightBig.ogg differ diff --git a/Assets/Resources/Sfx/games/workingDough/rightBig.ogg.meta b/Assets/Resources/Sfx/games/workingDough/rightBig.ogg.meta new file mode 100644 index 000000000..43c0e1ce5 --- /dev/null +++ b/Assets/Resources/Sfx/games/workingDough/rightBig.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: caf6c9c8208b6b8429cfa3e235241d92 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/workingDough/rightSmall.ogg b/Assets/Resources/Sfx/games/workingDough/rightSmall.ogg new file mode 100644 index 000000000..a2a091f72 Binary files /dev/null and b/Assets/Resources/Sfx/games/workingDough/rightSmall.ogg differ diff --git a/Assets/Resources/Sfx/games/workingDough/rightSmall.ogg.meta b/Assets/Resources/Sfx/games/workingDough/rightSmall.ogg.meta new file mode 100644 index 000000000..b02da26b2 --- /dev/null +++ b/Assets/Resources/Sfx/games/workingDough/rightSmall.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 84d932e4dd5969942b37d426f51eea22 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBallTransporters.controller b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBallTransporters.controller new file mode 100644 index 000000000..1e48408e2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBallTransporters.controller @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-5271402629914711275 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -733662123181872337} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2349258514875007457 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2340428444208282696} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-733662123181872337 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerBigMode + 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: a1b4e684e05abc740b201d8dd3b5181b, 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: PlayerBallTransporters + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7109160874140173496} + 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 &44796449260541181 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerGoBigMode + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5271402629914711275} + 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: e06afaa2bb7552747b68281ef00ac928, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1201876265887079916 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerExitBigMode + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2349258514875007457} + 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: a1cc93e641db8434f922126c545a9d9d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &2340428444208282696 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerNoBigMode + 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: efc38eadc562b2d4aa89ca6a6c05aacf, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7109160874140173496 +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: 44796449260541181} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -733662123181872337} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1201876265887079916} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2340428444208282696} + m_Position: {x: 305, y: 195, 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: 2340428444208282696} diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBallTransporters.controller.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBallTransporters.controller.meta new file mode 100644 index 000000000..d73f1f547 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBallTransporters.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39e4675ef7325f14ab5567c566e301bd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBigMode.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBigMode.anim new file mode 100644 index 000000000..e1949395a --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBigMode.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: PlayerBigMode + 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: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterLeftPlayer + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterRightPlayer + classID: 212 + script: {fileID: 0} + 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: 4202759684 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2223323900 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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/Resources/Sprites/Games/WorkingDough/Animations/PlayerBigMode.anim.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBigMode.anim.meta new file mode 100644 index 000000000..cb30bce99 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerBigMode.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1b4e684e05abc740b201d8dd3b5181b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerExitBigMode.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerExitBigMode.anim new file mode 100644 index 000000000..19bcd005d --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerExitBigMode.anim @@ -0,0 +1,95 @@ +%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: PlayerExitBigMode + 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: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.083333336 + value: {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.16666667 + value: {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterLeftPlayer + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.083333336 + value: {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.16666667 + value: {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterRightPlayer + classID: 212 + script: {fileID: 0} + 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: 4202759684 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2223323900 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.18333334 + 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/Resources/Sprites/Games/WorkingDough/Animations/PlayerExitBigMode.anim.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerExitBigMode.anim.meta new file mode 100644 index 000000000..7ddf31cab --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerExitBigMode.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1cc93e641db8434f922126c545a9d9d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerGoBigMode.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerGoBigMode.anim new file mode 100644 index 000000000..672198cb9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerGoBigMode.anim @@ -0,0 +1,95 @@ +%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: PlayerGoBigMode + 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: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.083333336 + value: {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.16666667 + value: {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterLeftPlayer + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.083333336 + value: {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - time: 0.16666667 + value: {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterRightPlayer + classID: 212 + script: {fileID: 0} + 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: 4202759684 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2223323900 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6377856438995678898, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: 6390041239020583844, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.18333334 + 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/Resources/Sprites/Games/WorkingDough/Animations/PlayerGoBigMode.anim.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerGoBigMode.anim.meta new file mode 100644 index 000000000..90ce7fdd1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerGoBigMode.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e06afaa2bb7552747b68281ef00ac928 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerNoBigMode.anim b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerNoBigMode.anim new file mode 100644 index 000000000..db332e017 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerNoBigMode.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: PlayerNoBigMode + 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: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterLeftPlayer + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + attribute: m_Sprite + path: BallTransporterRightPlayer + classID: 212 + script: {fileID: 0} + 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: 4202759684 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2223323900 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + - {fileID: -6723657067348311052, guid: 7bc82af4cf328374596aff0ade3ad198, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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/Resources/Sprites/Games/WorkingDough/Animations/PlayerNoBigMode.anim.meta b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerNoBigMode.anim.meta new file mode 100644 index 000000000..56cc10760 --- /dev/null +++ b/Assets/Resources/Sprites/Games/WorkingDough/Animations/PlayerNoBigMode.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efc38eadc562b2d4aa89ca6a6c05aacf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs index 8baf65998..6cbd8621d 100644 --- a/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs +++ b/Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs @@ -10,10 +10,41 @@ namespace HeavenStudio.Games.Scripts_WorkingDough public class PlayerEnterDoughBall : PlayerActionObject { public float startBeat; - bool goingDown = false; + public bool isBig; + public enum Rating + { + Succesful = 0, + Barely = 1, + Miss = 2 + } + + public enum PlayerFlyingStage + { + EnteringUp = 0, + EnteringDown = 1, + ExitingUp = 2, + ExitingDown = 3, + } + public PlayerFlyingStage currentFlyingStage; + public Rating rating; [NonSerialized] public BezierCurve3D enterUpCurve; [NonSerialized] public BezierCurve3D enterDownCurve; + [NonSerialized] public BezierCurve3D exitUpCurve; + [NonSerialized] public BezierCurve3D exitDownCurve; + + private WorkingDough game; + + private void Awake() + { + game = WorkingDough.instance; + } + + private void Start() + { + game.ScheduleInput(startBeat, 1, isBig ? InputType.STANDARD_ALT_DOWN : InputType.STANDARD_DOWN, Barely, Miss, Nothing); + Debug.Log(rating.ToString()); + } private void Update() { @@ -21,19 +52,76 @@ namespace HeavenStudio.Games.Scripts_WorkingDough float flyPos = 0f; - if (goingDown) + switch (currentFlyingStage) { - flyPos = cond.GetPositionFromBeat(startBeat + 0.5f, 0.5f); - transform.position = enterDownCurve.GetPoint(flyPos); - if (flyPos > 1f) GameObject.Destroy(gameObject); + case PlayerFlyingStage.EnteringUp: + flyPos = cond.GetPositionFromBeat(startBeat, 0.5f); + transform.position = enterUpCurve.GetPoint(flyPos); + if (flyPos > 1f) currentFlyingStage = PlayerFlyingStage.EnteringDown; + break; + case PlayerFlyingStage.EnteringDown: + flyPos = cond.GetPositionFromBeat(startBeat + 0.5f, 0.5f); + + transform.position = enterDownCurve.GetPoint(flyPos); + if (flyPos > 1f) + { + Debug.Log(rating.ToString()); + if (rating == Rating.Succesful || rating == Rating.Barely) + { + currentFlyingStage = PlayerFlyingStage.ExitingUp; + } + else + { + GameObject.Destroy(gameObject); + } + } + break; + case PlayerFlyingStage.ExitingUp: + flyPos = cond.GetPositionFromBeat(startBeat + 1f, 0.5f); + + transform.position = exitUpCurve.GetPoint(flyPos); + if (flyPos > 1f) currentFlyingStage = PlayerFlyingStage.ExitingDown; + break; + case PlayerFlyingStage.ExitingDown: + flyPos = cond.GetPositionFromBeat(startBeat + 1.5f, 0.5f); + + transform.position = exitDownCurve.GetPoint(flyPos); + if (flyPos > 1f) GameObject.Destroy(gameObject); + break; + } + } + + private void Success() + { + rating = Rating.Succesful; + if (isBig) + { + game.doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + Jukebox.PlayOneShotGame("workingDough/rightBig"); } else { - flyPos = cond.GetPositionFromBeat(startBeat, 0.5f); - transform.position = enterUpCurve.GetPoint(flyPos); - if (flyPos > 1f) goingDown = true; + game.doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + Jukebox.PlayOneShotGame("workingDough/rightSmall"); } } + + private void Barely(PlayerActionEvent caller, float state) + { + if (state >= 1f || state <= -1f) + { + rating = Rating.Barely; + return; + } + Success(); + } + + private void Miss(PlayerActionEvent caller) + { + rating = Rating.Miss; + } + + private void Nothing(PlayerActionEvent caller) {} } } diff --git a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs index c3c983d73..464061603 100644 --- a/Assets/Scripts/Games/WorkingDough/WorkingDough.cs +++ b/Assets/Scripts/Games/WorkingDough/WorkingDough.cs @@ -41,7 +41,7 @@ namespace HeavenStudio.Games { [Header("Components")] [SerializeField] GameObject doughDudesNPC; //Jump animations - [SerializeField] GameObject doughDudesPlayer; //Jump animations + public GameObject doughDudesPlayer; //Jump animations [SerializeField] GameObject ballTransporterRightNPC; //Close and open animations [SerializeField] GameObject ballTransporterLeftNPC; //Close and open animations [SerializeField] GameObject ballTransporterRightPlayer; //Close and open animations @@ -106,13 +106,6 @@ namespace HeavenStudio.Games { intervalStarted = true; bigMode = false; - //Open npc transporters - if (!isPlaying(ballTransporterLeftNPC.GetComponent(), "BallTransporterLeftOpened")) - { - ballTransporterLeftNPC.GetComponent().Play("BallTransporterLeftOpen", 0, 0); - ballTransporterRightNPC.GetComponent().Play("BallTransporterRightOpen", 0, 0); - } - BeatAction.New(ballTransporterLeftNPC, new List() { //Open player transporters @@ -124,25 +117,25 @@ namespace HeavenStudio.Games }), //End interval - new BeatAction.Action(beat + interval - 1, delegate { intervalStarted = false; }), + new BeatAction.Action(beat + interval, delegate { intervalStarted = false; }), //Close npc transporters - new BeatAction.Action(beat + interval + 1f, delegate { + new BeatAction.Action(beat + interval, delegate { if (bigMode) { NPCBallTransporters.GetComponent().Play("NPCExitBigMode", 0, 0); bigMode = false; } }), - new BeatAction.Action(beat + interval + 1f, delegate { if (!intervalStarted) ballTransporterLeftNPC.GetComponent().Play("BallTransporterLeftClose", 0, 0); }), - new BeatAction.Action(beat + interval + 1f, delegate { if (!intervalStarted) ballTransporterRightNPC.GetComponent().Play("BallTransporterRightClose", 0, 0); }), + new BeatAction.Action(beat + interval + 1, delegate { if (!intervalStarted) ballTransporterLeftNPC.GetComponent().Play("BallTransporterLeftClose", 0, 0); }), + new BeatAction.Action(beat + interval + 1, delegate { if (!intervalStarted) ballTransporterRightNPC.GetComponent().Play("BallTransporterRightClose", 0, 0); }), //Close player transporters - new BeatAction.Action(beat + interval * 2, delegate { ballTransporterLeftPlayer.GetComponent().Play("BallTransporterLeftClose", 0, 0); }), - new BeatAction.Action(beat + interval * 2, delegate { ballTransporterRightPlayer.GetComponent().Play("BallTransporterRightClose", 0, 0); }), - new BeatAction.Action(beat + interval * 2, delegate { + new BeatAction.Action(beat + interval * 2 + 1, delegate { ballTransporterLeftPlayer.GetComponent().Play("BallTransporterLeftClose", 0, 0); }), + new BeatAction.Action(beat + interval * 2 + 1, delegate { ballTransporterRightPlayer.GetComponent().Play("BallTransporterRightClose", 0, 0); }), + new BeatAction.Action(beat + interval * 2 + 1, delegate { if (bigModePlayer) { - PlayerBallTransporters.GetComponent().Play("NPCExitBigMode", 0, 0); + PlayerBallTransporters.GetComponent().Play("PlayerExitBigMode", 0, 0); bigModePlayer = false; } }), @@ -189,11 +182,6 @@ namespace HeavenStudio.Games new BeatAction.Action(beat + 1.9f, delegate { arrowSRRightNPC.sprite = redArrowSprite; }), new BeatAction.Action(beat + 2f, delegate { arrowSRRightNPC.sprite = whiteArrowSprite; }), }); - BeatAction.New(doughDudesPlayer, new List() - { - new BeatAction.Action(beat + beatInterval, delegate { SpawnPlayerBall(beat + beatInterval, isBig); }), - }); - } public void InstantExitBall(float beat, bool isBig, float offSet) @@ -235,7 +223,16 @@ namespace HeavenStudio.Games { BeatAction.New(instance.gameObject, new List() { + new BeatAction.Action(spawnBeat, delegate + { + if (!isPlaying(ballTransporterLeftNPC.GetComponent(), "BallTransporterLeftOpened") && !intervalStarted) + { + ballTransporterLeftNPC.GetComponent().Play("BallTransporterLeftOpen", 0, 0); + ballTransporterRightNPC.GetComponent().Play("BallTransporterRightOpen", 0, 0); + } + }), new BeatAction.Action(spawnBeat, delegate { if (instance != null) instance.SpawnBall(beat, isBig); }), + new BeatAction.Action(spawnBeat + beatInterval, delegate { SpawnPlayerBall(beat + beatInterval, isBig); }), }); } else @@ -257,17 +254,20 @@ namespace HeavenStudio.Games ballComponent.startBeat = beat; ballComponent.enterUpCurve = playerEnterUpCurve; ballComponent.enterDownCurve = playerEnterDownCurve; + ballComponent.exitUpCurve = playerExitUpCurve; + ballComponent.exitDownCurve = playerExitDownCurve; spawnedBall.SetActive(true); if (isBig && !bigModePlayer) { - PlayerBallTransporters.GetComponent().Play("NPCGoBigMode", 0, 0); + PlayerBallTransporters.GetComponent().Play("PlayerGoBigMode", 0, 0); bigModePlayer = true; } arrowSRLeftPlayer.sprite = redArrowSprite; + BeatAction.New(doughDudesPlayer, new List() { new BeatAction.Action(beat + 0.1f, delegate { arrowSRLeftPlayer.sprite = whiteArrowSprite; }), @@ -276,14 +276,20 @@ namespace HeavenStudio.Games public void PreSetIntervalStart(float beat, float interval) { - float spawnBeat = beat - 1f; beat -= 1f; - interval += 1f; if (GameManager.instance.currentGame == "workingDough") { BeatAction.New(instance.gameObject, new List() { - new BeatAction.Action(spawnBeat, delegate { if (instance != null) instance.SetIntervalStart(beat, interval); }), + new BeatAction.Action(beat, delegate + { + if (!isPlaying(ballTransporterLeftNPC.GetComponent(), "BallTransporterLeftOpened")) + { + ballTransporterLeftNPC.GetComponent().Play("BallTransporterLeftOpen", 0, 0); + ballTransporterRightNPC.GetComponent().Play("BallTransporterRightOpen", 0, 0); + } + }), + new BeatAction.Action(beat + 1, delegate { if (instance != null) instance.SetIntervalStart(beat + 1, interval); }), }); } else @@ -312,18 +318,15 @@ namespace HeavenStudio.Games } queuedIntervals.Clear(); } - if (!IsExpectingInputNow()) + if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) { - if (PlayerInput.Pressed()) - { - doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); - Jukebox.PlayOneShotGame("workingDough/PlayerSmallJump"); - } - else if (PlayerInput.AltPressed()) - { - doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); - Jukebox.PlayOneShotGame("workingDough/PlayerBigJump"); - } + doughDudesPlayer.GetComponent().Play("SmallDoughJump", 0, 0); + Jukebox.PlayOneShotGame("workingDough/PlayerSmallJump"); + } + else if (PlayerInput.AltPressed() && !IsExpectingInputNow(InputType.STANDARD_ALT_DOWN)) + { + doughDudesPlayer.GetComponent().Play("BigDoughJump", 0, 0); + Jukebox.PlayOneShotGame("workingDough/PlayerBigJump"); } }