From 86b6c637e670ca4421136760b38acf6585576111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com> Date: Wed, 22 Nov 2023 14:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E5=85=89=E5=90=8C=E6=AD=A5=E5=8F=8A?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B4=E7=90=86=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefebs/Models/moder/无人机List.prefab | 741 ++---------------- Assets/Temp/Scripts/Scenariopage.cs | 6 +- Assets/Zion/Scenes/单机演练.unity | 12 +- Assets/Zion/Scripts/Adam/DeviceManager.cs | 1 + Assets/Zion/Scripts/InterfaceManager.cs | 207 +++++ Assets/Zion/Scripts/InterfaceManager.cs.meta | 11 + .../Scripts/ModelFunction/EquipmentCommon.cs | 49 +- .../LaserFireControlPlatformManger.cs | 53 +- .../ModelFunction/Radar/RadarManger.cs | 30 +- .../ModelFunction/SingleMachineTest.cs | 40 +- .../UAV/UnmannedAerialVehicle.cs | 8 +- 11 files changed, 427 insertions(+), 731 deletions(-) create mode 100644 Assets/Zion/Scripts/InterfaceManager.cs create mode 100644 Assets/Zion/Scripts/InterfaceManager.cs.meta diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 954ab6ac..685d9f94 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -31,84 +31,6 @@ Transform: m_Father: {fileID: 6865737300552731159} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &672789134 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713047693628054391} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1246298282 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 768107848365297197} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &529492199 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1550832753322196950} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &151395584 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568030543216483140} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &131040704 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611324478266105743} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &493614234 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1872830556030293329} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} --- !u!1 &2096234269966851127 GameObject: m_ObjectHideFlags: 0 @@ -202,175 +124,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &421591416 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2482403066424627203} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &329626019 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2499279008215596090} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &320454154 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2577865565644119591} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &51633099 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3273620095990738525} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &872453875 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3778991970646513775} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &184767638 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4057900896101589522} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1723800569 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4061707263712443538} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &325908602 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4944900371505117885} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1068531953 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5167349154997552049} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1358004228 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5201130470601836435} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1511265849 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5512074156260461626} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1071328154 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6331659836092723442} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &882872666 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6629702139642053806} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} --- !u!1 &6865737300552731157 GameObject: m_ObjectHideFlags: 0 @@ -452,7 +205,8 @@ MonoBehaviour: equipmentCommon: {fileID: 0} selectedSide: 0 equipmentType: "\u65E0\u4EBA\u673AList" - replaceInfo: \ + deviceID: + replaceInfo: 0 --- !u!65 &41106886 BoxCollider: m_ObjectHideFlags: 0 @@ -604,149 +358,6 @@ MonoBehaviour: dataLinkCommunicationFrequency: electronicReconnaissanceCapability: opticalReconnaissanceCapability: ---- !u!65 &241388176 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7258120122570228598} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &844628025 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7438984634337869281} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &283222885 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8062921474742261734} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1053896605 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8153123965611774345} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &912502771 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348451640861860601} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1055019383 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8488010052738047958} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &968183465 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8520896806561604224} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &258422593 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8539805826321748421} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1966693104 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8798000438643106318} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &692364429 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8841683408495298876} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} ---- !u!65 &1764390531 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9173384892180205452} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.49976102, y: 0.12979063, z: 0.5267128} - m_Center: {x: 0.0026066701, y: 0.091190025, z: -0.0115314415} --- !u!1001 &87581316664468991 PrefabInstance: m_ObjectHideFlags: 0 @@ -1596,12 +1207,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &8062921474742261734 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 87581316664468991} - m_PrefabAsset: {fileID: 0} --- !u!4 &8062921474742261735 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -1614,7 +1219,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 87581316664468991} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8062921474742261734} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -2475,18 +2080,12 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 715777664892440568} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7438984634337869281} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &7438984634337869281 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 715777664892440568} - m_PrefabAsset: {fileID: 0} --- !u!4 &7438984634337869280 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -3342,12 +2941,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &7258120122570228598 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 749958366770983279} - m_PrefabAsset: {fileID: 0} --- !u!4 &7258120122570228599 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -3360,7 +2953,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 749958366770983279} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7258120122570228598} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -4215,12 +3808,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &9173384892180205452 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1268904682848828821} - m_PrefabAsset: {fileID: 0} --- !u!4 &9173384892180205453 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -4233,7 +3820,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 1268904682848828821} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9173384892180205452} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -5088,27 +4675,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &8841683408495298877 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1468629587382336293} - m_PrefabAsset: {fileID: 0} --- !u!114 &663871054226612824 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 1468629587382336293} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8841683408495298876} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &8841683408495298876 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, +--- !u!4 &8841683408495298877 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 1468629587382336293} m_PrefabAsset: {fileID: 0} @@ -5961,27 +5542,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &8798000438643106319 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1498185928744833047} - m_PrefabAsset: {fileID: 0} --- !u!114 &692909800614857066 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 1498185928744833047} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8798000438643106318} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &8798000438643106318 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, +--- !u!4 &8798000438643106319 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 1498185928744833047} m_PrefabAsset: {fileID: 0} @@ -6840,18 +6415,12 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 1752211167157593052} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8539805826321748421} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &8539805826321748421 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1752211167157593052} - m_PrefabAsset: {fileID: 0} --- !u!4 &8539805826321748420 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -7707,12 +7276,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &8520896806561604224 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1770522258813735065} - m_PrefabAsset: {fileID: 0} --- !u!4 &8520896806561604225 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -7725,7 +7288,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 1770522258813735065} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8520896806561604224} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -8580,30 +8143,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!114 &454312886544757938 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 1952625762317888975} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8488010052738047958} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &8488010052738047959 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 1952625762317888975} m_PrefabAsset: {fileID: 0} ---- !u!1 &8488010052738047958 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, +--- !u!114 &454312886544757938 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 1952625762317888975} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2092430464794464480 PrefabInstance: m_ObjectHideFlags: 0 @@ -9459,7 +9016,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 2092430464794464480} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348451640861860601} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -9471,12 +9028,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2092430464794464480} m_PrefabAsset: {fileID: 0} ---- !u!1 &8348451640861860601 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2092430464794464480} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2303540555920778128 PrefabInstance: m_ObjectHideFlags: 0 @@ -10332,18 +9883,12 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 2303540555920778128} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8153123965611774345} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &8153123965611774345 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2303540555920778128} - m_PrefabAsset: {fileID: 0} --- !u!4 &8153123965611774344 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -11205,7 +10750,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 2498570764477447715} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5512074156260461626} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -11217,12 +10762,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2498570764477447715} m_PrefabAsset: {fileID: 0} ---- !u!1 &5512074156260461626 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2498570764477447715} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2809197756700194186 PrefabInstance: m_ObjectHideFlags: 0 @@ -12072,12 +11611,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &5201130470601836435 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2809197756700194186} - m_PrefabAsset: {fileID: 0} --- !u!4 &5201130470601836434 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -12090,7 +11623,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 2809197756700194186} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5201130470601836435} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -12945,12 +12478,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &5167349154997552049 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 2982643334479475112} - m_PrefabAsset: {fileID: 0} --- !u!4 &5167349154997552048 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -12963,7 +12490,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 2982643334479475112} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5167349154997552049} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -13818,12 +13345,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &4944900371505117885 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 3048292988923725988} - m_PrefabAsset: {fileID: 0} --- !u!4 &4944900371505117884 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -13836,7 +13357,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 3048292988923725988} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4944900371505117885} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -14697,7 +14218,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 3662279832116246199} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6629702139642053806} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -14709,12 +14230,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3662279832116246199} m_PrefabAsset: {fileID: 0} ---- !u!1 &6629702139642053806 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 3662279832116246199} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4110930979306373867 PrefabInstance: m_ObjectHideFlags: 0 @@ -15570,7 +15085,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 4110930979306373867} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6331659836092723442} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -15582,12 +15097,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4110930979306373867} m_PrefabAsset: {fileID: 0} ---- !u!1 &6331659836092723442 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 4110930979306373867} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4880875880639175748 PrefabInstance: m_ObjectHideFlags: 0 @@ -16437,12 +15946,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &3273620095990738525 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 4880875880639175748} - m_PrefabAsset: {fileID: 0} --- !u!4 &3273620095990738524 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -16455,7 +15958,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 4880875880639175748} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3273620095990738525} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -17310,30 +16813,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!114 &5848568455846123358 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5511666963674910243} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2499279008215596090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &2499279008215596091 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 5511666963674910243} m_PrefabAsset: {fileID: 0} ---- !u!1 &2499279008215596090 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, +--- !u!114 &5848568455846123358 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 5511666963674910243} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5521732607769453082 PrefabInstance: m_ObjectHideFlags: 0 @@ -18183,30 +17680,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!4 &2482403066424627202 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5521732607769453082} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2482403066424627203 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5521732607769453082} - m_PrefabAsset: {fileID: 0} --- !u!114 &5905968906451827559 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 5521732607769453082} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2482403066424627203} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &2482403066424627202 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 5521732607769453082} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5554079564960066622 PrefabInstance: m_ObjectHideFlags: 0 @@ -19062,18 +18553,12 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 5554079564960066622} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2577865565644119591} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2577865565644119591 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 5554079564960066622} - m_PrefabAsset: {fileID: 0} --- !u!4 &2577865565644119590 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -19929,30 +19414,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &4057900896101589522 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6233801842401300491} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4057900896101589523 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6233801842401300491} - m_PrefabAsset: {fileID: 0} --- !u!114 &5464551210618669430 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 6233801842401300491} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4057900896101589522} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &4057900896101589523 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 6233801842401300491} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6236486983173705355 PrefabInstance: m_ObjectHideFlags: 0 @@ -20808,7 +20287,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 6236486983173705355} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4061707263712443538} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -20820,12 +20299,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6236486983173705355} m_PrefabAsset: {fileID: 0} ---- !u!1 &4061707263712443538 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6236486983173705355} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6531287970344790646 PrefabInstance: m_ObjectHideFlags: 0 @@ -21681,18 +21154,12 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 6531287970344790646} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3778991970646513775} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &3778991970646513775 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 6531287970344790646} - m_PrefabAsset: {fileID: 0} --- !u!4 &3778991970646513774 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -22554,7 +22021,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 7240302650516732980} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 768107848365297197} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -22566,12 +22033,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7240302650516732980} m_PrefabAsset: {fileID: 0} ---- !u!1 &768107848365297197 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 7240302650516732980} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7437457271094913390 PrefabInstance: m_ObjectHideFlags: 0 @@ -23421,30 +22882,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &713047693628054391 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 7437457271094913390} - m_PrefabAsset: {fileID: 0} ---- !u!4 &713047693628054390 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 7437457271094913390} - m_PrefabAsset: {fileID: 0} --- !u!114 &8818103163389751315 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 7437457271094913390} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713047693628054391} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &713047693628054390 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 7437457271094913390} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8588302458087827272 PrefabInstance: m_ObjectHideFlags: 0 @@ -24294,30 +23749,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &1872830556030293329 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 8588302458087827272} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1872830556030293328 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 8588302458087827272} - m_PrefabAsset: {fileID: 0} --- !u!114 &7672113369216351797 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 8588302458087827272} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1872830556030293329} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1872830556030293328 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 8588302458087827272} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8687151149057306006 PrefabInstance: m_ObjectHideFlags: 0 @@ -25167,30 +24616,24 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!114 &7339143432620078315 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 8687151149057306006} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1611324478266105743} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1611324478266105742 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 8687151149057306006} m_PrefabAsset: {fileID: 0} ---- !u!1 &1611324478266105743 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, +--- !u!114 &7339143432620078315 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2114182605201611133, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 8687151149057306006} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &8867769748213934429 PrefabInstance: m_ObjectHideFlags: 0 @@ -26040,12 +25483,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &1568030543216483140 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 8867769748213934429} - m_PrefabAsset: {fileID: 0} --- !u!4 &1568030543216483141 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -26058,7 +25495,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 8867769748213934429} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1568030543216483140} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -26919,7 +26356,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 8887797578038627791} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1550832753322196950} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -26931,9 +26368,3 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8887797578038627791} m_PrefabAsset: {fileID: 0} ---- !u!1 &1550832753322196950 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 8887797578038627791} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index 3c7d5fa1..256c3204 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -18,6 +18,8 @@ using UnityEngine.Rendering.PostProcessing; using UnityEngine.SceneManagement; using UnityEngine.UI; +using static InterfaceManager; + using YL; using static NetMQ.NetMQSelector; using static UnityEditor.ShaderData; @@ -88,7 +90,7 @@ public class Scenariopage : MonoBehaviour public Image contingency_list_panl;//想定列表面板 public Button off_btnn5;//关闭按钮 public Button queren_btnn3;//确认按钮 - private string url = "http://172.16.1.254:48888/Handler/Thinkingfile.ashx?action=all";//想定Wbe接口 + //private string url = Url_Action;//想定Wbe接口 //public List textlist = new List(); [SerializeField] Editinformation scen = new Editinformation(); @@ -288,7 +290,7 @@ public class Scenariopage : MonoBehaviour void Start() { //调用接口 - StartCoroutine(Post1(url, (bol, str) => + StartCoroutine(Post1(Url_Action, (bol, str) => { Scenario(bol, str); })); diff --git a/Assets/Zion/Scenes/单机演练.unity b/Assets/Zion/Scenes/单机演练.unity index f351e536..18157104 100644 --- a/Assets/Zion/Scenes/单机演练.unity +++ b/Assets/Zion/Scenes/单机演练.unity @@ -762,7 +762,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 742343356} m_LocalRotation: {x: 0.30070576, y: 0, z: 0, w: 0.953717} - m_LocalPosition: {x: 323, y: 178, z: -84} + m_LocalPosition: {x: 26, y: 190, z: -443} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -916,7 +916,7 @@ PrefabInstance: - target: {fileID: 3977472425108262603, guid: 2b2524df6b4053a4aa08b1f5fe4d62f5, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b2524df6b4053a4aa08b1f5fe4d62f5, type: 3} @@ -1866,12 +1866,12 @@ PrefabInstance: - target: {fileID: 7615181139496386322, guid: 7abae14e48a106d4c8120d0eba515162, type: 3} propertyPath: m_Name - value: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0" + value: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0(1)" objectReference: {fileID: 0} - target: {fileID: 7615181139496386322, guid: 7abae14e48a106d4c8120d0eba515162, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7615181139496386328, guid: 7abae14e48a106d4c8120d0eba515162, type: 3} @@ -1945,12 +1945,12 @@ PrefabInstance: - target: {fileID: 7615181139496386322, guid: 7abae14e48a106d4c8120d0eba515162, type: 3} propertyPath: m_Name - value: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0" + value: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0(2)" objectReference: {fileID: 0} - target: {fileID: 7615181139496386322, guid: 7abae14e48a106d4c8120d0eba515162, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7615181139496386328, guid: 7abae14e48a106d4c8120d0eba515162, type: 3} diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 5bc16274..2d6ae540 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -26,6 +26,7 @@ public class DeviceManager : MonoSingleton public void GetSend2roomMsg(string data) { + data = data.Replace("send2room", ""); string[] info = data.Split(','); EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[0]); if (equipmentCommon) diff --git a/Assets/Zion/Scripts/InterfaceManager.cs b/Assets/Zion/Scripts/InterfaceManager.cs new file mode 100644 index 00000000..54eaadf7 --- /dev/null +++ b/Assets/Zion/Scripts/InterfaceManager.cs @@ -0,0 +1,207 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Networking; +using System; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +public static class InterfaceManager +{ + + public static string IP { get => "111.229.30.246:"; } + public static string Port { get => "48888"; } + public static string IpAddress { get => string.Format("http://{0}:{1}", IP, Port); } + + + + + #region 接口 + + /// + /// 想定Wbe接口 + /// + public static string Url_Action { get => IpAddress + "/Handler/Thinkingfile.ashx?action=all"; } + /// + /// + /// + public static string Url_Updatedevicepara { get => IpAddress + "/Handler/Thinkingfile.ashx?action=updatedevicepara"; } + + #endregion + + public static string GetLocalTxt(string path) + { + using (System.IO.StreamReader reader = new System.IO.StreamReader(path)) { return reader.ReadToEnd(); } + } + + + + public static IEnumerator GetBytes(string url, Action callback) + { + using (UnityWebRequest www = UnityWebRequest.Get(url)) + { + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + callback(null); + Debug.Log("网络请求失败了"); + } + else + { + if (!string.IsNullOrEmpty(www.downloadHandler.text)) + { + callback(www.downloadHandler.text); + } + else + { + callback(null); + } + } + } + } + + public static IEnumerator GetString(string url, Action callback) + { + using (UnityWebRequest www = UnityWebRequest.Get(url)) + { + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + callback(null); + Debug.Log("网络请求失败了"); + } + else + { + if (!string.IsNullOrEmpty(www.downloadHandler.text)) + { + callback(www.downloadHandler.text); + } + else + { + callback(null); + } + } + } + } + public static IEnumerator GetString(string url, int time, Action callback) + { + while (true) + { + using (UnityWebRequest www = UnityWebRequest.Get(url)) + { + yield return new WaitForSeconds(time); // 每隔 time 秒调用一次接口 + + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + callback(null); + Debug.Log("网络请求失败了"); + } + else + { + if (!string.IsNullOrEmpty(www.downloadHandler.text)) + { + callback(www.downloadHandler.text); + } + else + { + callback(null); + } + } + } + } + } + + + + + + + public static IEnumerator PostString(string url, WWWForm formdata, Dictionary headers = null, Action callback = null) + { + using (UnityWebRequest www = UnityWebRequest.Post(url, formdata)) + { + foreach (var item in headers) + { + www.SetRequestHeader(item.Key, item.Value); + } + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + callback(null); + Debug.Log("网络请求失败了"); + } + else + { + if (!string.IsNullOrEmpty(www.downloadHandler.text)) + { + callback(www.downloadHandler.text); + } + else + { + callback(null); + } + } + } + } + + public static IEnumerator GetString(string url, Dictionary headers = null,int time=50,Action callback = null) + { + while (true) + { + using (UnityWebRequest www = UnityWebRequest.Get(url)) + { + yield return new WaitForSeconds(time); // 每隔 time 秒调用一次接口 + foreach (var item in headers) + { + www.SetRequestHeader(item.Key, item.Value); + } + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + callback(null); + Debug.Log("网络请求失败了"); + } + else + { + if (!string.IsNullOrEmpty(www.downloadHandler.text)) + { + callback(www.downloadHandler.text); + } + else + { + callback(null); + } + } + } + } + } + + public static IEnumerator GetString(string url, Dictionary headers = null, Action callback = null) + { + using (UnityWebRequest www = UnityWebRequest.Get(url)) + { + foreach (var item in headers) + { + www.SetRequestHeader(item.Key, item.Value); + } + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + callback(null); + Debug.Log("网络请求失败了"); + } + else + { + if (!string.IsNullOrEmpty(www.downloadHandler.text)) + { + callback(www.downloadHandler.text); + } + else + { + callback(null); + } + } + } + } +} diff --git a/Assets/Zion/Scripts/InterfaceManager.cs.meta b/Assets/Zion/Scripts/InterfaceManager.cs.meta new file mode 100644 index 00000000..51ee4aae --- /dev/null +++ b/Assets/Zion/Scripts/InterfaceManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 87232468ce4d4234599cf08409219d0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 0c9c423c..b1a78fc7 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -107,11 +107,6 @@ public class EquipmentCommon : MonoBehaviour } } - public char replaceInfo; - public Dictionary replaceInfoDic = new Dictionary(); - - - /// /// 物体生成时接受数据 /// @@ -121,6 +116,7 @@ public class EquipmentCommon : MonoBehaviour //向其他的单位发送创建信息 if (isPlayer && equipmentCommon)//但是是由我自主创建的时候发送一次 且只发送一次 { + Dictionary replaceInfoDic = new Dictionary(); string paraListJson = JsonConvert.SerializeObject(weaponitemone); replaceInfoDic.Add("PracticeId", GlobalFlag.roomID); replaceInfoDic.Add("PracticeSubjectId", GlobalFlag.practiceSubjectID); @@ -175,37 +171,50 @@ public class EquipmentCommon : MonoBehaviour if (!nowData.Equals(latestData)) { latestData = nowData; - Debug.Log(latestData); + //Debug.Log(latestData); _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); } } } + /// + /// 无人机 + /// + /// protected string GetSyncData() { return string.Format("{0},{1},{2},{3},{4},{5},{6}", equipmentCommon.deviceID, transform.position.x, transform.position.y, transform.position.z, transform.eulerAngles.x, transform.eulerAngles.y, transform.eulerAngles.z); } - - private void Update() - { - if (Input.GetKeyDown(KeyCode.T)) - { - isPlayer = !isPlayer; - } - } - /// /// /// /// public void ReceivingPositionAngle(string[] data) { - Debug.Log(data[0]); - Vector3 pos = new Vector3(float.Parse(data[1]), float.Parse(data[2]), float.Parse(data[3])); - Vector3 rot = new Vector3(float.Parse(data[4]), float.Parse(data[5]), float.Parse(data[6])); - transform.position = pos; - transform.position = rot; + switch (equipmentType) + { + case "无人机List": + Vector3 pos = new Vector3(float.Parse(data[1]), float.Parse(data[2]), float.Parse(data[3])); + Vector3 rot = new Vector3(float.Parse(data[4]), float.Parse(data[5]), float.Parse(data[6])); + transform.position = pos; + transform.eulerAngles = rot; + break; + case "激光火控平台": + LaserFireControlPlatformManger laserFireControlPlatformManger = GetComponent(); + if (laserFireControlPlatformManger) + laserFireControlPlatformManger.NonSelfGeneratedEmissionLaser(data); + break; + case "探测雷达": + + break; + case "地面无线电干扰": + + break; + + default: + break; + } } } diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index ade2c1a5..a7be7e0f 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -72,6 +72,9 @@ public class LaserFireControlPlatformManger : MonoBehaviour #endregion #region 激光 + /// + /// 是否这在攻击无人机 + /// public bool isLasing = false; public GameObject LaserModer; public GameObject LaserPoint; @@ -140,6 +143,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour } } + #region 创建场景激光发射 /// /// 数据写入 @@ -147,12 +151,6 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// public void FillInTheData(List weaponitemone) { - //if (equipmentCommon) - //{ - //string msg = $"send2room {equipmentCommon.equipmentType}+{transform.position.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}+{transform.eulerAngles.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}"; - //Debug.Log(msg); - //_ = SyncCreateRoom.SendMessageAsync(msg); - //} for (int i = 0; i < weaponitemone.Count; i++) { switch (weaponitemone[i].para_name) @@ -182,12 +180,12 @@ public class LaserFireControlPlatformManger : MonoBehaviour { if (targetPoint != null) { - if (isLasing) return; - isLasing = true; - LaserModer.transform.DOLookAt(targetPoint.position, 0.3f).OnComplete(()=> { + LaserModer.transform.DOLookAt(targetPoint.position, 0.1f).OnComplete(()=> { Debug.Log("目标点位..:"+targetPoint.position); CastRayAndRender(); }); + var nowData = GetSyncData(); + _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); } else { @@ -195,8 +193,6 @@ public class LaserFireControlPlatformManger : MonoBehaviour } } - public LayerMask layerMask; // 用于指定需要检测的层级 - /// /// 激光显示 /// @@ -236,7 +232,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// public IEnumerator LaserExtinction() { - yield return new WaitForSeconds(0.1f); + yield return new WaitForSeconds(1f); if (InnerLaserlineRenderer) { InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 @@ -249,4 +245,37 @@ public class LaserFireControlPlatformManger : MonoBehaviour } isLasing = false; } + + #endregion + + + /// + /// 激光发射点位 + /// + /// + protected string GetSyncData() + { + Debug.Log("目标点位..:" + targetPoint.position); + return string.Format("{0},{1},{2},{3}", equipmentCommon.deviceID, targetPoint.position.x, targetPoint.position.y, targetPoint.position.z); + } + + /// + /// 非自生成激光发射台发射激光发射激光 + /// + /// + public void NonSelfGeneratedEmissionLaser(string[] data) + { + Vector3 vector3 = new Vector3(float.Parse(data[1]), float.Parse(data[2]), float.Parse(data[3])); + if (InnerLaserlineRenderer) + { + InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 + InnerLaserlineRenderer.SetPosition(1, vector3); // 设置线段终点为目标点 + } + if (OuterLaserlineRenderer) + { + OuterLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 + OuterLaserlineRenderer.SetPosition(1, vector3); // 设置线段终点为目标点 + } + StartCoroutine(LaserExtinction()); + } } diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index ac6f3c8d..43fc7a43 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using AdamThinkDevicesData; using AdamSync; +using System.Linq; /// /// 雷达控制 @@ -143,10 +144,12 @@ public class RadarManger : MonoBehaviour { if (newValue) { + Debug.Log("开始检索"); StartTimer(); } else { + Debug.Log("停止检索"); StopTimer(); } } @@ -156,7 +159,7 @@ public class RadarManger : MonoBehaviour { while (true) { - Debug.Log("Timer fired at: " + Time.time); + //Debug.Log("Timer fired at: " + Time.time); yield return new WaitForSeconds(interval); // 等待一段时间后继续执行 RetrievalUAV(); } @@ -281,26 +284,25 @@ public class RadarManger : MonoBehaviour /// public void RetrievalUAV() { - Collider[] colliders = Physics.OverlapSphere(transform.position, detectionRadius); // 检索范围内的所有碰撞体 + List colliders = Physics.OverlapSphere(transform.position, detectionRadius).ToList(); // 检索范围内的所有碰撞体 int number = 0; - foreach (Collider col in colliders) + var colliders2 = colliders.FindAll(x => x.tag == "WRJ"); + if (colliders2.Count > 0) { - if (col.transform.tag == "WRJ") + for(int i=0;i< colliders2.Count; i++) { - UnmannedAerialVehicle unmannedAerialVehicle = col.GetComponent(); - if (number>= NumberOfProbes) - - if (unmannedAerialVehicle) + UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent(); + if (unmannedAerialVehicle) { - //Debug.Log("检测到无人机: " + col.name); - LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x=>(x!=null&&x.isLasing==false)); - - if (laserFireControlPlatformManger&& !laserFireControlPlatformManger.isLasing) + LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); + if (laserFireControlPlatformManger) { - number++; - laserFireControlPlatformManger.targetPoint = col.transform; + laserFireControlPlatformManger.isLasing = true; + Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name); + laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; laserFireControlPlatformManger.Lasing(); } + number++; } } } diff --git a/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs b/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs index 92d76654..2cd30d70 100644 --- a/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs +++ b/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs @@ -48,9 +48,9 @@ public class SingleMachineTest : MonoBehaviour laserFireControlPlatformMangers.ForEach(x => x.FillInTheData(root.data[3].list_para)); terrestrialRadioInterferenceMangers.ForEach(x => x.FillInTheData(root.data[1].list_para)); // 开始协程 - StartTimer(); + //StartTimer(); } - + void FixedUpdate() { if (Input.GetMouseButtonDown(1)) @@ -66,21 +66,25 @@ public class SingleMachineTest : MonoBehaviour } } - // 按下空格键来切换定时器的运行状态 - if (Input.GetKeyDown(KeyCode.Space)) + + } + + [ContextMenu("Add")] + public void Add() + { + if (isTimerRunning) { - if (isTimerRunning) - { - // 暂停定时器 - Debug.Log("暂停定时器执行调用: " + Time.time); - StopTimer(); - } - else - { - // 继续定时器 - Debug.Log("继续定时器执行调用: " + Time.time); - StartTimer(); - } + isTimerRunning = false; + // 暂停定时器 + Debug.Log("暂停定时器执行调用: " + Time.time); + StopTimer(); + } + else + { + isTimerRunning = true; + // 继续定时器 + Debug.Log("继续定时器执行调用: " + Time.time); + StartTimer(); } } @@ -101,7 +105,7 @@ public class SingleMachineTest : MonoBehaviour if (timerCoroutine == null) { timerCoroutine = StartCoroutine(Timer()); - isTimerRunning = true; + unmannedAerialVehicleManages.ForEach(x => x.isStartRehearsing = true); radarMangers.ForEach(x => x.isStartRehearsing = true); laserFireControlPlatformMangers.ForEach(x => x.isStartRehearsing = true); @@ -118,7 +122,7 @@ public class SingleMachineTest : MonoBehaviour { StopCoroutine(timerCoroutine); timerCoroutine = null; - isTimerRunning = false; + unmannedAerialVehicleManages.ForEach(x => x.isStartRehearsing = false); radarMangers.ForEach(x => x.isStartRehearsing = false); laserFireControlPlatformMangers.ForEach(x => x.isStartRehearsing = false); diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs index 1d3e24e4..b3cb2560 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs @@ -155,7 +155,7 @@ public class UnmannedAerialVehicle : MonoBehaviour Bao1.transform.SetParent(null); Bao1.SetActive(true); DistroyThis(); - Debug.Log("无人机被激光打击销毁了"); + Debug.Log(transform.name+"被激光打击销毁了"); break; case "无线电干扰": Vector3 _pos = transform.position - new Vector3(0, 30, 0); @@ -167,7 +167,7 @@ public class UnmannedAerialVehicle : MonoBehaviour Bao2.SetActive(true); DistroyThis(); }); - Debug.Log("无人机被无线电干扰销毁了"); + Debug.Log(transform.name + "无人机被无线电干扰销毁了"); break; case "攻击到目标": GameObject Bao3 = Instantiate(explodePrefab, transform); @@ -175,7 +175,7 @@ public class UnmannedAerialVehicle : MonoBehaviour Bao3.transform.SetParent(null); Bao3.SetActive(true); DistroyThis(); - Debug.Log("无人机自杀式攻击销毁了"); + Debug.Log(transform.name + "无人机自杀式攻击销毁了"); break; case "没有攻击到目标": GameObject Bao4 = Instantiate(explodePrefab, transform); @@ -183,7 +183,7 @@ public class UnmannedAerialVehicle : MonoBehaviour Bao4.transform.SetParent(null); Bao4.SetActive(true); DistroyThis(); - Debug.Log("无人机自杀式销毁了"); + Debug.Log(transform.name + "无人机自杀式销毁了"); break; default: break;