chart 완료
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using Cysharp.Threading.Tasks;
|
||||
using SHI.modal;
|
||||
using SHI.Modal.ISOP;
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
@@ -13,12 +14,13 @@ using UnityEngine.UI;
|
||||
public class ShiPopupSample : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
private GameObject blockDetailModalPrefab;
|
||||
private ISOPModal isopModal;
|
||||
// private GameObject blockDetailModalPrefab;
|
||||
|
||||
[SerializeField]
|
||||
private Button openModalButton;
|
||||
|
||||
private BlockDetailModal blockDetailModal;
|
||||
// private BlockDetailModal blockDetailModal;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
@@ -26,14 +28,20 @@ public class ShiPopupSample : MonoBehaviour
|
||||
{
|
||||
openModalButton.onClick.AddListener(() =>
|
||||
{
|
||||
if (blockDetailModal == null && blockDetailModalPrefab != null)
|
||||
// if (blockDetailModal == null && blockDetailModalPrefab != null)
|
||||
// {
|
||||
// Canvas canvas = Canvas.FindFirstObjectByType<Canvas>();
|
||||
// Debug.Log($"Creating BlockDetailModal under Canvas:{canvas}");
|
||||
// blockDetailModal = Instantiate(blockDetailModalPrefab, canvas.transform).GetComponent<BlockDetailModal>();
|
||||
// }
|
||||
// blockDetailModal.gameObject.SetActive(true);
|
||||
|
||||
if(isopModal != null)
|
||||
{
|
||||
Canvas canvas = Canvas.FindFirstObjectByType<Canvas>();
|
||||
Debug.Log($"Creating BlockDetailModal under Canvas:{canvas}");
|
||||
blockDetailModal = Instantiate(blockDetailModalPrefab, canvas.transform).GetComponent<BlockDetailModal>();
|
||||
isopModal.gameObject.SetActive(true);
|
||||
SetupData().Forget();
|
||||
}
|
||||
blockDetailModal.gameObject.SetActive(true);
|
||||
SetupData().Forget();
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -45,7 +53,7 @@ public class ShiPopupSample : MonoBehaviour
|
||||
/// </summary>
|
||||
private async UniTaskVoid SetupData()
|
||||
{
|
||||
if (blockDetailModal == null)
|
||||
if (isopModal == null)
|
||||
{
|
||||
Debug.LogWarning("BlockDetailModal is not assigned.");
|
||||
return;
|
||||
@@ -53,10 +61,10 @@ public class ShiPopupSample : MonoBehaviour
|
||||
|
||||
string sa = Application.streamingAssetsPath;
|
||||
string glbPath = Path.Combine(sa, "block.glb");
|
||||
string jsonPath = "isop_chart_short.json";
|
||||
string jsonPath = Path.Combine(sa, "isop_chart_short.json");
|
||||
|
||||
|
||||
Debug.Log($"Loaded blockDetailModal:{blockDetailModal}");
|
||||
await blockDetailModal.LoadData(glbPath, jsonPath);
|
||||
Debug.Log($"Loaded blockDetailModal:{isopModal}");
|
||||
await isopModal.LoadData(glbPath, jsonPath);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user