Browse Source

修改 UI 显示 和重置首页位置

DGJ 1 year ago
parent
commit
410bb02696

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

@@ -13,7 +13,7 @@ public class ChooseManager : MonoBehaviour,IController
     private IQueueSystem mQueueSystem;
     void Awake()
     {
-        transform.localPosition = new Vector3(0,0,500f);
+       // transform.localPosition = new Vector3(0,0,500f);
         StartCoroutine(ControlTip());
         ShowDevice.SetActive(true);
 
@@ -22,7 +22,12 @@ public class ChooseManager : MonoBehaviour,IController
         mQueueSystem.Level3QueueCount.Register(mQueueSystemCountNotNull).UnRegisterWhenGameObjectDestroyed(gameObject);
 
         SceneIOCContainer.Instance.Push("ShowChoose",gameObject);
+
+     
+
     }
+
+
     public void GotoXunJian()
     {
         Debug.Log("DGJ   =====>GotoXunJian ");
@@ -58,6 +63,17 @@ public class ChooseManager : MonoBehaviour,IController
         if(mQueueSystem.Level3QueueCount.Value>0)
             ShowHide_Toggle.interactable = true;
         Debug.Log($"打开的数量:{mQueueSystem.Level3QueueCount.Value}");
+
+        Debug.Log(transform.position);
+
+        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);
+        Debug.Log("DGJ  =======> " +transform.position);
+
+        GameObject obj = new GameObject();
+        obj.transform.position = transform.position;
+
     }
     private void ShowHideLevel3(bool on)
     {

+ 4 - 4
Assets/Game/ShowSupport/ShowRtc.prefab

@@ -648,9 +648,9 @@ RectTransform:
   m_Father: {fileID: 5466424356445212017}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 807, y: 593}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 807, y: 0}
   m_SizeDelta: {x: 72, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6357884478346561751
@@ -738,7 +738,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -340, y: 90}
+  m_AnchoredPosition: {x: -146, y: 0}
   m_SizeDelta: {x: 144, y: 144}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325

+ 17 - 17
Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -286,7 +286,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -725,7 +725,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -935,7 +935,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 1371397496031814873}
   toggleTransition: 1
   graphic: {fileID: 0}
   m_Group: {fileID: 8175746494880369120}
@@ -985,7 +985,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -1276,7 +1276,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -1411,7 +1411,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -1546,7 +1546,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -1681,7 +1681,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -2398,7 +2398,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -2836,7 +2836,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3407,7 +3407,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4291480266
   m_fontColor: {r: 0.7921569, g: 0.7921569, b: 0.7921569, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -3420,7 +3420,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3554,7 +3554,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 8873076052012861234}
   toggleTransition: 1
   graphic: {fileID: 0}
   m_Group: {fileID: 8175746494880369120}
@@ -3604,7 +3604,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -3874,7 +3874,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
@@ -4080,7 +4080,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -299, y: 114}
+  m_AnchoredPosition: {x: -299, y: 0}
   m_SizeDelta: {x: 144, y: 144}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325
@@ -5064,7 +5064,7 @@ MonoBehaviour:
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: 0
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2

+ 3 - 3
Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -13158,7 +13158,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 72, y: -72}
+  m_AnchoredPosition: {x: 33, y: -33}
   m_SizeDelta: {x: 48, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3278456518410092455
@@ -36873,8 +36873,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -93, y: 194}
-  m_SizeDelta: {x: 144, y: 144}
+  m_AnchoredPosition: {x: -93, y: -3}
+  m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325
 CanvasRenderer:

+ 1 - 1
Assets/Scripts/Managers/WayFindingManager.cs

@@ -269,7 +269,7 @@ public class WayFindingManager : MonoSingleton<WayFindingManager>
             route1.SetActive(true);
             listRoot.Add(route1.transform.GetChild(0).GetComponent<Route>());
 
-            listRoot[i].SetRoute(route1.transform.position, lookPoint.position, 0,lookPoint);
+           // listRoot[i].SetRoute(route1.transform.position, lookPoint.position, 0,lookPoint);
         }
 
         if (isdevice && machineObj)

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

@@ -30,6 +30,7 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>, IController
 
     private IQueueSystem mQueueSystem;
 
+    
     private void Start()
     {
         dhBtn.onClick.AddListener(() =>