Merge branch 'cepdnaclk:main' into main

cepdnaclk · Jan 28, 2024 · a8245b0 · a8245b0
2 parents 234617d + 2e42e39
commit a8245b0
Show file tree

Hide file tree

Showing 21 changed files with 2,289 additions and 1,745 deletions.
diff --git a/AR Demo/Assets/Scenes/LoadMap.unity b/AR Demo/Assets/Scenes/LoadMap.unity
diff --git a/AR Demo/Assets/Scenes/Login.unity b/AR Demo/Assets/Scenes/Login.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44612712, g: 0.49549305, b: 0.57307076, a: 1}
+  m_IndirectSpecularColor: {r: 0.44871938, g: 0.49877524, b: 0.5756833, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1332,15 +1332,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 219ab0d4a23f58445b4c26422134facd, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2099,15 +2099,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 219ab0d4a23f58445b4c26422134facd, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2285,7 +2285,6 @@ MonoBehaviour:
   username: {fileID: 1790214679}
   password: {fileID: 809858699}
   textBox: {fileID: 416825313}
-  displayName: 
 --- !u!114 &1995738619
 MonoBehaviour:
   m_ObjectHideFlags: 0