mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

More Playability Stuff

Browse source 
Added "boing" hit animation, added audience reactions to correct inputs
This commit is contained in:
ThePurpleAnon 2024-01-24 19:59:52 -06:00
parent 5b7add8761
commit 6562ccefa9
11 changed files with 37235 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

969
Assets/Resources/Games/manzai.prefab
View file

File diff suppressed because it is too large Load diff

4
Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller
View file

@ -201,13 +201,13 @@ AnimatorStateMachine:
m_Position: {x: 400, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: -4531825814840688901}
m_Position: {x: 400, y: 350, z: 0}
m_Position: {x: 400, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: -9038879307389905707}
m_Position: {x: 700, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: -6604525043240780645}
m_Position: {x: 700, y: 150, z: 0}
m_Position: {x: 700, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: 5900299164093410580}
m_Position: {x: 700, y: 250, z: 0}

5921
Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAttack.anim
View file

File diff suppressed because it is too large Load diff

1886
Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenBop.anim
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller
View file

@ -175,16 +175,16 @@ AnimatorStateMachine:
m_Position: {x: 400, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: 1991386350695458482}
m_Position: {x: 400, y: 350, z: 0}
m_Position: {x: 400, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: -1699792846544817994}
m_Position: {x: 700, y: 60, z: 0}
m_Position: {x: 700, y: 50, z: 0}
- serializedVersion: 1
m_State: {fileID: -3658582786328183824}
m_Position: {x: 700, y: 160, z: 0}
m_Position: {x: 700, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: -3978453348848310481}
m_Position: {x: 700, y: 260, z: 0}
m_Position: {x: 700, y: 250, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

6145
Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureBop.anim
View file

File diff suppressed because it is too large Load diff

22431
Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureDamage.anim
View file

File diff suppressed because it is too large Load diff

42
Assets/Scenes/Editor.unity
View file

@ -551,9 +551,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &9435782
@ -4172,9 +4172,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &121871281
@ -4396,9 +4396,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 72, y: -21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &129013734
@ -4532,9 +4532,9 @@ RectTransform:
m_Father: {fileID: 539838476}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 112, y: -21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &151246938
@ -26850,8 +26850,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 0
m_Size: 1
m_Value: 1
m_Size: 0.9987393
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -32707,7 +32707,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 97.42857}
m_AnchoredPosition: {x: 0, y: 97.428055}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@ -37250,9 +37250,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 40, y: -21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1345846031
@ -46876,9 +46876,9 @@ RectTransform:
m_Father: {fileID: 574002313}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 80, y: -21}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1783491359

54
Assets/Scripts/Games/Manzai/Manzai.cs
View file

@ -124,6 +124,10 @@ namespace HeavenStudio.Games
bool isPreparingForBoing = false;
bool missedWithWrongButton = false;
bool hitHaiL = false;
bool hitHaiR = false;
bool hitDonaiyanen = false;
public enum WhoBops
@ -330,6 +334,7 @@ namespace HeavenStudio.Games
new BeatAction.Action(beat + 0.50f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 2.25f, delegate { ravenCanBop = false; }),
new BeatAction.Action(beat + 3.25f, delegate { vultureCanBop = true; ravenCanBop = true; }),
new BeatAction.Action(beat + 3.25f, delegate { audienceRespond(beat); }),
});
}
else
@ -342,11 +347,12 @@ namespace HeavenStudio.Games
new BeatAction.Action(beat + 1.50f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 2.25f, delegate { ravenCanBop = false; }),
new BeatAction.Action(beat + 3.25f, delegate { vultureCanBop = true; ravenCanBop = true; }),
new BeatAction.Action(beat + 3.25f, delegate { audienceRespond(beat); }),
});
}
}
public void HaiJustFull(float state)
public void HaiJustFull(float state, int side)
{
SoundByte.PlayOneShotGame("manzai/hai", pitch: Conductor.instance.songBpm/98);
if (state >= 1f || state <= -1f)
@ -357,6 +363,14 @@ namespace HeavenStudio.Games
else
{
SoundByte.PlayOneShotGame("manzai/HaiAccent");
if (side == 0)
{
hitHaiL = true;
}
if (side == 1)
{
hitHaiR = true;
}
}
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
@ -366,16 +380,18 @@ namespace HeavenStudio.Games
{
// var euler = PivotL.eulerAngles;
// euler.z = UnityEngine.Random.Range(0, 100);
int side = 0;
HaiBubbleL.DoScaledAnimationAsync("HaiL", 0.5f);
HaiJustFull(state);
HaiJustFull(state, side);
}
public void HaiJustR(PlayerActionEvent caller, float state)
{
int side = 1;
HaiBubbleR.DoScaledAnimationAsync("HaiR", 0.5f);
HaiJustFull(state);
HaiJustFull(state, side);
}
@ -401,6 +417,8 @@ namespace HeavenStudio.Games
vultureCanBop = false;
int bubbleAnimation = UnityEngine.Random.Range(0, 2);
var punName= Enum.GetName(typeof(Puns), whichPun);
int length = boingLengths.GetValueOrDefault(punName);
int syllables = length != 0 ? length : 4;
ScheduleInput(beat, 2.5f, InputAction_Alt, BoingJust, BoingMiss, Nothing);
@ -410,10 +428,11 @@ namespace HeavenStudio.Games
{
new BeatAction.Action(beat + 0.00f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 0.50f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 1.25f, delegate { VultureAnim.DoScaledAnimationAsync("Boing", 0.5f); }),
new BeatAction.Action(beat + 1.25f, delegate { isPreparingForBoing = true; }),
new BeatAction.Action(syllables == 6 ? beat + 1.50 : beat + 1.25, delegate { VultureAnim.DoScaledAnimationAsync("Boing", 0.5f); }),
new BeatAction.Action(beat + 2.00f, delegate { SlapReady(); }),
new BeatAction.Action(beat + 2.25f, delegate { ravenCanBop = false; }),
new BeatAction.Action(beat + 3.00f, delegate { audienceRespond(beat); }),
new BeatAction.Action(beat + 3.20f, delegate { isPreparingForBoing = false; }),
new BeatAction.Action(beat + 3.25f, delegate { vultureCanBop = true; ravenCanBop = true; }),
});
@ -425,16 +444,38 @@ namespace HeavenStudio.Games
new BeatAction.Action(beat + 0.00f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 0.50f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 1.00f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }),
new BeatAction.Action(beat + 1.25f, delegate { VultureAnim.DoScaledAnimationAsync("Boing", 0.5f); }),
new BeatAction.Action(beat + 1.25f, delegate { isPreparingForBoing = true; }),
new BeatAction.Action(syllables == 6 ? beat + 1.50 : beat + 1.25, delegate { VultureAnim.DoScaledAnimationAsync("Boing", 0.5f); }),
new BeatAction.Action(beat + 2.00f, delegate { SlapReady(); }),
new BeatAction.Action(beat + 2.25f, delegate { ravenCanBop = false; }),
new BeatAction.Action(beat + 3.00f, delegate { audienceRespond(beat); }),
new BeatAction.Action(beat + 3.20f, delegate { isPreparingForBoing = false; }),
new BeatAction.Action(beat + 3.25f, delegate { vultureCanBop = true; ravenCanBop = true; }),
});
}
}
public void audienceRespond(double beat)
{
if (hitHaiL && hitHaiR)
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 3.50f, delegate { SoundByte.PlayOneShotGame("manzai/haiClap"); }),
});
}
if (hitDonaiyanen)
{
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 3.00f, delegate { SoundByte.PlayOneShotGame("manzai/donaiyanenLaugh"); }),
});
}
hitHaiL = false;
hitHaiR = false;
hitDonaiyanen = false;
}
public void BoingJust(PlayerActionEvent caller, float state)
{
SoundByte.PlayOneShotGame("manzai/donaiyanen", pitch: Conductor.instance.songBpm/98);
@ -446,6 +487,7 @@ namespace HeavenStudio.Games
else
{
SoundByte.PlayOneShotGame("manzai/donaiyanenAccent");
hitDonaiyanen = true;
}
RavenAnim.DoScaledAnimationAsync("Attack", 0.5f);
VultureAnim.DoScaledAnimationAsync("Damage", 0.5f);

BIN
Assets/animation_00.002 1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
Assets/animation_09.002.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 27 KiB