필오없는 스크립트 삭제 및 클로즈 베타전 마지막 업데이트
This commit is contained in:
parent
1269673cf7
commit
1f24f3ad99
File diff suppressed because it is too large
Load Diff
|
|
@ -2,7 +2,6 @@ using BestHTTP;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
|
||||||
|
|
||||||
public class Common : MonoBehaviour
|
public class Common : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
@ -15,8 +14,6 @@ public class Common : MonoBehaviour
|
||||||
[SerializeField] TMP_Dropdown fSuitStyle;
|
[SerializeField] TMP_Dropdown fSuitStyle;
|
||||||
[SerializeField] TMP_Dropdown fSuitType;
|
[SerializeField] TMP_Dropdown fSuitType;
|
||||||
[SerializeField] TMP_Dropdown fRegion;
|
[SerializeField] TMP_Dropdown fRegion;
|
||||||
// TODO 내부 저장 기능 만들기
|
|
||||||
// TODO 버전 기능 까지 만들어서 버전 체크후 새로 다운받아오게 만들기.
|
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.EventSystems;
|
|
||||||
using System.IO;
|
|
||||||
using UnityEngine.UI;
|
|
||||||
|
|
||||||
public class DragDrop : MonoBehaviour, IDropHandler
|
|
||||||
{
|
|
||||||
private byte[] sendData; // 바이너리 데이터 저장 변수
|
|
||||||
private string fileName; // 파일 이름 저장
|
|
||||||
public void OnDrop(PointerEventData eventData)
|
|
||||||
{
|
|
||||||
if (eventData.pointerDrag != null)
|
|
||||||
{
|
|
||||||
string path = eventData.pointerDrag.GetComponent<Text>().text; // 드래그된 파일의 경로
|
|
||||||
if (File.Exists(path))
|
|
||||||
{
|
|
||||||
sendData = File.ReadAllBytes(path); // 파일을 바이너리 데이터로 저장
|
|
||||||
fileName = Path.GetFileName(path); // 파일명 저장
|
|
||||||
Debug.Log($"파일 {fileName} 로드 완료, 크기: {sendData.Length} 바이트");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 7a38243e67c9e544289d6cbed9dfc871
|
|
||||||
|
|
@ -1,8 +1,4 @@
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using TMPro;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.EventSystems;
|
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class DropdownCtrl : MonoBehaviour
|
public class DropdownCtrl : MonoBehaviour
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,14 @@
|
||||||
using BestHTTP;
|
using BestHTTP;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Security.Cryptography;
|
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using static Common;
|
|
||||||
using static GameManager;
|
|
||||||
|
|
||||||
public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
{
|
{
|
||||||
|
[SerializeField] Image setImage;
|
||||||
[SerializeField] GameObject[] stepMenus;
|
[SerializeField] GameObject[] stepMenus;
|
||||||
[SerializeField] TMP_Text xid;
|
[SerializeField] TMP_Text xid;
|
||||||
[SerializeField] TMP_InputField owner;
|
[SerializeField] TMP_InputField owner;
|
||||||
|
|
@ -40,14 +37,38 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
[SerializeField] GameObject infoUI;
|
[SerializeField] GameObject infoUI;
|
||||||
[SerializeField] GameObject successUI;
|
[SerializeField] GameObject successUI;
|
||||||
[SerializeField] ScreenMove screenMove;
|
[SerializeField] ScreenMove screenMove;
|
||||||
|
|
||||||
|
private byte[] image;
|
||||||
|
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
|
WebGl.Instance.isOn = true;
|
||||||
|
image = null;
|
||||||
|
setImage.gameObject.SetActive(false);
|
||||||
UIReset();
|
UIReset();
|
||||||
xid.text = GameManager.Instance.xid;
|
xid.text = GameManager.Instance.xid;
|
||||||
sXid.text = GameManager.Instance.xid;
|
sXid.text = GameManager.Instance.xid;
|
||||||
owner.text = GameManager.Instance.xname;
|
owner.text = GameManager.Instance.xname;
|
||||||
sOwner.text = GameManager.Instance.xname;
|
sOwner.text = GameManager.Instance.xname;
|
||||||
}
|
}
|
||||||
|
private void OnDisable()
|
||||||
|
{
|
||||||
|
WebGl.Instance.isOn = false;
|
||||||
|
}
|
||||||
|
public void SetImage(byte[] image)
|
||||||
|
{
|
||||||
|
this.image = image;
|
||||||
|
Texture2D texture = new Texture2D(2, 2);
|
||||||
|
if (texture.LoadImage(image))
|
||||||
|
{
|
||||||
|
setImage.sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
|
||||||
|
setImage.gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogError("이미지 로드 실패!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void UIReset()
|
private void UIReset()
|
||||||
{
|
{
|
||||||
|
|
@ -81,44 +102,44 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
{
|
{
|
||||||
if (xid.text == string.Empty)
|
if (xid.text == string.Empty)
|
||||||
{
|
{
|
||||||
Debug.Log("로그인 안됨");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotLogin);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (owner.text == string.Empty)
|
if (owner.text == string.Empty)
|
||||||
{
|
{
|
||||||
Debug.Log("오너 정보 없음");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotOwner);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (characterName.text == string.Empty)
|
if (characterName.text == string.Empty)
|
||||||
{
|
{
|
||||||
Debug.Log("케릭터 이름 없음");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotName);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (animalType.value == 0)
|
if (animalType.value == 0)
|
||||||
{
|
{
|
||||||
Debug.Log("동물 정보 없음");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotAnimalType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (suitType.value == 0)
|
if (suitType.value == 0)
|
||||||
{
|
{
|
||||||
Debug.Log("슈트 타입 정보 없음");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotSuitType);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (suitStyle.value == 0)
|
if (suitStyle.value == 0)
|
||||||
{
|
{
|
||||||
Debug.Log("슈트스타일 정보 없음");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotSuitStyle);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (region.value == 0)
|
if (region.value == 0)
|
||||||
{
|
{
|
||||||
Debug.Log("국가 정보 없음");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotRegion);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
DateTime date;
|
DateTime date;
|
||||||
if (!DateTimeCheck(productionDate.text, out date))
|
if (!DateTimeCheck(productionDate.text, out date))
|
||||||
{
|
{
|
||||||
Debug.Log("날자 정보 잘못됨");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotProductionDate);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sXid.text = xid.text;
|
sXid.text = xid.text;
|
||||||
|
|
@ -134,7 +155,11 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
{
|
{
|
||||||
sColors[n].SetActive(colors[n].isOn);
|
sColors[n].SetActive(colors[n].isOn);
|
||||||
}
|
}
|
||||||
|
if (image == null)
|
||||||
|
{
|
||||||
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotImageSet);
|
||||||
|
return;
|
||||||
|
}
|
||||||
infoUI.SetActive(false);
|
infoUI.SetActive(false);
|
||||||
successUI.SetActive(true);
|
successUI.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
@ -154,24 +179,23 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
regSuitInfo.suitRegion = GameManager.Instance.region[region.value - 1].code_id;
|
regSuitInfo.suitRegion = GameManager.Instance.region[region.value - 1].code_id;
|
||||||
regSuitInfo.suitMaker = makerName.text;
|
regSuitInfo.suitMaker = makerName.text;
|
||||||
regSuitInfo.colorList = new List<string>();
|
regSuitInfo.colorList = new List<string>();
|
||||||
|
regSuitInfo.suitImg = image;
|
||||||
|
regSuitInfo.userInfo = introeuce.text;
|
||||||
|
regSuitInfo.productionDate = productionDate.text;
|
||||||
for (int n = 0; n < colors.Length; n++)
|
for (int n = 0; n < colors.Length; n++)
|
||||||
{
|
{
|
||||||
if (colors[n].isOn)
|
if (colors[n].isOn)
|
||||||
{
|
{
|
||||||
eColor color = eColor.핑크벚꽃 + n;
|
GameManager.eColor color = GameManager.eColor.핑크벚꽃 + n;
|
||||||
regSuitInfo.colorList.Add(((int)color).ToString());
|
regSuitInfo.colorList.Add(((int)color).ToString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
regSuitInfo.id = xid.text;
|
|
||||||
|
|
||||||
Debug.Log(JsonConvert.SerializeObject(regSuitInfo));
|
HTTPRequest httpFursuitAdd = NetworkManager.Instance.CreateRequest<object>("register/regFursuiterInfo", regSuitInfo, (data) =>
|
||||||
//HTTPRequest httpFursuitAdd = NetworkManager.Instance.CreateRequest<object>("register/regFursuiterInfo", new object(), (data) =>
|
{
|
||||||
//{
|
GameManager.Instance.infoPageUI.Set(InfoMessage.FursuitAdd, () => { screenMove.SearchView(); });
|
||||||
// GameManager.Instance.infoPageUI.Set(InfoMessage.FursuitAdd, () => { screenMove.SearchView(); });
|
}, null, HTTPMethods.Post);
|
||||||
//}, null, HTTPMethods.Post);
|
httpFursuitAdd.Send();
|
||||||
//httpFursuitAdd.Send();
|
|
||||||
|
|
||||||
GameManager.Instance.infoPageUI.Set(InfoMessage.FursuitAdd, () => { screenMove.SearchView(); });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class RegSuitInfo
|
public class RegSuitInfo
|
||||||
|
|
@ -184,8 +208,9 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
public string suitRegion;
|
public string suitRegion;
|
||||||
public string suitMaker;
|
public string suitMaker;
|
||||||
public List<string> colorList;
|
public List<string> colorList;
|
||||||
//public MultipartFile suitImg;
|
public byte[] suitImg;
|
||||||
|
|
||||||
public string id;
|
public string userInfo;
|
||||||
|
public string productionDate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,31 @@
|
||||||
using System;
|
using System;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class InfoPageCtrl : MonoBehaviour
|
public class InfoPageCtrl : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] TMP_Text message;
|
[SerializeField] TMP_Text message;
|
||||||
|
[SerializeField] Image outLine;
|
||||||
|
[SerializeField] Image button;
|
||||||
|
[SerializeField] Color success;
|
||||||
|
[SerializeField] Color fail;
|
||||||
|
|
||||||
private Action action;
|
private Action action;
|
||||||
|
|
||||||
public void Set(string message, Action action = null)
|
public void Set(string message, Action action = null)
|
||||||
{
|
{
|
||||||
|
outLine.color = success;
|
||||||
|
button.color = success;
|
||||||
|
this.message.text = message;
|
||||||
|
this.action = action;
|
||||||
|
gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetError(string message, Action action = null)
|
||||||
|
{
|
||||||
|
outLine.color = fail;
|
||||||
|
button.color = fail;
|
||||||
this.message.text = message;
|
this.message.text = message;
|
||||||
this.action = action;
|
this.action = action;
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,11 @@ public class ItemPrefab : MonoBehaviour, System.IEquatable<ItemPrefab>
|
||||||
this._library = library;
|
this._library = library;
|
||||||
suitName.text = library.suit_name;
|
suitName.text = library.suit_name;
|
||||||
ownerName.text = library.owner_name;
|
ownerName.text = library.owner_name;
|
||||||
|
if(library._suit_image == null)
|
||||||
|
{
|
||||||
|
loading.SetActive(true);
|
||||||
|
suitImage.texture = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ public class ModalCtrl : MonoBehaviour
|
||||||
[SerializeField] RectTransform imageMask;
|
[SerializeField] RectTransform imageMask;
|
||||||
[SerializeField] RawImage suitImage;
|
[SerializeField] RawImage suitImage;
|
||||||
[SerializeField] TMP_Text suitName;
|
[SerializeField] TMP_Text suitName;
|
||||||
|
[SerializeField] TMP_Text userInfo;
|
||||||
[SerializeField] TMP_Text ownerName;
|
[SerializeField] TMP_Text ownerName;
|
||||||
[SerializeField] TMP_Text suitMaker;
|
[SerializeField] TMP_Text suitMaker;
|
||||||
[SerializeField] TMP_Text debutDate;
|
[SerializeField] TMP_Text debutDate;
|
||||||
|
|
@ -38,10 +39,19 @@ public class ModalCtrl : MonoBehaviour
|
||||||
Vector2 newSize = new Vector2(rect.sizeDelta.x / size, rect.sizeDelta.y / size);
|
Vector2 newSize = new Vector2(rect.sizeDelta.x / size, rect.sizeDelta.y / size);
|
||||||
rect.sizeDelta = newSize;
|
rect.sizeDelta = newSize;
|
||||||
suitName.text = library.suit_name;
|
suitName.text = library.suit_name;
|
||||||
|
userInfo.text = library.user_info;
|
||||||
ownerName.text = library.owner_name;
|
ownerName.text = library.owner_name;
|
||||||
suitMaker.text = library.maker;
|
suitMaker.text = library.maker;
|
||||||
debutDate.text = library.production_date;
|
debutDate.text = library.production_date;
|
||||||
animalType.text = library.animal_type;
|
animalType.text = library.animal_type;
|
||||||
suitStyle.text = library.suit_style;
|
suitStyle.text = library.suit_style;
|
||||||
|
for(int n = 0; n < colors.Length; n++)
|
||||||
|
{
|
||||||
|
colors[n].SetActive(false);
|
||||||
|
}
|
||||||
|
for (int n = 0; n < library.suit_color.Count; n++)
|
||||||
|
{
|
||||||
|
colors[int.Parse(library.suit_color[n]) - (int)GameManager.eColor.ÇÎÅ©º¢²É].SetActive(true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,5 @@
|
||||||
using BestHTTP;
|
using BestHTTP;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using static Common;
|
|
||||||
|
|
||||||
public class ScreenMove : MonoBehaviour
|
public class ScreenMove : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ using System.Threading.Tasks;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System;
|
using System;
|
||||||
using BestHTTP;
|
using BestHTTP;
|
||||||
using Unity.VisualScripting;
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
||||||
{
|
{
|
||||||
|
|
@ -188,6 +188,32 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
||||||
isBefore = false;
|
isBefore = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<string> selectColor = new List<string>();
|
||||||
|
for (int n = 0; n < colors.Length; n++) {
|
||||||
|
if (colors[n].isOn)
|
||||||
|
{
|
||||||
|
selectColor.Add((n + (int)GameManager.eColor.ÇÎÅ©º¢²É).ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(selectColor.Count != request.colorList.Count)
|
||||||
|
{
|
||||||
|
request.colorList = selectColor;
|
||||||
|
isBefore = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for(int n = 0; n < selectColor.Count; n++)
|
||||||
|
{
|
||||||
|
if (selectColor[n] != request.colorList[n])
|
||||||
|
{
|
||||||
|
request.colorList = selectColor;
|
||||||
|
isBefore = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//첫 검색이거나 이전과 검색결과가 같지 않으면 검색진행
|
//첫 검색이거나 이전과 검색결과가 같지 않으면 검색진행
|
||||||
if (!isBefore || !listTop.activeSelf)
|
if (!isBefore || !listTop.activeSelf)
|
||||||
{
|
{
|
||||||
|
|
@ -215,10 +241,7 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
||||||
|
|
||||||
var tcs = new TaskCompletionSource<bool>();
|
var tcs = new TaskCompletionSource<bool>();
|
||||||
|
|
||||||
HTTPRequest searchRequest = NetworkManager.Instance.CreateRequest<SearchResponse>(
|
HTTPRequest searchRequest = NetworkManager.Instance.CreateRequest<SearchResponse>("library/select/suiters", request, (data) =>
|
||||||
"library/select/suiters",
|
|
||||||
request,
|
|
||||||
(data) =>
|
|
||||||
{
|
{
|
||||||
for (int n = 0; n < data.data.Count; n++)
|
for (int n = 0; n < data.data.Count; n++)
|
||||||
{
|
{
|
||||||
|
|
@ -396,6 +419,7 @@ public class Library
|
||||||
{
|
{
|
||||||
public string imageBase64;
|
public string imageBase64;
|
||||||
public string suit_name;
|
public string suit_name;
|
||||||
|
public string user_info;
|
||||||
public string owner_id;
|
public string owner_id;
|
||||||
public string owner_name;
|
public string owner_name;
|
||||||
public string production_date;
|
public string production_date;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
using System.Collections;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class GameObjectPool<T> where T : class
|
public class GameObjectPool<T> where T : class
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,30 @@
|
||||||
|
|
||||||
public static class InfoMessage
|
public static class InfoMessage
|
||||||
{
|
{
|
||||||
//public static readonly string FursuitAdd = "등록신청이 완료되었습니다!\n<size=66%>주말 / 공휴일 제외 3일 이내로 등록 예정으로 추가 문의는 @fursuit_library로 문의바랍니다.</size>";
|
public static readonly string FursuitAdd = "등록신청이 완료되었습니다!\n<size=66%>주말 / 공휴일 제외 3일 이내로 등록 예정으로 추가 문의는 @fursuit_library로 문의바랍니다.</size>";
|
||||||
public static readonly string FursuitAdd = "등록신청이 완료되었습니다!\n<size=66%>현재 기능 테스트 중입니다. 해당기능은 정식 오픈 후 이용하실 수 있습니다.\n(정식 오픈일시 4월1일)</size>";
|
|
||||||
|
//Error
|
||||||
|
public static readonly string NotLogin = "문제 발생!\n<size=66%>트위터 로그인이 되어있지 않습니다.\n@fursuit_library로 문의바랍니다.</size>";
|
||||||
|
|
||||||
|
public static readonly string NotOwner = "확인해 주세요\n<size=66%>오너 정보가 없습니다.</size>";
|
||||||
|
public static readonly string NotName = "확인해 주세요\n<size=66%>케릭터 이름을 등록하지 않으셨습니다</size>";
|
||||||
|
public static readonly string NotAnimalType = "확인해 주세요\n<size=66%>동물 종을 선택하지 않으셨습니다. \n만약 리스트에 없을경우 @fursuit_library로 문의바랍니다.</size>";
|
||||||
|
public static readonly string NotSuitType = "확인해 주세요\n<size=66%>슈트 타입정보가 없습니다.</size>";
|
||||||
|
public static readonly string NotSuitStyle = "확인해 주세요\n<size=66%>슈트 스타일정보가 없습니다.</size>";
|
||||||
|
public static readonly string NotRegion = "확인해 주세요\n<size=66%>활동 국가 정보가 없습니다.</size>";
|
||||||
|
public static readonly string NotProductionDate = "확인해 주세요\n<size=66%>활동 시작일 정보가 잘못되었습니다.\n예)2025-04-01</size>";
|
||||||
|
public static readonly string NotImage = "확인해 주세요\n<size=66%>이미지 파일이 아닙니다.</size>";
|
||||||
|
public static readonly string NotImageType = "확인해 주세요\n<size=66%>잘못된 이미지 타입입니다.\n현재 jpg, jpeg, png만 지원하고 있습니다.\n추가 지원문의는 @fursuit_library로 문의바랍니다.</size>";
|
||||||
|
public static readonly string NotImageSet = "확인해 주세요\n<size=66%>이미지를 등록해 주세요.</size>";
|
||||||
|
|
||||||
|
public static readonly string NotImageSize = "확인해 주세요\n<size=66%>등록 가능한 이미지 최대 크기는 10MB입니다.</size>";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//ErrorCode
|
||||||
|
//잘못된 압축 형식 Base64가 아닌경우 발생
|
||||||
|
public static readonly string SystemError00001 = "문제 발생!\n<size=66%>아래 코드를 @fursuit_library로 문의해주세요\nE00001</size>";
|
||||||
|
//json 처리 오류
|
||||||
|
public static readonly string SystemError00002 = "문제 발생!\n<size=66%>아래 코드를 @fursuit_library로 문의해주세요\nE00002</size>";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ using UnityEngine;
|
||||||
using BestHTTP;
|
using BestHTTP;
|
||||||
using System;
|
using System;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using BestHTTP.JSON;
|
||||||
|
|
||||||
|
|
||||||
public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
||||||
|
|
@ -59,7 +60,7 @@ public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public HTTPRequest CreateImageRequest(string api, object serializeData, Action<Texture2D> onSuccess, Action<Texture2D> onFail = null, HTTPMethods methods = HTTPMethods.Post)
|
public HTTPRequest CreateImageRequest(string api, object serializeData, Action<Texture2D> onSuccess, Action<Texture2D> onFail = null, HTTPMethods methods = HTTPMethods.Post)
|
||||||
{
|
{
|
||||||
string url = $"{baseUrl}{api}".Replace("\\p{Z}", String.Empty);
|
string url = $"{_baseUrl}/{_baseEndpoint}/{api}".Replace("\\p{Z}", String.Empty);
|
||||||
var httpRquest = new HTTPRequest(new Uri(url) //url 넣기
|
var httpRquest = new HTTPRequest(new Uri(url) //url 넣기
|
||||||
, methods //동작 방식 넣기
|
, methods //동작 방식 넣기
|
||||||
, (request, response) => {
|
, (request, response) => {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,4 @@
|
||||||
using System.Collections;
|
using UnityEngine;
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class SingletonMonoBehaviour<T> : MonoBehaviour where T : SingletonMonoBehaviour<T>
|
public class SingletonMonoBehaviour<T> : MonoBehaviour where T : SingletonMonoBehaviour<T>
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,45 +1,72 @@
|
||||||
using Newtonsoft.Json;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System;
|
using System;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
public class WebGl : MonoBehaviour
|
public class WebGl : SingletonMonoBehaviour<WebGl>
|
||||||
{
|
{
|
||||||
|
public bool isOn = false;
|
||||||
|
|
||||||
public byte[] image { get { return _images; } }
|
public byte[] image { get { return _images; } }
|
||||||
byte[] _images;
|
byte[] _images;
|
||||||
|
|
||||||
public void GetDragAndDrop(string base64Json)
|
public void GetDragAndDrop(string base64Json)
|
||||||
{
|
{
|
||||||
try
|
if (!isOn)
|
||||||
|
return;
|
||||||
|
try
|
||||||
{
|
{
|
||||||
Debug.Log("JSON 데이터 수신 완료");
|
base64Json = base64Json.Replace("[\"", "").Replace("\"]", "");
|
||||||
|
string[] data = base64Json.Split(',');
|
||||||
// JSON 문자열을 리스트로 변환
|
data[0] = data[0].Replace("data:", "");
|
||||||
List<string> base64List = JsonConvert.DeserializeObject<List<string>>(base64Json);
|
data[0] = data[0].Replace("/", ";");
|
||||||
|
string[] info = data[0].Split(";");
|
||||||
if (base64List == null || base64List.Count == 0)
|
if (info[0] != "image")
|
||||||
{
|
{
|
||||||
Debug.LogError("Base64 리스트가 비어 있습니다.");
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotImage);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 첫 번째 이미지를 _images에 저장 (여러 개 저장하려면 List<byte[]> 사용)
|
if (!(info[1] == "png" || info[1] == "jpg" || info[1] == "jpeg"))
|
||||||
_images = Convert.FromBase64String(base64List[0]);
|
{
|
||||||
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotImageType);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Debug.Log("이미지 변환 완료, 크기: " + _images.Length + " 바이트");
|
if (info[2] != "base64")
|
||||||
|
{
|
||||||
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.SystemError00001);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_images = DecodeBase64(data[1]);
|
||||||
|
double fileSizeInMB = _images.Length / (1024.0 * 1024.0);
|
||||||
|
|
||||||
|
if (fileSizeInMB > 10.0d)
|
||||||
|
{
|
||||||
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.NotImageSize);
|
||||||
|
Debug.Log($"파일 크기: {fileSizeInMB:F2} MB");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
FursuitAddCtrl.Instance.SetImage(image);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
Debug.LogError("JSON 처리 중 오류 발생: " + e.Message);
|
GameManager.Instance.infoPageUI.SetError(InfoMessage.SystemError00002);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
[DllImport("__Internal")]
|
|
||||||
private static extern void GetImageDataJS(byte[] array, int length);
|
|
||||||
|
|
||||||
public void ReceiveImageData(byte[] data)
|
public byte[] DecodeBase64(string base64String)
|
||||||
{
|
{
|
||||||
Debug.Log("시작");
|
try
|
||||||
_images = data;
|
{
|
||||||
Debug.Log($"이미지 데이터 수신 완료: {_images.Length} 바이트");
|
// Base64 문자열을 byte[]로 디코딩
|
||||||
|
byte[] byteArray = Convert.FromBase64String(base64String);
|
||||||
|
return byteArray;
|
||||||
|
}
|
||||||
|
catch (FormatException ex)
|
||||||
|
{
|
||||||
|
// 잘못된 Base64 문자열 처리
|
||||||
|
Console.WriteLine("Base64 디코딩 실패: " + ex.Message);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
using BestHTTP;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
|
||||||
using static Common;
|
|
||||||
|
|
||||||
public class Test : MonoBehaviour
|
|
||||||
{
|
|
||||||
[ContextMenu("test")]
|
|
||||||
public void test()
|
|
||||||
{
|
|
||||||
Application.OpenURL("https://tomcattest.pandoli365.com/oauth2/authorization/twitter");
|
|
||||||
//HTTPRequest httpRegion = NetworkManager.Instance.CreateRequest<object>("register/sessiontest", new object(), (data) =>
|
|
||||||
//{
|
|
||||||
//}, null, HTTPMethods.Post);
|
|
||||||
//httpRegion.Send();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: be363ce6969218a4fbbf818dec04cead
|
|
||||||
|
|
@ -147,7 +147,8 @@ TextureImporter:
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
spriteCustomMetadata:
|
spriteCustomMetadata:
|
||||||
entries: []
|
entries: []
|
||||||
nameFileIdTable: {}
|
nameFileIdTable:
|
||||||
|
Dropdown_Input_0: -2301733007492010490
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,8 @@ TextureImporter:
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
spriteCustomMetadata:
|
spriteCustomMetadata:
|
||||||
entries: []
|
entries: []
|
||||||
nameFileIdTable: {}
|
nameFileIdTable:
|
||||||
|
Icon_0: -2278566297644842510
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
|
|
@ -0,0 +1,156 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: be55064a11650084a98e70d3710ab911
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable:
|
||||||
|
- first:
|
||||||
|
213: -8320539100486018772
|
||||||
|
second: Rectangle_27_1_0
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 2
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: Rectangle_27_1_0
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 60
|
||||||
|
height: 60
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0.5, y: 0.5}
|
||||||
|
border: {x: 30, y: 30, z: 30, w: 30}
|
||||||
|
customData:
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID: c2958cfa5c1878c80800000000000000
|
||||||
|
internalID: -8320539100486018772
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 0baa582e3dcf32c46ac65e46bda1b95b
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable:
|
||||||
|
Rectangle_27_1_0: -8320539100486018772
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 907 B |
|
|
@ -0,0 +1,155 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1dc401a7352bb85449909791095ea911
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable:
|
||||||
|
- first:
|
||||||
|
213: -2278566297644842510
|
||||||
|
second: Icon_0
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 13
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 0
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
flipGreenChannel: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMipmapLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 0
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 2
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 1
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 8
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
swizzle: 50462976
|
||||||
|
cookieLightType: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 4
|
||||||
|
buildTarget: WebGL
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
ignorePlatformSupport: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites:
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: Icon_0
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 46
|
||||||
|
height: 53
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
customData:
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID: 2f1c3bf4608e060e0800000000000000
|
||||||
|
internalID: -2278566297644842510
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
outline: []
|
||||||
|
customData:
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
mipmapLimitGroupName:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 1023 KiB |
|
|
@ -147,8 +147,7 @@ TextureImporter:
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
spriteCustomMetadata:
|
spriteCustomMetadata:
|
||||||
entries: []
|
entries: []
|
||||||
nameFileIdTable:
|
nameFileIdTable: {}
|
||||||
Main_Container_0: 2478865279642758037
|
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,8 @@ TextureImporter:
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
spriteCustomMetadata:
|
spriteCustomMetadata:
|
||||||
entries: []
|
entries: []
|
||||||
nameFileIdTable: {}
|
nameFileIdTable:
|
||||||
|
Main_Containerasdf_0: 6839554522387699187
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1 +0,0 @@
|
||||||
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"WebGL","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.37f1","Branch":"6000.0/staging","Changeset":"090b7797214c","Date":1738096167},"Dependencies":["com.unity.collab-proxy@2.6.0","com.unity.feature.2d@2.0.1","com.unity.ide.rider@3.0.34","com.unity.ide.visualstudio@2.0.22","com.unity.multiplayer.center@1.0.0","com.unity.nuget.newtonsoft-json@3.2.1","com.unity.test-framework@1.4.5","com.unity.timeline@1.8.7","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.5","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.2d.animation@10.1.4","com.unity.2d.pixel-perfect@5.0.3","com.unity.2d.psdimporter@9.0.3","com.unity.2d.sprite@1.0.0","com.unity.2d.spriteshape@10.0.7","com.unity.2d.tilemap@1.0.0","com.unity.2d.tilemap.extras@4.1.0","com.unity.2d.aseprite@1.1.8","com.unity.2d.common@9.0.7","com.unity.mathematics@1.3.2","com.unity.collections@2.5.1","com.unity.burst@1.8.19","com.unity.nuget.mono-cecil@1.11.4","com.unity.test-framework.performance@3.0.3"],"Results":[]}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: f284d25e8123dd14c999c922d53e4ed3
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"MeasurementCount":-1}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: e87490adb90667642a6690c7bfb5425a
|
|
||||||
TextScriptImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
|
|
@ -10,7 +10,6 @@ namespace TMPro.Examples
|
||||||
public class TMP_TextInfoDebugTool : MonoBehaviour
|
public class TMP_TextInfoDebugTool : MonoBehaviour
|
||||||
{
|
{
|
||||||
// Since this script is used for debugging, we exclude it from builds.
|
// Since this script is used for debugging, we exclude it from builds.
|
||||||
// TODO: Rework this script to make it into an editor utility.
|
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
public bool ShowCharacters;
|
public bool ShowCharacters;
|
||||||
public bool ShowWords;
|
public bool ShowWords;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue