diff --git a/Assets/GameAssets/Animation/RadarNew.anim b/Assets/GameAssets/Animation/RadarNew.anim index 272c8d29..3360735f 100644 --- a/Assets/GameAssets/Animation/RadarNew.anim +++ b/Assets/GameAssets/Animation/RadarNew.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Radar + m_Name: RadarNew serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index a090a1b2..fc48ec03 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.16207841, g: 0.30599776, b: 0.6701277, a: 1} + m_IndirectSpecularColor: {r: 0.16235614, g: 0.30591527, b: 0.66776896, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -25857,7 +25857,7 @@ PrefabInstance: - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1640552070326309401, guid: 4917651f381dd774e933facd31452d35, type: 3} @@ -49760,6 +49760,8 @@ MonoBehaviour: m_EditorClassIdentifier: wrjMenuSetPanel: {fileID: 729007801} canvasRect: {fileID: 147647011} + eventsystem: {fileID: 1768340610} + RaycastInCanvas: {fileID: 147647008} --- !u!114 &1436809532 MonoBehaviour: m_ObjectHideFlags: 0 @@ -64224,7 +64226,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 273660937 + randSeed: 16312687 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -89160,7 +89162,7 @@ PrefabInstance: - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, type: 3} @@ -90818,7 +90820,7 @@ PrefabInstance: - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, type: 3}