sln 수정
This commit is contained in:
parent
dbead43ac9
commit
e2481fde77
|
|
@ -435,7 +435,6 @@ ExportedObj/
|
||||||
.consulo/
|
.consulo/
|
||||||
*.csproj
|
*.csproj
|
||||||
*.unityproj
|
*.unityproj
|
||||||
*.sln
|
|
||||||
*.suo
|
*.suo
|
||||||
*.tmp
|
*.tmp
|
||||||
*.user
|
*.user
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,11 @@ public class ItemPrefab : MonoBehaviour
|
||||||
[SerializeField] TMP_Text ownerName;
|
[SerializeField] TMP_Text ownerName;
|
||||||
[SerializeField] Image suitImage;
|
[SerializeField] Image suitImage;
|
||||||
|
|
||||||
|
public bool isNetWork;
|
||||||
|
|
||||||
public void Set(Library library)
|
public void Set(Library library)
|
||||||
{
|
{
|
||||||
|
isNetWork = true;
|
||||||
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;
|
||||||
|
|
@ -33,7 +36,7 @@ public class ItemPrefab : MonoBehaviour
|
||||||
float size = rect.sizeDelta.y / 500;
|
float size = rect.sizeDelta.y / 500;
|
||||||
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;
|
||||||
|
isNetWork = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Button()
|
public void Button()
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,8 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
||||||
results.gameObject.SetActive(true);
|
results.gameObject.SetActive(true);
|
||||||
listTop.SetActive(true);
|
listTop.SetActive(true);
|
||||||
bar.SetActive(true);
|
bar.SetActive(true);
|
||||||
ItemPrefab[] items = new ItemPrefab[5];
|
ItemPrefab[] items = new ItemPrefab[data.data.Count];
|
||||||
for (int n = 0; n < 5; n++)
|
for (int n = 0; n < data.data.Count; n++)
|
||||||
{
|
{
|
||||||
GameObject prefab = Instantiate(item, results);
|
GameObject prefab = Instantiate(item, results);
|
||||||
itemPrefabs.Add(prefab);
|
itemPrefabs.Add(prefab);
|
||||||
|
|
@ -142,7 +142,7 @@ public class SearchCtrl : SingletonMonoBehaviour<SearchCtrl>
|
||||||
NetworkManager.Instance.CreateImageRequest(library.imageBase64.Substring(1), new object(), (data) =>
|
NetworkManager.Instance.CreateImageRequest(library.imageBase64.Substring(1), new object(), (data) =>
|
||||||
{
|
{
|
||||||
library._suit_image = Sprite.Create(data, new Rect(0, 0, data.width, data.height), new Vector2(0.5f, 0.5f));
|
library._suit_image = Sprite.Create(data, new Rect(0, 0, data.width, data.height), new Vector2(0.5f, 0.5f));
|
||||||
itemPrefab.ImageSet();
|
//itemPrefab.ImageSet();
|
||||||
}, null, BestHTTP.HTTPMethods.Get);
|
}, null, BestHTTP.HTTPMethods.Get);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,8 @@ 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>
|
||||||
|
|
@ -73,4 +75,10 @@ public class NetworkManager : SingletonMonoBehaviour<NetworkManager>
|
||||||
httpRquest.Send();
|
httpRquest.Send();
|
||||||
return httpRquest;
|
return httpRquest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IEnumerator<float> Sendearch()
|
||||||
|
{
|
||||||
|
//Timing.RunCoroutine(BuildingSet());
|
||||||
|
yield return Timing.WaitForSeconds(0.1f);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio 15
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BestHTTP", "BestHTTP.csproj", "{B4248250-48E2-544F-260F-045B1BDF8029}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{C66B2060-3574-3445-45C9-F5C893B4C144}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{5E4A35A6-77F8-C45C-559F-2C6B8EFB2370}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{E0945D25-8040-0E53-AAE4-62B626709D83}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{B4248250-48E2-544F-260F-045B1BDF8029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{B4248250-48E2-544F-260F-045B1BDF8029}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{B4248250-48E2-544F-260F-045B1BDF8029}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{B4248250-48E2-544F-260F-045B1BDF8029}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{C66B2060-3574-3445-45C9-F5C893B4C144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{C66B2060-3574-3445-45C9-F5C893B4C144}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{C66B2060-3574-3445-45C9-F5C893B4C144}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{C66B2060-3574-3445-45C9-F5C893B4C144}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{5E4A35A6-77F8-C45C-559F-2C6B8EFB2370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{5E4A35A6-77F8-C45C-559F-2C6B8EFB2370}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{5E4A35A6-77F8-C45C-559F-2C6B8EFB2370}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{5E4A35A6-77F8-C45C-559F-2C6B8EFB2370}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{E0945D25-8040-0E53-AAE4-62B626709D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{E0945D25-8040-0E53-AAE4-62B626709D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{E0945D25-8040-0E53-AAE4-62B626709D83}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{E0945D25-8040-0E53-AAE4-62B626709D83}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
Loading…
Reference in New Issue