1. 重置 搜索 请求 接口 和数据 2. 修复 搜索界面UI显示的问题 3. 修改 ui搜索界面 返回按钮的ui美术
This commit is contained in:
parent
468ba2b392
commit
44d9249c1b
@ -354,6 +354,81 @@ MonoBehaviour:
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &3326037143687747246
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4996154618828138962}
|
||||
- component: {fileID: 6899808792495964410}
|
||||
- component: {fileID: 6100129919559553961}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4996154618828138962
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3326037143687747246}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6416667784294157467}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -2.2, y: -0.000061035156}
|
||||
m_SizeDelta: {x: -21.8809, y: -24.867798}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6899808792495964410
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3326037143687747246}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &6100129919559553961
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3326037143687747246}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: ddbb7899c426fdc4b93a4a43fe952dac, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &5023285269360186550
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -602,7 +677,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: -17}
|
||||
m_SizeDelta: {x: -20.1019, y: -17}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6416667783163931862
|
||||
CanvasRenderer:
|
||||
@ -886,13 +961,14 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 4996154618828138962}
|
||||
m_Father: {fileID: 8347992031880413858}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -354.35, y: 0.000088692}
|
||||
m_SizeDelta: {x: 41.3, y: 41.3}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 68.0517, y: 0}
|
||||
m_SizeDelta: {x: 60, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6416667784294157465
|
||||
CanvasRenderer:
|
||||
@ -915,7 +991,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.27707815, g: 0.25605196, b: 0.3962264, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@ -932,7 +1008,7 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
m_DrawShape: 0
|
||||
m_DrawShape: 1
|
||||
m_ImageType: 0
|
||||
m_MaterialMode: 0
|
||||
m_StrokeWidth: 0
|
||||
@ -950,8 +1026,8 @@ MonoBehaviour:
|
||||
m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UniformCornerRadius: 0
|
||||
m_Circle:
|
||||
m_Radius: 0
|
||||
m_FitRadius: 0
|
||||
m_Radius: 29.95
|
||||
m_FitRadius: 1
|
||||
m_Pentagon:
|
||||
m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_UniformCornerRadius: 0
|
||||
|
||||
@ -13,7 +13,7 @@ namespace GameLogic
|
||||
public async UniTask<ProjectData> GetSingleProjectAllData(string page, string userCode)
|
||||
{
|
||||
|
||||
if (m_dictallProject.TryGetValue(userCode,out var projectData))
|
||||
if (m_dictallProject.TryGetValue(userCode, out var projectData))
|
||||
{
|
||||
return projectData;
|
||||
}
|
||||
@ -21,12 +21,17 @@ namespace GameLogic
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm);
|
||||
var projectConfigRoot = JsonUtility.FromJson<ProjectConfigRoot>(jsonData);
|
||||
|
||||
return GetProjectData(projectConfigRoot.data,userCode);
|
||||
var projectDataist = GetProjectData(projectConfigRoot.data, userCode);
|
||||
if (projectDataist.Count > 0)
|
||||
{
|
||||
return projectDataist[0];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public async UniTask<ProjectData> GetSingleCompanyAllData(string page, string userCode)
|
||||
{
|
||||
|
||||
if (m_dictallProject.TryGetValue(userCode,out var projectData))
|
||||
if (m_dictallProject.TryGetValue(userCode, out var projectData))
|
||||
{
|
||||
return projectData;
|
||||
}
|
||||
@ -34,9 +39,22 @@ namespace GameLogic
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm);
|
||||
var projectConfigRoot = JsonUtility.FromJson<ProjectConfigRoot>(jsonData);
|
||||
|
||||
return GetProjectData(projectConfigRoot.data,userCode);
|
||||
var projectDataist = GetProjectData(projectConfigRoot.data, userCode);
|
||||
if (projectDataist.Count > 0)
|
||||
{
|
||||
return projectDataist[0];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public async UniTask<List<ProjectData>> GetSearchCompanyAllData(string page, string companyName)
|
||||
{
|
||||
string jsonParm = $"{{\"companyName\":\"{companyName}\"}}";
|
||||
var jsonData = await JsonHttpUtility.UnityWebRequestPostJsonByUserCode(page, jsonParm);
|
||||
Log.Info("jsonData"+jsonData);
|
||||
var projectConfigRoot = JsonUtility.FromJson<ProjectConfigRoot>(jsonData);
|
||||
|
||||
return GetProjectData(projectConfigRoot.data, companyName);
|
||||
}
|
||||
|
||||
|
||||
#region 场景数据
|
||||
@ -47,35 +65,35 @@ namespace GameLogic
|
||||
}
|
||||
|
||||
|
||||
public ProjectData GetProjectData(ProjectConfigData projectConfigData,string userCode)
|
||||
public List<ProjectData> GetProjectData(ProjectConfigData projectConfigData, string userCode)
|
||||
{
|
||||
if (projectConfigData.list == null || projectConfigData.list.Count <= 0)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var companyUnitData = projectConfigData.list[0];
|
||||
var projectListVo = companyUnitData.projectListVo;
|
||||
|
||||
var projectData = new ProjectData();
|
||||
|
||||
//projectData._currentProjectType = currentProjectType;
|
||||
projectData._companyName = companyUnitData.userInfoVo.companyName;
|
||||
projectData._coverAddressNameUrl = companyUnitData.userInfoVo.logoPath;
|
||||
|
||||
// 筛选出 wxProjectType 为 "wxVirtualHall" 的项目
|
||||
SetVirtualSceneData(ProjectType.wxVirtualHall, projectListVo, ref projectData);
|
||||
SetARData(ProjectType.wxPlane, projectListVo, ref projectData);
|
||||
SetARTrackData(projectData._companyName,ProjectType.wxTrack, projectListVo, ref projectData);
|
||||
SetARVirtualHumanData(ProjectType.wxVirtualHumans, projectListVo, ref projectData);
|
||||
if (!m_dictallProject.ContainsKey(userCode))
|
||||
List<ProjectData> projectDataList = new List<ProjectData>();
|
||||
foreach (var companyUnitData in projectConfigData.list)
|
||||
{
|
||||
m_dictallProject.Add(userCode,projectData);
|
||||
var projectListVo = companyUnitData.projectListVo;
|
||||
var projectData = new ProjectData();
|
||||
//projectData._currentProjectType = currentProjectType;
|
||||
projectData._companyName = companyUnitData.userInfoVo.companyName;
|
||||
projectData._coverAddressNameUrl = companyUnitData.userInfoVo.logoPath;
|
||||
|
||||
// 筛选出 wxProjectType 为 "wxVirtualHall" 的项目
|
||||
SetVirtualSceneData(ProjectType.wxVirtualHall, projectListVo, ref projectData);
|
||||
SetARData(ProjectType.wxPlane, projectListVo, ref projectData);
|
||||
SetARTrackData(projectData._companyName, ProjectType.wxTrack, projectListVo, ref projectData);
|
||||
SetARVirtualHumanData(ProjectType.wxVirtualHumans, projectListVo, ref projectData);
|
||||
if (!m_dictallProject.ContainsKey(userCode))
|
||||
{
|
||||
m_dictallProject.Add(userCode, projectData);
|
||||
}
|
||||
projectDataList.Add(projectData);
|
||||
}
|
||||
|
||||
return projectData;
|
||||
|
||||
return projectData;
|
||||
return projectDataList;
|
||||
}
|
||||
|
||||
private static void SetVirtualSceneData(ProjectType currentProjectType,
|
||||
@ -104,10 +122,11 @@ namespace GameLogic
|
||||
sceneData._sceneCoverhttpName = sceneChild.thumbnailUrl;
|
||||
sceneData.list_players.Add(new PlayerData()
|
||||
{
|
||||
_playerAddressName = "Player_female", _playerCoverAddressName = "show_car_player_female"
|
||||
_playerAddressName = "Player_female",
|
||||
_playerCoverAddressName = "show_car_player_female"
|
||||
});
|
||||
sceneData.list_players.Add(new PlayerData()
|
||||
{ _playerAddressName = "Player_man", _playerCoverAddressName = "show_car_player_man" });
|
||||
{ _playerAddressName = "Player_man", _playerCoverAddressName = "show_car_player_man" });
|
||||
sceneDataList.Add(sceneData);
|
||||
}
|
||||
}
|
||||
@ -150,12 +169,12 @@ namespace GameLogic
|
||||
}
|
||||
}
|
||||
|
||||
private static void SetARTrackData(string userCode,ProjectType currentProjectType, List<ProjectConfigListVoItem> projectListVo,
|
||||
private static void SetARTrackData(string userCode, ProjectType currentProjectType, List<ProjectConfigListVoItem> projectListVo,
|
||||
ref ProjectData projectData)
|
||||
{
|
||||
var projects = projectListVo
|
||||
.FindAll(p => p.wxProjectType == currentProjectType.ToString());
|
||||
// Log.Warning($"userCode{userCode} type :{currentProjectType.ToString()} 数量 {projects.Count} ");
|
||||
// Log.Warning($"userCode{userCode} type :{currentProjectType.ToString()} 数量 {projects.Count} ");
|
||||
if (projects != null)
|
||||
{
|
||||
List<ARTrackData> arTrackList = new List<ARTrackData>();
|
||||
@ -236,7 +255,7 @@ namespace GameLogic
|
||||
#endregion
|
||||
|
||||
#region 私有方法
|
||||
|
||||
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
@ -7,6 +7,8 @@ using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using TEngine;
|
||||
using TMPro;
|
||||
using System;
|
||||
using GameConfig.item;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
@ -21,7 +23,9 @@ namespace GameLogic
|
||||
private MPImage m_mpimg;
|
||||
private TextMeshProUGUI m_tmptext;
|
||||
private LoopListView m_loopListView;
|
||||
public List<JsonData.QueryCompanyData> m_datalllist = new List<JsonData.QueryCompanyData>();
|
||||
public List<ProjectData> m_datalllist = new List<ProjectData>();
|
||||
|
||||
public List<UIWidget> m_widgetList = new List<UIWidget>();
|
||||
protected override void ScriptGenerator()
|
||||
{
|
||||
m_btnReturn = FindChildComponent<Button>("UIComSceneTitle/m_btnReturn");
|
||||
@ -53,7 +57,7 @@ namespace GameLogic
|
||||
{
|
||||
return;
|
||||
}
|
||||
InputSearchResult(inputStr);
|
||||
await InputSearchResult(inputStr);
|
||||
if (!SaveDataSystem.Instance.IsContainsThisText(inputStr))
|
||||
{
|
||||
SaveDataSystem.Instance.SaveSearchTextToSaveFile(inputStr);
|
||||
@ -65,33 +69,63 @@ namespace GameLogic
|
||||
|
||||
protected override void RegisterEvent()
|
||||
{
|
||||
AddUIEvent<string>(UISearchEventDefined.SearchResult,InputSearchResult);
|
||||
AddUIEvent<string>(UISearchEventDefined.SearchResult,InputSearch);
|
||||
base.RegisterEvent();
|
||||
|
||||
}
|
||||
|
||||
private void InputSearch(string input)
|
||||
{
|
||||
InputSearchResult(input).Forget();
|
||||
}
|
||||
|
||||
protected override void OnCreate()
|
||||
{
|
||||
base.OnCreate();
|
||||
|
||||
}
|
||||
|
||||
private void InputSearchResult(string input)
|
||||
{
|
||||
|
||||
private async UniTask InputSearchResult(string input)
|
||||
{
|
||||
m_tmpinput.text = input;
|
||||
m_datalllist = DataConfigSystem.Instance.GetAllCompanyListDataContain(input);
|
||||
if(m_loopListView == null ) return;
|
||||
m_loopListView.InitListView(m_datalllist.Count,OnGetItemByIndex);
|
||||
m_datalllist = await DataConfigSystem.Instance.GetSearchCompanyAllData("1/100",input);
|
||||
|
||||
|
||||
if(m_loopListView == null && m_datalllist == null && m_datalllist.Count <= 0 ) {
|
||||
return;
|
||||
};
|
||||
Log.Info("m_datalllist"+m_datalllist?.Count);
|
||||
|
||||
if(m_loopListView.ItemTotalCount > 0)
|
||||
{
|
||||
|
||||
}
|
||||
m_loopListView.SetListItemCount(0);
|
||||
//m_loopListView.
|
||||
if(m_datalllist == null)
|
||||
{
|
||||
Log.Warning("m_datalllist == null");
|
||||
return;
|
||||
}
|
||||
else{
|
||||
m_widgetList.Clear();
|
||||
//m_loopListView.AllocOrNewListViewItem("UIWidgetSearchItem");
|
||||
m_loopListView?.InitListView(m_datalllist.Count,OnGetItemByIndex);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
LoopListViewItem OnGetItemByIndex(LoopListView listView, int index)
|
||||
{
|
||||
LoopListViewItem item = listView.AllocOrNewListViewItem("UIWidgetSearchItem");
|
||||
item.name = "UIWidgetSearchItem"+index;
|
||||
|
||||
var widget = CreateWidget<UIWidgetSearchItem>(item.gameObject);
|
||||
if (m_datalllist.Count > index)
|
||||
{
|
||||
widget.Init(m_datalllist[index],index,m_tmpinput.text);
|
||||
m_widgetList.Add(widget);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -18,6 +18,8 @@ namespace GameLogic
|
||||
private Button m_btnClickProject;
|
||||
public string m_searchText;
|
||||
|
||||
public ProjectData m_data;
|
||||
|
||||
protected override void ScriptGenerator()
|
||||
{
|
||||
m_mpimg = FindChildComponent<MPImage>("m_mpimg");
|
||||
@ -33,14 +35,11 @@ namespace GameLogic
|
||||
private async UniTaskVoid OnClickClickProjectBtn()
|
||||
{
|
||||
var companyName = m_tmptext.text;
|
||||
var project = DataConfigSystem.Instance.GetProjectData(companyName);
|
||||
if (project != null)
|
||||
if (m_data != null)
|
||||
{
|
||||
GameModule.UI.CloseUI<UIARBrochureHome>();
|
||||
StageSystem.Instance.LoadProject(typeof(UISearchScrollView), project, typeof(UISearchScrollView),m_searchText);
|
||||
StageSystem.Instance.LoadProject(typeof(UISearchScrollView), m_data, typeof(UISearchScrollView),m_searchText);
|
||||
}
|
||||
|
||||
|
||||
await UniTask.Yield();
|
||||
}
|
||||
|
||||
@ -52,64 +51,20 @@ namespace GameLogic
|
||||
m_tmptext.text = "";
|
||||
}
|
||||
|
||||
public void Init(JsonData.QueryCompanyData data, int index,string search)
|
||||
public async UniTask Init(ProjectData data, int index,string search)
|
||||
{
|
||||
ClearData();
|
||||
if (data.logoPath != null && data.logoPath.Length > 0)
|
||||
if (data._coverAddressNameUrl != null && data._coverAddressNameUrl.Length > 0)
|
||||
{
|
||||
if (!SaveDataSystem.Instance.IsContainUrlInMemory(data.logoPath))
|
||||
{
|
||||
Log.Debug("下载加载");
|
||||
DownloadAndSaveTextureToLocal(data.logoPath).Forget();
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Debug("从内存加载");
|
||||
var texture2D = SaveDataSystem.Instance.m_texture2Ddict[data.logoPath];
|
||||
Sprite sprite = CreateSpriteByTex(texture2D);
|
||||
m_mpimg.sprite = sprite;
|
||||
}
|
||||
|
||||
m_tmptext.text = data.companyName;
|
||||
m_data = data;
|
||||
var tex = await ImageUtility.UnityWebDownloadTexture2D(data._coverAddressNameUrl,this.gameObject.GetCancellationTokenOnDestroy());
|
||||
var sprite = CreateSpriteByTex(tex);
|
||||
m_tmptext.text = data._companyName;
|
||||
m_mpimg.sprite = sprite;
|
||||
m_searchText = search;
|
||||
}
|
||||
}
|
||||
|
||||
public async UniTaskVoid DownloadAndSaveTextureToLocal(string url)
|
||||
{
|
||||
var request = HTTPRequest.CreateGet(url, OnRequestFinishedCallback);
|
||||
//Debug.Log("开始下载：" + url);
|
||||
request.DownloadSettings.ContentStreamMaxBuffered = 100 * 1024 * 1024;
|
||||
request.Send();
|
||||
await request;
|
||||
|
||||
await UniTask.CompletedTask;
|
||||
}
|
||||
|
||||
private void OnRequestFinishedCallback(HTTPRequest req, HTTPResponse resp)
|
||||
{
|
||||
switch (req.State)
|
||||
{
|
||||
case HTTPRequestStates.Finished:
|
||||
if (resp.IsSuccess)
|
||||
{
|
||||
var texture2D = resp.DataAsTexture2D;
|
||||
string url = req.Uri.AbsoluteUri;
|
||||
Sprite sprite = CreateSpriteByTex(texture2D);
|
||||
m_mpimg.sprite = sprite;
|
||||
SaveDataSystem.Instance.AddTextureToMemory(url, texture2D);
|
||||
}
|
||||
else
|
||||
Debug.LogWarning($"Server error({resp.StatusCode} - {resp.Message})!");
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
// Debug.LogError(req.State.ToString());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private static Sprite CreateSpriteByTex(Texture2D texture2D)
|
||||
{
|
||||
return Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), new Vector2(0.5f, 0.5f));
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 66e03b3d319347e5b8d5599eafdb3857
|
||||
timeCreated: 1743497043
|
||||
@ -14,7 +14,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_PixelRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
x: -1920
|
||||
y: 43
|
||||
width: 1920
|
||||
height: 989
|
||||
@ -119,7 +119,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 400, y: 100}
|
||||
m_MaxSize: {x: 32384, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 284
|
||||
controlID: 71
|
||||
draggingID: 0
|
||||
--- !u!114 &6
|
||||
MonoBehaviour:
|
||||
@ -140,12 +140,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1470
|
||||
width: 1471
|
||||
height: 933
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 109
|
||||
controlID: 72
|
||||
draggingID: 0
|
||||
--- !u!114 &7
|
||||
MonoBehaviour:
|
||||
@ -167,12 +167,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1470
|
||||
height: 526
|
||||
width: 1471
|
||||
height: 447
|
||||
m_MinSize: {x: 300, y: 50}
|
||||
m_MaxSize: {x: 24288, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 110
|
||||
controlID: 49
|
||||
draggingID: 0
|
||||
--- !u!114 &8
|
||||
MonoBehaviour:
|
||||
@ -192,7 +192,7 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 0
|
||||
width: 396
|
||||
height: 526
|
||||
height: 447
|
||||
m_MinSize: {x: 201, y: 226}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_ActualView: {fileID: 16}
|
||||
@ -217,8 +217,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 396
|
||||
y: 0
|
||||
width: 492
|
||||
height: 526
|
||||
width: 451
|
||||
height: 447
|
||||
m_MinSize: {x: 202, y: 226}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 17}
|
||||
@ -241,10 +241,10 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 888
|
||||
x: 847
|
||||
y: 0
|
||||
width: 582
|
||||
height: 526
|
||||
width: 624
|
||||
height: 447
|
||||
m_MinSize: {x: 52, y: 76}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
m_ActualView: {fileID: 22}
|
||||
@ -271,13 +271,13 @@ MonoBehaviour:
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 526
|
||||
width: 1470
|
||||
height: 407
|
||||
y: 447
|
||||
width: 1471
|
||||
height: 486
|
||||
m_MinSize: {x: 300, y: 50}
|
||||
m_MaxSize: {x: 24288, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 134
|
||||
controlID: 73
|
||||
draggingID: 0
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
@ -296,8 +296,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 863
|
||||
height: 407
|
||||
width: 302
|
||||
height: 486
|
||||
m_MinSize: {x: 101, y: 126}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_ActualView: {fileID: 18}
|
||||
@ -320,10 +320,10 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 863
|
||||
x: 302
|
||||
y: 0
|
||||
width: 256
|
||||
height: 407
|
||||
width: 744
|
||||
height: 486
|
||||
m_MinSize: {x: 232, y: 276}
|
||||
m_MaxSize: {x: 10002, y: 10026}
|
||||
m_ActualView: {fileID: 19}
|
||||
@ -346,10 +346,10 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1119
|
||||
x: 1046
|
||||
y: 0
|
||||
width: 351
|
||||
height: 407
|
||||
width: 425
|
||||
height: 486
|
||||
m_MinSize: {x: 232, y: 276}
|
||||
m_MaxSize: {x: 10002, y: 10026}
|
||||
m_ActualView: {fileID: 20}
|
||||
@ -372,9 +372,9 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1470
|
||||
x: 1471
|
||||
y: 0
|
||||
width: 450
|
||||
width: 449
|
||||
height: 933
|
||||
m_MinSize: {x: 276, y: 76}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
@ -407,7 +407,7 @@ MonoBehaviour:
|
||||
x: 0
|
||||
y: 24
|
||||
width: 395
|
||||
height: 500
|
||||
height: 421
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -424,7 +424,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 7474feffde8afeffd496feff56a8feff96a8feffd8a8feffe4e3feff76e4feffc2e4feff080dffff1c0dffff502cffff022dffff762dffff022effff0240ffff0c40ffff5e40ffff0054ffff5254ffff6cfafffff4ffffffbe190100e0750100
|
||||
m_ExpandedIDs: 8afaffff
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -472,8 +472,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 397
|
||||
y: 24
|
||||
width: 490
|
||||
height: 500
|
||||
width: 449
|
||||
height: 421
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1003,7 +1003,7 @@ MonoBehaviour:
|
||||
sizeOverridden: 0
|
||||
m_ContainerData:
|
||||
- containerId: overlay-toolbar__top
|
||||
scrollOffset: 0
|
||||
scrollOffset: 54
|
||||
- containerId: overlay-toolbar__left
|
||||
scrollOffset: 0
|
||||
- containerId: overlay-container--left
|
||||
@ -1022,15 +1022,15 @@ MonoBehaviour:
|
||||
m_OverrideSceneCullingMask: 6917529027641081856
|
||||
m_SceneIsLit: 1
|
||||
m_SceneLighting: 1
|
||||
m_2DMode: 0
|
||||
m_2DMode: 1
|
||||
m_isRotationLocked: 0
|
||||
m_PlayAudio: 0
|
||||
m_AudioPlay: 0
|
||||
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
||||
m_Position:
|
||||
m_Target: {x: 51.08075, y: 103.136154, z: 1.9254299}
|
||||
m_Target: {x: -0.7560412, y: -0.6703586, z: 3845.4258}
|
||||
speed: 2
|
||||
m_Value: {x: -0.0021143705, y: 0.00019470416, z: 0.017705623}
|
||||
m_Value: {x: -0.7560412, y: -0.6703586, z: 3845.4258}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@ -1058,17 +1058,17 @@ MonoBehaviour:
|
||||
m_Size: {x: 0, y: 0}
|
||||
yGrid:
|
||||
m_Fade:
|
||||
m_Target: 1
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
m_Value: 1
|
||||
m_Value: 0
|
||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||
m_Pivot: {x: 0, y: 0, z: 0}
|
||||
m_Size: {x: 1, y: 1}
|
||||
zGrid:
|
||||
m_Fade:
|
||||
m_Target: 0
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
m_Value: 0
|
||||
m_Value: 1
|
||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||
m_Pivot: {x: 0, y: 0, z: 0}
|
||||
m_Size: {x: 1, y: 1}
|
||||
@ -1076,17 +1076,17 @@ MonoBehaviour:
|
||||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
m_Target: {x: -0.071449146, y: 0.9014462, z: -0.16128957, w: -0.39565155}
|
||||
m_Target: {x: 0, y: 0, z: 0, w: 1}
|
||||
speed: 2
|
||||
m_Value: {x: -0.3538849, y: 0.085412316, z: -0.032473784, w: -0.9308205}
|
||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_Size:
|
||||
m_Target: 0.8660254
|
||||
m_Target: 6.3326015
|
||||
speed: 2
|
||||
m_Value: 1.837598
|
||||
m_Value: 6.3326015
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
m_Target: 1
|
||||
speed: 2
|
||||
m_Value: 0
|
||||
m_Value: 1
|
||||
m_CameraSettings:
|
||||
m_Speed: 1
|
||||
m_SpeedNormalized: 0.5
|
||||
@ -1100,8 +1100,8 @@ MonoBehaviour:
|
||||
m_FarClip: 10000
|
||||
m_DynamicClip: 1
|
||||
m_OcclusionCulling: 0
|
||||
m_LastSceneViewRotation: {x: -0.10625771, y: 0.8399824, z: -0.17799085, w: -0.50145614}
|
||||
m_LastSceneViewOrtho: 1
|
||||
m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
|
||||
m_LastSceneViewOrtho: 0
|
||||
m_Viewpoint:
|
||||
m_SceneView: {fileID: 17}
|
||||
m_CameraOverscanSettings:
|
||||
@ -1136,8 +1136,8 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 24
|
||||
width: 862
|
||||
height: 381
|
||||
width: 301
|
||||
height: 460
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1170,10 +1170,10 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Project\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 864
|
||||
x: 303
|
||||
y: 24
|
||||
width: 254
|
||||
height: 381
|
||||
width: 742
|
||||
height: 460
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1196,7 +1196,7 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets/AssetRaw/UI/AR/Component
|
||||
- Assets/TEngine/Editor/ReleaseTools
|
||||
m_Globs: []
|
||||
m_ProductIds:
|
||||
m_AnyWithAssetOrigin: 0
|
||||
@ -1206,16 +1206,16 @@ MonoBehaviour:
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 64
|
||||
m_LastFolders:
|
||||
- Assets/AssetRaw/UI/AR/Component
|
||||
- Assets/TEngine/Editor/ReleaseTools
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_IsLocked: 1
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 180}
|
||||
m_SelectedIDs: 10840100
|
||||
m_LastClickedID: 99344
|
||||
m_ExpandedIDs: 00000000821b0100241c01005c1c0100908d0100928d0100948d0100968d0100988d01009a8d01009c8d01009e8d0100a08d0100a28d0100a48d0100a68d0100a88d0100aa8d0100ac8d0100ae8d0100b08d0100b28d0100b48d0100b68d0100b88d0100ba8d0100bc8d0100be8d0100c08d0100c28d0100c48d0100c68d0100c88d0100ca8d0100cc8d0100ce8d0100
|
||||
scrollPos: {x: 0, y: 300}
|
||||
m_SelectedIDs: d21e0100
|
||||
m_LastClickedID: 73426
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1244,7 +1244,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000821b0100241c01005c1c0100908d0100928d0100948d0100968d0100988d01009a8d01009c8d01009e8d0100a08d0100a28d0100a48d0100a68d0100a88d0100aa8d0100ac8d0100ae8d0100b08d0100b28d0100b48d0100b68d0100b88d0100ba8d0100bc8d0100be8d0100c08d0100c28d0100c48d0100c68d0100c88d0100ca8d0100cc8d0100ce8d0100
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1272,7 +1272,7 @@ MonoBehaviour:
|
||||
m_ListAreaState:
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_HadKeyboardFocusLastEvent: 0
|
||||
m_ExpandedInstanceIDs: c62300009e44060000000000bc4f0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
@ -1301,7 +1301,7 @@ MonoBehaviour:
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_GridSize: 64
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 150
|
||||
m_DirectoriesAreaWidth: 357
|
||||
--- !u!114 &20
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -1323,10 +1323,10 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Project\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1120
|
||||
x: 1047
|
||||
y: 24
|
||||
width: 349
|
||||
height: 381
|
||||
width: 423
|
||||
height: 460
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1349,7 +1349,7 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets
|
||||
- Assets/AssetRaw/UI/AR
|
||||
m_Globs: []
|
||||
m_ProductIds:
|
||||
m_AnyWithAssetOrigin: 0
|
||||
@ -1359,16 +1359,16 @@ MonoBehaviour:
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 16
|
||||
m_LastFolders:
|
||||
- Assets
|
||||
- Assets/AssetRaw/UI/AR
|
||||
m_LastFoldersGridSize: -1
|
||||
m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR
|
||||
m_LockTracker:
|
||||
m_IsLocked: 1
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 79}
|
||||
m_SelectedIDs: 961a0100
|
||||
m_LastClickedID: 72342
|
||||
m_ExpandedIDs: 00000000821b0100241c01005c1c0100908d0100928d0100948d0100968d0100988d01009a8d01009c8d01009e8d0100a08d0100a28d0100a48d0100a68d0100a88d0100aa8d0100ac8d0100ae8d0100b08d0100b28d0100b48d0100b68d0100b88d0100ba8d0100bc8d0100be8d0100c08d0100c28d0100c48d0100c68d0100c88d0100ca8d0100cc8d0100ce8d0100
|
||||
scrollPos: {x: 0, y: 175}
|
||||
m_SelectedIDs: 281e0100
|
||||
m_LastClickedID: 73256
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1397,7 +1397,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000821b0100241c01005c1c0100908d0100928d0100948d0100968d0100988d01009a8d01009c8d01009e8d0100a08d0100a28d0100a48d0100a68d0100a88d0100aa8d0100ac8d0100ae8d0100b08d0100b28d0100b48d0100b68d0100b88d0100ba8d0100bc8d0100be8d0100c08d0100c28d0100c48d0100c68d0100c88d0100ca8d0100cc8d0100ce8d0100
|
||||
m_ExpandedIDs: 00000000e21d0100e41d0100e61d0100e81d0100ea1d0100ec1d0100ee1d0100f01d0100f21d0100f41d0100f61d0100f81d0100fa1d0100fc1d0100fe1d0100001e0100021e0100041e0100061e0100081e01000a1e01000c1e01000e1e0100101e0100121e0100141e0100161e0100181e01001a1e01001c1e01001e1e0100201e0100221e0100241e0100261e0100281e01002a1e01002c1e01002e1e0100301e0100321e0100341e0100361e0100381e01003a1e01003c1e01003e1e0100401e0100421e0100
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@ -1454,7 +1454,7 @@ MonoBehaviour:
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
m_GridSize: 16
|
||||
m_SkipHiddenPackages: 0
|
||||
m_DirectoriesAreaWidth: 177
|
||||
m_DirectoriesAreaWidth: 239
|
||||
--- !u!114 &21
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@ -1476,9 +1476,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Inspector\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1471
|
||||
x: 1472
|
||||
y: 24
|
||||
width: 449
|
||||
width: 448
|
||||
height: 907
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@ -1525,10 +1525,10 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Game\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 889
|
||||
x: 848
|
||||
y: 24
|
||||
width: 580
|
||||
height: 500
|
||||
width: 622
|
||||
height: 421
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
m_PreferredDataMode: 0
|
||||
@ -1584,23 +1584,23 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 580
|
||||
height: 479
|
||||
m_Scale: {x: 0.35907045, y: 0.35907045}
|
||||
m_Translation: {x: 290, y: 239.49998}
|
||||
width: 622
|
||||
height: 400
|
||||
m_Scale: {x: 0.2998501, y: 0.29985008}
|
||||
m_Translation: {x: 311, y: 200}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -807.6409
|
||||
x: -1037.1849
|
||||
y: -667
|
||||
width: 1615.2819
|
||||
width: 2074.3699
|
||||
height: 1334
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 0.35907045
|
||||
m_LastWindowPixelSize: {x: 580, y: 500}
|
||||
m_defaultScale: 0.29985008
|
||||
m_LastWindowPixelSize: {x: 622, y: 421}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000101000000000000
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user