Browse Source

提供初始位置方法, RTC面板重置

DGJ 1 year ago
parent
commit
0d489bff13

+ 215 - 3
Assets/Scenes/LangChaoDemo2.unity

@@ -3508,6 +3508,7 @@ MonoBehaviour:
   homeBtn: {fileID: 6114604666341998328}
   dhBtn: {fileID: 6151485518763094706}
   rtcBtn: {fileID: 1688067945}
+  hideBtn: {fileID: 0}
   uiFollow: {fileID: 0}
 --- !u!114 &289110137
 MonoBehaviour:
@@ -12565,6 +12566,7 @@ GameObject:
   - component: {fileID: 969687063}
   - component: {fileID: 969687065}
   - component: {fileID: 969687064}
+  - component: {fileID: 969687066}
   m_Layer: 5
   m_Name: HideBtn (1)
   m_TagString: Untagged
@@ -12583,14 +12585,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 20, y: 20, z: 20}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1001450781}
   m_Father: {fileID: 1688067942}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 1950.051, y: 36}
-  m_SizeDelta: {x: 12, y: 12}
+  m_SizeDelta: {x: 10, y: 10}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &969687064
 MonoBehaviour:
@@ -12612,7 +12615,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e21b72d8641ed484080c7d86584b6034, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -12630,6 +12633,54 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 969687062}
   m_CullTransparentMesh: 1
+--- !u!114 &969687066
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 969687062}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 969687064}
+  toggleTransition: 1
+  graphic: {fileID: 1001450782}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 0
 --- !u!1 &972488007
 GameObject:
   m_ObjectHideFlags: 0
@@ -13085,6 +13136,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 987645655}
   m_CullTransparentMesh: 1
+--- !u!1 &1001450780
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1001450781}
+  - component: {fileID: 1001450783}
+  - component: {fileID: 1001450782}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1001450781
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001450780}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 969687063}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 10, y: 10}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1001450782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001450780}
+  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: 21300000, guid: e21b72d8641ed484080c7d86584b6034, type: 3}
+  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 &1001450783
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1001450780}
+  m_CullTransparentMesh: 1
 --- !u!1 &1012225062
 GameObject:
   m_ObjectHideFlags: 0
@@ -13120,6 +13247,7 @@ Transform:
   - {fileID: 336268920}
   - {fileID: 395315453}
   - {fileID: 1429598954}
+  - {fileID: 1617127047}
   m_Father: {fileID: 0}
   m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13150,6 +13278,7 @@ MonoBehaviour:
   leftLine: {fileID: 0}
   rightLine: {fileID: 0}
   isDataInit: 0
+  startShowDevice: {fileID: 1617127047}
   listRoomName: []
   listObjes: []
 --- !u!1 &1016915732
@@ -19382,6 +19511,89 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1617127046
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1617127047}
+  - component: {fileID: 1617127050}
+  - component: {fileID: 1617127049}
+  m_Layer: 0
+  m_Name: StartShowDevice
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1617127047
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617127046}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1012225063}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1617127049
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617127046}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1617127050
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617127046}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1671353537
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 3
Assets/Scripts/Managers/MachineRoomManager.cs

@@ -43,7 +43,9 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
     private Vector3 selectTOldRot;
 
     public bool isDataInit = false;
-    
+
+
+    public Transform startShowDevice;
     /// <summary>
     ///  临时创建 的tagid
     /// </summary>
@@ -322,8 +324,8 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         SettingMachineRoomData.Instance.Init(data);
         OpenXRCamera.Instance.head.GetComponent<Camera>().farClipPlane = data.CameraFar;
         MachineInit();
-       // ServerInit();
-
+        // ServerInit();
+        UICallManager.Instance.ShowDeviceTransform(startShowDevice);
         isDataInit = true;
     }
 

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

@@ -1,9 +1,10 @@
+using Blue;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
-public class HeadBtnManager : MonoSingleton<HeadBtnManager>
+public class HeadBtnManager : MonoSingleton<HeadBtnManager>, IController
 {
     /*
      * 1.1级页面消失后 ,在这连显示 重置按钮 和主界面
@@ -16,12 +17,17 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>
     public Button homeBtn;
     public Button dhBtn;
     public Button rtcBtn;
+
+    public Toggle hideBtn;
     // public Button 
 
     public UIFollow uiFollow;
 
     private Transform player;
 
+
+    private IQueueSystem mQueueSystem;
+
     private void Start()
     {
         dhBtn.onClick.AddListener(() =>
@@ -41,6 +47,13 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>
         player = new GameObject("Player").transform;
 
         Hide();
+
+        mQueueSystem = this.GetService<IQueueSystem>();
+
+        hideBtn.onValueChanged.AddListener((state) =>
+        {
+            HideL3(state);
+        });
     }
 
     private void Update()
@@ -94,4 +107,11 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>
         rtcBtn.gameObject.SetActive(false);
     }
 
+    public void HideL3( bool on)
+    {
+        foreach (var go in mQueueSystem.Level3List)
+        {
+            go.SetActive(!on);
+        }
+    }
 }