From 8107321f04aa4cc3ac90a24a4d70836fbb26409e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Sat, 8 Feb 2025 17:38:03 +0900 Subject: [PATCH] =?UTF-8?q?UI=20=EB=B2=84=EA=B7=B8=20=EC=A0=84=EB=B6=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/0_Scenes/Title.unity | 13 ++++++++++++- Assets/1_Script/Common.cs | 22 ++++++++++++++-------- Assets/1_Script/ItemPrefab.cs | 1 + Assets/1_Script/SearchCtrl.cs | 6 +++++- Assets/1_Script/System/NetworkManager.cs | 20 ++++++++++---------- 5 files changed, 42 insertions(+), 20 deletions(-) diff --git a/Assets/0_Scenes/Title.unity b/Assets/0_Scenes/Title.unity index 1a42c03..821225e 100644 --- a/Assets/0_Scenes/Title.unity +++ b/Assets/0_Scenes/Title.unity @@ -2940,7 +2940,7 @@ MonoBehaviour: isOnSprite: - {fileID: 21300000, guid: 50a793ca026e5f94db805e7d6ef95009, type: 3} - {fileID: 21300000, guid: 56b1f3526ae1a484992f61111d77da10, type: 3} - item: {fileID: 3565683730023604969, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + item: {fileID: 1680985025} results: {fileID: 560148188} listTop: {fileID: 1076792096} bar: {fileID: 281812711} @@ -13579,6 +13579,17 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 0 +--- !u!114 &1680985025 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3565683730023604969, guid: 1f0354a7d9f779b43a2437d0e2712b91, type: 3} + m_PrefabInstance: {fileID: 1262477021} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1da056f246b185842aae317b0faf0a3b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1685326729 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/1_Script/Common.cs b/Assets/1_Script/Common.cs index 1c64868..06e1b58 100644 --- a/Assets/1_Script/Common.cs +++ b/Assets/1_Script/Common.cs @@ -1,3 +1,4 @@ +using BestHTTP; using System.Collections.Generic; using TMPro; using UnityEngine; @@ -14,7 +15,7 @@ public class Common : MonoBehaviour void Start() { - NetworkManager.Instance.CreateRequest>("common/animalTypes", new object(), (data) => + HTTPRequest httpAnimal = NetworkManager.Instance.CreateRequest>("common/animalTypes", new object(), (data) => { GameManager.Instance.animalTypes = data; List strings = new List(); @@ -23,8 +24,9 @@ public class Common : MonoBehaviour strings.Add(data[n].code_nm); } dAnimal.AddOptions(strings); - }, null, BestHTTP.HTTPMethods.Get); - NetworkManager.Instance.CreateRequest>("common/suitStyle", new object(), (data) => + + }, null, HTTPMethods.Get); + HTTPRequest httpSuitStyle = NetworkManager.Instance.CreateRequest>("common/suitStyle", new object(), (data) => { GameManager.Instance.suitStyle = data; List strings = new List(); @@ -33,8 +35,8 @@ public class Common : MonoBehaviour strings.Add(data[n].code_nm); } dSuitStyle.AddOptions(strings); - }, null, BestHTTP.HTTPMethods.Get); - NetworkManager.Instance.CreateRequest>("common/suitType", new object(), (data) => + }, null, HTTPMethods.Get); + HTTPRequest httpSuitType = NetworkManager.Instance.CreateRequest>("common/suitType", new object(), (data) => { GameManager.Instance.suitType = data; List strings = new List(); @@ -43,8 +45,8 @@ public class Common : MonoBehaviour strings.Add(data[n].code_nm); } dSuitType.AddOptions(strings); - }, null, BestHTTP.HTTPMethods.Get); - NetworkManager.Instance.CreateRequest>("common/region", new object(), (data) => + }, null, HTTPMethods.Get); + HTTPRequest httpRegion = NetworkManager.Instance.CreateRequest>("common/region", new object(), (data) => { GameManager.Instance.region = data; List strings = new List(); @@ -53,7 +55,11 @@ public class Common : MonoBehaviour strings.Add(data[n].code_nm); } dRegion.AddOptions(strings); - }, null, BestHTTP.HTTPMethods.Get); + }, null, HTTPMethods.Get); + httpAnimal.Send(); + httpSuitStyle.Send(); + httpSuitType.Send(); + httpRegion.Send(); } public class CommonData diff --git a/Assets/1_Script/ItemPrefab.cs b/Assets/1_Script/ItemPrefab.cs index d41c1c7..8945a5a 100644 --- a/Assets/1_Script/ItemPrefab.cs +++ b/Assets/1_Script/ItemPrefab.cs @@ -4,6 +4,7 @@ using UnityEngine.UI; public class ItemPrefab : MonoBehaviour, System.IEquatable { + [SerializeField] Library _library; public Library library { get { return _library; } } [SerializeField] TMP_Text suitName; diff --git a/Assets/1_Script/SearchCtrl.cs b/Assets/1_Script/SearchCtrl.cs index 7691bb4..25f606f 100644 --- a/Assets/1_Script/SearchCtrl.cs +++ b/Assets/1_Script/SearchCtrl.cs @@ -6,6 +6,8 @@ using UnityEngine.Pool; using Cysharp.Threading.Tasks; using System.Threading.Tasks; using System.Linq; +using System; +using BestHTTP; public class SearchCtrl : SingletonMonoBehaviour { @@ -135,7 +137,7 @@ public class SearchCtrl : SingletonMonoBehaviour var tcs = new TaskCompletionSource(); - var searchRequest = NetworkManager.Instance.CreateRequest( + HTTPRequest searchRequest = NetworkManager.Instance.CreateRequest( "library/select/suiters", request, (data) => @@ -228,6 +230,7 @@ public class SearchCtrl : SingletonMonoBehaviour }, (fail) => { + Debug.LogError("GetImage Fail"); tcs.SetResult(null); }, BestHTTP.HTTPMethods.Get @@ -308,6 +311,7 @@ public class ImageResponse public byte[] imageBytes; } +[Serializable] public class Library { public string imageBase64; diff --git a/Assets/1_Script/System/NetworkManager.cs b/Assets/1_Script/System/NetworkManager.cs index 4bbddfa..e072bbb 100644 --- a/Assets/1_Script/System/NetworkManager.cs +++ b/Assets/1_Script/System/NetworkManager.cs @@ -44,13 +44,21 @@ public class NetworkManager : SingletonMonoBehaviour httpRquest.RawData = System.Text.Encoding.UTF8.GetBytes(json); } - httpRquest.Send(); return httpRquest; } + + /// + /// Texture2D 통신용 함수 + /// + /// + /// + /// + /// + /// + /// public HTTPRequest CreateImageRequest(string api, object serializeData, Action onSuccess, Action onFail = null, HTTPMethods methods = HTTPMethods.Post) { string url = $"{baseUrl}{api}".Replace("\\p{Z}", String.Empty); - var httpRquest = new HTTPRequest(new Uri(url) //url 넣기 , methods //동작 방식 넣기 , (request, response) => { @@ -71,14 +79,6 @@ public class NetworkManager : SingletonMonoBehaviour string json = JsonConvert.SerializeObject(serializeData); httpRquest.RawData = System.Text.Encoding.UTF8.GetBytes(json); } - - httpRquest.Send(); return httpRquest; } - - private IEnumerator Sendearch() - { - //Timing.RunCoroutine(BuildingSet()); - yield return Timing.WaitForSeconds(0.1f); - } }