Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 14:37:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Marching Orders Rework + Bug Fixes (#442)

Browse Source 
* first things first, kill mr. downbeat.

now onto fixing meat grinder forrealzies

* meat grinder fix

* fixed munchy monk icon + mr upbeat ding bug

* a few little changes

* lotta stuff

yeahh just look at the pr description

* point and clap

* anim Adjustment

* new sheet + adjustments for it

* IM USING THE INTERNET

i hate merge conflicts

* grrr merge conflicts

* insane changes

* progress

* fixed The Spaceball Camera Bug (literally a single line of code wtf guys)
* colrs

* k im done :3

---------

Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
This commit is contained in:
AstrlJelly
2023-06-04 00:30:42 -04:00
committed by GitHub
parent bb6559fe58
commit 11044922d3
84 changed files with 19587 additions and 1855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Scripts/Games/DJSchool/DJSchool.cs
View File

@ -454,17 +454,17 @@ namespace HeavenStudio.Games
{
string[] sounds = new string[] { };
if (type == 0)
switch (type)
{
case 0:
sounds = new string[] { "djSchool/scratchoHey1", "djSchool/scratchoHey2", "djSchool/scratchoHey3", "djSchool/scratchoHey4", "djSchool/hey" };
}
else if (type == 1)
{
break;
case 1:
sounds = new string[] { "djSchool/scratchoHeyAlt1", "djSchool/scratchoHeyAlt2", "djSchool/scratchoHeyAlt3", "djSchool/scratchoHeyAlt4", "djSchool/heyAlt" };
}
else if (type == 2)
{
break;
default:
sounds = new string[] { "djSchool/scratchoHeyLoud1", "djSchool/scratchoHeyLoud2", "djSchool/scratchoHeyLoud3", "djSchool/scratchoHeyLoud4", "djSchool/heyLoud" };
break;
}
float timing = 0f;

17
Assets/Scripts/Games/DJSchool/DJYellow.cs
View File

@ -17,37 +17,30 @@ namespace HeavenStudio.Games.Scripts_DJSchool
UpSecond = 6,
}
[SerializeField] List<Sprite> djYellowHeadSprites = new List<Sprite>();
[SerializeField] SpriteRenderer djYellowHeadSrpite;
[SerializeField] SpriteRenderer djYellowHeadSprite;
float normalXScale;
float negativeXScale;
void Awake()
{
normalXScale = djYellowHeadSrpite.transform.localScale.x;
normalXScale = djYellowHeadSprite.transform.localScale.x;
negativeXScale = -normalXScale;
}
public void ChangeHeadSprite(DJExpression expression)
{
if (expression == DJExpression.UpFirst && HeadSpriteCheck(DJExpression.UpSecond)) return;
djYellowHeadSrpite.sprite = djYellowHeadSprites[(int)expression];
djYellowHeadSprite.sprite = djYellowHeadSprites[(int)expression];
}
public bool HeadSpriteCheck(DJExpression expression)
{
return djYellowHeadSrpite.sprite == djYellowHeadSprites[(int)expression];
return djYellowHeadSprite.sprite == djYellowHeadSprites[(int)expression];
}
public void Reverse(bool should = false)
{
if (should)
{
djYellowHeadSrpite.transform.localScale = new Vector3(negativeXScale, normalXScale, normalXScale);
}
else
{
djYellowHeadSrpite.transform.localScale = new Vector3(normalXScale, normalXScale, normalXScale);
}
djYellowHeadSprite.transform.localScale = new Vector3(should ? negativeXScale : normalXScale, normalXScale, normalXScale);
}
}
}

9
Assets/Scripts/Games/DJSchool/Student.cs
View File

@ -15,11 +15,8 @@ namespace HeavenStudio.Games.Scripts_DJSchool
public static bool soundFX;
[Header("Properties")]
public float holdBeat;
public float swipeBeat;
public bool isHolding;
public bool shouldBeHolding;
public bool eligible;
public bool missed;
public bool swiping;
bool canBoo = true;
@ -29,7 +26,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
[SerializeField] private GameObject flashFX;
[SerializeField] private GameObject flashFXInverse;
[SerializeField] private GameObject TurnTable;
[SerializeField] private GameObject slamFX;
//[SerializeField] private GameObject slamFX;
AudioMixerGroup mixer;
private Animator tableAnim;
@ -222,7 +219,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
tableAnim.speed = 1;
tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f);
Instantiate(slamFX, this.transform.parent).SetActive(true);
//Instantiate(slamFX, this.transform.parent).SetActive(true);
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
}
else
@ -238,7 +235,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
tableAnim.speed = 1;
tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f);
Instantiate(slamFX, this.transform.parent).SetActive(true);
//Instantiate(slamFX, this.transform.parent).SetActive(true);
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
}