diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat index 3519bd27..dc853151 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat +++ b/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.1 + - _GIntensity: 0 - _Intensity: 0 - _SIntensity: 1 - _perturbation: 0.405 diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat index 36f8bdcf..846a590c 100644 --- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat +++ b/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, g: 0, b: 0, 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/GameAssets/Military/军用模型/军用卡车1/ArmyTruck MAX 2011.meta b/Assets/GameAssets/Military/军用模型/军用卡车1/ArmyTruck MAX 2011.meta deleted file mode 100644 index 2a2f6e6e..00000000 --- a/Assets/GameAssets/Military/军用模型/军用卡车1/ArmyTruck MAX 2011.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2e9f86a0b098d414a858bc560f469b94 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Military/军用模型/军用卡车1/ArmyTruck OBJ.meta b/Assets/GameAssets/Military/军用模型/军用卡车1/ArmyTruck OBJ.meta deleted file mode 100644 index f5783f24..00000000 --- a/Assets/GameAssets/Military/军用模型/军用卡车1/ArmyTruck OBJ.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 89fe6c441f49ceb4ba020bc8535c6663 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Military/军用模型/军用卡车1/textures.meta b/Assets/GameAssets/Military/军用模型/军用卡车1/textures.meta deleted file mode 100644 index b8f971e9..00000000 --- a/Assets/GameAssets/Military/军用模型/军用卡车1/textures.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d18247b11cf0921409f51b52e0cbd5f2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Military/军用模型/吉普1/40-吉普威利斯，军用吉普车汽车cr.meta b/Assets/GameAssets/Military/军用模型/吉普1/40-吉普威利斯，军用吉普车汽车cr.meta deleted file mode 100644 index 8332622e..00000000 --- a/Assets/GameAssets/Military/军用模型/吉普1/40-吉普威利斯，军用吉普车汽车cr.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 41f82bc673b25dd418e8b1fb90a03aae -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Military/军用模型/装甲车1/CN201807311103.meta b/Assets/GameAssets/Military/军用模型/装甲车1/CN201807311103.meta deleted file mode 100644 index e4b09559..00000000 --- a/Assets/GameAssets/Military/军用模型/装甲车1/CN201807311103.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 45f8c983cf745af4491a152a337774fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Military/军用模型/装甲车1/HMMWV M1151 Armored Vehicle.meta b/Assets/GameAssets/Military/军用模型/装甲车1/HMMWV M1151 Armored Vehicle.meta deleted file mode 100644 index 6751cf69..00000000 --- a/Assets/GameAssets/Military/军用模型/装甲车1/HMMWV M1151 Armored Vehicle.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b7ce2783e2461f44bba4c29bb93fd58f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameAssets/Military/军用模型/装甲车1/tex.meta b/Assets/GameAssets/Military/军用模型/装甲车1/tex.meta deleted file mode 100644 index 15130ee0..00000000 --- a/Assets/GameAssets/Military/军用模型/装甲车1/tex.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 26911220271809e43ab0f250af124650 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 39d64036..84b16939 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.030100383, g: 0.03369107, b: 0.03534769, a: 1} + m_IndirectSpecularColor: {r: 0.12549877, g: 0.1459642, b: 0.15314084, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6919,6 +6919,7 @@ RectTransform: - {fileID: 1637608973} - {fileID: 986231249} - {fileID: 522047489} + - {fileID: 1585142379} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13803,12 +13804,12 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 250950117} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 0, g: 0, b: 0, a: 0} - m_Intensity: 0.001 + m_Color: {r: 1, g: 0.99607843, b: 0.9843137, a: 1} + m_Intensity: 1.088 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -20176,7 +20177,7 @@ Camera: m_Enabled: 0 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.0041176477, g: 0.0041176477, b: 0.0041176477, a: 0.6} + m_BackGroundColor: {r: 0.39735296, g: 0.46529412, b: 0.52294123, a: 0.6} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -27733,6 +27734,125 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527494964} m_Mesh: {fileID: 4300000, guid: ee7b1f2ae3d3c47479b10db1a10fe3ab, type: 3} +--- !u!1 &535597721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535597722} + - component: {fileID: 535597725} + - component: {fileID: 535597724} + - component: {fileID: 535597723} + m_Layer: 5 + m_Name: StartFormationBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &535597722 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535597721} + 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: + - {fileID: 1175042540} + m_Father: {fileID: 1585142379} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 113.59265, y: 40.479065} + m_Pivot: {x: 0, y: 1} +--- !u!114 &535597723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535597721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 535597724} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &535597724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535597721} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &535597725 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535597721} + m_CullTransparentMesh: 0 --- !u!1 &535771147 GameObject: m_ObjectHideFlags: 0 @@ -39699,6 +39819,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 7828191145835787466, guid: 49c7b765b5b8a8845aad4c0acd9753a8, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -195 + objectReference: {fileID: 0} + - target: {fileID: 7828191145835787469, guid: 49c7b765b5b8a8845aad4c0acd9753a8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7828191145920499402, guid: 49c7b765b5b8a8845aad4c0acd9753a8, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -48453,6 +48598,84 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3494968556711875956} m_PrefabAsset: {fileID: 0} +--- !u!1 &991045927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 991045928} + - component: {fileID: 991045930} + - component: {fileID: 991045929} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &991045928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991045927} + 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: 1912788540} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &991045929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991045927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53D6\u6D88" +--- !u!222 &991045930 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 991045927} + m_CullTransparentMesh: 0 --- !u!1 &996536655 GameObject: m_ObjectHideFlags: 0 @@ -50648,6 +50871,84 @@ RectTransform: m_AnchoredPosition: {x: -233, y: -289.8} m_SizeDelta: {x: 438, y: 466.90735} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1175042539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1175042540} + - component: {fileID: 1175042542} + - component: {fileID: 1175042541} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1175042540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175042539} + 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: 535597722} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1175042541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175042539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7F16\u7EC4" +--- !u!222 &1175042542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1175042539} + m_CullTransparentMesh: 0 --- !u!114 &1190579712 MonoBehaviour: m_ObjectHideFlags: 0 @@ -54155,9 +54456,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f072abdc6ffe11f459a53ff73c2d0984, type: 3} m_Name: m_EditorClassIdentifier: - startFormationBtn: {fileID: 0} - submitFormationBtn: {fileID: 0} + startFormationBtn: {fileID: 535597723} + submitFormationBtn: {fileID: 1724214693} isStartFormation: 0 + formationInfos: [] + formationInfo: + groupName: + uavms: [] --- !u!1 &1444599844 GameObject: m_ObjectHideFlags: 0 @@ -54399,7 +54704,7 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452191771} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 10 m_Type: 1 m_Shape: 0 @@ -65528,6 +65833,85 @@ MonoBehaviour: off2_botn: {fileID: 1949154258} verify2_botn: {fileID: 436663175} cancel2_botn: {fileID: 2084742555} +--- !u!1 &1585142378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1585142379} + - component: {fileID: 1585142381} + - component: {fileID: 1585142380} + m_Layer: 5 + m_Name: GroupBtns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1585142379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585142378} + 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: + - {fileID: 535597722} + - {fileID: 1724214692} + - {fileID: 1912788540} + m_Father: {fileID: 147647011} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 363.8, y: -90.7} + m_SizeDelta: {x: 0, y: 45.75061} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1585142380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585142378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &1585142381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1585142378} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1001 &1586360840 PrefabInstance: m_ObjectHideFlags: 0 @@ -67739,6 +68123,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1712588402} m_CullTransparentMesh: 0 +--- !u!1 &1715176926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1715176927} + - component: {fileID: 1715176929} + - component: {fileID: 1715176928} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1715176927 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1715176926} + 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: 1724214692} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1715176928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1715176926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E\u8BA4" +--- !u!222 &1715176929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1715176926} + m_CullTransparentMesh: 0 --- !u!1 &1718797254 GameObject: m_ObjectHideFlags: 0 @@ -68137,6 +68599,125 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721277641} m_Mesh: {fileID: 4300000, guid: ee7b1f2ae3d3c47479b10db1a10fe3ab, type: 3} +--- !u!1 &1724214691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1724214692} + - component: {fileID: 1724214695} + - component: {fileID: 1724214694} + - component: {fileID: 1724214693} + m_Layer: 5 + m_Name: SubmitBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1724214692 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724214691} + 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: + - {fileID: 1715176927} + m_Father: {fileID: 1585142379} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 113.59265, y: 40.479065} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1724214693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724214691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1724214694} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1724214694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724214691} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1724214695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724214691} + m_CullTransparentMesh: 0 --- !u!1 &1736135528 GameObject: m_ObjectHideFlags: 0 @@ -69493,16 +70074,16 @@ MonoBehaviour: moonlightObject: {fileID: 639984703} moonLightAmt: 0.90791565 moonPhase: 0.54604214 - ambientCol: {r: 0, g: 0, b: 0, a: 1} - colorSun: {r: 0, g: 0, b: 0, a: 1} + ambientCol: {r: 1, g: 1, b: 1, a: 1} + colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1} colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1} - colorSkyBase: {r: 0.00627451, g: 0.00627451, b: 0.00627451, a: 0.8} - colorSkyBaseLow: {r: 0.007843138, g: 0.007843138, b: 0.007843138, a: 1} - colorHorizon: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2} + 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} - colorSkyAmbient: {r: 0, g: 0, b: 0, a: 1} - colorClouds: {r: 0, g: 0, b: 0, a: 1} - colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1} + 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} 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]' @@ -69840,7 +70421,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 150061843 + randSeed: 335766515 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -71528,6 +72109,125 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1 &1912788539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1912788540} + - component: {fileID: 1912788543} + - component: {fileID: 1912788542} + - component: {fileID: 1912788541} + m_Layer: 5 + m_Name: CancelBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1912788540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912788539} + 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: + - {fileID: 991045928} + m_Father: {fileID: 1585142379} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 113.59265, y: 40.479065} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1912788541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912788539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1912788542} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1912788542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912788539} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1912788543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1912788539} + m_CullTransparentMesh: 0 --- !u!1 &1913435858 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scripts/Adam/FormationManager.cs b/Assets/Zion/Scripts/Adam/FormationManager.cs index 7ae22801..4362cc7b 100644 --- a/Assets/Zion/Scripts/Adam/FormationManager.cs +++ b/Assets/Zion/Scripts/Adam/FormationManager.cs @@ -1,18 +1,27 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +[Serializable] +public class FormationInfo +{ + public int groupName; + public List uavms = new List(); +} + /// /// 编队控制脚本 /// -public class FormationManager : MonoBehaviour +public class FormationManager : MonoSingleton { public Button startFormationBtn; public Button submitFormationBtn; public bool isStartFormation; - public List uavm = new List(); + public List formationInfos = new List(); + public FormationInfo formationInfo; // Start is called before the first frame update void Start() { @@ -34,8 +43,16 @@ public class FormationManager : MonoBehaviour { if (hitInfo.collider.gameObject.tag == "WRJ") { - if (!uavm.Contains(hitInfo.collider.gameObject.GetComponent())) - uavm.Add(hitInfo.collider.gameObject.GetComponent()); + UnmannedAerialVehicleManage uavmTemp = hitInfo.collider.gameObject.GetComponent(); + if (uavmTemp != null && !uavmTemp.isGroup) + { + if (!formationInfo.uavms.Contains(uavmTemp)) + { + uavmTemp.isGroup = true; + uavmTemp.groupId = formationInfo.groupName; + formationInfo.uavms.Add(uavmTemp); + } + } Debug.Log("拾取"); } @@ -43,14 +60,77 @@ public class FormationManager : MonoBehaviour } } } + /// + /// 设置组中得无人机所有航线 + /// + public void SetUAVMGroupAirRoute(int uavmGroupID, Vector3 pos) + { + List uavms = new List(); + for (int i = 0; i < formationInfos.Count; i++) + { + int indexI = i; + if (formationInfos[indexI].groupName == uavmGroupID) + { + uavms = formationInfos[indexI].uavms; + } + } + for (int j = 0; j < uavms.Count; j++) + { + uavms[j].positions.Enqueue(pos); + } + } + /// + /// 清除组内所有无人机得航线 + /// + /// + public void RemoveUAMGroupAirRoute(int uavmGroupID) + { + List uavms = new List(); + for (int i = 0; i < formationInfos.Count; i++) + { + int indexI = i; + if (formationInfos[indexI].groupName == uavmGroupID) + { + uavms = formationInfos[indexI].uavms; + } + } + for (int j = 0; j < uavms.Count; j++) + { + uavms[j].positions.Clear(); + } + } + + public void SetAirRouteObj(int uavmGroupID, GameObject _airRoute) + { + List uavms = new List(); + for (int i = 0; i < formationInfos.Count; i++) + { + int indexI = i; + if (formationInfos[indexI].groupName == uavmGroupID) + { + uavms = formationInfos[indexI].uavms; + } + } + for (int j = 0; j < uavms.Count; j++) + { + if (!uavms[j].airRoute) + { + uavms[j].airRoute = _airRoute; + } + } + } public void OnStartFormation() { isStartFormation = true; + formationInfo = new FormationInfo(); + formationInfo.groupName = formationInfos.Count; } public void OnSubmit() { isStartFormation = false; + if (!formationInfos.Contains(formationInfo)) + formationInfos.Add(formationInfo); } } diff --git a/Assets/Zion/Scripts/ModelFunction/DrawingLine/DistanceMeasurement.cs b/Assets/Zion/Scripts/ModelFunction/DrawingLine/DistanceMeasurement.cs index 494e7d5b..5e2d8852 100644 --- a/Assets/Zion/Scripts/ModelFunction/DrawingLine/DistanceMeasurement.cs +++ b/Assets/Zion/Scripts/ModelFunction/DrawingLine/DistanceMeasurement.cs @@ -18,7 +18,7 @@ public class DistanceMeasurement : MonoBehaviour { if (isPathCanBePlanned) { - if (Input.GetMouseButtonDown(0)&& !IsPointerOverUI()) + if (Input.GetMouseButtonDown(0) && !IsPointerOverUI()) { Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit; @@ -32,7 +32,7 @@ public class DistanceMeasurement : MonoBehaviour ClearMarkers(); } } - + } bool IsPointerOverUI() @@ -58,7 +58,12 @@ public class DistanceMeasurement : MonoBehaviour markers.CopyTo(newMarkers, 0); newMarkers[markers.Length] = go.transform; markers = newMarkers; - unmannedAerialVehicleManage.positions.Enqueue(go.transform.position); + if (unmannedAerialVehicleManage.groupId == -1) + unmannedAerialVehicleManage.positions.Enqueue(go.transform.position); + else + { + FormationManager.Instance.SetUAVMGroupAirRoute(unmannedAerialVehicleManage.groupId, go.transform.position); + } go.transform.SetParent(transform); } @@ -91,13 +96,16 @@ public class DistanceMeasurement : MonoBehaviour { Transform[] newmarkers = new Transform[1]; newmarkers[0] = markers[0]; - for (int i=1;i< markers.Length; i++) + for (int i = 1; i < markers.Length; i++) { Destroy(markers[i].gameObject); } markers = newmarkers; lineRenderer.positionCount = 0; - unmannedAerialVehicleManage.positions.Clear(); + if (unmannedAerialVehicleManage.groupId == -1) + unmannedAerialVehicleManage.positions.Clear(); + else + FormationManager.Instance.RemoveUAMGroupAirRoute(unmannedAerialVehicleManage.groupId); } } } diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index ae05e01d..cb1f9e28 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -13,10 +13,7 @@ using UnityEngine.Events; public class EquipmentCommon : MonoBehaviour { public EquipmentCommon equipmentCommon; - /// - /// 打组ID - /// - public string groupId; + /// /// 场景所在方 /// diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 4b03eae9..64b0d971 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -59,6 +59,12 @@ public class UnmannedAerialVehicleManage : MonoBehaviour public EquipmentCommon equipmentCommon; + /// + /// 打组ID + /// + public int groupId = -1; + + public bool isGroup = false; /// /// 无人机预制体 @@ -75,7 +81,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// /// 频段设置 /// - public List togFrequencyBands=new List(); + public List togFrequencyBands = new List(); /// /// 探测频段设置 /// @@ -115,7 +121,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// 电子侦察无人机 /// public Camera dzWRJCamera; - + #region 无人机数据 /// /// 续航时间 @@ -185,12 +191,12 @@ public class UnmannedAerialVehicleManage : MonoBehaviour //频段设置 foreach (Toggle toggle in togFrequencyBands) { - toggle.onValueChanged.AddListener(delegate { FrequencyBandsValueChanged(toggle);}); + toggle.onValueChanged.AddListener(delegate { FrequencyBandsValueChanged(toggle); }); } //探测频段设置 foreach (Toggle toggle in togSurveillanceFrequencyBands) { - toggle.onValueChanged.AddListener(delegate { SurveillanceFrequencyBandsValueChanged(toggle);}); + toggle.onValueChanged.AddListener(delegate { SurveillanceFrequencyBandsValueChanged(toggle); }); } } @@ -375,23 +381,23 @@ public class UnmannedAerialVehicleManage : MonoBehaviour List allColliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体 for (int i = 0; i < allColliders.Count; i++) { - if (allColliders[i].gameObject.tag == "AttackTarget" - && !allColliders[i].isTrigger - && !attackColliders1.Contains(allColliders[i]) - && allColliders[i].transform.GetComponent() - && allColliders[i].transform.GetComponent().frequency== electronicReconnaissanceCapability) + if (allColliders[i].gameObject.tag == "AttackTarget" + && !allColliders[i].isTrigger + && !attackColliders1.Contains(allColliders[i]) + && allColliders[i].transform.GetComponent() + && allColliders[i].transform.GetComponent().frequency == electronicReconnaissanceCapability) { attackColliders1.Add(allColliders[i]); } - + } } - else if(wrjModel == WRJModel.光学无人机) + else if (wrjModel == WRJModel.光学无人机) { List allColliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体 for (int i = 0; i < allColliders.Count; i++) { - if (allColliders[i].gameObject.tag == "AttackTarget" && !allColliders[i].isTrigger&& !attackColliders1.Contains(allColliders[i])) + if (allColliders[i].gameObject.tag == "AttackTarget" && !allColliders[i].isTrigger && !attackColliders1.Contains(allColliders[i])) { Vector3 pos = gxWRJCamera.WorldToViewportPoint(allColliders[i].transform.position); bool ispcamera = (pos.x > 0 && pos.x < 1 && pos.y > 0 && pos.y < 1 && pos.z > 0); @@ -401,7 +407,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour } } } - + } if (wrjModel == WRJModel.电子侦察无人机) @@ -466,14 +472,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour ///上传日志 /// /// - public void UploadLog(string str1,string str2) + public void UploadLog(string str1, string str2) { string currentTime = System.DateTime.Now.ToString(); List uploadLogMains = new List(); UploadLogMain uploadLogMain = new UploadLogMain(); uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID; uploadLogMain.ThinkId = GlobalFlag.currentThinkId; - string log = currentTime + " " + transform.name+"(" + equipmentCommon.deviceID + ")"+ str1 + str2; + string log = currentTime + " " + transform.name + "(" + equipmentCommon.deviceID + ")" + str1 + str2; uploadLogMain.log = log; uploadLogMains.Add(uploadLogMain); string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains); @@ -560,12 +566,12 @@ public class UnmannedAerialVehicleManage : MonoBehaviour case "数据链通信频点:": string date1 = GetFrequencyBand(weaponitemone[i].para_value); - string[] dates1=date1.Split(','); + string[] dates1 = date1.Split(','); if (dates1.Length > 0) { for (int k = 0; k < togFrequencyBands.Count; k++) { - + togFrequencyBands[k].gameObject.SetActive(date1.Contains(togFrequencyBands[k].transform.name)); } dataLinkCommunicationFrequency = dates1[0]; @@ -576,20 +582,20 @@ public class UnmannedAerialVehicleManage : MonoBehaviour if (toggle.transform.name == dataLinkCommunicationFrequency) toggle.isOn = true; } - + } - + break; case "电子侦察能力:": string date2 = GetFrequencyBand(weaponitemone[i].para_value); - + string[] dates2 = date2.Split(','); if (dates2.Length > 0) { for (int k = 0; k < togSurveillanceFrequencyBands.Count; k++) { - + togSurveillanceFrequencyBands[k].gameObject.SetActive(date2.Contains(togSurveillanceFrequencyBands[k].transform.name)); } electronicReconnaissanceCapability = dates2[0]; @@ -602,7 +608,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour toggle.isOn = true; } } - + break; case "光学侦察能力:": //opticalReconnaissanceCapability = weaponitemone[i].para_value; @@ -647,13 +653,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// /// /// - string GetFrequencyBand(string para_value) + string GetFrequencyBand(string para_value) { string _data = ""; string[] str = para_value.Split(','); if (str.Length > 0) { - + for (int j = 0; j < str.Length; j++) { switch (str[j]) @@ -746,7 +752,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour public void CheckSatellitePositioningFrequency( string interferenceMode) { - + if (interferenceMode == "驱离") { transform.DOKill(); @@ -793,7 +799,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour uav.wrjModel = wrjModel; if (uav.tips != null) uav.tips.text = wrjModel.ToString(); - WRJName=wrjModel.ToString(); + WRJName = wrjModel.ToString(); } } } @@ -980,7 +986,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour distanceMeasurement.isPathCanBePlanned = true; positions.Clear(); positions.Enqueue(startPos.transform.position); + } + FormationManager.Instance.SetAirRouteObj(groupId, airRoute); } else { @@ -998,8 +1006,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour positions.Enqueue(startPos.transform.position); distanceMeasurement.unmannedAerialVehicleManage = this; } - else{ - startPos = Instantiate(distanceMeasurement.PosPrefab,transform); + else + { + startPos = Instantiate(distanceMeasurement.PosPrefab, transform); startPos.transform.localScale = Vector3.zero; startPos.transform.position = new Vector3(transform.position.x, hight, transform.position.z); distanceMeasurement.isPathCanBePlanned = true; @@ -1007,8 +1016,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour positions.Enqueue(startPos.transform.position); distanceMeasurement.unmannedAerialVehicleManage = this; } - + } + FormationManager.Instance.SetAirRouteObj(groupId, airRoute); } } @@ -1042,7 +1052,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour } public IEnumerator MoveObjectAlongPath(Vector3 _positions, bool _isMove) // 协程：按路线移动物体 { - + Vector3 targetPosition = new Vector3(_positions.x, hight, _positions.z);// 目标位置为当前顶点坐标 float _distance = Vector3.Distance(transform.position, targetPosition); float _time = _distance / FireSpeed; @@ -1074,7 +1084,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour } StopCoroutine(ShowRadarTips(0, 0)); OnActivationChanged -= OnActivationChangedHandler; - + }