alexis/Vampire-Survivor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Refactorisation

Browse Source
This commit is contained in:
alexis
2023-10-23 11:56:24 +02:00
parent 18237e3a0b
commit 600545e0f1
31 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UI/Upgrade Screen/Upgrade Screen.cs
+5 -6
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
@@ -11,7 +10,7 @@ using Random = UnityEngine.Random;
public class UpgradeScreen : MonoBehaviour
{
[SerializeField]
private List<Button> buttons = new();
private List<Button> _buttons = new();
private Upgrade[] _upgrades;
private PlayerManager _manager;
@@ -26,7 +25,7 @@ public class UpgradeScreen : MonoBehaviour
public void GenerateChoice()
{
Upgrade[] choosen = new Upgrade[buttons.Count];
Upgrade[] choosen = new Upgrade[_buttons.Count];
while (choosen.Length != choosen.Distinct().Count())
{
@@ -34,7 +33,7 @@ public class UpgradeScreen : MonoBehaviour
{
Upgrade choosenUpgrade = _upgrades[Random.Range(0, _upgrades.Length)];
bool beamCondition = (choosenUpgrade.paramName == "laserOnX" && _manager.laserOnX >= 1) || (choosenUpgrade.paramName == "laserOnY" && _manager.laserOnY >= 1);
bool beamCondition = (choosenUpgrade.paramName == "HorizontalBeam" && _manager.HorizontalBeam >= 1) || (choosenUpgrade.paramName == "VerticalBeam" && _manager.VerticalBeam >= 1);
bool beamFrequencyCondition = (choosenUpgrade.paramName == "BeamFrequency" && _manager.BeamFrequency <= 0);
bool arrowFrequency = (choosenUpgrade.paramName == "ArrowFrequency" && _manager.ArrowFrequency <= 0.5f);
@@ -42,7 +41,7 @@ public class UpgradeScreen : MonoBehaviour
{
choosenUpgrade = _upgrades[Random.Range(0, _upgrades.Length)];
beamCondition = (choosenUpgrade.paramName == "laserOnX" && _manager.laserOnX >= 1) || (choosenUpgrade.paramName == "laserOnY" && _manager.laserOnY >= 1);
beamCondition = (choosenUpgrade.paramName == "HorizontalBeam" && _manager.HorizontalBeam >= 1) || (choosenUpgrade.paramName == "VerticalBeam" && _manager.VerticalBeam >= 1);
beamFrequencyCondition = (choosenUpgrade.paramName == "BeamFrequency" && _manager.BeamFrequency <= 0);
arrowFrequency = (choosenUpgrade.paramName == "ArrowFrequency" && _manager.ArrowFrequency <= 0.5f);
};
@@ -51,7 +50,7 @@ public class UpgradeScreen : MonoBehaviour
}
}
foreach (var button in buttons.Select((value, i) => new {i, value}))
foreach (var button in _buttons.Select((value, i) => new {i, value}))
{
button.value.GetComponentInChildren<TMP_Text>().SetText(choosen[button.i].name);
button.value.GetComponent<Button>().onClick.AddListener(() => { UpgradePlayer(button.value, _upgrades, _manager); });
Assets/UI/Upgrade Screen/Upgrade Screen.prefab
+2 -2
View File
@@ -46,7 +46,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e0d6eae981931e49af7552730883326, type: 3}
m_Name:
m_EditorClassIdentifier:
buttons:
_buttons:
- {fileID: 84359638430006894}
- {fileID: 6549512925133430735}
- {fileID: 451137559467290092}
@@ -62,7 +62,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 132f6eb0a04c6614d9ebb227a443e2a6, type: 3}
m_Name:
m_EditorClassIdentifier:
upgradesJSON: {fileID: 4900000, guid: aaa2ab8454f62084e836d4c194574793, type: 3}
_upgradesJSON: {fileID: 4900000, guid: aaa2ab8454f62084e836d4c194574793, type: 3}
upgrades:
upgrades: []
--- !u!1 &587910270085467340