diff --git a/Assets/1_Script/ModalCtrl.cs b/Assets/1_Script/ModalCtrl.cs index e7e7b50..7a59b95 100644 --- a/Assets/1_Script/ModalCtrl.cs +++ b/Assets/1_Script/ModalCtrl.cs @@ -1,4 +1,6 @@ +using System.Collections; using TMPro; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; @@ -14,10 +16,12 @@ public class ModalCtrl : MonoBehaviour [SerializeField] TMP_Text suitStyle; [SerializeField] GameObject[] colors; + + public void Set(Library library) { gameObject.SetActive(true); - suitImage.texture = library._suit_image; + StartCoroutine(checkImageUpdate(library)); suitImage.SetNativeSize(); RectTransform rect = suitImage.gameObject.GetComponent(); rect.anchorMin = new Vector2(0.5f, 0.5f); @@ -31,5 +35,23 @@ public class ModalCtrl : MonoBehaviour debutDate.text = library.production_date; suitType.text = library.suit_type; suitStyle.text = library.suit_style; + + + + } + + void OnDisable() + { + StopAllCoroutines(); + } + + IEnumerator checkImageUpdate(Library library) + { + while(library._suit_image == null) + { + yield return null; + } + + suitImage.texture = library._suit_image; } } diff --git a/Assets/1_Script/SearchCtrl.cs b/Assets/1_Script/SearchCtrl.cs index 55672f2..07d9aa0 100644 --- a/Assets/1_Script/SearchCtrl.cs +++ b/Assets/1_Script/SearchCtrl.cs @@ -276,8 +276,7 @@ public class SearchCtrl : SingletonMonoBehaviour await request.Send(); - await tcs.Task; - + await tcs.Task; return library._suit_image; }