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

toss boys fixed

Browse source
This commit is contained in:
Rapandrasmus 2023-11-24 17:52:12 +01:00
parent a29b11352a
commit ef1260880a
2 changed files with 4 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Assets/Scripts/Games/TossBoys/TossBoys.cs
View file

@ -169,7 +169,7 @@ namespace HeavenStudio.Games
protected static bool IA_TouchNrm(out double dt) protected static bool IA_TouchNrm(out double dt)
{ {
return PlayerInput.GetFlick(out dt) return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
&& (instance.currentReceiver is WhichTossKid.Akachan && (instance.currentReceiver is WhichTossKid.Akachan
|| (instance.lastReceiver is WhichTossKid.Akachan or WhichTossKid.None || (instance.lastReceiver is WhichTossKid.Akachan or WhichTossKid.None
&& instance.currentReceiver is WhichTossKid.None) && instance.currentReceiver is WhichTossKid.None)
@ -178,7 +178,7 @@ namespace HeavenStudio.Games
} }
protected static bool IA_TouchDir(out double dt) protected static bool IA_TouchDir(out double dt)
{ {
return PlayerInput.GetFlick(out dt) return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
&& (instance.currentReceiver is WhichTossKid.Kiiyan && (instance.currentReceiver is WhichTossKid.Kiiyan
|| (instance.lastReceiver is WhichTossKid.Kiiyan || (instance.lastReceiver is WhichTossKid.Kiiyan
&& instance.currentReceiver is WhichTossKid.None) && instance.currentReceiver is WhichTossKid.None)
@ -187,7 +187,7 @@ namespace HeavenStudio.Games
} }
protected static bool IA_TouchAlt(out double dt) protected static bool IA_TouchAlt(out double dt)
{ {
return PlayerInput.GetFlick(out dt) return PlayerInput.GetTouchDown(InputController.ActionsTouch.Tap, out dt)
&& (instance.currentReceiver is WhichTossKid.Aokun && (instance.currentReceiver is WhichTossKid.Aokun
|| (instance.lastReceiver is WhichTossKid.Aokun || (instance.lastReceiver is WhichTossKid.Aokun
&& instance.currentReceiver is WhichTossKid.None) && instance.currentReceiver is WhichTossKid.None)
@ -276,44 +276,6 @@ namespace HeavenStudio.Games
BackgroundColorUpdate(); BackgroundColorUpdate();
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (PlayerInput.CurrentControlStyle == InputController.ControlStyles.Touch)
{
TossKid next = GetCurrentReceiver();
if (currentReceiver == WhichTossKid.None && lastReceiver != WhichTossKid.None)
{
next = GetReceiver(lastReceiver);
}
else if (currentReceiver == WhichTossKid.None && lastReceiver == WhichTossKid.None)
{
next = akachan;
}
if (PlayerInput.GetIsAction(InputAction_BasicPress))
{
if (currentBall != null && next != null)
{
if (currentBall.willBePopped)
{
next.PopBallPrepare();
}
else
{
next.Crouch();
}
}
else if (next != null)
{
next.Crouch();
}
}
else if (PlayerInput.GetIsAction(InputAction_BasicRelease))
{
if (next != null)
{
next.UnCrouch();
}
}
}
if (PlayerInput.GetIsAction(InputAction_Aka) && !IsExpectingInputNow(InputAction_Aka)) if (PlayerInput.GetIsAction(InputAction_Aka) && !IsExpectingInputNow(InputAction_Aka))
{ {
akachan.HitBall(false); akachan.HitBall(false);

2
Assets/Scripts/Games/TossBoys/TossKid.cs
View file

@ -41,7 +41,7 @@ namespace HeavenStudio.Games.Scripts_TossBoys
public void Bop() public void Bop()
{ {
if (crouch || preparing) return; if (crouch || preparing || (!anim.IsAnimationNotPlaying() && !anim.IsPlayingAnimationName(prefix + "Idle"))) return;
DoAnimationScaledAsync("Bop", 0.5f); DoAnimationScaledAsync("Bop", 0.5f);
} }