Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Sveske Juice 2024-02-03 22:15:29 -08:00
parent b07650b7f0 4c1ad8e585
commit 85af588eac
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/BloodComputeShader.cs
View File

@ -162,7 +162,7 @@ public class BloodComputeShader : MonoBehaviour
score += bufferData[0];
float mappedRumble = Convert.ToSingle(bufferData[0]).Remap(0, RumbleAmount, 0, 0.1f);
RumbleManager.StartRumble(-1, 0, mappedRumble, 0.1f);
//RumbleManager.StartRumble(-1, 0, mappedRumble, 0.1f);
squeakVolume += 0.1f;

2
Assets/Scripts/Enemy/EnemyAnimationHandler.cs
View File

@ -30,7 +30,7 @@ public class EnemyAnimationHandler : MonoBehaviour
IEnumerator AnimationDie()
{
Strangle();
Debug.Log("Strangle");
//Debug.Log("Strangle");
yield return new WaitForSecondsRealtime(0.1f);
Die();
}

2
Assets/Scripts/Rumbling/RopeRumbling.cs
View File

@ -43,6 +43,6 @@ public class RopeRumbling : MonoBehaviour
float ropeClamed = Mathf.Max(0, rope.Overshoot);
float sensitive_mapped = ropeClamed.Remap(0.2f, 1f, 0f, MaxVibration);
float mapped = ropeClamed.Remap(0.9f, 1f, 0f, MaxVibration);
RumbleManager.StartRumble(-1, mapped, sensitive_mapped, 0.1f);
RumbleManager.StartRumble(-1, 0, sensitive_mapped, 0.1f);
}
}