From a642f9228801e4292a8aca34dd46f1657c527c51 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Mon, 14 Jul 2025 13:57:44 -0700 Subject: [PATCH] Improve markeplace scripts --- Assets/Scenes/IconMarketplaceMenu.unity | 2 ++ .../Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs | 5 ++--- Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs | 4 +--- Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/IconMarketplaceMenu.unity b/Assets/Scenes/IconMarketplaceMenu.unity index 3a4bdf3..9cdfd92 100644 --- a/Assets/Scenes/IconMarketplaceMenu.unity +++ b/Assets/Scenes/IconMarketplaceMenu.unity @@ -4123,6 +4123,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac25b048bc0f6aded8697b98caef8382, type: 3} m_Name: m_EditorClassIdentifier: + marketplaceManager: {fileID: 789608752} statusText: {fileID: 1732844199} --- !u!1 &1708620717 GameObject: @@ -5717,6 +5718,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b8133693b9ee6eec098e9cef8b719edf, type: 3} m_Name: m_EditorClassIdentifier: + marketplaceManager: {fileID: 789608752} statusText: {fileID: 1866125040} backButton: {fileID: 968417894} content: {fileID: 1517048288} diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs index 0a55939..3868054 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs @@ -6,15 +6,14 @@ using UnityEngine.UI; public class IconMarketplaceDownloadIcon : MonoBehaviour { + public IconMarketplaceManager marketplaceManager; public TMP_Text statusText; public Button backButton; - private IconMarketplaceManager marketplaceManager; public GameObject content; public GameObject sample; - public void Load(IconMarketplaceManager loadedFrom) + void Awake() { - marketplaceManager = loadedFrom; backButton.onClick.AddListener(() => marketplaceManager.SwitchPanel(0)); GetIcons(); } diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs index 43a5cbf..c65e9ea 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs @@ -14,7 +14,7 @@ public class IconMarketplaceManager : MonoBehaviour public Button downloadButton; public Button uploadButton; - void Start() + void Awake() { downloadButton.onClick.AddListener(() => SwitchPanel(1)); #if !UNITY_STANDALONE_OSX && !UNITY_STANDALONE_WIN && !UNITY_STANDALONE_LINUX && !UNITY_EDITOR @@ -45,13 +45,11 @@ public class IconMarketplaceManager : MonoBehaviour uploadPanel.SetActive(false); break; case 1: - downloadPanelScript.Load(this); normalPanel.SetActive(false); downloadPanel.SetActive(true); uploadPanel.SetActive(false); break; case 2: - uploadPanelScript.Load(); normalPanel.SetActive(false); downloadPanel.SetActive(false); uploadPanel.SetActive(true); diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs index 21fdbe4..23d9aee 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceUploadIcon.cs @@ -8,9 +8,10 @@ using UnityEngine.Networking; public class IconMarketplaceUploadIcon : MonoBehaviour { + public IconMarketplaceManager marketplaceManager; public TMP_Text statusText; - public void Load() + void Awake() { OpenFilePicker(); }