From a61a45900a4bda080a652d643103cc35b2da26e2 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 26 Jan 2024 10:23:38 +0800 Subject: [PATCH] 23 --- .../TEXTURES/mat_moon.mat | 4 +- Assets/Resources/DeviceBtn/DeviceBtn.prefab | 1 + .../AdamTraining_pilot_terminal_panl 1.unity | 352 +----------------- .../Scripts/Adam/Components/DeviceBtnItem.cs | 5 +- .../Adam/Components/PostureController.cs | 23 +- 5 files changed, 35 insertions(+), 350 deletions(-) diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat index 44f8ade1..846a590c 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat +++ b/Assets/3rdParty/TENKOKU - DYNAMIC 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} diff --git a/Assets/Resources/DeviceBtn/DeviceBtn.prefab b/Assets/Resources/DeviceBtn/DeviceBtn.prefab index 7f0dc6f7..8c6e14e5 100644 --- 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 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 558648ed..fa4e21e1 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.064971805, g: 0.12189754, b: 0.26652402, a: 1} + m_IndirectSpecularColor: {r: 0.030100383, g: 0.033691067, b: 0.03534769, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -156,7 +156,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.000015258789} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3921062 MonoBehaviour: @@ -45765,7 +45765,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.000015258789} - m_SizeDelta: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &996536657 MonoBehaviour: @@ -49466,7 +49466,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 231000, y: 167760} + m_AnchoredPosition: {x: 250800, y: 181880} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1347317408 @@ -63226,7 +63226,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1719983406 RectTransform: m_ObjectHideFlags: 0 @@ -63269,6 +63269,8 @@ MonoBehaviour: blueContanier: {fileID: 3921061} deviceBtnItem: {fileID: 633993627584584296, guid: fd27e404fb7dcc3499a0c8fabd75e0c1, type: 3} + redShowImage: {fileID: 0} + blueShowImage: {fileID: 0} --- !u!1 &1720944765 GameObject: m_ObjectHideFlags: 0 @@ -64649,10 +64651,10 @@ MonoBehaviour: colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8} colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1} colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} - colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2} + colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1} colorClouds: {r: 1, g: 1, b: 1, a: 1} - colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1} + colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1} colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1} colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1} displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]' @@ -64990,7 +64992,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 704365281 + randSeed: 766053484 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -92979,9 +92981,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} @@ -93092,7 +93091,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -948, y: 10} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6368481658076565719 MonoBehaviour: @@ -93146,112 +93145,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 @@ -94247,80 +94140,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 @@ -94423,112 +94242,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 @@ -95207,40 +94920,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 @@ -95252,7 +94931,6 @@ GameObject: - component: {fileID: 6368481659455215664} - component: {fileID: 6368481659455215671} - component: {fileID: 6368481659455215670} - - component: {fileID: 6368481659455215665} m_Layer: 0 m_Name: video-red m_TagString: Untagged @@ -95279,7 +94957,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 @@ -95520,7 +95198,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -96016,9 +95694,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -7, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6368481659665436127 MonoBehaviour: diff --git a/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs b/Assets/Zion/Scripts/Adam/Components/DeviceBtnItem.cs index ff051b86..a83bb98e 100644 --- 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