|
@@ -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>();
|