任务1081

Assets/Game/Blue/Controller/Item/FaultPanel_Item.cs

@@ -30,6 +30,7 @@ namespace GHZLangChao
             Debug.Log($"选择了{name}");
             GetComponent<RawImage>().color = mButtonColor;
             XunJianManager.AlarmData = AlarmData;
+            BasicDeviceControl.AlarmData = AlarmData;
         }
     }
 }

Assets/Game/Blue/Event/ShowDeviceEvent.cs

@@ -0,0 +1,26 @@
+using Blue;
+using UnityEngine;
+
+/// <summary>
+/// ShowDevice获取位置事件
+/// </summary>
+public struct ShowDeviceEvent : IEvent
+{
+    public Transform ShowDeviceTransform;
+}
+
+/// <summary>
+/// ShowDevice获取位置命令
+/// </summary>
+public class ShowDeviceCommand : ICommand
+{
+    private Transform showDeviceTransform;
+    public ShowDeviceCommand(Transform showDeviceTransform)
+    {
+        this.showDeviceTransform = showDeviceTransform;
+    }
+    public void OnExcute()
+    {
+        this.SendEvent(new ShowDeviceEvent(){ShowDeviceTransform = showDeviceTransform});
+    }
+}

Assets/Game/Blue/Event/ShowDeviceEvent.cs.meta

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

Assets/Game/Blue/System/GetObjectSystem.cs

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

Assets/Game/PrefabTemplate/借用_导航按钮.prefab

@@ -0,0 +1,204 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6928945057267689983
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5706998278937222250}
+  - component: {fileID: 4918548284483158147}
+  - component: {fileID: 4833322339959364596}
+  - component: {fileID: 5678510081945810536}
+  m_Layer: 5
+  m_Name: "\u501F\u7528_\u5BFC\u822A\u6309\u94AE"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5706998278937222250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6928945057267689983}
+  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: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 950457243212409300}
+  m_Father: {fileID: 0}
+  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: 504, y: 364.49384}
+  m_SizeDelta: {x: 272.158, y: 99.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4918548284483158147
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6928945057267689983}
+  m_CullTransparentMesh: 1
+--- !u!114 &4833322339959364596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6928945057267689983}
+  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: 66a4800eae780b3479b9f702eaf8ea9e, type: 3}
+  m_Type: 1
+  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!114 &5678510081945810536
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6928945057267689983}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 4833322339959364596}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &8804556033241371366
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 950457243212409300}
+  - component: {fileID: 3779840270921680902}
+  - component: {fileID: 4994401155604457960}
+  m_Layer: 5
+  m_Name: NavText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &950457243212409300
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8804556033241371366}
+  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: 5706998278937222250}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3779840270921680902
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8804556033241371366}
+  m_CullTransparentMesh: 1
+--- !u!114 &4994401155604457960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8804556033241371366}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 55
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 76
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5BFC\u822A"

Assets/Game/PrefabTemplate/借用_导航按钮.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6ea18265b95f647499647230c5e8598c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/PrefabTemplate/借用_显示隐藏图标.prefab

@@ -0,0 +1,241 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1597913796236980628
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2670231667173737909}
+  - component: {fileID: 3598315921864983098}
+  - component: {fileID: 8941566966774647124}
+  m_Layer: 5
+  m_Name: Checkmark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2670231667173737909
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597913796236980628}
+  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: 241325131497973755}
+  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: 72, y: 72}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3598315921864983098
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597913796236980628}
+  m_CullTransparentMesh: 1
+--- !u!114 &8941566966774647124
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1597913796236980628}
+  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: 7416d0026c4d26248a5fd85a85becef5, 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!1 &1808403396893309107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 241325131497973755}
+  - component: {fileID: 7764524321485705302}
+  - component: {fileID: 4388269670648670941}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &241325131497973755
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1808403396893309107}
+  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:
+  - {fileID: 2670231667173737909}
+  m_Father: {fileID: 6877406028193463693}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &7764524321485705302
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1808403396893309107}
+  m_CullTransparentMesh: 1
+--- !u!114 &4388269670648670941
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1808403396893309107}
+  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: 45952f334976d2647ba6af3e2fb5bb0e, 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!1 &4856903671440466861
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6877406028193463693}
+  - component: {fileID: 5270824527327099967}
+  m_Layer: 5
+  m_Name: "\u501F\u7528_\u663E\u793A\u9690\u85CF\u56FE\u6807"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6877406028193463693
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4856903671440466861}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 6, y: 6, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 241325131497973755}
+  m_Father: {fileID: 0}
+  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: 1964, y: 999}
+  m_SizeDelta: {x: 72, y: 72}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5270824527327099967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4856903671440466861}
+  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: 0
+  m_TargetGraphic: {fileID: 4388269670648670941}
+  toggleTransition: 1
+  graphic: {fileID: 8941566966774647124}
+  m_Group: {fileID: 0}
+  onValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_IsOn: 0

Assets/Game/PrefabTemplate/借用_显示隐藏图标.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4069e4225bd4a18438b1afbf97a949c0
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/ShowChoose/ChooseManager.cs

@@ -1,14 +1,17 @@
 using System.Collections;
+using GHZLangChao;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class ChooseManager : MonoBehaviour
 {
     [SerializeField] private GameObject Tip;
+    [SerializeField] private GameObject ShowDevice => SceneIOCContainer.Instance.Pull("ShowDevice") as GameObject;
     [SerializeField] private Toggle ShowHide_Toggle;
     void Start()
     {
         StartCoroutine(ControlTip());
+        ShowDevice.SetActive(true);
     }
 
     public void GotoXunJian()
@@ -23,11 +26,6 @@ public class ChooseManager : MonoBehaviour
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowRTC);
     }
 
-    public void DeviceInfo()
-    {
-        ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
-    }
-
     private IEnumerator ControlTip()
     {
         Tip.SetActive(true);

Assets/Game/ShowChoose/ShowChoose.prefab

@@ -1388,7 +1388,7 @@ RectTransform:
   m_GameObject: {fileID: 3628605579353754057}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 6, y: 6, z: 1}
+  m_LocalScale: {x: 3, y: 3, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8243010390360968607}
@@ -1397,7 +1397,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: 1964, y: 999}
+  m_AnchoredPosition: {x: 1964, y: 761}
   m_SizeDelta: {x: 72, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4042525268217239131

Assets/Game/ShowDevice/BasicDeviceControl.cs

@@ -1,10 +1,86 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using Blue;
+
 namespace GHZLangChao
 {
     public class BasicDeviceControl : AbstractController
     {
+        [SerializeField] private Toggle Arrow_Toggle; //箭头toggle
+        [SerializeField] private Image ArrowToggleBackground; // 箭头toggle的背景
+        [SerializeField] private GameObject FaultPanel; // 故障面板
+        [SerializeField] private Transform FaultPanelContent;// 故障面板Item父物体
+
+        [SerializeField] private Button Nav_Btn; // 导航按钮
+        private bool isInit=false;
+        private void Awake()
+        {
+            this.RegisterEvent<ShowDeviceEvent>(SetShowDeviceTransform);
+            Nav_Btn.onClick.AddListener(StartNav);
+            Arrow_Toggle.onValueChanged.AddListener((e) =>
+            {
+                if(!isInit) Init();
+                if(e)
+                    ArrowToggleBackground.enabled = false;
+                else
+                    ArrowToggleBackground.enabled = true;
+            });
+        }
         public void ShowChoose()
         {
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         }
+
+        /// <summary>
+        /// 初始化数据
+        /// </summary>
+        private void Init()
+        {
+            isInit = true;
+            // 初始化故障面板
+            List<AlarmData> ListAlarmData = UICallManager.Instance.GetAlarmData();
+
+            for (int i = 0; i < ListAlarmData.Count;i++)
+            {
+                GameObject go = Instantiate(InstantiateSystem.Instance.BlueObject.FaultPanel_Item,FaultPanelContent);
+                FaultPanel_Item item = go.GetComponent<FaultPanel_Item>();
+                item.Init(ListAlarmData[i]);
+                go.name = ListAlarmData[i].title;
+            }
+            for (int i = 0; i < ListAlarmData.Count;i++)
+            {
+                GameObject go = Instantiate(InstantiateSystem.Instance.BlueObject.FaultPanel_Item,FaultPanelContent);
+                FaultPanel_Item item = go.GetComponent<FaultPanel_Item>();
+                item.Init(ListAlarmData[i]);
+                go.name = ListAlarmData[i].title;
+            }
+        }
+
+        #region  UI监听
+
+        private static AlarmData mAlarmData;
+        public static AlarmData AlarmData
+        {
+            get => mAlarmData;
+            set => mAlarmData = value;
+        }
+        private void StartNav()
+        {
+            MachineObj obj = UICallManager.Instance.QueryMachineObj(AlarmData.deviceId);
+
+            if (obj != null)
+                UICallManager.Instance.NavigatorServer(obj);
+            else
+                Debug.LogError(" 未查找到设备 " + AlarmData.deviceId + "   " + AlarmData.deviceName);
+        }
+        #endregion
+
+        #region  事件监听
+        private void SetShowDeviceTransform(ShowDeviceEvent e)
+        {
+            this.UnRegisterEvent<ShowDeviceEvent>(SetShowDeviceTransform);
+        }
+        #endregion
     }
 }

Assets/Game/ShowDevice/ShowDevice.cs

@@ -15,7 +15,7 @@ public class ShowDevice : RemoteSingleton<ShowDevice>,IController
         base.Awake();
         this.RegisterEvent<DeviceDetailsUpdataDataEvent>(e=>
         {
-            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
+            //ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
             ShowDevice.Instance.gotoWindow(ScenesManager.SceneType.DeviceDetails);
             if(DeviceDetailsControl==null)
                 DeviceDetailsControl = GetComponentInChildren<DeviceDetailsControl>();

Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -2535,6 +2535,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 65f83d6e499a787479f63b1414eaaad8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  dis: 0
+  angle: 0
+  pos: {x: 0, y: 0, z: 0}
 --- !u!1 &5573163100672273733
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/LangChaoDemo2.unity

@@ -9828,6 +9828,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6195766569180850275, guid: 9e1deb76e7ead614da932413e318b2fc, type: 3}
+      propertyPath: ShowDevice
+      value: 
+      objectReference: {fileID: 1067717208}
     - target: {fileID: 8253213312023144010, guid: 9e1deb76e7ead614da932413e318b2fc, type: 3}
       propertyPath: m_Name
       value: BlueRoot
@@ -13623,6 +13627,117 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1063711597}
   m_CullTransparentMesh: 1
+--- !u!1001 &1067717207
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6968753639176216594}
+    m_Modifications:
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 1468
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 1020
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -4000
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212314, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_Name
+      value: ShowDevice
+      objectReference: {fileID: 0}
+    - target: {fileID: 5466424356445212314, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+--- !u!1 &1067717208 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5466424356445212314, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+  m_PrefabInstance: {fileID: 1067717207}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1067717209 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5466424356445212017, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+  m_PrefabInstance: {fileID: 1067717207}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1077211057
 GameObject:
   m_ObjectHideFlags: 0
@@ -24889,6 +25004,7 @@ RectTransform:
   - {fileID: 6968753639174600229}
   - {fileID: 6968753639805341796}
   - {fileID: 6968753639674314496}
+  - {fileID: 1067717209}
   m_Father: {fileID: 6968753640028822056}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/UICallManager.cs

@@ -1,9 +1,9 @@
 using SC.XR.Unity.Module_InputSystem;
-using System.Collections;
+using Blue;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class UICallManager : MonoSingleton<UICallManager>
+public class UICallManager : MonoSingleton<UICallManager>,IController
 {
 
     public delegate void TrackingFound(DataItem tagobj);
@@ -370,6 +370,15 @@ public class UICallManager : MonoSingleton<UICallManager>
 
         return null;
     }
+    
+    /// <summary>
+    /// 获取ShowDevice位置
+    /// </summary>
+    /// <param name="showDeviceTransform"></param>
+    public void ShowDeviceTransform(Transform showDeviceTransform)
+    {
+        this.SendCommand(new ShowDeviceCommand(showDeviceTransform));
+    }
 
     /// <summary>
     ///  导航