diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat index 846a590c..44f8ade1 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: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2} + - _AmbientTint: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003} - _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/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 5fae3d49..70d6775f 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.16234362, g: 0.306482, b: 0.6709422, a: 1} + m_IndirectSpecularColor: {r: 0.064973496, g: 0.12172709, b: 0.2656237, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -62351,6 +62351,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1719983406} + - component: {fileID: 1719983407} m_Layer: 0 m_Name: NormalRoot m_TagString: Untagged @@ -62381,6 +62382,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1719983407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719983405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16abbb3ac7fac0b4a85fa24a4ceefd26, type: 3} + m_Name: + m_EditorClassIdentifier: + redObjs: [] + blueObjs: [] + deviceManager: {fileID: 0} --- !u!1 &1720944765 GameObject: m_ObjectHideFlags: 0 @@ -63581,10 +63597,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.9082354, g: 1.0682354, b: 1.1952941, a: 1.2} + colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2} colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1} colorClouds: {r: 1, g: 1, b: 1, a: 1} - colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1} + colorHighlightClouds: {r: 0, g: 0, b: 0, 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]' @@ -63922,7 +63938,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 683195703 + randSeed: 692076359 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/Components/PostureController.cs b/Assets/Zion/Scripts/Adam/Components/PostureController.cs index 91acd98c..a983da77 100644 --- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs +++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs @@ -1,15 +1,20 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; public class PostureController : MonoBehaviour { public List redObjs = new List(); public List blueObjs = new List(); + public DeviceManager deviceManager; + public Transform redContanier; + public Transform blueContanier; + // Start is called before the first frame update - void Start() + void Awake() { - + deviceManager = DeviceManager.Instance; } // Update is called once per frame @@ -20,11 +25,13 @@ public class PostureController : MonoBehaviour private void OnEnable() { - + GetSceneInfo(); } private void GetSceneInfo() { + redObjs = deviceManager.devices.Where(x => x != null && x.gameObject.layer == 11).ToList(); + blueObjs = deviceManager.devices.Where(x => x != null && x.gameObject.layer == 12).ToList(); } }