Browse Source

修复小地图bug

“hujiajun” 1 year ago
parent
commit
056e2cb7e4

+ 3 - 2
Assets/HotUpdate/GameManager.cs

@@ -89,7 +89,7 @@ public class GameManager : MonoSingleton<GameManager>
     private MinMap m_MinMap;
     [Header("Setting")]
     [SerializeField, Tooltip("设置面板")]
-    private SettingPanel m_SettingPanel;
+    public SettingPanel m_SettingPanel;
     [SerializeField, Tooltip("编辑器面板")]
     private Transform m_EditorCanvas;
     [SerializeField, Tooltip("设置按钮")]
@@ -347,6 +347,7 @@ public class GameManager : MonoSingleton<GameManager>
     public List<SceneValue> sucessvalues;
     public void exitscene()
     {
+        XRLocalizer.Instance.gameObject.SetActive(true);
         m_EditorCanvas.gameObject.SetActive(false);
         m_SettingPanel.gameObject.SetActive(false);
         Destroy(loadref.goRefrence);
@@ -364,7 +365,7 @@ public class GameManager : MonoSingleton<GameManager>
         ARSpace.spaceToTransform.Clear();
         ARSpace.mapIdToOffset.Clear();
         ARSpace.mapIdToMap.Clear();
-        
+        Immersal.Core.FreeMap(PointFileGetUrlCommand.mapct);
         armap.FreeMap();
         Destroy(armap);
         armap = armapObj.AddComponent<ARMap>();

+ 6 - 1
Assets/HotUpdate/MinMap.cs

@@ -32,7 +32,12 @@ public class MinMap : MonoBehaviour
         mapPlayer.localPosition = pos;
         mapPlayer.localRotation = Quaternion.Euler(0, 0, -rot);
     }
-    
+
+    private void Update()
+    {
+        this.transform.localPosition = new Vector3(0.294f, 0.2405f,2.7f);
+        this.transform.localEulerAngles = Vector3.zero;
+    }
     /// <summary>
     /// 显示所有水晶点 (所有可触发交互的地方)
     /// </summary>

+ 2 - 0
Assets/HotUpdate/MoveChange.cs

@@ -93,6 +93,8 @@ public class MoveChange : MonoBehaviour
         ARSpace.isFind = true;
         islixian = true;
         GameManager.Instance.armap.renderMode = Immersal.AR.ARMap.RenderMode.EditorAndRuntime;
+        GameManager.Instance.m_SettingPanel.setdingwei(false);
+        //GameManager.Instance.armap.FreeMap(true);
     }
     public static bool isCx;
     public static bool islixian;

+ 1 - 0
Assets/HybridCLRGenerate/link.xml

@@ -433,6 +433,7 @@
     <type fullname="Immersal.AR.MapOffset" preserve="all" />
     <type fullname="Immersal.AR.SpaceContainer" preserve="all" />
     <type fullname="Immersal.AR.XRLocalizer" preserve="all" />
+    <type fullname="Immersal.Core" preserve="all" />
     <type fullname="SetLocalTime" preserve="all" />
   </assembly>
   <assembly fullname="mscorlib">

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -971,10 +971,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
+      Proximity: False
       InternetClient: True
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      Proximity: False
   metroTargetDeviceFamilies: {}
   metroFTAName: 
   metroFTAFileTypes: []