From 9345718457a8f88a18a9d3d69c1f9d03ff366535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=8B=8B?= <3077614386@qq.com> Date: Mon, 20 Nov 2023 17:43:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BD=8D=E7=BD=AE=E4=BC=A0?= =?UTF-8?q?=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/moder/地面无线电干扰.prefab | 1 + .../Prefebs/Models/moder/探测雷达.prefab | 1 + .../Prefebs/Models/moder/无人机List.prefab | 4 +- .../Prefebs/Models/moder/激光火控平台.prefab | 1 + Assets/Zion/Scenes/单机演练.unity | 206 +++++++++++++----- .../Scripts/ModelFunction/EquipmentCommon.cs | 17 +- .../ModelFunction/SingleMachineTest.cs | 39 +--- .../UAV/UnmannedAerialVehicleManage.cs | 30 ++- 8 files changed, 201 insertions(+), 98 deletions(-) diff --git a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab index afcf7cf0..0402139b 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab @@ -48,6 +48,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3} m_Name: m_EditorClassIdentifier: + selectedSide: 1 equipmentType: "\u5730\u9762\u65E0\u7EBF\u7535\u5E72\u6270" --- !u!114 &625513913607457923 MonoBehaviour: diff --git a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab index 6c40ae21..c21ba226 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab @@ -3080,6 +3080,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3} m_Name: m_EditorClassIdentifier: + selectedSide: 1 equipmentType: "\u63A2\u6D4B\u96F7\u8FBE" --- !u!95 &3977472425108262601 Animator: diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 235bf681..9c79dbc5 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -449,6 +449,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3} m_Name: m_EditorClassIdentifier: + selectedSide: 0 equipmentType: "\u65E0\u4EBA\u673AList" --- !u!65 &41106886 BoxCollider: @@ -550,8 +551,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7c8a5e37f63c8e419e73f2c1b2ad41e, type: 3} m_Name: m_EditorClassIdentifier: - interval: 5 pattern: 0 + interval: 5 + equipmentCommon: {fileID: -7238547075891962512} msg: "{\"state\":true,\"message\":\"\",\"data\":[{\"id\":\"1700269207290001\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u7EED\u822A\u65F6\u95F4\uFF1A\",\"para_type\":\"\",\"para_value\":\"28\",\"para_unit\":\"\u5206\u949F\",\"r1\":\"35\u5206\u949F\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290002\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u6297\u98CE\u7B49\u7EA7\uFF1A\",\"para_type\":\"\",\"para_value\":\"4\",\"para_unit\":\"\u7EA7\",\"r1\":\"\u7EA7\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290003\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u6700\u5927\u98DE\u884C\u901F\u5EA6\uFF1A\",\"para_type\":\"\",\"para_value\":\"8\",\"para_unit\":\"m/s\",\"r1\":\"20.0km\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290004\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"RCS\uFF1A\",\"para_type\":\"\",\"para_value\":\"0\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290005\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u536B\u661F\u5B9A\u4F4D\u9891\u70B9\uFF1A\",\"para_type\":\"\",\"para_value\":\"1\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290006\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u6570\u636E\u94FE\u901A\u4FE1\u9891\u70B9:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290007\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u7535\u5B50\u4FA6\u5BDF\u80FD\u529B:\",\"para_type\":\"\",\"para_value\":\"3\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290008\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u5149\u5B66\u4FA6\u5BDF\u80FD\u529B:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"}]}" UAVPrefab: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} diff --git a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab index 597d8733..90c81e4e 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab @@ -9953,6 +9953,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0afac659d8be281448f9ecd22f828b72, type: 3} m_Name: m_EditorClassIdentifier: + selectedSide: 1 equipmentType: "\u6FC0\u5149\u706B\u63A7\u5E73\u53F0" --- !u!65 &7615181139496386334 BoxCollider: diff --git a/Assets/Zion/Scenes/单机演练.unity b/Assets/Zion/Scenes/单机演练.unity index 07911c37..58449823 100644 --- a/Assets/Zion/Scenes/单机演练.unity +++ b/Assets/Zion/Scenes/单机演练.unity @@ -421,61 +421,157 @@ MonoBehaviour: terrestrialRadioInterferenceMangers: - {fileID: 480997535} interval: 3 - msg1: "{\"state\":true,\"message\":\"\",\"data\":[{\"id\":\"1700269207290001\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u7EED\u822A\u65F6\u95F4\uFF1A\",\"para_type\":\"\",\"para_value\":\"28\",\"para_unit\":\"\u5206\u949F\",\"r1\":\"35\u5206\u949F\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290002\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u6297\u98CE\u7B49\u7EA7\uFF1A\",\"para_type\":\"\",\"para_value\":\"4\",\"para_unit\":\"\u7EA7\",\"r1\":\"\u7EA7\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290003\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u6700\u5927\u98DE\u884C\u901F\u5EA6\uFF1A\",\"para_type\":\"\",\"para_value\":\"8\",\"para_unit\":\"m/s\",\"r1\":\"20.0km\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290004\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"RCS\uFF1A\",\"para_type\":\"\",\"para_value\":\"0\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290005\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u536B\u661F\u5B9A\u4F4D\u9891\u70B9\uFF1A\",\"para_type\":\"\",\"para_value\":\"1\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290006\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u6570\u636E\u94FE\u901A\u4FE1\u9891\u70B9:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290007\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u7535\u5B50\u4FA6\u5BDF\u80FD\u529B:\",\"para_type\":\"\",\"para_value\":\"3\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269207290008\",\"think_device_id\":\"1700269206959003\",\"para_name\":\"\u5149\u5B66\u4FA6\u5BDF\u80FD\u529B:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"/\",\"r1\":\"\u201C\u201D\",\"r2\":\"\",\"r3\":\"\"}]}" - msg2: "{\"state\":true, \"message\":\"\", \"data\":[ { - \"id\":\"1700269137132001\", \"think_device_id\":\"1700269136819001\", - \"para_name\":\"\u8F6C\u53F0\u8F6C\u901F:\", \"para_type\":\"\", - \"para_value\":\"3\", \"para_unit\":\"s/\u5708\", \"r1\":\"3s/\u5708\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132002\", - \"think_device_id\":\"1700269136819001\", \"para_name\":\"\u63A2\u6D4B\u8DDD\u79BB:\", - \"para_type\":\"\", \"para_value\":\"1\", \"para_unit\":\"km\", - \"r1\":\"1km\", \"r2\":\"\", \"r3\":\"\" }, - { \"id\":\"1700269137132003\", \"think_device_id\":\"1700269136819001\", - \"para_name\":\"\u8FD1\u76F2\u533A:\", \"para_type\":\"\", - \"para_value\":\"100\", \"para_unit\":\"m\", \"r1\":\"100m\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132004\", - \"think_device_id\":\"1700269136819001\", \"para_name\":\"\u6279\u91CF\u6807\u5904\u7406\u80FD\u529B:\", - \"para_type\":\"\", \"para_value\":\"10\", \"para_unit\":\"\u4E2A\", - \"r1\":\"10\u4E2A\", \"r2\":\"\", \"r3\":\"\" - }, { \"id\":\"1700269137132005\", \"think_device_id\":\"1700269136819001\", - \"para_name\":\"\u63A2\u6D4B\u6210\u529F\u7387:\", \"para_type\":\"\", - \"para_value\":\"90\", \"para_unit\":\"%\", \"r1\":\"90%\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132006\", - \"think_device_id\":\"1700269136819001\", \"para_name\":\"\u6700\u5C0F\u63A2\u6D4B\u901F\u5EA6:\", - \"para_type\":\"\", \"para_value\":\"5\", \"para_unit\":\"m/s\", - \"r1\":\"5m/s\", \"r2\":\"\", \"r3\":\"\" }, - { \"id\":\"1700269137132007\", \"think_device_id\":\"1700269136819001\", - \"para_name\":\"\u8DDD\u79BB\u5206\u8FA8\u7387:\", \"para_type\":\"\", - \"para_value\":\"3\", \"para_unit\":\"km\", \"r1\":\"3km\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132008\", - \"think_device_id\":\"1700269136819001\", \"para_name\":\"\u65B9\u4F4D\u5206\u8FA8\u7387:\", - \"para_type\":\"\", \"para_value\":\"4\", \"para_unit\":\"km\", - \"r1\":\"4km\", \"r2\":\"\", \"r3\":\"\" }, - { \"id\":\"1700269137132009\", \"think_device_id\":\"1700269136819001\", - \"para_name\":\"\u65B9\u4F4D\u6CE2\u675F\u5BBD\u5EA6:\", \"para_type\":\"\", - \"para_value\":\"1\", \"para_unit\":\"\u5EA6\", \"r1\":\"1\u5EA6\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137132010\", - \"think_device_id\":\"1700269136819001\", \"para_name\":\"\u4FEF\u4EF0\u6CE2\u675F\u5BBD\u5EA6:\", - \"para_type\":\"\", \"para_value\":\"1\", \"para_unit\":\"\u5EA6\", - \"r1\":\"1\u5EA6\", \"r2\":\"\", \"r3\":\"\" - } ] }" - msg3: "{\"state\":true, \"message\":\"\", \"data\":[ { - \"id\":\"1700269137180001\", \"think_device_id\":\"1700269136819004\", - \"para_name\":\"\u50A8\u80FD\u95F4\u9694\u65F6\u95F4\uFF1A\", \"para_type\":\"\", - \"para_value\":\"1\", \"para_unit\":\"s\", \"r1\":\"1s\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137180002\", - \"think_device_id\":\"1700269136819004\", \"para_name\":\"\u6BC1\u4F24\u76EE\u6807\u7D2F\u79EF\u4F5C\u7528\u65F6\u95F4:\", - \"para_type\":\"\", \"para_value\":\"3\", \"para_unit\":\"s\", - \"r1\":\"3s\", \"r2\":\"\", \"r3\":\"\" }, - { \"id\":\"1700269137180003\", \"think_device_id\":\"1700269136819004\", - \"para_name\":\"\u5E72\u6270\u8DDD\u79BB\uFF1A\", \"para_type\":\"\", - \"para_value\":\"0\", \"para_unit\":\"km\", \"r1\":\"0.1km\", - \"r2\":\"\", \"r3\":\"\" }, { \"id\":\"1700269137180004\", - \"think_device_id\":\"1700269136819004\", \"para_name\":\"\u5E72\u6270\u89D2\u5EA6\uFF1A\", - \"para_type\":\"\", \"para_value\":\"0\", \"para_unit\":\"\u5EA6\", - \"r1\":\"0\u5EA6\", \"r2\":\"\", \"r3\":\"\" - } ] }" - msg4: "{\"state\":true,\"message\":\"\",\"data\":[{\"id\":\"1700269137164001\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u9891\u7387:\",\"para_type\":\"\",\"para_value\":\"3\",\"para_unit\":\"\\\"\\\"\",\"r1\":\"\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164002\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u6A21\u5F0F:\",\"para_type\":\"\",\"para_value\":\"0\",\"para_unit\":\"\\\"\\\"\",\"r1\":\"\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164003\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u53D1\u5C04\u529F\u7387:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"\\\"\\\"\",\"r1\":\"\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164004\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u89D2\u5EA6:\",\"para_type\":\"\",\"para_value\":\"37\",\"para_unit\":\"\u5EA6\",\"r1\":\"37\u5EA6\",\"r2\":\"\",\"r3\":\"\"},{\"id\":\"1700269137164005\",\"think_device_id\":\"1700269136819002\",\"para_name\":\"\u5E72\u6270\u8DDD\u79BB:\",\"para_type\":\"\",\"para_value\":\"2\",\"para_unit\":\"km\",\"r1\":\"2km\",\"r2\":\"\",\"r3\":\"\"}]}" + msg1: "{ \t\"state\": true, \t\"message\": \"\", \t\"data\": [ \t\t{ \t\t\t\"id\": + \"1700407128875001\", \t\t\t\"PracticeId\": \"1700407128875\", \t\t\t\"think_id\": + \"1700407128875\", \t\t\t\"device_name\": \"\u63A2\u6D4B\u96F7\u8FBE\", \t\t\t\"device_count\": + 2, \t\t\t\"r1\": \"1\", \t\t\t\"r2\": \"\", \t\t\t\"r3\": \"\", \t\t\t\"list_para\": + [ \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001001\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u8F6C\u53F0\u8F6C\u901F:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"12\", \t\t\t\t\t\"para_unit\": + \"s/\u5708\", \t\t\t\t\t\"r1\": \"12s/\u5708\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001002\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u63A2\u6D4B\u8DDD\u79BB:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"5\", \t\t\t\t\t\"para_unit\": + \"km\", \t\t\t\t\t\"r1\": \"5km\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001003\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u8FD1\u76F2\u533A:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"300\", \t\t\t\t\t\"para_unit\": \"m\", \t\t\t\t\t\"r1\": + \"300m\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875001004\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875001\", + \t\t\t\t\t\"para_name\": \"\u6279\u91CF\u6807\u5904\u7406\u80FD\u529B:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"50\", \t\t\t\t\t\"para_unit\": \"\u4E2A\", + \t\t\t\t\t\"r1\": \"50\u4E2A\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" + \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001005\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u63A2\u6D4B\u6210\u529F\u7387:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"90\", \t\t\t\t\t\"para_unit\": + \"%\", \t\t\t\t\t\"r1\": \"90%\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" + \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001006\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u6700\u5C0F\u63A2\u6D4B\u901F\u5EA6:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"1\", \t\t\t\t\t\"para_unit\": + \"m/s\", \t\t\t\t\t\"r1\": \"1m/s\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001007\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u8DDD\u79BB\u5206\u8FA8\u7387:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"1\", \t\t\t\t\t\"para_unit\": + \"km\", \t\t\t\t\t\"r1\": \"1km\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001008\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u65B9\u4F4D\u5206\u8FA8\u7387:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": + \"km\", \t\t\t\t\t\"r1\": \"2km\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001009\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u65B9\u4F4D\u6CE2\u675F\u5BBD\u5EA6:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"1\", \t\t\t\t\t\"para_unit\": + \"\u5EA6\", \t\t\t\t\t\"r1\": \"1\u5EA6\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875001010\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875001\", \t\t\t\t\t\"para_name\": \"\u4FEF\u4EF0\u6CE2\u675F\u5BBD\u5EA6:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"1\", \t\t\t\t\t\"para_unit\": + \"\u5EA6\", \t\t\t\t\t\"r1\": \"1\u5EA6\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t} \t\t\t] \t\t}, \t\t{ \t\t\t\"id\": \"1700407128875002\", \t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\"think_id\": \"1700407128875\", \t\t\t\"device_name\": + \"\u5730\u9762\u65E0\u7EBF\u7535\u5E72\u6270\", \t\t\t\"device_count\": 2, \t\t\t\"r1\": + \"1\", \t\t\t\"r2\": \"\", \t\t\t\"r3\": \"\", \t\t\t\"list_para\": [ \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875002001\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875002\", + \t\t\t\t\t\"para_name\": \"\u5E72\u6270\u9891\u7387:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"0\", \t\t\t\t\t\"para_unit\": \"\\\"\\\"\", + \t\t\t\t\t\"r1\": \"\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, + \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875002002\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875002\", \t\t\t\t\t\"para_name\": \"\u5E72\u6270\u6A21\u5F0F:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": + \"\\\"\\\"\", \t\t\t\t\t\"r1\": \"\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875002003\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875002\", \t\t\t\t\t\"para_name\": \"\u53D1\u5C04\u529F\u7387:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": + \"\\\"\\\"\", \t\t\t\t\t\"r1\": \"\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875002004\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875002\", \t\t\t\t\t\"para_name\": \"\u5E72\u6270\u89D2\u5EA6:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"49\", \t\t\t\t\t\"para_unit\": + \"\u5EA6\", \t\t\t\t\t\"r1\": \"49\u5EA6\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875002005\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875002\", \t\t\t\t\t\"para_name\": \"\u5E72\u6270\u8DDD\u79BB:\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": + \"km\", \t\t\t\t\t\"r1\": \"2km\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t} \t\t\t] \t\t}, \t\t{ \t\t\t\"id\": \"1700407128875003\", \t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\"think_id\": \"1700407128875\", \t\t\t\"device_name\": + \"\u8702\u7FA4\u65E0\u4EBA\u673A\", \t\t\t\"device_count\": 0, \t\t\t\"r1\": + \"0\", \t\t\t\"r2\": \"\", \t\t\t\"r3\": \"\", \t\t\t\"list_para\": [ \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875003001\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875003\", + \t\t\t\t\t\"para_name\": \"\u7EED\u822A\u65F6\u95F4\uFF1A\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"35\", \t\t\t\t\t\"para_unit\": \"\u5206\u949F\", + \t\t\t\t\t\"r1\": \"35\u5206\u949F\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875003002\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875003\", \t\t\t\t\t\"para_name\": \"\u6297\u98CE\u7B49\u7EA7\uFF1A\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"0\", \t\t\t\t\t\"para_unit\": + \"\u7EA7\", \t\t\t\t\t\"r1\": \"\u7EA7\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875003003\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875003\", \t\t\t\t\t\"para_name\": \"\u6700\u5927\u98DE\u884C\u901F\u5EA6\uFF1A\", + \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": \"11\", \t\t\t\t\t\"para_unit\": + \"m/s\", \t\t\t\t\t\"r1\": \"11.0km\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": + \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875003004\", \t\t\t\t\t\"PracticeId\": + \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": + \"1700407128875003\", \t\t\t\t\t\"para_name\": \"RCS\uFF1A\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"1\", \t\t\t\t\t\"para_unit\": \"/\", \t\t\t\t\t\"r1\": + \"\u201C\u201D\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875003005\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875003\", + \t\t\t\t\t\"para_name\": \"\u536B\u661F\u5B9A\u4F4D\u9891\u70B9\uFF1A\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": \"/\", \t\t\t\t\t\"r1\": + \"\u201C\u201D\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875003006\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875003\", + \t\t\t\t\t\"para_name\": \"\u6570\u636E\u94FE\u901A\u4FE1\u9891\u70B9:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"0\", \t\t\t\t\t\"para_unit\": \"/\", \t\t\t\t\t\"r1\": + \"\u201C\u201D\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875003007\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875003\", + \t\t\t\t\t\"para_name\": \"\u7535\u5B50\u4FA6\u5BDF\u80FD\u529B:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": \"/\", \t\t\t\t\t\"r1\": + \"\u201C\u201D\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ + \t\t\t\t\t\"id\": \"1700407128875003008\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\t\t\"think_id\": \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875003\", + \t\t\t\t\t\"para_name\": \"\u5149\u5B66\u4FA6\u5BDF\u80FD\u529B:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"2\", \t\t\t\t\t\"para_unit\": \"/\", \t\t\t\t\t\"r1\": + \"\u201C\u201D\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t} \t\t\t] + \t\t}, \t\t{ \t\t\t\"id\": \"1700407128875004\", \t\t\t\"PracticeId\": \"1700407128875\", + \t\t\t\"think_id\": \"1700407128875\", \t\t\t\"device_name\": \"\u6FC0\u5149\u706B\u63A7\u5E73\u53F0\", + \t\t\t\"device_count\": 0, \t\t\t\"r1\": \"0\", \t\t\t\"r2\": \"\", \t\t\t\"r3\": + \"\", \t\t\t\"list_para\": [ \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875004001\", + \t\t\t\t\t\"PracticeId\": \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", + \t\t\t\t\t\"think_device_id\": \"1700407128875004\", \t\t\t\t\t\"para_name\": + \"\u50A8\u80FD\u95F4\u9694\u65F6\u95F4\uFF1A\", \t\t\t\t\t\"para_type\": \"\", + \t\t\t\t\t\"para_value\": \"5\", \t\t\t\t\t\"para_unit\": \"s\", \t\t\t\t\t\"r1\": + \"5s\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": + \"1700407128875004002\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", \t\t\t\t\t\"think_id\": + \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875004\", \t\t\t\t\t\"para_name\": + \"\u6BC1\u4F24\u76EE\u6807\u7D2F\u79EF\u4F5C\u7528\u65F6\u95F4:\", \t\t\t\t\t\"para_type\": + \"\", \t\t\t\t\t\"para_value\": \"3\", \t\t\t\t\t\"para_unit\": \"s\", \t\t\t\t\t\"r1\": + \"3s\", \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": + \"1700407128875004003\", \t\t\t\t\t\"PracticeId\": \"1700407128875\", \t\t\t\t\t\"think_id\": + \"1700407128875\", \t\t\t\t\t\"think_device_id\": \"1700407128875004\", \t\t\t\t\t\"para_name\": + \"\u5E72\u6270\u8DDD\u79BB\uFF1A\", \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": + \"0\", \t\t\t\t\t\"para_unit\": \"km\", \t\t\t\t\t\"r1\": \"0.1km\", \t\t\t\t\t\"r2\": + \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t}, \t\t\t\t{ \t\t\t\t\t\"id\": \"1700407128875004004\", + \t\t\t\t\t\"PracticeId\": \"1700407128875\", \t\t\t\t\t\"think_id\": \"1700407128875\", + \t\t\t\t\t\"think_device_id\": \"1700407128875004\", \t\t\t\t\t\"para_name\": + \"\u5E72\u6270\u89D2\u5EA6\uFF1A\", \t\t\t\t\t\"para_type\": \"\", \t\t\t\t\t\"para_value\": + \"60\", \t\t\t\t\t\"para_unit\": \"\u5EA6\", \t\t\t\t\t\"r1\": \"60\u5EA6\", + \t\t\t\t\t\"r2\": \"\", \t\t\t\t\t\"r3\": \"\" \t\t\t\t} \t\t\t] \t\t} \t] }" --- !u!4 &144713089 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index bb32e8fc..b4c4fbef 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -8,8 +8,15 @@ using AdamThinkDevicesData; /// public class EquipmentCommon : MonoBehaviour { + /// + /// 场景所在方 + /// + public SelectedSide selectedSide = SelectedSide.Other; + /// + /// 所有设备 + /// public static List equipmentCommons = new List(); - public string equipmentType=""; + public string equipmentType = ""; private bool _isStartRehearsing = false; // 布尔值变化时触发的事件 @@ -95,3 +102,11 @@ public class EquipmentCommon : MonoBehaviour } } } + +public enum SelectedSide +{ + Rad, + Blue, + Director, + Other +} \ No newline at end of file diff --git a/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs b/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs index 42968d1b..8e245b39 100644 --- a/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs +++ b/Assets/Zion/Scripts/ModelFunction/SingleMachineTest.cs @@ -38,42 +38,15 @@ public class SingleMachineTest : MonoBehaviour /// /// 测试接受数据 /// - private Weaponitemone weaponitemones1; - /// - /// 测试用 - /// - public string msg2; - /// - /// 测试接受数据 - /// - private Weaponitemone weaponitemones2; - /// - /// 测试用 - /// - public string msg3; - /// - /// 测试接受数据 - /// - private Weaponitemone weaponitemones3; - /// - /// 测试用 - /// - public string msg4; - /// - /// 测试接受数据 - /// - private Weaponitemone weaponitemones4; + private AdamThinkDevicesData.Root root; void Start() { - weaponitemones1 = Newtonsoft.Json.JsonConvert.DeserializeObject(msg1); - weaponitemones2 = Newtonsoft.Json.JsonConvert.DeserializeObject(msg2); - weaponitemones3 = Newtonsoft.Json.JsonConvert.DeserializeObject(msg3); - weaponitemones4 = Newtonsoft.Json.JsonConvert.DeserializeObject(msg4); + root = Newtonsoft.Json.JsonConvert.DeserializeObject(msg1); - //unmannedAerialVehicleManages.ForEach(x => x.FillInTheData(weaponitemones1)); - //radarMangers.ForEach(x => x.FillInTheData(weaponitemones2)); - //laserFireControlPlatformMangers.ForEach(x => x.FillInTheData(weaponitemones3)); - //terrestrialRadioInterferenceMangers.ForEach(x => x.FillInTheData(weaponitemones4)); + unmannedAerialVehicleManages.ForEach(x => x.FillInTheData(root.data[2].list_para)); + radarMangers.ForEach(x => x.FillInTheData(root.data[0].list_para)); + laserFireControlPlatformMangers.ForEach(x => x.FillInTheData(root.data[3].list_para)); + terrestrialRadioInterferenceMangers.ForEach(x => x.FillInTheData(root.data[1].list_para)); // 开始协程 StartTimer(); } diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index a1eb88f7..be41e8c5 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -4,13 +4,17 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using AdamThinkDevicesData; +using AdamSync; /// /// 单个无人机蜂群控制 /// public class UnmannedAerialVehicleManage : MonoBehaviour { - + /// + /// 无人机状态 + /// + public Pattern pattern = Pattern.待机; public static List unmannedAerialVehicleManages = new List(); #region 启动暂停 private bool _isStartRehearsing = false; @@ -39,11 +43,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// public float interval = 5.0f; #endregion - /// - /// 状态 - /// - public Pattern pattern = Pattern.待机; - + + public EquipmentCommon equipmentCommon; /// /// 测试用 @@ -53,7 +54,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// 测试接受数据 /// private List weaponitems; - + /// + /// 设备通用脚本 + /// private Weaponitemone weaponitemones; /// @@ -86,6 +89,9 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// 飞行速度 /// public float FireSpeed = 20.0f; + + + #region 无人机数据 /// /// 续航时间 @@ -125,11 +131,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour void Start() { unmannedAerialVehicleManages.Add(this); + equipmentCommon = GetComponent(); //weaponitemones = Newtonsoft.Json.JsonConvert.DeserializeObject(msg); //FillInTheData(weaponitemones);//测试写入 Formation(1);//默认阵型 // 订阅布尔值变化事件 OnActivationChanged += OnActivationChangedHandler; + } // Update is called once per frame @@ -206,7 +214,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour /// public void FillInTheData(List weaponitemone) { - for(int i=0;i< weaponitemone.Count; i++) + if (equipmentCommon) + { + string msg = $"send2room ,{equipmentCommon.equipmentType},{transform.position},{transform.eulerAngles}"; + Debug.Log(msg); + _ = SyncCreateRoom.SendMessageAsync(msg); + } + for (int i=0;i< weaponitemone.Count; i++) { switch (weaponitemone[i].para_name) { case "续航时间：":