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

No way is that more minor things

Browse source 
Added figure-farter-esque easter egg. (hold both shoulder buttons while inputting and see what happens :3)
Made whiffs detract from your score.
This commit is contained in:
ThePurpleAnon 2024-02-01 15:18:08 -06:00
parent d43263307a
commit e414773f5d
8 changed files with 3829 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Assets/Resources/Fonts/Kurokane.asset
View file

File diff suppressed because one or more lines are too long

45
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

151
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset
View file

File diff suppressed because one or more lines are too long

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

@ -204,16 +204,19 @@ AnimatorStateMachine:
m_Position: {x: 400, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: -9038879307389905707}
m_Position: {x: 700, y: 50, z: 0}
m_Position: {x: 700, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -6604525043240780645}
m_Position: {x: 700, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: 5900299164093410580}
m_Position: {x: 700, y: 250, z: 0}
m_Position: {x: 700, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: -8866232171375675686}
m_Position: {x: 700, y: 350, z: 0}
m_Position: {x: 700, y: 300, z: 0}
- serializedVersion: 1
m_State: {fileID: 6174615794334292397}
m_Position: {x: 700, y: 150, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -276,6 +279,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &6174615794334292397
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MoveM
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: f6fd118e8db962a4ebfc4984c44e9011, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &8229823037153680195
AnimatorState:
serializedVersion: 6

3497
Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenMoveM.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenMoveM.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f6fd118e8db962a4ebfc4984c44e9011
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

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

@ -184,7 +184,7 @@ AnimatorStateMachine:
m_Position: {x: 700, y: 100, z: 0}
- serializedVersion: 1
m_State: {fileID: -3978453348848310481}
m_Position: {x: 700, y: 250, z: 0}
m_Position: {x: 700, y: 200, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

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

@ -183,9 +183,10 @@ namespace HeavenStudio.Games
Sound crowdSound;
bool isHolding = false;
bool isPlayingReadyAnimationForTapMode = false;
bool easterEgg1 = false;
bool easterEgg2 = false;
public enum WhoBops
@ -443,7 +444,14 @@ namespace HeavenStudio.Games
hitHaiR = true;
}
}
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
if (easterEgg1 && easterEgg2)
{
RavenAnim.DoScaledAnimationAsync(side == 0 ? "Move" : "MoveM", 0.5f);
}
else
{
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
}
VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
if (crowdSound != null)
@ -672,6 +680,21 @@ namespace HeavenStudio.Games
StageAnim.DoScaledAnimationAsync(lightsEnabled ? "LightsOff" : "LightsOn", 0.5f);
}
public void kasukeHaiAnimFull()
{
SoundByte.PlayOneShotGame("manzai/hai");
if (easterEgg1 && easterEgg2)
{
int danceSide = UnityEngine.Random.Range(0, 2);
RavenAnim.DoScaledAnimationAsync(danceSide == 0 ? "Move" : "MoveM", 0.5f);
}
else
{
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
}
VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
}
private void Update()
{
if (isMoving) {
@ -694,18 +717,16 @@ namespace HeavenStudio.Games
}
else
{
SoundByte.PlayOneShotGame("manzai/hai");
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
kasukeHaiAnimFull();
Manzai.instance.ScoreMiss(0.5f);
lastWhiffBeat = conductor.songPositionInBeatsAsDouble;
ravenCanBopTemp = false;
}
}
else
{
SoundByte.PlayOneShotGame("manzai/hai");
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
kasukeHaiAnimFull();
Manzai.instance.ScoreMiss(0.5f);
lastWhiffBeat = conductor.songPositionInBeatsAsDouble;
ravenCanBopTemp = false;
}
@ -721,6 +742,7 @@ namespace HeavenStudio.Games
{
SoundByte.PlayOneShotGame("manzai/miss2");
RavenAnim.DoScaledAnimationAsync("Spin", 0.5f);
Manzai.instance.ScoreMiss(0.5f);
lastWhiffBeat = conductor.songPositionInBeatsAsDouble;
ravenCanBopTemp = false;
if (canDodge)
@ -733,9 +755,7 @@ namespace HeavenStudio.Games
if (PlayerInput.GetIsAction(InputAction_BasicPress) && IsExpectingInputNow(InputAction_Alt) && PlayerInput.CurrentControlStyle != InputController.ControlStyles.Touch)
{
crowdSound = SoundByte.PlayOneShotGame("manzai/missWrongButton");
SoundByte.PlayOneShotGame("manzai/hai");
RavenAnim.DoScaledAnimationAsync("Talk", 0.5f);
VultureAnim.DoScaledAnimationAsync("Bop", 0.5f);
kasukeHaiAnimFull();
missedWithWrongButton = true;
}
@ -767,6 +787,26 @@ namespace HeavenStudio.Games
isPlayingReadyAnimationForTapMode = false;
}
if (PlayerInput.GetPadDown(InputController.ActionsPad.ButtonL))
{
easterEgg1 = true;
}
if (PlayerInput.GetPadUp(InputController.ActionsPad.ButtonL))
{
easterEgg1 = false;
}
if (PlayerInput.GetPadDown(InputController.ActionsPad.ButtonR))
{
easterEgg2 = true;
}
if (PlayerInput.GetPadUp(InputController.ActionsPad.ButtonR))
{
easterEgg2 = false;
}
if (canDodge == false)
{
vultureCanBopTemp = true;