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

Improve icon marketplace download code and also add a Only Show dropdown filter

Browse Source
This commit is contained in:
Travis
2025-09-04 17:47:19 -07:00
parent a836550206
commit 2dcdafaf69
2 changed files with 1884 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1868
Assets/Scenes/IconMarketplaceMenu.unity
View File

File diff suppressed because it is too large Load Diff

31
Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs
View File

@@ -18,26 +18,28 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
public GameObject sample; public GameObject sample;
private string statusMessage; private string statusMessage;
private Coroutine statusRoutine; private Coroutine statusRoutine;
public AudioSource iconPurchaseSound;
public Button refreshButton; public Button refreshButton;
public Button optionsButton; public Button optionsButton;
public GameObject optionsPanel; public GameObject optionsPanel;
public Button optionsPanelSubmitButton; public Button optionsPanelSubmitButton;
public Button optionsPanelResetButton; public Button optionsPanelResetButton;
public TMP_Dropdown optionsPanelSortByDropdown; public TMP_Dropdown optionsPanelSortByDropdown;
public Toggle optionsPanelPriceRangeToggle; public Toggle optionsPanelPriceRangeToggle;
public TMP_InputField optionsPanelPriceRangeMinInput; public TMP_InputField optionsPanelPriceRangeMinInput;
public TMP_InputField optionsPanelPriceRangeMaxInput; public TMP_InputField optionsPanelPriceRangeMaxInput;
public Toggle optionsPanelSearchForToggle;
public TMP_InputField optionsPanelSearchForInputField;
public AudioSource iconPurchaseSound;
internal bool priceRangeEnabled = false;
internal string priceRangeMin = "10"; internal string priceRangeMin = "10";
internal string priceRangeMax = "250"; internal string priceRangeMax = "250";
internal bool searchForEnabled = false; public Toggle optionsPanelSearchForToggle;
public TMP_InputField optionsPanelSearchForInputField;
internal string searchForValue = ""; internal string searchForValue = "";
public Toggle optionsPanelOnlyShowToggle;
public TMP_Dropdown optionsPanelOnlyShowDropdown;
internal bool anyChanges = false; internal bool anyChanges = false;
void Awake() void Awake()
@@ -56,10 +58,10 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
}); });
optionsPanelResetButton.onClick.AddListener(() => optionsPanelResetButton.onClick.AddListener(() =>
{ {
anyChanges = true;
optionsPanelSortByDropdown.value = 3; optionsPanelSortByDropdown.value = 3;
optionsPanelPriceRangeToggle.isOn = false; optionsPanelPriceRangeToggle.isOn = false;
optionsPanelSearchForToggle.isOn = false; optionsPanelSearchForToggle.isOn = false;
optionsPanelOnlyShowToggle.isOn = false;
}); });
optionsPanelPriceRangeToggle.onValueChanged.AddListener((on) => optionsPanelPriceRangeToggle.onValueChanged.AddListener((on) =>
@@ -76,9 +78,15 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
optionsPanelSearchForToggle.onValueChanged.AddListener((on) => optionsPanelSearchForToggle.onValueChanged.AddListener((on) =>
{ {
anyChanges = true; anyChanges = true;
optionsPanelSearchForInputField.text = ""; if (!on) optionsPanelSearchForInputField.text = "";
optionsPanelSearchForInputField.interactable = on; optionsPanelSearchForInputField.interactable = on;
}); });
optionsPanelOnlyShowToggle.onValueChanged.AddListener((on) =>
{
anyChanges = true;
if (!on) optionsPanelOnlyShowDropdown.value = 0;
optionsPanelOnlyShowDropdown.interactable = on;
});
optionsPanelSortByDropdown.onValueChanged.AddListener((_) => anyChanges = true); optionsPanelSortByDropdown.onValueChanged.AddListener((_) => anyChanges = true);
optionsPanelPriceRangeMinInput.onValueChanged.AddListener((value) => optionsPanelPriceRangeMinInput.onValueChanged.AddListener((value) =>
@@ -96,6 +104,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
anyChanges = true; anyChanges = true;
searchForValue = value; searchForValue = value;
}); });
optionsPanelOnlyShowDropdown.onValueChanged.AddListener((_) => anyChanges = true);
} }
internal void Load() internal void Load()
@@ -119,11 +128,13 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
ShowStatus("Loading..."); ShowStatus("Loading...");
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("sortBy", optionsPanelSortByDropdown.value.ToString()); dataForm.AddField("sortBy", optionsPanelSortByDropdown.value.ToString());
dataForm.AddField("priceRangeEnabled", priceRangeEnabled.ToString()); dataForm.AddField("priceRangeEnabled", optionsPanelPriceRangeToggle.isOn.ToString());
dataForm.AddField("priceRangeMin", priceRangeMin); dataForm.AddField("priceRangeMin", priceRangeMin);
dataForm.AddField("priceRangeMax", priceRangeMax); dataForm.AddField("priceRangeMax", priceRangeMax);
dataForm.AddField("searchForEnabled", searchForEnabled.ToString()); dataForm.AddField("searchForEnabled", optionsPanelSearchForToggle.isOn.ToString());
dataForm.AddField("searchForValue", searchForValue); dataForm.AddField("searchForValue", searchForValue);
dataForm.AddField("onlyShowEnabled", optionsPanelOnlyShowToggle.isOn.ToString());
dataForm.AddField("onlyShowValue", optionsPanelOnlyShowDropdown.value.ToString());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "getMarketplaceIcons.php", dataForm.form); using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "getMarketplaceIcons.php", dataForm.form);
request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version); request.SetRequestHeader("ClientVersion", Application.version);