Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane

Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat

@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _GIntensity: 0
+    - _GIntensity: 0.1
     - _Intensity: 0
     - _SIntensity: 1
     - _perturbation: 0.405

Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat

@@ -33,7 +33,7 @@ Material:
     - _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}
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
     - _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}

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.06497114, g: 0.121774174, b: 0.26588207, a: 1}
+  m_IndirectSpecularColor: {r: 0.030100383, g: 0.03369107, b: 0.03534769, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -13803,12 +13803,12 @@ Light:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 250950117}
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
-  m_Intensity: 1.088
+  m_Intensity: 0.001
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -20176,7 +20176,7 @@ Camera:
   m_Enabled: 0
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.39735296, g: 0.46529412, b: 0.52294123, a: 0.6}
+  m_BackGroundColor: {r: 0.0041176477, g: 0.0041176477, b: 0.0041176477, a: 0.6}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -53945,6 +53945,7 @@ GameObject:
   - component: {fileID: 1436809534}
   - component: {fileID: 1436809535}
   - component: {fileID: 1436809536}
+  - component: {fileID: 1436809537}
   m_Layer: 0
   m_Name: Bootstraps
   m_TagString: Untagged
@@ -54142,6 +54143,21 @@ MonoBehaviour:
   SweepFrequencyBand: SweepFrequencyBand
   KeyTarget: KeyTarget
   identification: 
+--- !u!114 &1436809537
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1436809528}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f072abdc6ffe11f459a53ff73c2d0984, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startFormationBtn: {fileID: 0}
+  submitFormationBtn: {fileID: 0}
+  isStartFormation: 0
 --- !u!1 &1444599844
 GameObject:
   m_ObjectHideFlags: 0
@@ -54383,7 +54399,7 @@ Light:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1452191771}
-  m_Enabled: 0
+  m_Enabled: 1
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
@@ -69477,15 +69493,15 @@ MonoBehaviour:
   moonlightObject: {fileID: 639984703}
   moonLightAmt: 0.90791565
   moonPhase: 0.54604214
-  ambientCol: {r: 1, g: 1, b: 1, a: 1}
+  ambientCol: {r: 0, g: 0, b: 0, a: 1}
-  colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
+  colorSun: {r: 0, g: 0, b: 0, a: 1}
   colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1}
-  colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
+  colorSkyBase: {r: 0.00627451, g: 0.00627451, b: 0.00627451, a: 0.8}
-  colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
+  colorSkyBaseLow: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1}
-  colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
+  colorHorizon: {r: 0.12235295, g: 0.2964706, b: 0.36705884, 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}
+  colorSkyAmbient: {r: 0, g: 0, b: 0, a: 1}
-  colorClouds: {r: 1, g: 1, b: 1, a: 1}
+  colorClouds: {r: 0, g: 0, b: 0, 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}
@@ -69824,7 +69840,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 753317671
+  randSeed: 150061843
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574

Assets/Zion/Scripts/Adam/FormationManager.cs

@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+/// <summary>
+/// 编队控制脚本
+/// </summary>
+public class FormationManager : MonoBehaviour
+{
+    public Button startFormationBtn;
+    public Button submitFormationBtn;
+    public bool isStartFormation;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        startFormationBtn.onClick.AddListener(OnStartFormation);
+        submitFormationBtn.onClick.AddListener(OnSubmit);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (isStartFormation)
+        {
+            if (Input.GetKeyDown(KeyCode.LeftControl) && Input.GetMouseButtonDown(0))
+            {
+                Debug.Log("拾取");
+            }
+        }
+    }
+
+    public void OnStartFormation()
+    {
+        isStartFormation = true;
+    }
+
+    public void OnSubmit()
+    {
+        isStartFormation = false;
+    }
+}

Assets/Zion/Scripts/Adam/FormationManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f072abdc6ffe11f459a53ff73c2d0984
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: