33

12
2024-01-26 10:33:50 +08:00 · 2024-01-26 10:30:33 +08:00 · 2024-01-26 10:24:15 +08:00 · 2024-01-26 10:23:38 +08:00
5 changed files with 220 additions and 605 deletions
--- a/SKY/TEXTURES/mat_moon.mat
+++ b/SKY/TEXTURES/mat_moon.mat
@ -32,8 +32,8 @@ Material:
    - _dispStrength: 1
    - _overBright: 1
    m_Colors:
-    - _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
-    - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
+    - _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
    - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
    - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
    - _TintColor: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/Resources/DeviceBtn/DeviceBtn.prefab
+++ b/Assets/Resources/DeviceBtn/DeviceBtn.prefab
@ -170,6 +170,7 @@ MonoBehaviour:
  selfBtn: {fileID: 8125462804241330245}
  id: 
  selfName: 
+  selfText: {fileID: 3870983289451212411}
 --- !u!114 &8125462804241330245
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl
+++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl
@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 1113159741}
-  m_IndirectSpecularColor: {r: 0.16220552, g: 0.3063946, b: 0.6714107, a: 1}
+  m_IndirectSpecularColor: {r: 0.030100383, g: 0.033691067, b: 0.03534769, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -6837,7 +6837,7 @@ RectTransform:
  - {fileID: 138577124}
  - {fileID: 1637608973}
  - {fileID: 986231249}
-  - {fileID: 987446155}
+  - {fileID: 1841332558}
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -45395,156 +45395,6 @@ RectTransform:
    type: 3}
  m_PrefabInstance: {fileID: 3494968556711875956}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &987446154
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 147647011}
-    m_Modifications:
-    - target: {fileID: 1640552068655503858, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552068655503858, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552068655503858, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552069826656985, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552069826656985, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 9
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1640552070326309402, guid: 4917651f381dd774e933facd31452d35,
-        type: 3}
-      propertyPath: m_Name
-      value: DroneViewDisplay
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4917651f381dd774e933facd31452d35, type: 3}
--- !u!224 &987446155 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
-    type: 3}
-  m_PrefabInstance: {fileID: 987446154}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &996536655
 GameObject:
  m_ObjectHideFlags: 0
@ -62790,6 +62640,8 @@ MonoBehaviour:
  blueContanier: {fileID: 3921061}
  deviceBtnItem: {fileID: 633993627584584296, guid: fd27e404fb7dcc3499a0c8fabd75e0c1,
    type: 3}
+  redShowImage: {fileID: 6368481659455215670}
+  blueShowImage: {fileID: 6368481658589340120}
 --- !u!1 &1720944765
 GameObject:
  m_ObjectHideFlags: 0
@ -64331,7 +64183,7 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
-  randSeed: 30977109
+  randSeed: 766670031
  isDoingTransition: 0
  minimumHeight: 0
 --- !u!114 &1820978574
@ -64458,6 +64310,186 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1822401518}
  m_CullTransparentMesh: 0
+--- !u!1001 &1841332557
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 147647011}
+    m_Modifications:
+    - target: {fileID: 1640552068655503858, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552068655503858, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552068655503858, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552069391739284, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13800
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552069391739284, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 11920
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552069826656985, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552069826656985, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552069826656985, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1640552070326309402, guid: 4917651f381dd774e933facd31452d35,
+        type: 3}
+      propertyPath: m_Name
+      value: DroneViewDisplay
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4917651f381dd774e933facd31452d35, type: 3}
+--- !u!224 &1841332558 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35,
+    type: 3}
+  m_PrefabInstance: {fileID: 1841332557}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1842386699
 GameObject:
  m_ObjectHideFlags: 0
@ -91529,9 +91561,6 @@ RectTransform:
  m_Children:
  - {fileID: 6368481659455215664}
  - {fileID: 6368481659155807908}
-  - {fileID: 6368481659012800516}
-  - {fileID: 6368481659141481127}
-  - {fileID: 6368481658281002850}
  m_Father: {fileID: 6368481659553906091}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -91696,112 +91725,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 42}
  m_SizeDelta: {x: 0, y: 84.03992}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6368481658281002848
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481658281002861}
-  m_Enabled: 0
-  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_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 442b4b7d8601d224aac22c3a3dd578fa, type: 2}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!222 &6368481658281002849
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481658281002861}
-  m_CullTransparentMesh: 0
--- !u!224 &6368481658281002850
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481658281002861}
-  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_Children: []
-  m_Father: {fileID: 6368481658055216393}
-  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: 727.9, y: -231.1}
-  m_SizeDelta: {x: 969.8899, y: 664.5488}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &6368481658281002851
-VideoPlayer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481658281002861}
-  m_Enabled: 1
-  m_VideoClip: {fileID: 32900000, guid: 4ef5fe4fd879c154eadadf61c39838ac, type: 3}
-  m_TargetCameraAlpha: 1
-  m_TargetCamera3DLayout: 0
-  m_TargetCamera: {fileID: 0}
-  m_TargetTexture: {fileID: 8400000, guid: 442b4b7d8601d224aac22c3a3dd578fa, type: 2}
-  m_TimeReference: 0
-  m_TargetMaterialRenderer: {fileID: 0}
-  m_TargetMaterialProperty: _MainTex
-  m_RenderMode: 2
-  m_AspectRatio: 2
-  m_DataSource: 0
-  m_PlaybackSpeed: 1
-  m_AudioOutputMode: 2
-  m_TargetAudioSources:
-  - {fileID: 0}
-  m_DirectAudioVolumes:
-  - 1
-  m_Url: 
-  m_EnabledAudioTracks: 01
-  m_DirectAudioMutes: 00
-  m_ControlledAudioTrackCount: 1
-  m_PlayOnAwake: 1
-  m_SkipOnDrop: 1
-  m_Looping: 0
-  m_WaitForFirstFrame: 1
-  m_FrameReadyEventEnabled: 0
--- !u!1 &6368481658281002861
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6368481658281002850}
-  - component: {fileID: 6368481658281002849}
-  - component: {fileID: 6368481658281002848}
-  - component: {fileID: 6368481658281002851}
-  m_Layer: 0
-  m_Name: RawImage (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!114 &6368481658342163396
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -92380,9 +92303,8 @@ GameObject:
  - component: {fileID: 6368481658589340122}
  - component: {fileID: 6368481658589340121}
  - component: {fileID: 6368481658589340120}
-  - component: {fileID: 6368481658589340123}
  m_Layer: 0
-  m_Name: video-red
+  m_Name: video-Blue
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -92407,7 +92329,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2}
+  m_Texture: {fileID: 0}
  m_UVRect:
    serializedVersion: 2
    x: 0
@ -92441,40 +92363,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: -20}
  m_SizeDelta: {x: 0, y: -40}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &6368481658589340123
-VideoPlayer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481658589340069}
-  m_Enabled: 1
-  m_VideoClip: {fileID: 0}
-  m_TargetCameraAlpha: 1
-  m_TargetCamera3DLayout: 0
-  m_TargetCamera: {fileID: 0}
-  m_TargetTexture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2}
-  m_TimeReference: 0
-  m_TargetMaterialRenderer: {fileID: 0}
-  m_TargetMaterialProperty: _MainTex
-  m_RenderMode: 2
-  m_AspectRatio: 2
-  m_DataSource: 0
-  m_PlaybackSpeed: 1
-  m_AudioOutputMode: 2
-  m_TargetAudioSources:
-  - {fileID: 0}
-  m_DirectAudioVolumes:
-  - 1
-  m_Url: 
-  m_EnabledAudioTracks: 01
-  m_DirectAudioMutes: 00
-  m_ControlledAudioTrackCount: 1
-  m_PlayOnAwake: 1
-  m_SkipOnDrop: 1
-  m_Looping: 0
-  m_WaitForFirstFrame: 1
-  m_FrameReadyEventEnabled: 0
 --- !u!222 &6368481658622910616
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -92797,80 +92685,6 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!224 &6368481659012800516
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659012800519}
-  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_Children: []
-  m_Father: {fileID: 6368481658055216393}
-  m_RootOrder: 2
-  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: -22.5}
-  m_SizeDelta: {x: -10, y: -55}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6368481659012800517
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659012800519}
-  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_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e4f83b8335375d3499a736d8eee04f50, 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 &6368481659012800519
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6368481659012800516}
-  - component: {fileID: 6368481659012800570}
-  - component: {fileID: 6368481659012800517}
-  m_Layer: 0
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!222 &6368481659012800570
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659012800519}
-  m_CullTransparentMesh: 0
 --- !u!1 &6368481659050327190
 GameObject:
  m_ObjectHideFlags: 0
@ -92973,112 +92787,6 @@ Transform:
  m_Father: {fileID: 6368481659336677724}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!328 &6368481659141481124
-VideoPlayer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659141481126}
-  m_Enabled: 1
-  m_VideoClip: {fileID: 32900000, guid: a8bad4b025a416645bbbca067fa92fa5, type: 3}
-  m_TargetCameraAlpha: 1
-  m_TargetCamera3DLayout: 0
-  m_TargetCamera: {fileID: 0}
-  m_TargetTexture: {fileID: 8400000, guid: 0d600ac215cd2004c81406e136b75a8a, type: 2}
-  m_TimeReference: 0
-  m_TargetMaterialRenderer: {fileID: 0}
-  m_TargetMaterialProperty: _MainTex
-  m_RenderMode: 2
-  m_AspectRatio: 2
-  m_DataSource: 0
-  m_PlaybackSpeed: 1
-  m_AudioOutputMode: 2
-  m_TargetAudioSources:
-  - {fileID: 0}
-  m_DirectAudioVolumes:
-  - 1
-  m_Url: 
-  m_EnabledAudioTracks: 01
-  m_DirectAudioMutes: 00
-  m_ControlledAudioTrackCount: 1
-  m_PlayOnAwake: 1
-  m_SkipOnDrop: 1
-  m_Looping: 0
-  m_WaitForFirstFrame: 1
-  m_FrameReadyEventEnabled: 0
--- !u!114 &6368481659141481125
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659141481126}
-  m_Enabled: 0
-  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_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 0d600ac215cd2004c81406e136b75a8a, type: 2}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
--- !u!1 &6368481659141481126
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6368481659141481127}
-  - component: {fileID: 6368481659141481178}
-  - component: {fileID: 6368481659141481125}
-  - component: {fileID: 6368481659141481124}
-  m_Layer: 0
-  m_Name: RawImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &6368481659141481127
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659141481126}
-  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_Children: []
-  m_Father: {fileID: 6368481658055216393}
-  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}
-  m_AnchoredPosition: {x: 0, y: -23.75}
-  m_SizeDelta: {x: 428, y: 242.5}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6368481659141481178
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659141481126}
-  m_CullTransparentMesh: 0
 --- !u!224 &6368481659155807908
 RectTransform:
  m_ObjectHideFlags: 0
@ -93235,80 +92943,6 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: "\u653B\u51FB\u7C7B\u578B"
--- !u!114 &6368481659234529240
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659234529242}
-  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_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e60054bb692e0e049866eb548b78ccca, 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 &6368481659234529241
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659234529242}
-  m_CullTransparentMesh: 0
--- !u!1 &6368481659234529242
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6368481659234529243}
-  - component: {fileID: 6368481659234529241}
-  - component: {fileID: 6368481659234529240}
-  m_Layer: 0
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &6368481659234529243
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659234529242}
-  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_Children: []
-  m_Father: {fileID: 6368481659264686938}
-  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: 0, y: -28}
-  m_SizeDelta: {x: 195, y: 195}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6368481659264686885
 GameObject:
  m_ObjectHideFlags: 0
@ -93348,7 +92982,6 @@ RectTransform:
  m_Children:
  - {fileID: 6368481658008034198}
  - {fileID: 6368481658589340122}
-  - {fileID: 6368481659234529243}
  m_Father: {fileID: 6368481658201838891}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -93757,40 +93390,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: -25}
  m_SizeDelta: {x: -10, y: -55}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!328 &6368481659455215665
-VideoPlayer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6368481659455215667}
-  m_Enabled: 1
-  m_VideoClip: {fileID: 0}
-  m_TargetCameraAlpha: 1
-  m_TargetCamera3DLayout: 0
-  m_TargetCamera: {fileID: 0}
-  m_TargetTexture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2}
-  m_TimeReference: 0
-  m_TargetMaterialRenderer: {fileID: 0}
-  m_TargetMaterialProperty: _MainTex
-  m_RenderMode: 2
-  m_AspectRatio: 2
-  m_DataSource: 0
-  m_PlaybackSpeed: 1
-  m_AudioOutputMode: 2
-  m_TargetAudioSources:
-  - {fileID: 0}
-  m_DirectAudioVolumes:
-  - 1
-  m_Url: 
-  m_EnabledAudioTracks: 01
-  m_DirectAudioMutes: 00
-  m_ControlledAudioTrackCount: 1
-  m_PlayOnAwake: 1
-  m_SkipOnDrop: 1
-  m_Looping: 0
-  m_WaitForFirstFrame: 1
-  m_FrameReadyEventEnabled: 0
 --- !u!1 &6368481659455215667
 GameObject:
  m_ObjectHideFlags: 0
@ -93802,7 +93401,6 @@ GameObject:
  - component: {fileID: 6368481659455215664}
  - component: {fileID: 6368481659455215671}
  - component: {fileID: 6368481659455215670}
-  - component: {fileID: 6368481659455215665}
  m_Layer: 0
  m_Name: video-red
  m_TagString: Untagged
@ -93829,7 +93427,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 8400000, guid: 573e6faa88d2ce44c9c6dfda7f6b7559, type: 2}
+  m_Texture: {fileID: 0}
  m_UVRect:
    serializedVersion: 2
    x: 0
--- a/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs
+++ b/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs
@ -8,11 +8,13 @@ public class DeviceBtnItem : MonoBehaviour
    public Button selfBtn;
    public string id;
    public string selfName;
+    public Text selfText;

    // Start is called before the first frame update
    void Start()
    {
-
+        selfBtn = GetComponent<Button>();
+        selfText = transform.GetComponentInChildren<Text>();
    }

    // Update is called once per frame
@ -25,6 +27,7 @@ public class DeviceBtnItem : MonoBehaviour
    {
        id = _id;
        selfName = _selfName;
+        selfText.text = _selfName;
    }

 }
--- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs
+++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs
@ -12,6 +12,8 @@ public class PostureController : MonoBehaviour
    public Transform redContanier;
    public Transform blueContanier;
    public DeviceBtnItem deviceBtnItem;
+    public RawImage redShowImage;
+    public RawImage blueShowImage;
    // Start is called before the first frame update
    void Awake()
    {
@ -49,25 +51,36 @@ public class PostureController : MonoBehaviour
        }
        for (int i = 0; i < redObjs.Count; i++)
        {
-            DeviceBtnItem obj = Instantiate(deviceBtnItem, redContanier);
-            obj.selfBtn.onClick.AddListener(() =>
-           {
-               OnDeviceBtn(obj.id);
-           });
+            CreatDeviceItem(redContanier, redObjs[i].name, redObjs[i].deviceID, 0);
        }
        for (int i = 0; i < blueObjs.Count; i++)
        {
-            DeviceBtnItem obj = Instantiate(deviceBtnItem, blueContanier);
-            obj.selfBtn.onClick.AddListener(() =>
-            {
-                OnDeviceBtn(obj.id);
-            });
+            CreatDeviceItem(blueContanier, blueObjs[i].name, redObjs[i].deviceID, 1);
        }
-
    }

-    private void OnDeviceBtn(string id)
+    private void CreatDeviceItem(Transform contanier, string objName, string id, int redOrBlue)
    {
+        DeviceBtnItem obj = Instantiate(deviceBtnItem, contanier);
+        obj.SetInfo(id, objName);
+        obj.selfBtn.onClick.AddListener(() =>
+        {
+            OnDeviceBtn(id, redOrBlue);
+        });
+    }
+
+    private void OnDeviceBtn(string id, int redOrBlue)
+    {
+        if (string.IsNullOrEmpty(id)) return;
+        if (redOrBlue == 0)
+        {
+            redShowImage.texture = DroneViewDisplay.Instance.renderTextureTo(id);
+        }
+        else
+        {
+            blueShowImage.texture = DroneViewDisplay.Instance.renderTextureTo(id);
+
+        }
        Debug.Log(id);
    }
 }
Author	SHA1	Message	Date
YangHua	8a06a15be6	33	2024-01-26 10:33:50 +08:00
YangHua	342410607f	12	2024-01-26 10:30:33 +08:00
YangHua	e02267c5ae	12	2024-01-26 10:24:15 +08:00
YangHua	a61a45900a	23	2024-01-26 10:23:38 +08:00