Browse Source

修改会议中眼睛按钮图标,退到首页关闭详情+概览

蓝色星空 1 year ago
parent
commit
1335d891de

+ 3 - 2
Assets/Game/Blue/Controller/ShowDeviceControle.cs

@@ -4,9 +4,10 @@ using GHZLangChao;
 
 public class ShowDeviceControle : MonoBehaviour,IController
 {
-    public GameObject ShowDeviceDetails;
+    public static ShowDeviceControle Instance;
     public  void Awake()
     {
+        Instance = this;
         this.RegisterEvent<DeviceDetailsUpdataDataEvent>(e=>
         {
             if(DeviceDetailsControl==null)
@@ -29,5 +30,5 @@ public class ShowDeviceControle : MonoBehaviour,IController
                0);
         }).UnRegisterWhenGameObjectDestroyed(gameObject);
     }
-    private DeviceDetailsControl DeviceDetailsControl = null;
+    public DeviceDetailsControl DeviceDetailsControl = null;
 }

+ 20 - 3
Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -2713,7 +2713,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2241088652506551446}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0ca53a4fedf42974da5a1551b545af31, type: 3}
   m_Name: 
@@ -3049,7 +3049,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.49019608}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.627451}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3863,6 +3863,7 @@ GameObject:
   - component: {fileID: 6325526256269672135}
   - component: {fileID: 4947460359587142076}
   - component: {fileID: 101371371462617081}
+  - component: {fileID: 6491374567634651701}
   m_Layer: 5
   m_Name: HideBtn
   m_TagString: Untagged
@@ -3946,7 +3947,23 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
+--- !u!114 &6491374567634651701
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5573040390527793210}
+  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: 8041133824467914880}
 --- !u!1 &6936254396664479206
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -128,6 +128,11 @@ public class HeadBtnManager : MonoSingleton<HeadBtnManager>, IController
 
     public void GoHome()
     {
+        Debug.LogError("GoHome");
+        if(BladeServerManager.Instance.foundItem!=null)
+        BladeServerManager.Instance.foundItem.gameObject.SetActive(false);
+        if(ShowDeviceControle.Instance.DeviceDetailsControl!=null)
+            ShowDeviceControle.Instance.DeviceDetailsControl.gameObject.SetActive(false);
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         BladeServerManager.Instance.isDaoHang = false;
         WayFindingManager.Instance.CloseWayFind();