이미지 업로드 1차 작업
This commit is contained in:
parent
e016254acb
commit
1269673cf7
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,23 @@
|
||||||
|
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} 바이트");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7a38243e67c9e544289d6cbed9dfc871
|
||||||
|
|
@ -1,9 +1,14 @@
|
||||||
|
using BestHTTP;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Security.Cryptography;
|
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>
|
||||||
{
|
{
|
||||||
|
|
@ -21,17 +26,35 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
[SerializeField] Toggle[] colors;
|
[SerializeField] Toggle[] colors;
|
||||||
[SerializeField] Sprite[] isOnSprite;
|
[SerializeField] Sprite[] isOnSprite;
|
||||||
|
|
||||||
|
[SerializeField] TMP_Text sXid;
|
||||||
|
[SerializeField] TMP_Text sOwner;
|
||||||
|
[SerializeField] TMP_Text sCharacterName;
|
||||||
|
[SerializeField] TMP_Text sMmakerName;
|
||||||
|
[SerializeField] TMP_Text sAnimalType;
|
||||||
|
[SerializeField] TMP_Text sSuitType;
|
||||||
|
[SerializeField] TMP_Text sSuitStyle;
|
||||||
|
[SerializeField] TMP_Text sRegion;
|
||||||
|
[SerializeField] TMP_Text sProductionDate;
|
||||||
|
[SerializeField] GameObject[] sColors;
|
||||||
|
|
||||||
[SerializeField] GameObject infoUI;
|
[SerializeField] GameObject infoUI;
|
||||||
[SerializeField] GameObject successUI;
|
[SerializeField] GameObject successUI;
|
||||||
|
[SerializeField] ScreenMove screenMove;
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
UIReset();
|
UIReset();
|
||||||
|
xid.text = GameManager.Instance.xid;
|
||||||
|
sXid.text = GameManager.Instance.xid;
|
||||||
|
owner.text = GameManager.Instance.xname;
|
||||||
|
sOwner.text = GameManager.Instance.xname;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UIReset()
|
private void UIReset()
|
||||||
{
|
{
|
||||||
stepMenus[0].SetActive(false);
|
stepMenus[0].SetActive(false);
|
||||||
stepMenus[1].SetActive(false);
|
stepMenus[1].SetActive(false);
|
||||||
|
infoUI.SetActive(true);
|
||||||
|
successUI.SetActive(false);
|
||||||
xid.text = string.Empty;
|
xid.text = string.Empty;
|
||||||
owner.text = string.Empty;
|
owner.text = string.Empty;
|
||||||
introeuce.text = string.Empty;
|
introeuce.text = string.Empty;
|
||||||
|
|
@ -98,6 +121,20 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
Debug.Log("³¯ÀÚ Á¤º¸ À߸øµÊ");
|
Debug.Log("³¯ÀÚ Á¤º¸ À߸øµÊ");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
sXid.text = xid.text;
|
||||||
|
sOwner.text = owner.text;
|
||||||
|
sCharacterName.text = characterName.text;
|
||||||
|
sMmakerName.text = makerName.text;
|
||||||
|
sAnimalType.text = GameManager.Instance.animalTypes[animalType.value - 1].code_nm;
|
||||||
|
sSuitType.text = GameManager.Instance.suitType[suitType.value - 1].code_nm;
|
||||||
|
sSuitStyle.text = GameManager.Instance.suitStyle[suitStyle.value - 1].code_nm;
|
||||||
|
sRegion.text = GameManager.Instance.region[region.value - 1].code_nm;
|
||||||
|
sProductionDate.text = productionDate.text;
|
||||||
|
for(int n = 0; n < colors.Length; n++)
|
||||||
|
{
|
||||||
|
sColors[n].SetActive(colors[n].isOn);
|
||||||
|
}
|
||||||
|
|
||||||
infoUI.SetActive(false);
|
infoUI.SetActive(false);
|
||||||
successUI.SetActive(true);
|
successUI.SetActive(true);
|
||||||
}
|
}
|
||||||
|
|
@ -105,4 +142,50 @@ public class FursuitAddCtrl : SingletonMonoBehaviour<FursuitAddCtrl>
|
||||||
{
|
{
|
||||||
colors[velue].image.sprite = isOnSprite[(colors[velue].isOn ? 1 : 0)];
|
colors[velue].image.sprite = isOnSprite[(colors[velue].isOn ? 1 : 0)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void FursuitAdd()
|
||||||
|
{
|
||||||
|
RegSuitInfo regSuitInfo = new RegSuitInfo();
|
||||||
|
regSuitInfo.ownerName = owner.text;
|
||||||
|
regSuitInfo.charName = characterName.text;
|
||||||
|
regSuitInfo.suitAnimalType = GameManager.Instance.animalTypes[animalType.value - 1].code_id;
|
||||||
|
regSuitInfo.suitStyle = GameManager.Instance.suitStyle[suitStyle.value - 1].code_id;
|
||||||
|
regSuitInfo.suitType = GameManager.Instance.suitType[suitType.value - 1].code_id;
|
||||||
|
regSuitInfo.suitRegion = GameManager.Instance.region[region.value - 1].code_id;
|
||||||
|
regSuitInfo.suitMaker = makerName.text;
|
||||||
|
regSuitInfo.colorList = new List<string>();
|
||||||
|
for (int n = 0; n < colors.Length; n++)
|
||||||
|
{
|
||||||
|
if (colors[n].isOn)
|
||||||
|
{
|
||||||
|
eColor color = eColor.ÇÎÅ©º¢²É + n;
|
||||||
|
regSuitInfo.colorList.Add(((int)color).ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
regSuitInfo.id = xid.text;
|
||||||
|
|
||||||
|
Debug.Log(JsonConvert.SerializeObject(regSuitInfo));
|
||||||
|
//HTTPRequest httpFursuitAdd = NetworkManager.Instance.CreateRequest<object>("register/regFursuiterInfo", new object(), (data) =>
|
||||||
|
//{
|
||||||
|
// GameManager.Instance.infoPageUI.Set(InfoMessage.FursuitAdd, () => { screenMove.SearchView(); });
|
||||||
|
//}, null, HTTPMethods.Post);
|
||||||
|
//httpFursuitAdd.Send();
|
||||||
|
|
||||||
|
GameManager.Instance.infoPageUI.Set(InfoMessage.FursuitAdd, () => { screenMove.SearchView(); });
|
||||||
|
}
|
||||||
|
|
||||||
|
public class RegSuitInfo
|
||||||
|
{
|
||||||
|
public string ownerName;
|
||||||
|
public string charName;
|
||||||
|
public string suitAnimalType;
|
||||||
|
public string suitStyle;
|
||||||
|
public string suitType;
|
||||||
|
public string suitRegion;
|
||||||
|
public string suitMaker;
|
||||||
|
public List<string> colorList;
|
||||||
|
//public MultipartFile suitImg;
|
||||||
|
|
||||||
|
public string id;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
using System;
|
||||||
|
using TMPro;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class InfoPageCtrl : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] TMP_Text message;
|
||||||
|
|
||||||
|
private Action action;
|
||||||
|
|
||||||
|
public void Set(string message, Action action = null)
|
||||||
|
{
|
||||||
|
this.message.text = message;
|
||||||
|
this.action = action;
|
||||||
|
gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void okButton()
|
||||||
|
{
|
||||||
|
action?.Invoke();
|
||||||
|
gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5fbc49285d6699848b5befdb66a6ba82
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
using JetBrains.Annotations;
|
using BestHTTP;
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using static Common;
|
||||||
|
|
||||||
public class ScreenMove : MonoBehaviour
|
public class ScreenMove : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
@ -13,6 +14,8 @@ public class ScreenMove : MonoBehaviour
|
||||||
|
|
||||||
[SerializeField] GameObject[] closeUI;
|
[SerializeField] GameObject[] closeUI;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
readonly Vector2 stretch = new Vector2(0f, 0.5f);
|
readonly Vector2 stretch = new Vector2(0f, 0.5f);
|
||||||
readonly Vector2 middle = new Vector2(1f, 0.5f);
|
readonly Vector2 middle = new Vector2(1f, 0.5f);
|
||||||
readonly Vector2 center = new Vector2(0.5f, 0.5f);
|
readonly Vector2 center = new Vector2(0.5f, 0.5f);
|
||||||
|
|
@ -85,6 +88,34 @@ public class ScreenMove : MonoBehaviour
|
||||||
}
|
}
|
||||||
public void FursuitAdd()
|
public void FursuitAdd()
|
||||||
{
|
{
|
||||||
|
#if UNITY_EDITOR
|
||||||
|
GameManager.Instance.xid = "Fursuit_Library";
|
||||||
|
GameManager.Instance.xname = "ÆÛ½´Æ®µµ¼°ü";
|
||||||
|
#endif
|
||||||
|
if (GameManager.Instance.xid == string.Empty)
|
||||||
|
{
|
||||||
|
HTTPRequest http = NetworkManager.Instance.CreateRequest<Session>("common/session/user", new object(), (data) =>
|
||||||
|
{
|
||||||
|
if(data.status == "L0002")
|
||||||
|
{
|
||||||
|
Application.OpenURL($"{NetworkManager.Instance.baseUrl}/oauth2/authorization/twitter");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
GameManager.Instance.xid = data.userId;
|
||||||
|
GameManager.Instance.xname = data.userName;
|
||||||
|
searchView.SetActive(false);
|
||||||
|
fursuitAdd.SetActive(true);
|
||||||
|
|
||||||
|
for (int n = 0; n < closeUI.Length; n++)
|
||||||
|
{
|
||||||
|
closeUI[n].SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, null, HTTPMethods.Get);
|
||||||
|
http.Send();
|
||||||
|
return;
|
||||||
|
}
|
||||||
searchView.SetActive(false);
|
searchView.SetActive(false);
|
||||||
fursuitAdd.SetActive(true);
|
fursuitAdd.SetActive(true);
|
||||||
|
|
||||||
|
|
@ -94,4 +125,10 @@ public class ScreenMove : MonoBehaviour
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class Session
|
||||||
|
{
|
||||||
|
public string status;
|
||||||
|
public string userId;
|
||||||
|
public string userName;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -308,7 +308,7 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
||||||
},
|
},
|
||||||
(fail) =>
|
(fail) =>
|
||||||
{
|
{
|
||||||
Debug.LogError("GetImage Fail");
|
//Debug.LogError("GetImage Fail");
|
||||||
tcs.SetResult(null);
|
tcs.SetResult(null);
|
||||||
},
|
},
|
||||||
BestHTTP.HTTPMethods.Get
|
BestHTTP.HTTPMethods.Get
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,16 @@ public class GameManager : DontDestroy<GameManager>
|
||||||
public List<CommonData> suitType;
|
public List<CommonData> suitType;
|
||||||
public List<CommonData> region;
|
public List<CommonData> region;
|
||||||
|
|
||||||
|
public InfoPageCtrl infoPageUI;
|
||||||
|
|
||||||
|
public string xid;
|
||||||
|
public string xname;
|
||||||
|
|
||||||
protected override void OnAwake()
|
protected override void OnAwake()
|
||||||
{
|
{
|
||||||
Application.targetFrameRate = 100;
|
Application.targetFrameRate = 100;
|
||||||
|
infoPageUI.gameObject.SetActive(false);
|
||||||
|
xid = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum eColor
|
public enum eColor
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
|
||||||
|
public static class InfoMessage
|
||||||
|
{
|
||||||
|
//public static readonly string FursuitAdd = "등록신청이 완료되었습니다!\n<size=66%>주말 / 공휴일 제외 3일 이내로 등록 예정으로 추가 문의는 @fursuit_library로 문의바랍니다.</size>";
|
||||||
|
public static readonly string FursuitAdd = "등록신청이 완료되었습니다!\n<size=66%>현재 기능 테스트 중입니다. 해당기능은 정식 오픈 후 이용하실 수 있습니다.\n(정식 오픈일시 4월1일)</size>";
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: bd699c354f1fbc24ab3d3d6821f6bdaa
|
||||||
|
|
@ -2,13 +2,14 @@ using UnityEngine;
|
||||||
using BestHTTP;
|
using BestHTTP;
|
||||||
using System;
|
using System;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using MEC;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
|
|
||||||
|
|
||||||
public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
||||||
{
|
{
|
||||||
[SerializeField] private string baseUrl;
|
[SerializeField] private string _baseUrl;
|
||||||
|
[SerializeField] private string _baseEndpoint;
|
||||||
|
|
||||||
|
public string baseUrl { get { return _baseUrl; } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 데이터를 송수신해야할 때 사용합니다. send()는 생성을 마치고 자동으로 보냅니다.
|
/// 데이터를 송수신해야할 때 사용합니다. send()는 생성을 마치고 자동으로 보냅니다.
|
||||||
|
|
@ -21,7 +22,7 @@ public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
||||||
/// <returns>역직렬화된 데이터 or 기본값(반환 받지 못함)</returns>
|
/// <returns>역직렬화된 데이터 or 기본값(반환 받지 못함)</returns>
|
||||||
public HTTPRequest CreateRequest<T>(string api, object serializeData, Action<T> onSuccess, Action<T> onFail = null, HTTPMethods methods = HTTPMethods.Post)
|
public HTTPRequest CreateRequest<T>(string api, object serializeData, Action<T> onSuccess, Action<T> 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 //동작 방식 넣기
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ public class SingletonMonoBehaviour<T> : MonoBehaviour where T : SingletonMonoBe
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Debug.Log("1개이상의 싱글턴이 존재합니다" + gameObject.name);
|
//Debug.Log("1개이상의 싱글턴이 존재합니다" + gameObject.name);
|
||||||
Debug.Log("같은 함수가 들어간 싱글턴을 제거해 주세요");
|
//Debug.Log("같은 함수가 들어간 싱글턴을 제거해 주세요");
|
||||||
Destroy(gameObject);
|
Destroy(gameObject);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System;
|
||||||
|
using UnityEngine;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
public class WebGl : MonoBehaviour
|
||||||
|
{
|
||||||
|
public byte[] image { get { return _images; } }
|
||||||
|
byte[] _images;
|
||||||
|
public void GetDragAndDrop(string base64Json)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Debug.Log("JSON 데이터 수신 완료");
|
||||||
|
|
||||||
|
// JSON 문자열을 리스트로 변환
|
||||||
|
List<string> base64List = JsonConvert.DeserializeObject<List<string>>(base64Json);
|
||||||
|
|
||||||
|
if (base64List == null || base64List.Count == 0)
|
||||||
|
{
|
||||||
|
Debug.LogError("Base64 리스트가 비어 있습니다.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 첫 번째 이미지를 _images에 저장 (여러 개 저장하려면 List<byte[]> 사용)
|
||||||
|
_images = Convert.FromBase64String(base64List[0]);
|
||||||
|
|
||||||
|
Debug.Log("이미지 변환 완료, 크기: " + _images.Length + " 바이트");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Debug.LogError("JSON 처리 중 오류 발생: " + e.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
[DllImport("__Internal")]
|
||||||
|
private static extern void GetImageDataJS(byte[] array, int length);
|
||||||
|
|
||||||
|
public void ReceiveImageData(byte[] data)
|
||||||
|
{
|
||||||
|
Debug.Log("시작");
|
||||||
|
_images = data;
|
||||||
|
Debug.Log($"이미지 데이터 수신 완료: {_images.Length} 바이트");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 061efe05400e6e34c8d1e9dc2bc05eb8
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: be363ce6969218a4fbbf818dec04cead
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
|
@ -3,7 +3,7 @@ guid: 861fc7ede2a1c3d4f815235336202eba
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
internalIDToNameTable: []
|
internalIDToNameTable: []
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 12
|
serializedVersion: 13
|
||||||
mipmaps:
|
mipmaps:
|
||||||
mipMapMode: 0
|
mipMapMode: 0
|
||||||
enableMipMap: 0
|
enableMipMap: 0
|
||||||
|
|
@ -67,7 +67,7 @@ TextureImporter:
|
||||||
swizzle: 50462976
|
swizzle: 50462976
|
||||||
cookieLightType: 0
|
cookieLightType: 0
|
||||||
platformSettings:
|
platformSettings:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: DefaultTexturePlatform
|
buildTarget: DefaultTexturePlatform
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -80,7 +80,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: WebGL
|
buildTarget: WebGL
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -93,7 +93,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: Standalone
|
buildTarget: Standalone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -106,7 +106,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: Android
|
buildTarget: Android
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -119,7 +119,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: Server
|
buildTarget: Server
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -136,6 +136,7 @@ TextureImporter:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
outline: []
|
outline: []
|
||||||
|
customData:
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
|
@ -145,6 +146,8 @@ TextureImporter:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
nameFileIdTable: {}
|
nameFileIdTable: {}
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
|
|
@ -3,7 +3,7 @@ guid: 50a793ca026e5f94db805e7d6ef95009
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
internalIDToNameTable: []
|
internalIDToNameTable: []
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 12
|
serializedVersion: 13
|
||||||
mipmaps:
|
mipmaps:
|
||||||
mipMapMode: 0
|
mipMapMode: 0
|
||||||
enableMipMap: 0
|
enableMipMap: 0
|
||||||
|
|
@ -67,7 +67,7 @@ TextureImporter:
|
||||||
swizzle: 50462976
|
swizzle: 50462976
|
||||||
cookieLightType: 0
|
cookieLightType: 0
|
||||||
platformSettings:
|
platformSettings:
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: DefaultTexturePlatform
|
buildTarget: DefaultTexturePlatform
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -80,7 +80,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: WebGL
|
buildTarget: WebGL
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -93,7 +93,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: Standalone
|
buildTarget: Standalone
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -106,7 +106,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: Android
|
buildTarget: Android
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -119,7 +119,7 @@ TextureImporter:
|
||||||
ignorePlatformSupport: 0
|
ignorePlatformSupport: 0
|
||||||
androidETC2FallbackOverride: 0
|
androidETC2FallbackOverride: 0
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
- serializedVersion: 3
|
- serializedVersion: 4
|
||||||
buildTarget: Server
|
buildTarget: Server
|
||||||
maxTextureSize: 2048
|
maxTextureSize: 2048
|
||||||
resizeAlgorithm: 0
|
resizeAlgorithm: 0
|
||||||
|
|
@ -136,6 +136,7 @@ TextureImporter:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites: []
|
sprites: []
|
||||||
outline: []
|
outline: []
|
||||||
|
customData:
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
|
@ -145,6 +146,8 @@ TextureImporter:
|
||||||
edges: []
|
edges: []
|
||||||
weights: []
|
weights: []
|
||||||
secondaryTextures: []
|
secondaryTextures: []
|
||||||
|
spriteCustomMetadata:
|
||||||
|
entries: []
|
||||||
nameFileIdTable: {}
|
nameFileIdTable: {}
|
||||||
mipmapLimitGroupName:
|
mipmapLimitGroupName:
|
||||||
pSDRemoveMatte: 0
|
pSDRemoveMatte: 0
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
|
|
@ -0,0 +1,155 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 01776f7a17020134898f7ed7462e2af9
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable:
|
||||||
|
- first:
|
||||||
|
213: 6839554522387699187
|
||||||
|
second: Main_Containerasdf_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: Main_Containerasdf_0
|
||||||
|
rect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 1920
|
||||||
|
height: 1080
|
||||||
|
alignment: 0
|
||||||
|
pivot: {x: 0, y: 0}
|
||||||
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
customData:
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
tessellationDetail: -1
|
||||||
|
bones: []
|
||||||
|
spriteID: 3f5d5d0c99afaee50800000000000000
|
||||||
|
internalID: 6839554522387699187
|
||||||
|
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:
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: dbf5424a438529346a04421a9b50851a
|
guid: f284d25e8123dd14c999c922d53e4ed3
|
||||||
TextScriptImporter:
|
TextScriptImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: bd45736cfa857c2448864f0047ea6c02
|
guid: e87490adb90667642a6690c7bfb5425a
|
||||||
TextScriptImporter:
|
TextScriptImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|
|
||||||
|
|
@ -41,22 +41,22 @@ namespace TMPro.Examples
|
||||||
|
|
||||||
void OnCharacterSelection(char c, int index)
|
void OnCharacterSelection(char c, int index)
|
||||||
{
|
{
|
||||||
Debug.Log("Character [" + c + "] at Index: " + index + " has been selected.");
|
//Debug.Log("Character [" + c + "] at Index: " + index + " has been selected.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnSpriteSelection(char c, int index)
|
void OnSpriteSelection(char c, int index)
|
||||||
{
|
{
|
||||||
Debug.Log("Sprite [" + c + "] at Index: " + index + " has been selected.");
|
//Debug.Log("Sprite [" + c + "] at Index: " + index + " has been selected.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnWordSelection(string word, int firstCharacterIndex, int length)
|
void OnWordSelection(string word, int firstCharacterIndex, int length)
|
||||||
{
|
{
|
||||||
Debug.Log("Word [" + word + "] with first character index of " + firstCharacterIndex + " and length of " + length + " has been selected.");
|
//Debug.Log("Word [" + word + "] with first character index of " + firstCharacterIndex + " and length of " + length + " has been selected.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnLineSelection(string lineText, int firstCharacterIndex, int length)
|
void OnLineSelection(string lineText, int firstCharacterIndex, int length)
|
||||||
{
|
{
|
||||||
Debug.Log("Line [" + lineText + "] with first character index of " + firstCharacterIndex + " and length of " + length + " has been selected.");
|
//Debug.Log("Line [" + lineText + "] with first character index of " + firstCharacterIndex + " and length of " + length + " has been selected.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnLinkSelection(string linkID, string linkText, int linkIndex)
|
void OnLinkSelection(string linkID, string linkText, int linkIndex)
|
||||||
|
|
@ -66,7 +66,7 @@ namespace TMPro.Examples
|
||||||
TMP_LinkInfo linkInfo = m_TextComponent.textInfo.linkInfo[linkIndex];
|
TMP_LinkInfo linkInfo = m_TextComponent.textInfo.linkInfo[linkIndex];
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Log("Link Index: " + linkIndex + " with ID [" + linkID + "] and Text \"" + linkText + "\" has been selected.");
|
//Debug.Log("Link Index: " + linkIndex + " with ID [" + linkID + "] and Text \"" + linkText + "\" has been selected.");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -142,14 +142,14 @@ namespace TMPro.Examples
|
||||||
|
|
||||||
public void OnPointerEnter(PointerEventData eventData)
|
public void OnPointerEnter(PointerEventData eventData)
|
||||||
{
|
{
|
||||||
Debug.Log("OnPointerEnter()");
|
//Debug.Log("OnPointerEnter()");
|
||||||
m_isHoveringObject = true;
|
m_isHoveringObject = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void OnPointerExit(PointerEventData eventData)
|
public void OnPointerExit(PointerEventData eventData)
|
||||||
{
|
{
|
||||||
Debug.Log("OnPointerExit()");
|
//Debug.Log("OnPointerExit()");
|
||||||
m_isHoveringObject = false;
|
m_isHoveringObject = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,28 +24,28 @@ namespace WebGLSupport.Detail
|
||||||
// any not same
|
// any not same
|
||||||
if (beforeString != input.text)
|
if (beforeString != input.text)
|
||||||
{
|
{
|
||||||
if(debug) Debug.Log(string.Format("beforeString : {0} != {1}", beforeString, input.text));
|
//if(debug) Debug.Log(string.Format("beforeString : {0} != {1}", beforeString, input.text));
|
||||||
beforeString = input.text;
|
beforeString = input.text;
|
||||||
res = true;
|
res = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (beforeCaretPosition != input.caretPosition)
|
if (beforeCaretPosition != input.caretPosition)
|
||||||
{
|
{
|
||||||
if (debug) Debug.Log(string.Format("beforeCaretPosition : {0} != {1}", beforeCaretPosition, input.caretPosition));
|
//if (debug) Debug.Log(string.Format("beforeCaretPosition : {0} != {1}", beforeCaretPosition, input.caretPosition));
|
||||||
beforeCaretPosition = input.caretPosition;
|
beforeCaretPosition = input.caretPosition;
|
||||||
res = true;
|
res = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (beforeSelectionFocusPosition != input.selectionFocusPosition)
|
if (beforeSelectionFocusPosition != input.selectionFocusPosition)
|
||||||
{
|
{
|
||||||
if (debug) Debug.Log(string.Format("beforeSelectionFocusPosition : {0} != {1}", beforeSelectionFocusPosition, input.selectionFocusPosition));
|
//if (debug) Debug.Log(string.Format("beforeSelectionFocusPosition : {0} != {1}", beforeSelectionFocusPosition, input.selectionFocusPosition));
|
||||||
beforeSelectionFocusPosition = input.selectionFocusPosition;
|
beforeSelectionFocusPosition = input.selectionFocusPosition;
|
||||||
res = true;
|
res = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (beforeSelectionAnchorPosition != input.selectionAnchorPosition)
|
if (beforeSelectionAnchorPosition != input.selectionAnchorPosition)
|
||||||
{
|
{
|
||||||
if (debug) Debug.Log(string.Format("beforeSelectionAnchorPosition : {0} != {1}", beforeSelectionAnchorPosition, input.selectionAnchorPosition));
|
//if (debug) Debug.Log(string.Format("beforeSelectionAnchorPosition : {0} != {1}", beforeSelectionAnchorPosition, input.selectionAnchorPosition));
|
||||||
beforeSelectionAnchorPosition = input.selectionAnchorPosition;
|
beforeSelectionAnchorPosition = input.selectionAnchorPosition;
|
||||||
res = true;
|
res = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue