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

Remove on screen buttons and bigger buttons settings (it's default bigger buttons)

Browse Source 
This auto converts if you are on beta1, it will keep your show fps and
vsync setting. This also fixes VSync being incorrect.
This commit is contained in:
Travis
2025-06-05 15:15:51 -07:00
parent cacd5335d4
commit 73cf036569
4 changed files with 38 additions and 824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Assets/Scripts/GamePlayer.cs
View File

@@ -82,7 +82,7 @@ public class GamePlayer : MonoBehaviour
backgroundMusic.volume = PlayerPrefs.GetFloat("musicVolume", 1f);
screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect;
highScoreText.text = $"High Score: {highscore}";
if (PlayerPrefs.GetInt("Setting2", 0) == 1)
if (Application.isMobilePlatform)
{
GameObject leftArrow = new("LeftArrow");
GameObject rightArrow = new("RightArrow");
@@ -108,24 +108,13 @@ public class GamePlayer : MonoBehaviour
rightArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -4f, 0f);
restartButton.transform.position = new UnityEngine.Vector3(screenWidth / 2.3f, Camera.main.orthographicSize - 1.2f, 0f);
backButton.transform.position = new UnityEngine.Vector3(-screenWidth / 2.3f, Camera.main.orthographicSize - 1.2f, 0f);
if (PlayerPrefs.GetInt("Setting3", 0) == 1)
{
leftArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
rightArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
restartButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
backButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -1f, 0f);
}
else
{
leftArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
rightArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
jumpArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
restartButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
backButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
jumpArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -2f, 0f);
}
leftArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
rightArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
restartButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
backButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -1f, 0f);
}
}
@@ -161,7 +150,7 @@ public class GamePlayer : MonoBehaviour
{
doMoveRight = true;
}
if (controllerJump || Keyboard.current.spaceKey.isPressed || Keyboard.current.upArrowKey.isPressed || Keyboard.current.wKey.isPressed || (Mouse.current.leftButton.isPressed && PlayerPrefs.GetInt("Setting2", 0) == 0) || (Gamepad.current != null && Gamepad.current.buttonSouth.isPressed))
if (controllerJump || Keyboard.current.spaceKey.isPressed || Keyboard.current.upArrowKey.isPressed || Keyboard.current.wKey.isPressed || (Mouse.current.leftButton.isPressed && !Application.isMobilePlatform || (Gamepad.current != null && Gamepad.current.buttonSouth.isPressed)))
{
doJump = true;
}
@@ -170,7 +159,7 @@ public class GamePlayer : MonoBehaviour
doRestart = true;
}
}
if (PlayerPrefs.GetInt("Setting2", 0) == 1)
if (Application.isMobilePlatform)
{
GameObject leftArrow = GameObject.Find("LeftArrow");
GameObject rightArrow = GameObject.Find("RightArrow");
@@ -357,7 +346,7 @@ public class GamePlayer : MonoBehaviour
void Update()
{
if (PlayerPrefs.GetInt("Setting4", 0) == 1 && Time.time > nextUpdate)
if (PlayerPrefs.GetInt("Setting2", 0) == 1 && Time.time > nextUpdate)
{
fps = 1f / Time.deltaTime;
fpsCounter.text = "FPS: " + Mathf.Round(fps);
@@ -367,35 +356,25 @@ public class GamePlayer : MonoBehaviour
{
screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect;
ClampPosition(screenWidth, bird);
if (PlayerPrefs.GetInt("Setting2", 0) == 1)
if (Application.isMobilePlatform)
{
GameObject leftArrow = GameObject.Find("LeftArrow");
GameObject rightArrow = GameObject.Find("RightArrow");
GameObject jumpArrow = GameObject.Find("JumpArrow");
GameObject restartButton = GameObject.Find("RestartButton");
GameObject backButton = GameObject.Find("BackButton");
leftArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -4f, 0f);
leftArrow.transform.position = new UnityEngine.Vector3(-screenWidth / 2.5f, -4f, 0f);
rightArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -4f, 0f);
restartButton.transform.position = new UnityEngine.Vector3(screenWidth / 2.3f, Camera.main.orthographicSize - 1.2f, 0f);
backButton.transform.position = new UnityEngine.Vector3(-screenWidth / 2.3f, Camera.main.orthographicSize - 1.2f, 0f);
if (PlayerPrefs.GetInt("Setting3", 0) == 1)
{
leftArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
rightArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
restartButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
backButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -1f, 0f);
}
else
{
leftArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
rightArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
jumpArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
restartButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
backButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 20f, screenWidth / 20f, 1f);
jumpArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -2f, 0f);
}
leftArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
rightArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
restartButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
backButton.transform.localScale = new UnityEngine.Vector3(screenWidth / 14f, screenWidth / 14f, 1f);
jumpArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -1f, 0f);
}
}
GameObject[] berries = GameObject.FindGameObjectsWithTag("Berry");

19
Assets/Scripts/LoadingMenu.cs
View File

@@ -13,29 +13,32 @@ public class LoadingMenu : MonoBehaviour
void Awake()
{
if (PlayerPrefs.GetString("latestVersion", Application.version) == "1.4.0-beta1")
{
PlayerPrefs.DeleteKey("Setting2");
PlayerPrefs.DeleteKey("Setting3");
PlayerPrefs.SetInt("Setting2", PlayerPrefs.GetInt("Setting4", 0));
PlayerPrefs.SetInt("Setting3", PlayerPrefs.GetInt("Setting5", 0));
PlayerPrefs.SetString("latestVersion", "1.4.0");
}
if (PlayerPrefs.HasKey("HighScore"))
{
PlayerPrefs.SetString("HighScoreV2", Math.Max(PlayerPrefs.GetInt("HighScore"), 0).ToString());
PlayerPrefs.DeleteKey("HighScore");
}
Application.targetFrameRate = 360;
QualitySettings.vSyncCount = PlayerPrefs.GetInt("Setting5", 1);
QualitySettings.vSyncCount = PlayerPrefs.GetInt("Setting3", 1) == 1 ? 1 : -1;
Screen.fullScreen = PlayerPrefs.GetInt("Setting1", 1) == 1;
if (!Application.isMobilePlatform)
{
SetIfNone("Setting1", 1);
SetIfNone("Setting2", 0);
SetIfNone("Setting3", 0);
SetIfNone("Setting4", 0);
SetIfNone("Setting5", 1);
SetIfNone("Setting3", 1);
}
else
{
SetIfNone("Setting1", 1, true);
SetIfNone("Setting2", 1, true);
SetIfNone("Setting3", 0);
SetIfNone("Setting4", 0);
SetIfNone("Setting5", 0, true);
SetIfNone("Setting3", 0, true);
QualitySettings.vSyncCount = 0;
}
PlayerPrefs.SetString("latestVersion", Application.version);

26
Assets/Scripts/SettingsMenu.cs
View File

@@ -6,8 +6,6 @@ public class SettingsMenu : MonoBehaviour
public Toggle setting1toggle;
public Toggle setting2toggle;
public Toggle setting3toggle;
public Toggle setting4toggle;
public Toggle setting5toggle;
public Slider musicSlider;
public Slider sfxSlider;
@@ -19,18 +17,13 @@ public class SettingsMenu : MonoBehaviour
{
setting1toggle.isOn = PlayerPrefs.GetInt("Setting1", 1) == 1;
setting2toggle.isOn = PlayerPrefs.GetInt("Setting2", 0) == 1;
setting3toggle.isOn = PlayerPrefs.GetInt("Setting3", 0) == 1;
setting3toggle.interactable = PlayerPrefs.GetInt("Setting2", 0) == 1;
setting4toggle.isOn = PlayerPrefs.GetInt("Setting4", 0) == 1;
setting5toggle.isOn = PlayerPrefs.GetInt("Setting5", 1) == 1;
setting3toggle.isOn = PlayerPrefs.GetInt("Setting3", 1) == 1;
}
else
{
setting1toggle.interactable = false;
setting2toggle.interactable = false;
setting3toggle.isOn = PlayerPrefs.GetInt("Setting3", 0) == 1;
setting4toggle.isOn = PlayerPrefs.GetInt("Setting4", 0) == 1;
setting5toggle.interactable = false;
setting2toggle.isOn = PlayerPrefs.GetInt("Setting2", 0) == 1;
setting3toggle.interactable = false;
}
setting1toggle.onValueChanged.AddListener(value =>
{
@@ -40,22 +33,11 @@ public class SettingsMenu : MonoBehaviour
setting2toggle.onValueChanged.AddListener(value =>
{
PlayerPrefs.SetInt("Setting2", value ? 1 : 0);
setting3toggle.interactable = value;
setting3toggle.isOn = value && setting3toggle.isOn;
PlayerPrefs.SetInt("Setting3", setting3toggle.isOn ? 1 : 0);
});
setting3toggle.onValueChanged.AddListener(value =>
{
PlayerPrefs.SetInt("Setting3", value ? 1 : 0);
});
setting4toggle.onValueChanged.AddListener(value =>
{
PlayerPrefs.SetInt("Setting4", value ? 1 : 0);
});
setting5toggle.onValueChanged.AddListener(value =>
{
PlayerPrefs.SetInt("Setting5", value ? 1 : 0);
QualitySettings.vSyncCount = value ? 1 : 0;
QualitySettings.vSyncCount = value ? 1 : -1;
});
musicSlider.onValueChanged.AddListener(value =>
{