提交监控一次美化大更新

Assets/Prefabs/UI/LoadingPrefb.prefab

@@ -10,6 +10,8 @@ GameObject:
   m_Component:
   - component: {fileID: 32149629415189723}
   - component: {fileID: 1608046197164546008}
+  - component: {fileID: 1720524844108958273}
+  - component: {fileID: 3078911036170780830}
   m_Layer: 0
   m_Name: 'Loading '
   m_TagString: Untagged
@@ -58,6 +60,44 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!222 &1720524844108958273
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2119906121442431573}
+  m_CullTransparentMesh: 1
+--- !u!114 &3078911036170780830
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2119906121442431573}
+  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: 3a5b5d91ce55834499bc5ce1c08c47d5, 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 &4458589404328323751
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/ObsPlayerPanel.prefab

@@ -111,7 +111,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -263,7 +263,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -459,7 +459,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -579,6 +579,80 @@ MonoBehaviour:
     - {r: 0, g: 0, b: 0, a: 0}
     - {r: 0, g: 0, b: 0, a: 0}
     m_Rotation: 0
+--- !u!1 &1979947293945961693
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4470085313981321796}
+  - component: {fileID: 2107879895977821465}
+  - component: {fileID: 6358613991927766530}
+  m_Layer: 5
+  m_Name: BGTex
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4470085313981321796
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1979947293945961693}
+  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: 844362121425973440}
+  m_Father: {fileID: 8676194456186192790}
+  m_RootOrder: 2
+  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: -62, y: -16}
+  m_SizeDelta: {x: 640, y: 360}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2107879895977821465
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1979947293945961693}
+  m_CullTransparentMesh: 1
+--- !u!114 &6358613991927766530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1979947293945961693}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &3309493388944890632
 GameObject:
   m_ObjectHideFlags: 0
@@ -611,7 +685,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -884,7 +958,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1081,7 +1155,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1202,7 +1276,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1399,7 +1473,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1677,7 +1751,7 @@ RectTransform:
   m_Children:
   - {fileID: 6260869791229565964}
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1799,7 +1873,7 @@ RectTransform:
   m_Children:
   - {fileID: 8228025258745457358}
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1920,7 +1994,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2118,7 +2192,7 @@ RectTransform:
   m_Children:
   - {fileID: 7349912975184369468}
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2239,7 +2313,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2691,7 +2765,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2888,7 +2962,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8676194456186192790}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3086,6 +3160,7 @@ RectTransform:
   m_Children:
   - {fileID: 3868293429924653366}
   - {fileID: 8343010122236299789}
+  - {fileID: 4470085313981321796}
   - {fileID: 8483397398028422228}
   - {fileID: 5309500629640126028}
   - {fileID: 2071419030124261382}
@@ -3130,6 +3205,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   obsPlayer: {fileID: 0}
+  bgTex: {fileID: 6358613991927766530}
 --- !u!114 &4832472719989189542
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3235,3 +3311,125 @@ MonoBehaviour:
     - {r: 0, g: 0, b: 0, a: 0}
     - {r: 0, g: 0, b: 0, a: 0}
     m_Rotation: 90
+--- !u!1001 &3649989796731045089
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4470085313981321796}
+    m_Modifications:
+    - target: {fileID: 32149629415189723, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 32149629415189723, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 3078911036170780830, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_Color.b
+      value: 0.8490566
+      objectReference: {fileID: 0}
+    - target: {fileID: 3078911036170780830, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_Color.g
+      value: 0.7269046
+      objectReference: {fileID: 0}
+    - target: {fileID: 3078911036170780830, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_Color.r
+      value: 0.6047526
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4458589404328323751, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+      propertyPath: m_Name
+      value: LoadingPrefb
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+--- !u!224 &844362121425973440 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4111954141865554977, guid: a9d908184de937942a529c35143f2fd9, type: 3}
+  m_PrefabInstance: {fileID: 3649989796731045089}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/HttpHelper.cs

@@ -528,8 +528,9 @@ public class HttpHelper : MonoBehaviour
                     for (int i = 0; i < serverObsDatas.list.Count; i++)
                     {
                         ObsData obsData = new ObsData();
-                        obsData.name = serverObsDatas.list[i].name;
-                        if (GlobalData.obsCameraLib.TryGetValue(obsData.name, out var value))
+                        string originName = serverObsDatas.list[i].name;
+                        obsData.name = "补元-" + serverObsDatas.list[i].name;
+                        if (GlobalData.obsCameraLib.TryGetValue(originName, out var value))
                         {
                             obsData.targetName = value;
                         }
@@ -617,8 +618,9 @@ public class HttpHelper : MonoBehaviour
                     for (int i = 0; i < serverObsDatas.list.Count; i++)
                     {
                         ObsData obsData = new ObsData();
-                        obsData.name = serverObsDatas.list[i].name;
-                        if (GlobalData.obsCameraLib.TryGetValue(obsData.name, out var value))
+                        string originName = serverObsDatas.list[i].name;
+                        obsData.name = "套口-" + serverObsDatas.list[i].name;
+                        if (GlobalData.obsCameraLib.TryGetValue(originName, out var value))
                         {
                             obsData.targetName = value;
                         }

Assets/Scripts/UI/Item/ObsItem.cs

@@ -12,7 +12,8 @@ public class ObsItem : MonoBehaviour
     public Button _button;
     private Text nameText;
     private RawImage fmImg;
-    
+
+    public static Dictionary<string, Texture> OBSTexLibrary = new Dictionary<string, Texture>();
     private void Awake()
     {
         _button = this.GetComponent<Button>();
@@ -57,6 +58,8 @@ public class ObsItem : MonoBehaviour
         if (www.isDone && www.result == UnityWebRequest.Result.Success)
         {
             fmImg.texture = ((DownloadHandlerTexture)www.downloadHandler).texture;
+            if(!OBSTexLibrary.ContainsKey(ServerAddress.Server_TextureSavePath + _data.targetName + ".jpg"))
+                OBSTexLibrary.Add(ServerAddress.Server_TextureSavePath + _data.targetName + ".jpg", fmImg.texture);
         }
         www.disposeDownloadHandlerOnDispose = true;
         www.Dispose();

Assets/Scripts/UI/Tools/ObsPlayerPanel.cs

@@ -44,6 +44,8 @@ public class ObsPlayerPanel : MonoBehaviour
     private string currentDeviceId="";
 
     private string _targetName;
+
+    public RawImage bgTex;
     
     private void Awake()
     {
@@ -119,7 +121,7 @@ public class ObsPlayerPanel : MonoBehaviour
 
     public void Close()
     {
-        Texture2D saveTex = new Texture2D(704,576);
+        Texture2D saveTex = new Texture2D(1920,1080);
         obsPlayer.ExtractFrame(saveTex);
         HttpHelper._Instance.SaveFirstFrame(saveTex.EncodeToJPG(), $"{_targetName}.jpg", _targetName);
         obsPlayer.Control.Stop();
@@ -130,7 +132,15 @@ public class ObsPlayerPanel : MonoBehaviour
     public async void SetObsData(ObsData _data)
     {
         _targetName = _data.targetName;
-        
+        if (ObsItem.OBSTexLibrary.ContainsKey(ServerAddress.Server_TextureSavePath + _data.targetName + ".jpg"))
+        {
+            bgTex.texture = ObsItem.OBSTexLibrary[ServerAddress.Server_TextureSavePath + _data.targetName + ".jpg"];
+            bgTex.color = Color.gray;
+        }
+        else {
+            bgTex.texture = null;
+            bgTex.color = Color.black;
+        }
         string playUrl = await HttpHelper._Instance.GetObsUrl(_data.deviceId, _data.channelId);
         obsPlayer.GetComponent<DisplayUGUI>().color = Color.clear;
         obsPlayer.OpenMedia(MediaPathType.AbsolutePathOrURL,playUrl, true);

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -830,6 +830,11 @@ public class GCJKLayer : YZTRootLayer
         {
             ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
             tempItem.SetData(GlobalData.obsDatas_by[i]);
+            int tempi = i;
+            tempItem._button.onClick.AddListener(() =>
+            {
+                GCJKLayer._Instance.ShowObsPlayerPanel(GlobalData.obsDatas_by[tempi]);
+            });
             _obsItems.Add(tempItem);
             ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
             Debug.Log(GlobalData.obsDatas_by[i].name + " " + GlobalData.obsDatas_by[i].targetName);
@@ -843,6 +848,11 @@ public class GCJKLayer : YZTRootLayer
             Debug.LogError(GlobalData.obsDatas_tk[i].targetName);
             ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
             tempItem.SetData(GlobalData.obsDatas_tk[i]);
+            int tempi = i;
+            tempItem._button.onClick.AddListener(() =>
+            {
+                GCJKLayer._Instance.ShowObsPlayerPanel(GlobalData.obsDatas_tk[tempi]);
+            });
             _obsItems.Add(tempItem);
             ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
             tempIcon.Init(GlobalData.obsDatas_tk[i]);