Browse Source

修改导航显示逻辑

DGJ 1 year ago
parent
commit
db2d01dee5

+ 2 - 1
Assets/Game/ShowChoose/ChooseManager.cs

@@ -40,6 +40,7 @@ public class ChooseManager : MonoBehaviour,IController
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowRTC);
 
         BladeServerManager.Instance.isDaoHang = false;
+        WayFindingManager.Instance.CloseWayFind();
     }
 
     public void GotoNav()
@@ -68,7 +69,7 @@ public class ChooseManager : MonoBehaviour,IController
 
         transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
         Vector3 pos = OpenXRCamera.Instance.head.position+ OpenXRCamera.Instance.head.forward * 2.5f;
-        transform.position = new Vector3(pos.x, 0, pos.z);
+        transform.position = new Vector3(pos.x, 0.5f, pos.z);
         Debug.Log("DGJ  =======> " +transform.position);
 
         GameObject obj = new GameObject();

+ 1 - 1
Assets/Game/ShowXunJian/XunJianManager.cs

@@ -41,7 +41,7 @@ namespace GHZLangChao
         {
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
 
-            BladeServerManager.Instance.isDaoHang = false;
+           // BladeServerManager.Instance.isDaoHang = false;
         }
 
         public void Navigationing()

+ 8 - 4
Assets/Scenes/LangChaoDemo2.unity

@@ -4269,7 +4269,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_LocalPosition.z
@@ -26489,6 +26489,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2671986348543453396, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 9c61c4cb267f6c14a978c54512e7ecae, type: 2}
     - target: {fileID: 8955719703749531882, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_Name
       value: Route
@@ -26503,15 +26507,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8955719703749531883, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.5
+      value: 0.25
       objectReference: {fileID: 0}
     - target: {fileID: 8955719703749531883, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.5
+      value: 0.25
       objectReference: {fileID: 0}
     - target: {fileID: 8955719703749531883, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.5
+      value: 0.25
       objectReference: {fileID: 0}
     - target: {fileID: 8955719703749531883, guid: b8f06988b095a5b47b02ae16f8140d34, type: 3}
       propertyPath: m_LocalPosition.x

+ 0 - 3
Assets/Scripts/Managers/WayFindingManager.cs

@@ -342,10 +342,7 @@ public class WayFindingManager : MonoSingleton<WayFindingManager>
                         route.setHighLight(false);
                         route = listRoot[i];
                     }
-                      
-
                 }
-
                 route.setHighLight(true);
             }
         }

+ 3 - 0
Assets/Scripts/Tool/HeadBtnManager.cs

@@ -59,6 +59,7 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>, IController
         });
 
         homeBtn.onClick.AddListener(GoHome);
+        homeBtn2.onClick.AddListener(GoHome);
     }
 
     private void Update()
@@ -128,5 +129,7 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>, IController
     {
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         BladeServerManager.Instance.isDaoHang = false;
+        WayFindingManager.Instance.CloseWayFind();
+        Hide();
     }
 }