Berry-Dash/source
1
2 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format again

Browse Source
This commit is contained in:
Lncvrt committed 2026-03-06 12:27:14 -07:00
1 parent 3f6849060f
commit 7e34203da9
4 files changed
+137 -134
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/GamePlayers/AutoGamePlayer.cs
+33 -32
View File
@@ -330,40 +330,41 @@ public class AutoGamePlayer : MonoBehaviour {
var allBerries = Tools.GetAllBerries(berryParent.transform); var allBerries = Tools.GetAllBerries(berryParent.transform);
if (!pausePanel.activeSelf) foreach (GameObject berry in allBerries) { if (!pausePanel.activeSelf)
if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) { foreach (GameObject berry in allBerries) {
noGravityBerries.Remove(berry.GetInstanceID()); if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) {
Destroy(berry); noGravityBerries.Remove(berry.GetInstanceID());
} else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) { Destroy(berry);
switch (berry.tag) { } else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
case "NormalBerry": switch (berry.tag) {
DoNormalBerry(berry, true); case "NormalBerry":
break; DoNormalBerry(berry, true);
case "PoisonBerry": break;
DoPoisonBerry(); case "PoisonBerry":
break; DoPoisonBerry();
case "SlowBerry": break;
DoSlowBerry(berry, true); case "SlowBerry":
break; DoSlowBerry(berry, true);
case "UltraBerry": break;
DoUltraBerry(berry, true); case "UltraBerry":
break; DoUltraBerry(berry, true);
case "SpeedyBerry": break;
DoSpeedyBerry(berry, true); case "SpeedyBerry":
break; DoSpeedyBerry(berry, true);
case "RandomBerry": break;
DoRandomBerry(berry); case "RandomBerry":
break; DoRandomBerry(berry);
case "AntiBerry": break;
DoAntiBerry(berry, true); case "AntiBerry":
break; DoAntiBerry(berry, true);
case "GoldenBerry": break;
DoGoldenBerry(berry, true); case "GoldenBerry":
break; DoGoldenBerry(berry, true);
break;
}
} }
if (berry != null) berry.GetComponent<Rigidbody2D>().linearVelocity = noGravityBerries.Contains(berry.GetInstanceID()) ? UnityEngine.Vector2.zero : new UnityEngine.Vector2(0f, speedyLeft == 0.0f ? (-300f * canvasRect.lossyScale.y) : (-550f * canvasRect.lossyScale.y));
} }
if (berry != null) berry.GetComponent<Rigidbody2D>().linearVelocity = noGravityBerries.Contains(berry.GetInstanceID()) ? UnityEngine.Vector2.zero : new UnityEngine.Vector2(0f, speedyLeft == 0.0f ? (-300f * canvasRect.lossyScale.y) : (-550f * canvasRect.lossyScale.y));
}
else foreach (GameObject berry in allBerries) berry.GetComponent<Rigidbody2D>().linearVelocity = UnityEngine.Vector2.zero; else foreach (GameObject berry in allBerries) berry.GetComponent<Rigidbody2D>().linearVelocity = UnityEngine.Vector2.zero;
if ((Application.platform == RuntimePlatform.Android && Keyboard.current.escapeKey.wasPressedThisFrame) || !Application.isMobilePlatform && (Keyboard.current.escapeKey.wasPressedThisFrame || (Gamepad.current != null && (Gamepad.current.startButton.wasPressedThisFrame || Gamepad.current.buttonEast.wasPressedThisFrame)))) TogglePause(); if ((Application.platform == RuntimePlatform.Android && Keyboard.current.escapeKey.wasPressedThisFrame) || !Application.isMobilePlatform && (Keyboard.current.escapeKey.wasPressedThisFrame || (Gamepad.current != null && (Gamepad.current.startButton.wasPressedThisFrame || Gamepad.current.buttonEast.wasPressedThisFrame)))) TogglePause();
} }
Assets/Scripts/GamePlayers/CustomGamePlayer.cs
+36 -35
View File
@@ -496,43 +496,44 @@ public class CustomGamePlayer : MonoBehaviour {
var allBerries = Tools.GetAllBerries(berryParent.transform); var allBerries = Tools.GetAllBerries(berryParent.transform);
if (!pausePanel.activeSelf) foreach (GameObject berry in allBerries) { if (!pausePanel.activeSelf)
if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) { foreach (GameObject berry in allBerries) {
noGravityBerries.Remove(berry.GetInstanceID()); if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) {
Destroy(berry); noGravityBerries.Remove(berry.GetInstanceID());
} else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) { Destroy(berry);
switch (berry.tag) { } else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
case "NormalBerry": switch (berry.tag) {
DoNormalBerry(berry); case "NormalBerry":
break; DoNormalBerry(berry);
case "PoisonBerry": break;
DoPoisonBerry(); case "PoisonBerry":
break; DoPoisonBerry();
case "SlowBerry": break;
DoSlowBerry(berry); case "SlowBerry":
break; DoSlowBerry(berry);
case "UltraBerry": break;
DoUltraBerry(berry); case "UltraBerry":
break; DoUltraBerry(berry);
case "SpeedyBerry": break;
DoSpeedyBerry(berry); case "SpeedyBerry":
break; DoSpeedyBerry(berry);
case "RandomBerry": break;
DoRandomBerry(berry); case "RandomBerry":
break; DoRandomBerry(berry);
case "AntiBerry": break;
DoAntiBerry(berry); case "AntiBerry":
break; DoAntiBerry(berry);
case "GoldenBerry": break;
DoGoldenBerry(berry); case "GoldenBerry":
break; DoGoldenBerry(berry);
case "NothingBerry": break;
DoNothingBerry(berry); case "NothingBerry":
break; DoNothingBerry(berry);
break;
}
} }
if (berry != null) berry.GetComponent<Rigidbody2D>().linearVelocity = noGravityBerries.Contains(berry.GetInstanceID()) ? UnityEngine.Vector2.zero : new UnityEngine.Vector2(0f, speedyLeft == 0.0f ? (-300f * canvasRect.lossyScale.y) : (-550f * canvasRect.lossyScale.y));
} }
if (berry != null) berry.GetComponent<Rigidbody2D>().linearVelocity = noGravityBerries.Contains(berry.GetInstanceID()) ? UnityEngine.Vector2.zero : new UnityEngine.Vector2(0f, speedyLeft == 0.0f ? (-300f * canvasRect.lossyScale.y) : (-550f * canvasRect.lossyScale.y));
}
else foreach (GameObject berry in allBerries) berry.GetComponent<Rigidbody2D>().linearVelocity = UnityEngine.Vector2.zero; else foreach (GameObject berry in allBerries) berry.GetComponent<Rigidbody2D>().linearVelocity = UnityEngine.Vector2.zero;
if ((Application.platform == RuntimePlatform.Android && Keyboard.current.escapeKey.wasPressedThisFrame) || !Application.isMobilePlatform && (Keyboard.current.escapeKey.wasPressedThisFrame || (Gamepad.current != null && (Gamepad.current.startButton.wasPressedThisFrame || Gamepad.current.buttonEast.wasPressedThisFrame)))) TogglePause(); if ((Application.platform == RuntimePlatform.Android && Keyboard.current.escapeKey.wasPressedThisFrame) || !Application.isMobilePlatform && (Keyboard.current.escapeKey.wasPressedThisFrame || (Gamepad.current != null && (Gamepad.current.startButton.wasPressedThisFrame || Gamepad.current.buttonEast.wasPressedThisFrame)))) TogglePause();
} }
Assets/Scripts/GamePlayers/GamePlayer.cs
+36 -35
View File
@@ -276,43 +276,44 @@ public class GamePlayer : MonoBehaviour {
var allBerries = Tools.GetAllBerries(berryParent.transform); var allBerries = Tools.GetAllBerries(berryParent.transform);
if (!pausePanel.activeSelf) foreach (GameObject berry in allBerries) { if (!pausePanel.activeSelf)
if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) { foreach (GameObject berry in allBerries) {
noGravityBerries.Remove(berry.GetInstanceID()); if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) {
Destroy(berry); noGravityBerries.Remove(berry.GetInstanceID());
} else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) { Destroy(berry);
switch (berry.tag) { } else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
case "NormalBerry": switch (berry.tag) {
DoNormalBerry(berry, true); case "NormalBerry":
break; DoNormalBerry(berry, true);
case "PoisonBerry": break;
DoPoisonBerry(); case "PoisonBerry":
break; DoPoisonBerry();
case "SlowBerry": break;
DoSlowBerry(berry, true); case "SlowBerry":
break; DoSlowBerry(berry, true);
case "UltraBerry": break;
DoUltraBerry(berry, true); case "UltraBerry":
break; DoUltraBerry(berry, true);
case "SpeedyBerry": break;
DoSpeedyBerry(berry, true); case "SpeedyBerry":
break; DoSpeedyBerry(berry, true);
case "CoinBerry": break;
DoCoinBerry(berry, true); case "CoinBerry":
break; DoCoinBerry(berry, true);
case "RandomBerry": break;
DoRandomBerry(berry); case "RandomBerry":
break; DoRandomBerry(berry);
case "AntiBerry": break;
DoAntiBerry(berry, true); case "AntiBerry":
break; DoAntiBerry(berry, true);
case "GoldenBerry": break;
DoGoldenBerry(berry, true); case "GoldenBerry":
break; DoGoldenBerry(berry, true);
break;
}
} }
if (berry != null) berry.GetComponent<Rigidbody2D>().linearVelocity = noGravityBerries.Contains(berry.GetInstanceID()) ? UnityEngine.Vector2.zero : new UnityEngine.Vector2(0f, speedyLeft == 0.0f ? (-300f * canvasRect.lossyScale.y) : (-550f * canvasRect.lossyScale.y));
} }
if (berry != null) berry.GetComponent<Rigidbody2D>().linearVelocity = noGravityBerries.Contains(berry.GetInstanceID()) ? UnityEngine.Vector2.zero : new UnityEngine.Vector2(0f, speedyLeft == 0.0f ? (-300f * canvasRect.lossyScale.y) : (-550f * canvasRect.lossyScale.y));
}
else foreach (GameObject berry in allBerries) berry.GetComponent<Rigidbody2D>().linearVelocity = UnityEngine.Vector2.zero; else foreach (GameObject berry in allBerries) berry.GetComponent<Rigidbody2D>().linearVelocity = UnityEngine.Vector2.zero;
if ((Application.platform == RuntimePlatform.Android && Keyboard.current.escapeKey.wasPressedThisFrame) || !Application.isMobilePlatform && (Keyboard.current.escapeKey.wasPressedThisFrame || (Gamepad.current != null && (Gamepad.current.startButton.wasPressedThisFrame || Gamepad.current.buttonEast.wasPressedThisFrame)))) TogglePause(); if ((Application.platform == RuntimePlatform.Android && Keyboard.current.escapeKey.wasPressedThisFrame) || !Application.isMobilePlatform && (Keyboard.current.escapeKey.wasPressedThisFrame || (Gamepad.current != null && (Gamepad.current.startButton.wasPressedThisFrame || Gamepad.current.buttonEast.wasPressedThisFrame)))) TogglePause();
} }
Assets/Scripts/Other/MultiplayerSmoothMove.cs
+32 -32
View File
@@ -1,40 +1,40 @@
using UnityEngine; using UnityEngine;
public class MultiplayerSmoothMove : MonoBehaviour { public class MultiplayerSmoothMove : MonoBehaviour {
private RectTransform rt; private RectTransform rt;
private Vector3 fromPosition; private Vector3 fromPosition;
private Vector3 toPosition; private Vector3 toPosition;
private Vector3 pendingPosition; private Vector3 pendingPosition;
private bool hasPending = false; private bool hasPending = false;
private float elapsed = 0f; private float elapsed = 0f;
private const float interval = 0.1f; private const float interval = 0.1f;
void Awake() { void Awake() {
rt = GetComponent<RectTransform>(); rt = GetComponent<RectTransform>();
fromPosition = rt.anchoredPosition; fromPosition = rt.anchoredPosition;
toPosition = rt.anchoredPosition; toPosition = rt.anchoredPosition;
}
public void UpdatePosition(float x, float y) {
if (hasPending) {
fromPosition = rt.anchoredPosition;
toPosition = pendingPosition;
elapsed = 0f;
} }
pendingPosition = new Vector3(x, y, 0f);
hasPending = true;
}
void Update() { public void UpdatePosition(float x, float y) {
elapsed += Time.deltaTime; if (hasPending) {
float t = Mathf.Clamp01(elapsed / interval); fromPosition = rt.anchoredPosition;
rt.anchoredPosition = Vector3.Lerp(fromPosition, toPosition, t); toPosition = pendingPosition;
elapsed = 0f;
if (t >= 1f && hasPending) { }
fromPosition = toPosition; pendingPosition = new Vector3(x, y, 0f);
toPosition = pendingPosition; hasPending = true;
hasPending = false; }
elapsed = 0f;
void Update() {
elapsed += Time.deltaTime;
float t = Mathf.Clamp01(elapsed / interval);
rt.anchoredPosition = Vector3.Lerp(fromPosition, toPosition, t);
if (t >= 1f && hasPending) {
fromPosition = toPosition;
toPosition = pendingPosition;
hasPending = false;
elapsed = 0f;
}
} }
}
} }