From 8d9459c1734a4693b4a3984994643c336133b96f Mon Sep 17 00:00:00 2001 From: SnowShow Date: Thu, 27 Mar 2025 17:59:32 +0800 Subject: [PATCH] =?UTF-8?q?Utility=20=E6=95=B4=E5=92=8C=20=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=20=E6=96=B0=E5=A2=9E=20=E5=B7=A5=E5=85=B7=20ImageUtil?= =?UTF-8?q?=20UnityWeb=E4=B8=8B=E8=BD=BD=E5=9B=BE=E7=89=87=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81Token=E5=8F=96=E6=B6=88=20=EF=BC=8CArTrackManager=20?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E4=B8=8B=E8=BD=BD=20=E5=92=8C=20?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=20=E8=AF=86=E5=88=AB=E5=9B=BE=20=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Manager/ARTrack/ARTrackManager.cs | 25 +- .../AR Brochure/System/ARTrackSystem.cs | 10 +- .../HotFix/GameLogic/AR Brochure/Tool.meta | 8 - .../UI/ARTrack/UIWindTraceLibrary.cs | 4 +- .../UI/ARTrack/Widget/UIARTrackScrollView.cs | 12 + .../AR Brochure/{Util.meta => Utility.meta} | 0 .../GameLogic/AR Brochure/Utility/New.meta | 3 + .../AR Brochure/Utility/New/Image.meta | 3 + .../Utility/New/Image/ImageUtility.cs | 24 + .../Utility/New/Image/ImageUtility.cs.meta | 3 + .../GameLogic/AR Brochure/Utility/Old.meta | 3 + .../AR Brochure/{Tool => Utility/Old}/AR.meta | 0 .../Old}/AR/ARPlaneDebugVisualizer.cs | 0 .../Old}/AR/ARPlaneDebugVisualizer.cs.meta | 0 .../{Util => Utility/Old}/External.meta | 0 .../Old}/External/UIWindowsExternal.cs | 0 .../Old}/External/UIWindowsExternal.cs.meta | 0 .../{Util => Utility/Old}/FlowLayoutGroup.cs | 0 .../Old}/FlowLayoutGroup.cs.meta | 0 .../{Util => Utility/Old}/Http.meta | 0 .../Old}/Http/LifecycleSafeTool.cs | 0 .../Old}/Http/LifecycleSafeTool.cs.meta | 0 .../{Tool => Utility/Old}/HttpHandleTool.cs | 0 .../Old}/HttpHandleTool.cs.meta | 0 .../AR Brochure/{Util => Utility/Old}/JS.meta | 0 .../{Util => Utility/Old}/JS/JsUtil.cs | 0 .../{Util => Utility/Old}/JS/JsUtil.cs.meta | 0 .../{Tool => Utility/Old}/JsonHandleTool.cs | 0 .../Old}/JsonHandleTool.cs.meta | 0 .../{Util => Utility/Old}/MathUtil.cs | 0 .../{Util => Utility/Old}/MathUtil.cs.meta | 0 .../{Tool => Utility/Old}/Permission.meta | 0 .../Permission/CameraPermissionRequester.cs | 0 .../CameraPermissionRequester.cs.meta | 0 .../Resources/ES3/ES3Defaults.asset | 9 + .../ProjectSettings/GvhProjectSettings.xml | 3 + .../ProjectSettings/ProjectSettings.asset | 8 +- .../UserSettings/Layouts/default-6000.dwlt | 439 +++++++----------- 38 files changed, 252 insertions(+), 302 deletions(-) delete mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool.meta rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util.meta => Utility.meta} (100%) create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New.meta create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image.meta create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs.meta create mode 100644 EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old.meta rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/AR.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/AR/ARPlaneDebugVisualizer.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/AR/ARPlaneDebugVisualizer.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/External.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/External/UIWindowsExternal.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/External/UIWindowsExternal.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/FlowLayoutGroup.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/FlowLayoutGroup.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/Http.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/Http/LifecycleSafeTool.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/Http/LifecycleSafeTool.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/HttpHandleTool.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/HttpHandleTool.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/JS.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/JS/JsUtil.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/JS/JsUtil.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/JsonHandleTool.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/JsonHandleTool.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/MathUtil.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Util => Utility/Old}/MathUtil.cs.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/Permission.meta (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/Permission/CameraPermissionRequester.cs (100%) rename EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/{Tool => Utility/Old}/Permission/CameraPermissionRequester.cs.meta (100%) diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Manager/ARTrack/ARTrackManager.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Manager/ARTrack/ARTrackManager.cs index 433107ed..3c06a0d1 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Manager/ARTrack/ARTrackManager.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Manager/ARTrack/ARTrackManager.cs @@ -1,7 +1,9 @@ using System.Collections; using System.Collections.Generic; +using Cysharp.Threading.Tasks; using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.Serialization; using UnityEngine.XR.ARFoundation; using UnityEngine.XR.ARSubsystems; @@ -11,12 +13,14 @@ namespace GameLogic public class ARTrackManager : MonoBehaviorSingleton { [ShowInInspector, ReadOnly] private ARTrackedImageManager m_ImgTrackedManager; + + /// 缓存模型库 private Dictionary m_DicModels = new Dictionary(); - public List images; // 识别图列表 - public List models; // 对应的模型列表 + [ShowInInspector]private List m_trackImages = new List(); // 识别图列表 private Dictionary imageToModelMap = new Dictionary(); + private List m_arTrackDataList = new List(); public override void Awake() { @@ -24,6 +28,18 @@ namespace GameLogic m_ImgTrackedManager = FindAnyObjectByType(); } + public async UniTask SetAndHandleTrack(List ardata ) + { + var token = this.GetCancellationTokenOnDestroy(); + m_arTrackDataList = ardata; + foreach (var arTrackData in m_arTrackDataList) + { + var trackImg = await ImageUtility.UnityWebDownloadTexture2D(arTrackData.trackImageUrl, token); + if (trackImg == null) continue; + m_trackImages.Add(trackImg); + } + } + public override void Start() { base.Start(); @@ -56,10 +72,9 @@ namespace GameLogic return; } - foreach (var image in images) + foreach (var image in m_trackImages) { - var job = library.ScheduleAddImageWithValidationJob(image, image.name, 0.1f); // 0.1f为物理尺寸，需根据实际情况调整 - job.jobHandle.Complete(); // Use jobHandle to complete the job + } } diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs index b6b2fcda..01c99d82 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/System/ARTrackSystem.cs @@ -28,15 +28,7 @@ namespace GameLogic GameObjectFactory.CreateDeviceOrientationGo( m_arTrackManager.transform,OrientationState.Portrait); var glController = m_arTrackManager.gameObject.AddComponent(); - - - Log.Info(_projectToSceneSavedData._projectData.List_arTrackData.Count); - foreach (var arModelData in _projectToSceneSavedData._projectData.List_arTrackData) - { - Log.Debug($"{arModelData.trackImageUrl}"); - //Log.Debug($"{arModelData._trackImageUrl}"); - //await m_arTrackImageLibraryManager.AddTrackImage(arModelData); - } + await m_arTrackManager.SetAndHandleTrack(_projectToSceneSavedData._projectData.List_arTrackData); GameModule.UI.ShowUI(); GameEvent.Send(UIProjectEventDefined.SettingProject, _projectToSceneSavedData); GameModule.UI.CloseUI(); diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool.meta deleted file mode 100644 index 3abfcdb2..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4049f9d0ea2109d4697f1e25d06dfa1b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs index b2b7c2b8..f53df37f 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/UIWindTraceLibrary.cs @@ -86,7 +86,9 @@ namespace GameLogic private void SetUpComponentByData(ProjectData projectData) { - + + + // m_trackScrollerView.SetUp(); // var arlibrary = ARTrackImageLibraryManager.Instance; // if (arlibrary != null) // { diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs index 3a0d6802..7fb61e04 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/ARTrack/Widget/UIARTrackScrollView.cs @@ -34,6 +34,7 @@ using frame8.Logic.Misc.Other.Extensions; using Com.ForbiddenByte.OSA.Core; using Com.ForbiddenByte.OSA.CustomParams; using Com.ForbiddenByte.OSA.DataHelpers; +using GameLogic; // You should modify the namespace to your own or - if you're sure there won't ever be conflicts - remove it altogether namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists @@ -201,6 +202,17 @@ namespace Your.Namespace.Here.UniqueStringHereToAvoidNamespaceConflicts.Lists { Data.InsertItemsAtEnd(newItems); } + + public void SetUp(List arTrackAllData) + { + List newItems = new List(); + foreach (var arTrackData in arTrackAllData) + { + + } + + + } } // Class containing the data associated with an item diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New.meta new file mode 100644 index 00000000..262b92b7 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 996ed2fb1621472f91f4c041cda54f6a +timeCreated: 1743068291 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image.meta new file mode 100644 index 00000000..309a067c --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d2db364ea81243099100bed84db21319 +timeCreated: 1743068240 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs new file mode 100644 index 00000000..0c9e5dc3 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs @@ -0,0 +1,24 @@ +using System; +using System.Threading; +using Cysharp.Threading.Tasks; +using UnityEngine; +using UnityEngine.Networking; + +namespace GameLogic +{ + public static class ImageUtility + { + public static async UniTask UnityWebDownloadTexture2D(string url,CancellationToken token) + { + UnityWebRequest request = UnityWebRequestTexture.GetTexture(url); + var operation = await request.SendWebRequest().ToUniTask(cancellationToken: token); + if (operation.result != UnityWebRequest.Result.Success) + { + Debug.LogWarning($"Error downloading image: {operation.error}"); + return null; + } + Texture2D tex2D = DownloadHandlerTexture.GetContent(request); + return tex2D; + } + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs.meta new file mode 100644 index 00000000..61ffe7b6 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/New/Image/ImageUtility.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 654046ef054044b8b52bbae2a9bf3c92 +timeCreated: 1743068259 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old.meta new file mode 100644 index 00000000..36a0883e --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 52303a77d3e64d23a413f93626ba6f02 +timeCreated: 1743068274 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/AR.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/AR.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/AR.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/AR.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/AR/ARPlaneDebugVisualizer.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/AR/ARPlaneDebugVisualizer.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/AR/ARPlaneDebugVisualizer.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/AR/ARPlaneDebugVisualizer.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/AR/ARPlaneDebugVisualizer.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/AR/ARPlaneDebugVisualizer.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/AR/ARPlaneDebugVisualizer.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/AR/ARPlaneDebugVisualizer.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/External.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/External.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/External.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/External.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/External/UIWindowsExternal.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/External/UIWindowsExternal.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/External/UIWindowsExternal.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/External/UIWindowsExternal.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/External/UIWindowsExternal.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/External/UIWindowsExternal.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/External/UIWindowsExternal.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/External/UIWindowsExternal.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/FlowLayoutGroup.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/FlowLayoutGroup.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/FlowLayoutGroup.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/FlowLayoutGroup.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/FlowLayoutGroup.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/FlowLayoutGroup.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/FlowLayoutGroup.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/FlowLayoutGroup.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/Http.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Http.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/Http.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Http.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/Http/LifecycleSafeTool.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Http/LifecycleSafeTool.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/Http/LifecycleSafeTool.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Http/LifecycleSafeTool.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/Http/LifecycleSafeTool.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Http/LifecycleSafeTool.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/Http/LifecycleSafeTool.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Http/LifecycleSafeTool.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/HttpHandleTool.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/HttpHandleTool.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/HttpHandleTool.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/HttpHandleTool.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/HttpHandleTool.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/HttpHandleTool.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/HttpHandleTool.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/HttpHandleTool.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/JS.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JS.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/JS.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JS.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/JS/JsUtil.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JS/JsUtil.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/JS/JsUtil.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JS/JsUtil.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/JS/JsUtil.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JS/JsUtil.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/JS/JsUtil.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JS/JsUtil.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/JsonHandleTool.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JsonHandleTool.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/JsonHandleTool.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JsonHandleTool.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/JsonHandleTool.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JsonHandleTool.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/JsonHandleTool.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/JsonHandleTool.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/MathUtil.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/MathUtil.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/MathUtil.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/MathUtil.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/MathUtil.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/MathUtil.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Util/MathUtil.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/MathUtil.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/Permission.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Permission.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/Permission.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Permission.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/Permission/CameraPermissionRequester.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Permission/CameraPermissionRequester.cs similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/Permission/CameraPermissionRequester.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Permission/CameraPermissionRequester.cs diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/Permission/CameraPermissionRequester.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Permission/CameraPermissionRequester.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Tool/Permission/CameraPermissionRequester.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Utility/Old/Permission/CameraPermissionRequester.cs.meta diff --git a/EintooAR/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/EintooAR/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset index dc9c8a70..b4633246 100644 --- a/EintooAR/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/EintooAR/Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -68,6 +68,15 @@ MonoBehaviour: - UniTask.DOTween - UniTask.Linq - UniTask.TextMeshPro + - VoxelBusters.CoreLibrary + - VoxelBusters.CoreLibrary.NativePlugins + - VoxelBusters.CoreLibrary.NativePlugins.AndroidModule + - VoxelBusters.CoreLibrary.NativePlugins.iOSModule + - VoxelBusters.CoreLibrary.Parser + - VoxelBusters.EssentialKit + - VoxelBusters.EssentialKit.AndroidModule + - VoxelBusters.EssentialKit.Demo + - VoxelBusters.EssentialKit.iOSModule - YooAsset showAdvancedSettings: 0 addMgrToSceneAutomatically: 0 diff --git a/EintooAR/ProjectSettings/GvhProjectSettings.xml b/EintooAR/ProjectSettings/GvhProjectSettings.xml index cc01efb7..cd6fcb21 100644 --- a/EintooAR/ProjectSettings/GvhProjectSettings.xml +++ b/EintooAR/ProjectSettings/GvhProjectSettings.xml @@ -1,3 +1,6 @@ + + + \ No newline at end of file diff --git a/EintooAR/ProjectSettings/ProjectSettings.asset b/EintooAR/ProjectSettings/ProjectSettings.asset index c8b79786..48ef352e 100644 --- a/EintooAR/ProjectSettings/ProjectSettings.asset +++ b/EintooAR/ProjectSettings/ProjectSettings.asset @@ -783,7 +783,7 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 scriptingDefineSymbols: - Android: ENABLE_LOG;TextMeshPro;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;ES3_TMPRO;ES3_UGUI;ATMOSPHERIC_HEIGHT_FOG;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;NODECANVAS;ENABLE_HYBRIDCLR + Android: ENABLE_LOG;TextMeshPro;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;ES3_TMPRO;ES3_UGUI;ATMOSPHERIC_HEIGHT_FOG;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;NODECANVAS;ENABLE_HYBRIDCLR;ENABLE_VOXELBUSTERS_ESSENTIAL_KIT EmbeddedLinux: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 GameCoreScarlett: DOTWEEN GameCoreXboxOne: TextMeshPro;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 @@ -794,12 +794,12 @@ PlayerSettings: QNX: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 ReservedCFE: TextMeshPro;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 Server: ES3_TMPRO;ES3_UGUI - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;SLATE;NODECANVAS;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENABLE_HYBRIDCLR + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;SLATE;NODECANVAS;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENABLE_HYBRIDCLR;ENABLE_VOXELBUSTERS_ESSENTIAL_KIT VisionOS: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 - WebGL: ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;ENABLE_HYBRIDCLR + WebGL: ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;ENABLE_HYBRIDCLR;ENABLE_VOXELBUSTERS_ESSENTIAL_KIT Windows Store Apps: ENABLE_LOG;ES3_TMPRO;ES3_UGUI;DOTWEEN;ENABLE_HYBRIDCLR XboxOne: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 - iPhone: ENABLE_LOG;TextMeshPro;UNITY_XR_ARKIT_LOADER_ENABLED;ES3_TMPRO;ES3_UGUI;DOTWEEN;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;NODECANVAS;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3;ENABLE_HYBRIDCLR + iPhone: ENABLE_LOG;TextMeshPro;UNITY_XR_ARKIT_LOADER_ENABLED;ES3_TMPRO;ES3_UGUI;DOTWEEN;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;NODECANVAS;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3;ENABLE_HYBRIDCLR;ENABLE_VOXELBUSTERS_ESSENTIAL_KIT tvOS: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 678a00af..34ddec66 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 279 - y: 201 - width: 725 - height: 578 - m_ShowMode: 0 - m_Title: Build Profiles - m_RootView: {fileID: 4} - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,63 +19,12 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Project - m_RootView: {fileID: 5} + m_Title: Console + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: BuildProfileWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 725 - height: 578 - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 725 - height: 578 - m_MinSize: {x: 725, y: 426} - m_MaxSize: {x: 4000, y: 4026} - vertical: 0 - controlID: 1094 - draggingID: 0 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -112,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -127,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -170,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -183,8 +108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 18} + - {fileID: 6} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 @@ -194,9 +119,9 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 45 + controlID: 63 draggingID: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -209,20 +134,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 14} + - {fileID: 7} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1429 + width: 1438 height: 933 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 46 + controlID: 64 draggingID: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -235,21 +160,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 12} - - {fileID: 13} + - {fileID: 8} + - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1429 - height: 486 + width: 1438 + height: 545 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 47 + controlID: 65 draggingID: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,16 +191,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 390 - height: 486 + width: 280 + height: 545 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,18 +215,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 390 + x: 280 y: 0 - width: 302 - height: 486 + width: 413 + height: 545 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -316,18 +241,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 692 + x: 693 y: 0 - width: 737 - height: 486 + width: 745 + height: 545 m_MinSize: {x: 52, y: 76} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 20} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -340,21 +265,21 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 16} - - {fileID: 17} + - {fileID: 12} + - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 - y: 486 - width: 1429 - height: 447 + y: 545 + width: 1438 + height: 388 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 169 + controlID: 132 draggingID: 0 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -371,16 +296,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 199 - height: 447 + width: 787 + height: 388 m_MinSize: {x: 101, y: 126} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 23} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -395,18 +320,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 199 + x: 787 y: 0 - width: 940 - height: 447 + width: 331 + height: 388 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 24} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -421,18 +346,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1139 + x: 1118 y: 0 - width: 290 - height: 447 + width: 320 + height: 388 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} - m_ActualView: {fileID: 25} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 25} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -447,54 +372,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1429 + x: 1438 y: 0 - width: 491 + width: 482 height: 933 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 26} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 26} + - {fileID: 22} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 15004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 725, y: 400} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Build Profiles - m_Image: {fileID: 0} - m_Tooltip: - m_TextWithWhitespace: "Build Profiles\u200B" - m_Pos: - serializedVersion: 2 - x: 0 - y: 26 - width: 725 - height: 552 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ContainerData: [] - m_OverlaysVisible: 1 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -515,10 +404,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 693 + x: 694 y: 24 - width: 735 - height: 460 + width: 743 + height: 519 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -574,29 +463,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 735 - height: 439 - m_Scale: {x: 0.32908547, y: 0.32908547} - m_Translation: {x: 367.5, y: 219.50002} + width: 743 + height: 498 + m_Scale: {x: 0.37331334, y: 0.37331334} + m_Translation: {x: 371.5, y: 249} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1116.7312 + x: -995.1426 y: -667 - width: 2233.4624 + width: 1990.2852 height: 1334 m_MinimalGUI: 1 - m_defaultScale: 0.32908547 - m_LastWindowPixelSize: {x: 735, y: 460} + m_defaultScale: 0.37331334 + m_LastWindowPixelSize: {x: 743, y: 519} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000101000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -619,8 +508,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 389 - height: 460 + width: 279 + height: 519 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -637,7 +526,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: d64af6ffae4df6ffbc4df6ff20bcf7ffde3bf9ffec3bf9fffa3bf9ff083cf9ff183cf9ff2a3cf9ff4c3cf9ff5a3cf9ff683cf9ff763cf9ff843cf9ff923cf9fff03df9fffa3df9ff4eacfaff062cfcff102cfcff1a2cfcff242cfcff2e2cfcff382cfcff422cfcff4c2cfcff562cfcff602cfcff6a2cfcff742cfcffca40fcff3a41fcffaa4afcffe04afcffb652fcffc654fcff + m_ExpandedIDs: 8c51fdff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -654,7 +543,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -662,7 +551,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -683,10 +572,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 391 + x: 281 y: 24 - width: 300 - height: 460 + width: 411 + height: 519 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -812,7 +701,7 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/Light Settings - index: 0 + index: 1 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 @@ -840,7 +729,7 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/Cloth Constraints - index: 1 + index: 2 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 @@ -854,7 +743,7 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/Cloth Collisions - index: 2 + index: 3 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 @@ -910,20 +799,6 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/Occlusion Culling - index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/Physics Debugger index: 4 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -937,7 +812,7 @@ MonoBehaviour: - dockPosition: 1 containerId: overlay-container--right displayed: 0 - id: Scene View/Scene Visibility + id: Scene View/Physics Debugger index: 5 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -951,7 +826,7 @@ MonoBehaviour: - dockPosition: 1 containerId: overlay-container--right displayed: 0 - id: Scene View/Particles + id: Scene View/Scene Visibility index: 6 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -962,6 +837,20 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/Particles + index: 7 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 - dockPosition: 1 containerId: overlay-container--right displayed: 0 @@ -1106,7 +995,7 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: Scene View/Tile Palette Brush Pick - index: 9 + index: 10 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 @@ -1134,20 +1023,6 @@ MonoBehaviour: containerId: overlay-container--right displayed: 0 id: SceneView/CamerasOverlay - index: 7 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' - floating: 0 - collapsed: 0 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 24, y: 0} - snapCorner: 0 - layout: 4 - size: {x: 0, y: 0} - sizeOverridden: 0 - - dockPosition: 1 - containerId: overlay-container--right - displayed: 0 - id: Scene View/PBR Validation Settings index: 8 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -1161,7 +1036,7 @@ MonoBehaviour: - dockPosition: 1 containerId: overlay-container--right displayed: 0 - id: Scene View/TrailRenderer + id: Scene View/PBR Validation Settings index: 9 contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 @@ -1172,6 +1047,20 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverridden: 0 + - dockPosition: 1 + containerId: overlay-container--right + displayed: 0 + id: Scene View/TrailRenderer + index: 11 + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + floating: 0 + collapsed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 24, y: 0} + snapCorner: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverridden: 0 - dockPosition: 1 containerId: overlay-container--right displayed: 0 @@ -1293,9 +1182,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10 + m_Target: 12.124355 speed: 2 - m_Value: 10 + m_Value: 12.124355 m_Ortho: m_Target: 1 speed: 2 @@ -1316,7 +1205,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 22} + m_SceneView: {fileID: 18} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1326,7 +1215,7 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_LastDebugDrawMode: 35 m_ViewIsLockedToObject: 0 ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1349,8 +1238,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 198 - height: 421 + width: 786 + height: 362 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1362,7 +1251,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1383,10 +1272,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 200 + x: 788 y: 24 - width: 938 - height: 421 + width: 329 + height: 362 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1409,7 +1298,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Editor/ExternalDependencyManager m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1419,16 +1308,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Editor/ExternalDependencyManager m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR m_LockTracker: m_IsLocked: 1 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4c020200 - m_LastClickedID: 131660 - m_ExpandedIDs: 00000000cc7e0300ce7e0300d07e0300 + m_SelectedIDs: ecdc0300 + m_LastClickedID: 253164 + m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1445,7 +1334,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 16} + m_ClientGUIView: {fileID: 13} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1457,7 +1346,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000cc7e0300ce7e0300d07e0300 + m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1503,7 +1392,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 16} + m_ClientGUIView: {fileID: 13} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1514,8 +1403,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 420 ---- !u!114 &25 + m_DirectoriesAreaWidth: 279 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1536,10 +1425,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 1140 + x: 1119 y: 24 - width: 288 - height: 421 + width: 318 + height: 362 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1562,7 +1451,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Plugins/VoxelBusters/EssentialKit/Runtime m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1572,16 +1461,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets + - Assets/Plugins/VoxelBusters/EssentialKit/Runtime m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR m_LockTracker: - m_IsLocked: 1 + m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 37} - m_SelectedIDs: 56f70100 - m_LastClickedID: 128854 - m_ExpandedIDs: 00000000cc7e0300ce7e0300d07e0300 + scrollPos: {x: 0, y: 586} + m_SelectedIDs: fcdd0300 + m_LastClickedID: 253436 + m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1598,7 +1487,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 17} + m_ClientGUIView: {fileID: 14} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1610,7 +1499,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000cc7e0300ce7e0300d07e0300 + m_ExpandedIDs: 00000000e01f0100e21f0100e41f0100e61f0100e81f0100ea1f0100ec1f0100ee1f0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1656,7 +1545,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 17} + m_ClientGUIView: {fileID: 14} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1667,8 +1556,8 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 238 ---- !u!114 &26 + m_DirectoriesAreaWidth: 198 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1689,9 +1578,9 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1430 + x: 1439 y: 24 - width: 490 + width: 481 height: 907 m_SerializedDataModeController: m_DataMode: 0