diff --git a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller index d8f0e9f95..f339eae08 100644 --- a/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller +++ b/Assets/Resources/Sprites/Games/FrogHop/Animations/BackupFrogAnim.controller @@ -160,6 +160,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-4668820667232048466 +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: -3892388120866464541} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.00034093857 + m_TransitionOffset: 0.0021683 + m_ExitTime: 1.0000137 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-3892388120866464541 AnimatorState: serializedVersion: 6 @@ -320,7 +342,8 @@ AnimatorState: m_Name: Glare m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -4668820667232048466} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -372,7 +395,8 @@ AnimatorState: m_Name: Ouch m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 5633596555366892614} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -480,6 +504,28 @@ AnimatorStateMachine: m_ExitPosition: {x: 0, y: 300, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -3853639908880509319} +--- !u!1101 &5633596555366892614 +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: -3892388120866464541} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0.0013498082 + m_ExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5870825019702331518 AnimatorState: serializedVersion: 6 diff --git a/Assets/Scripts/Games/FrogHop/FrogHop.cs b/Assets/Scripts/Games/FrogHop/FrogHop.cs index ffc9d07e3..d0de9ef6f 100644 --- a/Assets/Scripts/Games/FrogHop/FrogHop.cs +++ b/Assets/Scripts/Games/FrogHop/FrogHop.cs @@ -380,7 +380,7 @@ namespace HeavenStudio.Games.Loaders }, defaultLength = 0.5f, }, - new GameAction("force", "Force Hop") + new GameAction("force", "Force Shake") { preFunction = delegate { var e = eventCaller.currentEntity; @@ -393,6 +393,7 @@ namespace HeavenStudio.Games.Loaders new Param("front", true, "Front Frogs", "Make the frogs in the front sing during this event."), new Param("back", true, "Back Frogs", "Make the frogs in the back sing during this event."), }, + preFunctionLength = 1, resizable = true, defaultLength = 4.0f, }, @@ -678,8 +679,10 @@ namespace HeavenStudio.Games { if (entity.beat >= beat && entity.beat <= beat + 1) { - if (entity.datamodel == "frogHop/hop") - Hop(entity.beat); + if (entity.datamodel == "frogHop/hop") Hop(entity.beat); + + else if (entity.datamodel == "frogHop/force") ForceHop(entity.beat, entity.length, entity["front"], entity["back"]); + continue; } @@ -951,11 +954,11 @@ namespace HeavenStudio.Games //call if (start <= 0.0) actions.Add(new(beat + 0.0, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Wide", beat); })); - if (start <= 0.5) actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs, true); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 2.5 : beat + 1.5); })); + if (start <= 0.5) actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs, true); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 2.25 : beat + 1.5); })); //response actions.Add(new(beat + 2.0, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Wide", beat); })); - actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs, true); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 4.5 : beat + 3.5); })); + actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs, true); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 4.25 : beat + 3.5); })); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HA", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAAI", beat + 2.5, usesGlobalePitch ? globalPitch : 1)); @@ -990,12 +993,12 @@ namespace HeavenStudio.Games var sounds = new List(); //call - if (start <= 0.0) actions.Add(new(beat + 0.0, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 2.5 : beat); })); + if (start <= 0.0) actions.Add(new(beat + 0.0, delegate { NPCHop(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 1.75 : beat); })); if (start <= 0.5) actions.Add(new(beat + 0.5, delegate { NPCHop(FrontFrogs); if (!jumpinJazz) Talk(new List() { LeaderFrog }, "Narrow", beat); })); if (start <= 1.0) actions.Add(new(beat + 1.0, delegate { NPCHop(FrontFrogs, true); if (!jumpinJazz) Talk(new List() { LeaderFrog }, "Narrow", beat); })); //response - actions.Add(new(beat + 2.0, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 4.5 : beat); })); + actions.Add(new(beat + 2.0, delegate { NPCHop(BackFrogs); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 3.75 : beat); })); actions.Add(new(beat + 2.5, delegate { NPCHop(BackFrogs); if (!jumpinJazz) Talk(BackFrogs, "Narrow", beat); })); actions.Add(new(beat + 3.0, delegate { NPCHop(BackFrogs, true); if (!jumpinJazz) Talk(BackFrogs, "Narrow", beat); })); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_HAI", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); @@ -1030,17 +1033,17 @@ namespace HeavenStudio.Games public void SpinItBoys (double beat, bool spotlights, bool jumpinJazz, double start = 0) { - CueCommon(beat, spotlights); + CueCommon(beat, spotlights, 1); var actions = new List(); var sounds = new List(); //call - if (start <= 0.0) actions.Add(new(beat + 0.0, delegate { NPCCharge(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", beat); })); + if (start <= 0.0) actions.Add(new(beat + 0.0, delegate { NPCCharge(FrontFrogs); Talk(new List() { LeaderFrog }, "Narrow", jumpinJazz ? beat + 0.75 : beat); })); if (start <= 1.0) actions.Add(new(beat + 1.0, delegate { NPCSpin(FrontFrogs); Talk(new List() { LeaderFrog }, "Wide", beat); })); //response - actions.Add(new(beat + 2.0, delegate { NPCCharge(BackFrogs); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 3.0 : beat); })); + actions.Add(new(beat + 2.0, delegate { NPCCharge(BackFrogs); Talk(BackFrogs, "Narrow", jumpinJazz ? beat + 2.75 : beat); })); actions.Add(new(beat + 3.0, delegate { NPCSpin(BackFrogs); Talk(BackFrogs, "Wide", beat); })); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_KURU_1", beat + 2.0, usesGlobalePitch ? globalPitch : 1)); sounds.Add(new MultiSound.Sound("frogHop/SE_NTR_FROG_EN_E_KURU_2", beat + 2.5, usesGlobalePitch ? globalPitch : 1)); @@ -1070,7 +1073,7 @@ namespace HeavenStudio.Games MultiSound.Play(sounds, forcePlay: true); } - public void CueCommon(double beat, bool spotlights = true) + public void CueCommon(double beat, bool spotlights = true, double spin = 0) { startBackHop = beat; startNoHop = beat + 2; @@ -1080,8 +1083,8 @@ namespace HeavenStudio.Games var actions = new List(); - actions.Add(new(beat + 1.5, delegate { Spotlights(false, true); })); - actions.Add(new(beat + 3.5, delegate { Spotlights(true, false); })); + actions.Add(new(beat + 1.5 + spin, delegate { Spotlights(false, true); })); + actions.Add(new(beat + 3.5 + spin, delegate { Spotlights(true, false); })); BeatAction.New(this, actions); }