蓝色星空 1 year ago
parent
commit
aaf8cfbea4

+ 58 - 0
Assets/Game/Blue/Controller/ShowHide_Toggle.cs

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+using Blue;
+
+public class ShowHide_Toggle : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IController
+{
+    public List<Sprite> SpriteList;
+    public Image mImage;
+    private Toggle toggle;
+    Color normalColor = new Color32(255, 255, 255, 255);
+    Color changeColor = new Color32(255, 255, 255, 125);
+    private IQueueSystem mQueueSystem;
+
+    void Awake()
+    {
+        toggle = GetComponent<Toggle>();
+        toggle.onValueChanged.AddListener(ShowHideLevel3);
+        mQueueSystem = this.GetService<IQueueSystem>();
+        mQueueSystem.Level3QueueCount.Register(mQueueSystemCountNotNull).UnRegisterWhenGameObjectDestroyed(gameObject);
+    }
+
+    private void OnEnable()
+    {
+        Debug.Log($"打开的数量:{mQueueSystem.Level3QueueCount.Value}");
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        mImage.color = normalColor;
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        mImage.color = changeColor;
+    }
+
+    private void mQueueSystemCountNotNull(int newCount)
+    {
+        Debug.Log($"打开的数量:{mQueueSystem.Level3QueueCount.Value}");
+    }
+
+    private void ShowHideLevel3(bool on)
+    {
+        Debug.LogError("Level3Queue:" + mQueueSystem.Level3List.Count);
+
+        if (on)
+            mImage.sprite = SpriteList[0];
+        else
+            mImage.sprite = SpriteList[1];
+
+        foreach (var go in mQueueSystem.Level3List)
+        {
+            go.SetActive(!on);
+        }
+    }
+}

+ 11 - 0
Assets/Game/Blue/Controller/ShowHide_Toggle.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: adc7e7b9276598843baabd94aeb3ad44
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
Assets/Game/Blue/System/GetObjectSystem.cs

@@ -6,6 +6,7 @@ namespace GHZLangChao
     public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
     {
         [SerializeField] private GameObject ShowDevice;
+        [SerializeField] private Transform Xunjian;
         //[SerializeField] private GameObject ARSpaceForAll;
         private void Awake()
         {
@@ -20,6 +21,7 @@ namespace GHZLangChao
         private void PushIOC()
         {
             SceneIOCContainer.Instance.Push("ShowDevice",ShowDevice);
+            SceneIOCContainer.Instance.Push("Xunjian",Xunjian);
         }
     }
 }

+ 32 - 32
Assets/Game/PrefabTemplate/DeviceInfo.prefab

@@ -603,8 +603,8 @@ RectTransform:
   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: 61.200012, y: 0}
-  m_SizeDelta: {x: 100, y: 20}
+  m_AnchoredPosition: {x: 134, y: 0}
+  m_SizeDelta: {x: 193.199, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3645512729381588365
 CanvasRenderer:
@@ -661,8 +661,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
-  m_fontSizeBase: 15
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -738,8 +738,8 @@ RectTransform:
   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: 61.200012, y: 0}
-  m_SizeDelta: {x: 100, y: 20}
+  m_AnchoredPosition: {x: 112, y: 0}
+  m_SizeDelta: {x: 163.008, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4987471580963492362
 CanvasRenderer:
@@ -796,8 +796,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
-  m_fontSizeBase: 15
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1086,8 +1086,8 @@ RectTransform:
   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: 79.19997, y: -0.20000005}
-  m_SizeDelta: {x: 60, y: 20}
+  m_AnchoredPosition: {x: 93.2, y: -0.20000005}
+  m_SizeDelta: {x: 129.8417, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9207843894968701855
 CanvasRenderer:
@@ -1144,8 +1144,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
-  m_fontSizeBase: 15
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1290,7 +1290,7 @@ RectTransform:
   m_GameObject: {fileID: 6368258268486523539}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 1, y: 1, z: 0.5}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5470585228180069535}
@@ -1299,7 +1299,7 @@ RectTransform:
   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: 181.1, y: 0.9}
+  m_AnchoredPosition: {x: 228.9, y: 0.9}
   m_SizeDelta: {x: 16, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6207526813155301674
@@ -1452,8 +1452,8 @@ RectTransform:
   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: -241.2, y: 1.1}
-  m_SizeDelta: {x: 200, y: 50}
+  m_AnchoredPosition: {x: -233.324, y: 1.1}
+  m_SizeDelta: {x: 231.504, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &835009461542761230
 CanvasRenderer:
@@ -1510,8 +1510,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 25
-  m_fontSizeBase: 25
+  m_fontSize: 35
+  m_fontSizeBase: 35
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1588,8 +1588,8 @@ RectTransform:
   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: -177, y: -0.2}
-  m_SizeDelta: {x: 60, y: 20}
+  m_AnchoredPosition: {x: -147.3, y: -0.2}
+  m_SizeDelta: {x: 92.0991, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2044278242464778515
 CanvasRenderer:
@@ -1646,8 +1646,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
-  m_fontSizeBase: 15
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1723,8 +1723,8 @@ RectTransform:
   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: 70, y: 0}
-  m_SizeDelta: {x: 100, y: 20}
+  m_AnchoredPosition: {x: 137, y: 0}
+  m_SizeDelta: {x: 182.091, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &186852345534786094
 CanvasRenderer:
@@ -1781,8 +1781,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
-  m_fontSizeBase: 15
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1859,8 +1859,8 @@ RectTransform:
   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: -87.40004, y: -0.20000005}
-  m_SizeDelta: {x: 60, y: 20}
+  m_AnchoredPosition: {x: -33.5, y: -0.20000005}
+  m_SizeDelta: {x: 95.2575, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5019178714115637395
 CanvasRenderer:
@@ -1917,8 +1917,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 15
-  m_fontSizeBase: 15
+  m_fontSize: 30
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -2257,7 +2257,7 @@ RectTransform:
   m_GameObject: {fileID: 8742461659272804791}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8395069113887031565}
@@ -2265,7 +2265,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -31.119995, y: 2.181}
+  m_AnchoredPosition: {x: -31.119995, y: -0.5}
   m_SizeDelta: {x: 60, y: 44.362}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7228139809174974243

+ 14 - 14
Assets/Game/PrefabTemplate/借用_XunjianToogleUI.prefab

@@ -233,7 +233,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -338,7 +338,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 50
-    m_FontStyle: 2
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 5
     m_MaxSize: 50
@@ -719,7 +719,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 50
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 5
     m_MaxSize: 50
@@ -868,7 +868,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 2
+  m_fontStyle: 3
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
@@ -1003,7 +1003,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -1271,7 +1271,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -1406,7 +1406,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -1541,7 +1541,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -1948,7 +1948,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -2306,7 +2306,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -2615,7 +2615,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -2750,7 +2750,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 256
   m_textAlignment: 65535
@@ -3709,7 +3709,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -4364,7 +4364,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535

+ 1 - 1
Assets/Game/ShowChoose/ShowChoose.prefab

@@ -1829,7 +1829,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3336360227880015849
 RectTransform:
   m_ObjectHideFlags: 0

+ 72 - 3
Assets/Game/ShowSupport/ShowRtc.prefab

@@ -53,7 +53,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 518735179457021308}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -136,7 +136,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.49019608}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -577,6 +577,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Titile_Btn: {fileID: 6989965228074315159}
   ShowHide_Toggle: {fileID: 6357884478346561751}
+  UserList_Btn: {fileID: 8908284830907246518}
+  ShowRtcHistory_Btn: {fileID: 3144313263904251065}
+  UserList_Text: {fileID: 3076773033835630584}
+  ShowRtcHistory_Text: {fileID: 2911069066738432039}
 --- !u!114 &68587665577711952
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -625,6 +629,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5651859873243564389}
   - component: {fileID: 6357884478346561751}
+  - component: {fileID: 4559395045512758594}
   m_Layer: 5
   m_Name: ShowHide_Toggle
   m_TagString: Untagged
@@ -700,7 +705,23 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
+--- !u!114 &4559395045512758594
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5942839336781322053}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adc7e7b9276598843baabd94aeb3ad44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpriteList:
+  - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
+  - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
+  mImage: {fileID: 3312468753262583349}
 --- !u!1 &6804054572846459353
 GameObject:
   m_ObjectHideFlags: 0
@@ -964,6 +985,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5466424356445212017}
     m_Modifications:
+    - target: {fileID: 448172786466754177, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+      propertyPath: m_fontStyle
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1227350726860449412, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
       propertyPath: m_Name
       value: Panel
@@ -1058,8 +1083,52 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+--- !u!114 &2911069066738432039 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 354922246215399774, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+  m_PrefabInstance: {fileID: 3209621791322341753}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3076773033835630584 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 448172786466754177, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+  m_PrefabInstance: {fileID: 3209621791322341753}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3144313263904251065 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 515669040464715200, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+  m_PrefabInstance: {fileID: 3209621791322341753}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &6025107294591558059 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 9157969971192635602, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
   m_PrefabInstance: {fileID: 3209621791322341753}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8908284830907246518 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6280916023673956047, guid: 4bc1314b7e165d4478dd2efccd6d1826, type: 3}
+  m_PrefabInstance: {fileID: 3209621791322341753}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

+ 30 - 27
Assets/Game/ShowSupport/SupportControl.cs

@@ -1,14 +1,21 @@
 using UnityEngine;
 using UnityEngine.UI;
 using Blue;
+using TMPro;
 
 public class SupportControl : AbstractController
 {
     [SerializeField] private Button Titile_Btn;
     [SerializeField] private Toggle ShowHide_Toggle;
 
+    [SerializeField] private Button UserList_Btn;
+    [SerializeField] private Button ShowRtcHistory_Btn;
+
     private Transform ShowRtcTrans;
-    private IQueueSystem mQueueSystem;
+    private FontStyle FontStyleB = FontStyle.Bold;
+    private FontStyle FontStyleN = FontStyle.Normal;
+    [SerializeField] private TextMeshProUGUI UserList_Text;
+    [SerializeField] private TextMeshProUGUI ShowRtcHistory_Text;
     void Awake()
     {
         Init();
@@ -17,13 +24,20 @@ public class SupportControl : AbstractController
             transform.position = ShowRtcTrans.position;
             Quaternion ang = Quaternion.LookRotation(OpenXRCamera.Instance.head.position - transform.position);
             transform.rotation = ang;
-            transform.localEulerAngles = new Vector3(transform.localEulerAngles.x,transform.localEulerAngles.y+180f,transform.localEulerAngles.z);
+            transform.localEulerAngles = new Vector3(transform.localEulerAngles.x, transform.localEulerAngles.y + 180f, transform.localEulerAngles.z);
         });
-        ShowHide_Toggle.onValueChanged.AddListener(ShowHideLevel3);
-        mQueueSystem = this.GetService<IQueueSystem>();
-        mQueueSystem.Level3QueueCount.Register(mQueueSystemCountNotNull).UnRegisterWhenGameObjectDestroyed(gameObject);
-    }
 
+        UserList_Btn.onClick.AddListener(()=>
+        {
+            UserList_Text.fontStyle = (FontStyles)FontStyleB;
+            ShowRtcHistory_Text.fontStyle = (FontStyles)FontStyleN;
+        });
+        ShowRtcHistory_Btn.onClick.AddListener(()=>
+        {
+            UserList_Text.fontStyle = (FontStyles)FontStyleN;
+            ShowRtcHistory_Text.fontStyle = (FontStyles)FontStyleB;
+        });
+    }
     public void showRTC()
     {
         LangChaoRTC.Instance.showRTC(0);
@@ -41,9 +55,7 @@ public class SupportControl : AbstractController
 
     public void Nav()
     {
-        
     }
-    
     public void History()
     {
         //ShowRTC.Instance.gotoWindow(ScenesManager.SceneType.ShowRTCHistory);
@@ -52,29 +64,20 @@ public class SupportControl : AbstractController
     private void Init()
     {
         ShowRtcTrans = new GameObject("ShowRtcTrans").transform;
-        ShowRtcTrans.position = OpenXRCamera.Instance.head.position + new Vector3(-1,0,0);
+        ShowRtcTrans.position = OpenXRCamera.Instance.head.position + new Vector3(-1, 0, 0);
         ShowRtcTrans.localEulerAngles = new Vector3(0, -90, 0);
         ShowRtcTrans.SetParent(OpenXRCamera.Instance.head);
     }
-    
+
     private void OnEnable()
     {
-        if(mQueueSystem.Level3QueueCount.Value>0)
-            ShowHide_Toggle.interactable = true;
-        Debug.Log($"打开的数量:{mQueueSystem.Level3QueueCount.Value}");
-    }
-    private void ShowHideLevel3(bool on)
-    {
-        Debug.Log("Level3Queue:"+mQueueSystem.Level3List.Count);
-        foreach(var go in mQueueSystem.Level3List)
-        {
-            go.SetActive(!on);
-        }
-    }
-    private void mQueueSystemCountNotNull(int newCount)
-    {
-        if(newCount>0)
-            ShowHide_Toggle.interactable = true;
-        Debug.Log($"打开的数量:{mQueueSystem.Level3QueueCount.Value}");
+        transform.LookAt(OpenXRCamera.Instance.head);
+        transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
+        Transform Player = OpenXRCamera.Instance.head;
+        Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
+        transform.position = OpenXRCamera.Instance.head.position + Player.forward * 1.6f;
+        transform.position = new Vector3(transform.position.x, transform.position.y + 0f, transform.position.z);
     }
+
+
 }

+ 59 - 57
Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -99,7 +99,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -234,7 +234,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -530,7 +530,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8560100870857192279}
-  - {fileID: 1769282904888709128}
+  - {fileID: 7557512296016039854}
   - {fileID: 3671324079101866303}
   - {fileID: 6007970590168449410}
   m_Father: {fileID: 4629186307896980025}
@@ -762,8 +762,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 6, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 1.9690018, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5901707140697943203
 CanvasRenderer:
@@ -826,7 +826,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -894,7 +894,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8885911096571082457}
-  - {fileID: 7557512296016039854}
+  - {fileID: 1769282904888709128}
   - {fileID: 4497618124609323474}
   m_Father: {fileID: 4629186307896980025}
   m_RootOrder: 1
@@ -1225,8 +1225,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 5, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 0.96900177, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2200620642863621698
 CanvasRenderer:
@@ -1289,7 +1289,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -1904,7 +1904,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -2537,8 +2537,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: -2.031, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6384007225315508589
 CanvasRenderer:
@@ -2601,7 +2601,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -2736,7 +2736,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -3035,7 +3035,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -3182,8 +3182,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: -2.031, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &59975529998913250
 CanvasRenderer:
@@ -3246,7 +3246,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -3381,7 +3381,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -3680,7 +3680,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -3885,8 +3885,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 5, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 0.96900177, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &329477577710047050
 CanvasRenderer:
@@ -3949,7 +3949,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -4240,7 +4240,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -4375,7 +4375,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -4446,8 +4446,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 7, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 2.969, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9028017195707679481
 CanvasRenderer:
@@ -4510,7 +4510,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -4745,8 +4745,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -1, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: -5.031, y: -134.09497}
+  m_SizeDelta: {x: 54.2, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3002780703516980200
 CanvasRenderer:
@@ -4809,7 +4809,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -5016,13 +5016,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1604557598583110365}
+  m_Father: {fileID: 6772490152775480182}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 256, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 3.801, y: -134.09497}
+  m_SizeDelta: {x: 61.741, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7630348826448097460
 CanvasRenderer:
@@ -5085,7 +5085,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -5220,7 +5220,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -5428,7 +5428,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -5499,8 +5499,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 13, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 6.954, y: -134.09497}
+  m_SizeDelta: {x: 58.231, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2656666433883658492
 CanvasRenderer:
@@ -5563,7 +5563,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -5820,6 +5820,8 @@ MonoBehaviour:
   SaveBtn: {fileID: 3523176626855364471}
   toggleBoolList: 010000000000000000000000
   DefaultUI_go: {fileID: 8040946423383846060}
+  yyyyy: 1.3
+  zzz: {x: -0.2, y: 1, z: 0}
   mScreenshotSprite: {fileID: 21300000, guid: 72a6f38aacb371e4e808f9b74800e742, type: 3}
 --- !u!114 &2159527941179580181
 MonoBehaviour:
@@ -5942,7 +5944,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -6585,7 +6587,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -7159,7 +7161,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -7294,7 +7296,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -7441,8 +7443,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 6, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: 8.6, y: -134.09497}
+  m_SizeDelta: {x: 51.339, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2706124895040845699
 CanvasRenderer:
@@ -7505,7 +7507,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -7640,7 +7642,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -7706,13 +7708,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6772490152775480182}
+  m_Father: {fileID: 1604557598583110365}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -258, y: -134.09497}
-  m_SizeDelta: {x: 46.138, y: -45.81}
+  m_AnchoredPosition: {x: -0.5999985, y: -134.09497}
+  m_SizeDelta: {x: 51.339, y: -45.81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3843150962026192377
 CanvasRenderer:
@@ -7775,7 +7777,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -8004,7 +8006,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 0
   m_fontSizeMax: 0
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -8139,7 +8141,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -8438,7 +8440,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
@@ -8573,7 +8575,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535

+ 18 - 2
Assets/Game/ShowXunJian/StartXunJian.cs

@@ -27,17 +27,33 @@ namespace GHZLangChao
             }
             SaveBtn.onClick.AddListener(ClickSave);
             //CancelBtn.onClick.AddListener(ClickCancel);
+            trans = new GameObject("trans").transform;
+            trans.SetParent(OpenXRCamera.Instance.head);
         }
+        private Transform trans;
         private float y;
+
+        public float yyyyy = 1.3f;
+        public Vector3 zzz = new Vector3(-0.2f, 1f, 0);
+        [SerializeField] private Transform Xunjian => SceneIOCContainer.Instance.Pull("Xunjian") as Transform;
         private void Update()
         {
             if (Test) return;
+            transform.position = Xunjian.position;
+            transform.eulerAngles = Xunjian.eulerAngles;
+            /*
+            transform.LookAt(OpenXRCamera.Instance.head);
+            transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y+180, 0);
+            transform.position = OpenXRCamera.Instance.head.position + OpenXRCamera.Instance.head.forward *yyyyy + zzz;
+            //transform.position = trans.position;
+            
             transform.LookAt(OpenXRCamera.Instance.head);
             transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
             Transform Player = OpenXRCamera.Instance.head;
-            Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
+            //Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
             transform.position = OpenXRCamera.Instance.head.position + Player.forward * 2.5f;
-            transform.position = new Vector3(transform.position.x, y+0.65f, transform.position.z);
+            transform.position = new Vector3(transform.position.x, OpenXRCamera.Instance.head.position.y, transform.position.z);
+            */
         }
         public void Next()
         {

+ 101 - 20
Assets/Scenes/LangChaoDemo2.unity

@@ -7527,6 +7527,7 @@ RectTransform:
   - {fileID: 1107507334}
   - {fileID: 1456619378}
   - {fileID: 1746801817}
+  - {fileID: 1016632607}
   m_Father: {fileID: 1971097074}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9877,6 +9878,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6195766569180850275, guid: 9e1deb76e7ead614da932413e318b2fc, type: 3}
+      propertyPath: Xunjian
+      value: 
+      objectReference: {fileID: 1016632607}
     - target: {fileID: 6195766569180850275, guid: 9e1deb76e7ead614da932413e318b2fc, type: 3}
       propertyPath: ShowDevice
       value: 
@@ -14082,6 +14087,82 @@ MonoBehaviour:
   startShowDevice: {fileID: 1617127047}
   listRoomName: []
   listObjes: []
+--- !u!1 &1016632606
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1016632607}
+  - component: {fileID: 1016632609}
+  - component: {fileID: 1016632608}
+  m_Layer: 5
+  m_Name: StartXunJian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1016632607
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1016632606}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 120}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 587736015}
+  m_RootOrder: 4
+  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: 50, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1016632608
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1016632606}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1016632609
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1016632606}
+  m_CullTransparentMesh: 1
 --- !u!1 &1016915732
 GameObject:
   m_ObjectHideFlags: 0
@@ -25438,11 +25519,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 615615474161798055, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1075597915225954956, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1479982879588746964, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25462,7 +25543,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1907622142837202286, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1973304089051764606, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25498,7 +25579,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2205336781636602355, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2557188539094350829, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25550,27 +25631,27 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3263085723088741106, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3846354269211939563, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3896771372522710359, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3983087063973060177, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3991251582674812027, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4083097891402654770, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4143398295852258783, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25638,19 +25719,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5498595504241209676, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5593401512085620786, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5648274785306676127, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5652208089067239423, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5934325707843120300, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25670,7 +25751,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5964324968971029439, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6137456996257044755, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25690,7 +25771,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6456349542393202068, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6496849879084603179, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25742,7 +25823,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7324154036786858276, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7624923062918335809, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_SizeDelta.y
@@ -25750,7 +25831,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7684126386548236135, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7703838488260728917, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25842,7 +25923,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8347430636885931941, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8478527382906984555, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y
@@ -25862,7 +25943,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8802874722286564434, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9202955563919216051, guid: 2cb5ff62fa16eed42bdf0f348ac8acc0, type: 3}
       propertyPath: m_AnchorMax.y