init

Assets/DownLoadXR/NuGet.config.meta

@@ -15,6 +15,17 @@ PluginImporter:
   platformData:
   - first:
       Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
     second:
       enabled: 1
       settings: {}

Assets/DownLoadXR/packages.config.meta

@@ -15,6 +15,17 @@ PluginImporter:
   platformData:
   - first:
       Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
     second:
       enabled: 1
       settings: {}

Assets/FrameWork.meta

@@ -4,5 +4,5 @@ folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: framework
   assetBundleVariant: 

Assets/FrameWork/Art/3D/Materials/New Material.mat → Assets/FrameWork/Art/3D/Materials/New Material222.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: New Material
+  m_Name: New Material222
   m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords: []
   m_InvalidKeywords: []

Assets/FrameWork/Canvas.prefab

@@ -160,7 +160,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &8894333160753431136
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/FrameWork/JianTou.prefab

@@ -85,7 +85,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &1909995360214599718
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/FrameWork/Login/Scripts/Window/WindowConfig.cs

@@ -1,42 +0,0 @@
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using XRTool.Util;
-
-[CreateAssetMenu(menuName = "WindowConfig")]
-public class WindowConfig : ScriptableObject
-{
-    public windowType initShowWindow;
-    public Canvas canvas;
-    public List<UnityEngine.Object> initComponent;
-    public List<windowItemGameObject> windowItemGameObjectList;
-
-    [Serializable]
-    public class windowItemGameObject
-    {
-        public GameObject window;
-        public windowType type;
-        public List<windowItemGameObject> windowItemGameObjectList;
-        public windowType parentType;
-    }
-
-
-    public enum windowType
-    {
-        Login = 100001, // 登录
-        Project = 100002, // 项目
-        XunJian = 200001, // 巡检
-        XunJianLB = 201001, // 巡检
-        XunJianStart = 201002, // 巡检
-        ProjectMain = 200002, // 主页
-        RTC = 200003, // 远程协助
-        RoomMain = 203001, // 远程协助房间
-        YinDao = 200004, // 引导
-        PeiXun = 200005, // 
-        Error = 900001, // 
-        Tip = 800001, // 
-        Tip2 = 800002, // 
-        Top = 700001, // 
-    }
-}

Assets/RTC/Remote/ShowRoom/MREduastryStart.prefab → Assets/FrameWork/MREduastryStart.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &4994975482032598254
+--- !u!1 &8240336528491331399
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4994975482032598250}
-  - component: {fileID: 4994975482032598252}
-  - component: {fileID: 4994975482032598251}
+  - component: {fileID: 8240336528491331395}
+  - component: {fileID: 8240336528491331397}
+  - component: {fileID: 8240336528491331394}
   m_Layer: 5
   m_Name: MREduastryStart
   m_TagString: Untagged
@@ -18,13 +18,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4994975482032598250
+--- !u!4 &8240336528491331395
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4994975482032598254}
+  m_GameObject: {fileID: 8240336528491331399}
   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}
@@ -33,32 +33,35 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4994975482032598252
+--- !u!114 &8240336528491331397
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4994975482032598254}
+  m_GameObject: {fileID: 8240336528491331399}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 7e656a8683536334e8c167b4fda505ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   global: 1
+  isTest: 0
   isShowTip: 0
   wConfig: {fileID: 11400000, guid: 0667bace594664440902795c5cce1cf3, type: 2}
   canvasRoot: {fileID: 0}
   windowItemGameObjectList: []
   windowsConfig: {fileID: 11400000, guid: b605ed4a23ccd7144abbae608329d926, type: 2}
   isStart: 0
---- !u!114 &4994975482032598251
+  tipInfoGameObject: {fileID: 0}
+  preJDInt: 0
+--- !u!114 &8240336528491331394
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4994975482032598254}
+  m_GameObject: {fileID: 8240336528491331399}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 25230ae935fb3694a90363ba85ddd6c6, type: 3}

Assets/RTC/Remote/ShowRoom/MREduastryStart.prefab.meta → Assets/FrameWork/MREduastryStart.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9438f12e306761a468a2fa87b70d25a7
+guid: c2bba08c58147f6428b068597dde0286
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/ImmersalSDK/Core/Prefabs/ImmersalSDK.prefab → Assets/FrameWork/Minio.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &1434895627878410
+--- !u!1 &6207651209150305333
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,40 +8,42 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4682760393691964}
-  - component: {fileID: 8869940821398010349}
+  - component: {fileID: 6207651209150305334}
+  - component: {fileID: 6207651209150305335}
   m_Layer: 0
-  m_Name: ImmersalARCloudSDK
+  m_Name: Minio
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4682760393691964
+--- !u!4 &6207651209150305334
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1434895627878410}
+  m_GameObject: {fileID: 6207651209150305333}
   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: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8869940821398010349
+--- !u!114 &6207651209150305335
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1434895627878410}
+  m_GameObject: {fileID: 6207651209150305333}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bc609bf82f8e346d593bc1a41c2b7cb8, type: 3}
+  m_Script: {fileID: 11500000, guid: cd1ffb18c74b5664584b51b6933a3b04, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  developerToken: 
-  m_TargetFrameRate: 60
+  global: 1
+  bucket: 
+  islogin: 0

Assets/ImmersalSDK/Samples/Prefabs/Content Placement/AR Diamond.prefab.meta → Assets/FrameWork/Minio.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9f3a62c3a64e96a4aa6c44ff209648d4
+guid: a7bf7890c1ee8344fa6b93bf5667a2d8
 PrefabImporter:
   externalObjects: {}
   userData: