diff --git a/Assets/EffectExamples/FireExplosionEffects/Prefabs/SmallExplosionEffect.prefab b/Assets/EffectExamples/FireExplosionEffects/Prefabs/SmallExplosionEffect.prefab index cf76a2f6..3bcf9543 100644 --- a/Assets/EffectExamples/FireExplosionEffects/Prefabs/SmallExplosionEffect.prefab +++ b/Assets/EffectExamples/FireExplosionEffects/Prefabs/SmallExplosionEffect.prefab @@ -14245,6 +14245,7 @@ GameObject: - component: {fileID: 198000012942003240} - component: {fileID: 199000010939959374} - component: {fileID: -5050309998061860860} + - component: {fileID: -5323272299469524365} m_Layer: 0 m_Name: SmallExplosionEffect m_TagString: Untagged @@ -18899,3 +18900,99 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 138b049cc739bad4a8fc408243656e89, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &-5323272299469524365 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000013462590818} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 78fcf458e4728324883632ffe6f1cd44, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index b2b1da9d..31d63ab4 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -464,6 +464,102 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 0 +--- !u!82 &2616403662216775593 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5512074156260461626} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: ddceb361921ef7143a2564de31e8dec6, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &6865737300552731157 GameObject: m_ObjectHideFlags: 0 @@ -1910,6 +2006,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} +--- !u!1 &5512074156260461626 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 2498570764477447715} + m_PrefabAsset: {fileID: 0} --- !u!4 &5512074156260461627 stripped Transform: m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, @@ -1922,7 +2024,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 2498570764477447715} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 5512074156260461626} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} @@ -2585,18 +2687,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} ---- !u!4 &4583632407061898182 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - m_PrefabInstance: {fileID: 8108767849280698377} - m_PrefabAsset: {fileID: 0} --- !u!1 &392167392884716949 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} m_PrefabInstance: {fileID: 8108767849280698377} m_PrefabAsset: {fileID: 0} +--- !u!4 &4583632407061898182 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, + type: 3} + m_PrefabInstance: {fileID: 8108767849280698377} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8589356912259884851 PrefabInstance: m_ObjectHideFlags: 0 @@ -3053,60 +3155,6 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} ---- !u!1 &7049978149805136275 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} ---- !u!224 &7049978149805136274 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5257004626334551120 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6926759985235920099 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2851464892156488724 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4744025336127579705 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2422519879457413226 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3119,18 +3167,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8153617188426273849 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 8589356912259884851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &7877613851723470549 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3155,3 +3191,69 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7049978149805136275 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1649737328956898976, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7049978149805136274 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6926759985235920099 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5257004626334551120 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2851464892156488724 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4744025336127579705 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8153617188426273849 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 8589356912259884851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/New Terrain 2.asset.meta b/Assets/GameAssets/Sound.meta similarity index 52% rename from Assets/New Terrain 2.asset.meta rename to Assets/GameAssets/Sound.meta index 40483b39..e466d7a0 100644 --- a/Assets/New Terrain 2.asset.meta +++ b/Assets/GameAssets/Sound.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 542e67c9c9999ef4b9e158fcfab14b5b -NativeFormatImporter: +guid: dcc45408a6480e24ea2d3d20d1f005f3 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 15600000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GameAssets/Sound/WRJ.mp3 b/Assets/GameAssets/Sound/WRJ.mp3 new file mode 100644 index 00000000..bda2cef6 Binary files /dev/null and b/Assets/GameAssets/Sound/WRJ.mp3 differ diff --git a/Assets/GameAssets/Sound/WRJ.mp3.meta b/Assets/GameAssets/Sound/WRJ.mp3.meta new file mode 100644 index 00000000..331ac22d --- /dev/null +++ b/Assets/GameAssets/Sound/WRJ.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ddceb361921ef7143a2564de31e8dec6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Sound/爆炸音效1.mp3 b/Assets/GameAssets/Sound/爆炸音效1.mp3 new file mode 100644 index 00000000..8eefede7 Binary files /dev/null and b/Assets/GameAssets/Sound/爆炸音效1.mp3 differ diff --git a/Assets/GameAssets/Sound/爆炸音效1.mp3.meta b/Assets/GameAssets/Sound/爆炸音效1.mp3.meta new file mode 100644 index 00000000..b39536fe --- /dev/null +++ b/Assets/GameAssets/Sound/爆炸音效1.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 78fcf458e4728324883632ffe6f1cd44 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Sound/爆炸音效2.mp3 b/Assets/GameAssets/Sound/爆炸音效2.mp3 new file mode 100644 index 00000000..eb4346f2 Binary files /dev/null and b/Assets/GameAssets/Sound/爆炸音效2.mp3 differ diff --git a/Assets/GameAssets/Sound/爆炸音效2.mp3.meta b/Assets/GameAssets/Sound/爆炸音效2.mp3.meta new file mode 100644 index 00000000..5d9b8dfc --- /dev/null +++ b/Assets/GameAssets/Sound/爆炸音效2.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6b52faf01e7dcff42a694bb3fae46062 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/New Terrain 2.asset b/Assets/New Terrain 2.asset deleted file mode 100644 index 7aaaa05e..00000000 Binary files a/Assets/New Terrain 2.asset and /dev/null differ diff --git a/Assets/New Terrain 6.asset b/Assets/New Terrain 6.asset deleted file mode 100644 index 22bc9258..00000000 Binary files a/Assets/New Terrain 6.asset and /dev/null differ diff --git a/Assets/Plugins/HslCommunication.dll b/Assets/Plugins/HslCommunication.dll new file mode 100644 index 00000000..163ca1d6 Binary files /dev/null and b/Assets/Plugins/HslCommunication.dll differ diff --git a/Assets/Plugins/HslCommunication.dll.meta b/Assets/Plugins/HslCommunication.dll.meta new file mode 100644 index 00000000..7ec96986 --- /dev/null +++ b/Assets/Plugins/HslCommunication.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 700033c57918bec4caa64d87c5e95abf +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/model/重点攻击目标1.prefab b/Assets/Resources/model/重点攻击目标1.prefab index a34e5bbc..82b8757f 100644 --- a/Assets/Resources/model/重点攻击目标1.prefab +++ b/Assets/Resources/model/重点攻击目标1.prefab @@ -367,7 +367,7 @@ GameObject: - component: {fileID: 417831844122255817} - component: {fileID: 64890494959671527} m_Layer: 5 - m_Name: Toggle6 + m_Name: Ku m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -605,7 +605,7 @@ GameObject: - component: {fileID: 6770021343729673679} - component: {fileID: 78723881495536872} m_Layer: 5 - m_Name: Toggle1 + m_Name: UHF m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -842,7 +842,7 @@ GameObject: - component: {fileID: 4572663592685352645} - component: {fileID: 8932471483062020681} m_Layer: 5 - m_Name: Toggle5 + m_Name: X m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -927,7 +927,7 @@ GameObject: - component: {fileID: 5508895505262336779} - component: {fileID: 3463523368336500832} m_Layer: 5 - m_Name: Toggle2 + m_Name: L m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1340,7 +1340,7 @@ GameObject: - component: {fileID: 2928229192971956969} - component: {fileID: 28412645170237004} m_Layer: 5 - m_Name: Toggle4 + m_Name: C m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1821,7 +1821,7 @@ GameObject: - component: {fileID: 2664904005748253655} - component: {fileID: 4401106011680143311} m_Layer: 5 - m_Name: Toggle7 + m_Name: Ka m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2660,6 +2660,14 @@ MonoBehaviour: toggle5: {fileID: 8932471483062020681} toggle6: {fileID: 64890494959671527} toggle7: {fileID: 4401106011680143311} + togFrequencyBands: + - {fileID: 78723881495536872} + - {fileID: 3463523368336500832} + - {fileID: 3619221509897912575} + - {fileID: 28412645170237004} + - {fileID: 8932471483062020681} + - {fileID: 64890494959671527} + - {fileID: 4401106011680143311} frequency: UHF gamepos: {fileID: 1001764166187808509} --- !u!54 &-3761067737480147572 @@ -2892,7 +2900,7 @@ GameObject: - component: {fileID: 7672555938990899863} - component: {fileID: 3619221509897912575} m_Layer: 5 - m_Name: Toggle3 + m_Name: S m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/model/重点攻击目标2.prefab b/Assets/Resources/model/重点攻击目标2.prefab index 18ddd756..12316fcc 100644 --- a/Assets/Resources/model/重点攻击目标2.prefab +++ b/Assets/Resources/model/重点攻击目标2.prefab @@ -377,7 +377,7 @@ GameObject: - component: {fileID: 3886508728929720948} - component: {fileID: 6205561511136672778} m_Layer: 5 - m_Name: Toggle3 + m_Name: S m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1012,7 +1012,7 @@ GameObject: - component: {fileID: 4570008193819074587} - component: {fileID: 4866093980683021871} m_Layer: 5 - m_Name: Toggle4 + m_Name: C m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1403,7 +1403,7 @@ GameObject: - component: {fileID: 7555599023184203222} - component: {fileID: 6760580611336481383} m_Layer: 5 - m_Name: Toggle1 + m_Name: UHF m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1606,7 +1606,7 @@ GameObject: - component: {fileID: 8170169743295760303} - component: {fileID: 1595232079232995888} m_Layer: 5 - m_Name: Toggle5 + m_Name: X m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2335,7 +2335,7 @@ GameObject: - component: {fileID: 1189075051087439035} - component: {fileID: 848134281435870856} m_Layer: 5 - m_Name: Toggle6 + m_Name: Ku m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2420,7 +2420,7 @@ GameObject: - component: {fileID: 5122973371926029238} - component: {fileID: 6994627430635325071} m_Layer: 5 - m_Name: Toggle7 + m_Name: Ka m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2833,6 +2833,14 @@ MonoBehaviour: toggle5: {fileID: 1595232079232995888} toggle6: {fileID: 848134281435870856} toggle7: {fileID: 6994627430635325071} + togFrequencyBands: + - {fileID: 6760580611336481383} + - {fileID: 2327747177229680297} + - {fileID: 6205561511136672778} + - {fileID: 4866093980683021871} + - {fileID: 1595232079232995888} + - {fileID: 848134281435870856} + - {fileID: 6994627430635325071} frequency: gamepos: {fileID: 5062416000507490738} --- !u!54 &-5022022242888478449 @@ -2888,7 +2896,7 @@ GameObject: - component: {fileID: 4633601417677248842} - component: {fileID: 2327747177229680297} m_Layer: 5 - m_Name: Toggle2 + m_Name: L m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/model/重点攻击目标3.prefab b/Assets/Resources/model/重点攻击目标3.prefab index d2caf09b..86c33323 100644 --- a/Assets/Resources/model/重点攻击目标3.prefab +++ b/Assets/Resources/model/重点攻击目标3.prefab @@ -292,7 +292,7 @@ GameObject: - component: {fileID: 3270466385869718369} - component: {fileID: 2987344993920604129} m_Layer: 5 - m_Name: Toggle1 + m_Name: UHF m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -600,7 +600,7 @@ GameObject: - component: {fileID: 9207480014856290226} - component: {fileID: 4263437241937524701} m_Layer: 5 - m_Name: Toggle2 + m_Name: L m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -994,7 +994,7 @@ GameObject: - component: {fileID: 8667056753855765841} - component: {fileID: 8540854955145205225} m_Layer: 5 - m_Name: Toggle7 + m_Name: Ka m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1079,7 +1079,7 @@ GameObject: - component: {fileID: 426504098932314885} - component: {fileID: 3776191318234792201} m_Layer: 5 - m_Name: Toggle5 + m_Name: X m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1238,7 +1238,7 @@ GameObject: - component: {fileID: 1874952852834218643} - component: {fileID: 6688120530323237334} m_Layer: 5 - m_Name: Toggle6 + m_Name: Ku m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1562,7 +1562,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2949388239291875526 RectTransform: m_ObjectHideFlags: 0 @@ -1953,7 +1953,7 @@ GameObject: - component: {fileID: 5283489733529701045} - component: {fileID: 6045683915690793988} m_Layer: 5 - m_Name: Toggle4 + m_Name: C m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2833,6 +2833,14 @@ MonoBehaviour: toggle5: {fileID: 3776191318234792201} toggle6: {fileID: 6688120530323237334} toggle7: {fileID: 8540854955145205225} + togFrequencyBands: + - {fileID: 2987344993920604129} + - {fileID: 4263437241937524701} + - {fileID: 2372794671036074061} + - {fileID: 6045683915690793988} + - {fileID: 3776191318234792201} + - {fileID: 6688120530323237334} + - {fileID: 8540854955145205225} frequency: gamepos: {fileID: 1634967572523846151} --- !u!54 &-796140687388611865 @@ -3041,7 +3049,7 @@ GameObject: - component: {fileID: 8884587536741026771} - component: {fileID: 2372794671036074061} m_Layer: 5 - m_Name: Toggle3 + m_Name: S m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/StreamingAssets/mqttConfig.json b/Assets/StreamingAssets/mqttConfig.json new file mode 100644 index 00000000..a632f329 --- /dev/null +++ b/Assets/StreamingAssets/mqttConfig.json @@ -0,0 +1 @@ +{"ip":"172.16.1.117","port":54232,"userName":"server1234","passwd":"123456"} \ No newline at end of file diff --git a/Assets/New Terrain 6.asset.meta b/Assets/StreamingAssets/mqttConfig.json.meta similarity index 52% rename from Assets/New Terrain 6.asset.meta rename to Assets/StreamingAssets/mqttConfig.json.meta index 0c1bd629..e4010efa 100644 --- a/Assets/New Terrain 6.asset.meta +++ b/Assets/StreamingAssets/mqttConfig.json.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 6798811fbaf286842997f6b12aadc1cd -NativeFormatImporter: +guid: 2ca0bb1f150abab4697c60c8a84d9992 +DefaultImporter: externalObjects: {} - mainObjectFileID: 15600000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Temp/Scripts/Backpack.cs b/Assets/Temp/Scripts/Backpack.cs index c6596141..83fe848d 100644 --- a/Assets/Temp/Scripts/Backpack.cs +++ b/Assets/Temp/Scripts/Backpack.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using System; using System.Collections; using System.Collections.Generic; @@ -111,8 +111,8 @@ public class Backpack : MonoBehaviour return; } string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", Id); - _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - + //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData); WWWForm headers = new WWWForm(); headers.AddField("id", Id); StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data => @@ -128,8 +128,8 @@ public class Backpack : MonoBehaviour return; } string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", wrjid); - _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - + //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData); WWWForm headers = new WWWForm(); headers.AddField("id", wrjid); StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data => diff --git a/Assets/Temp/Scripts/Conversionfrequency.cs b/Assets/Temp/Scripts/Conversionfrequency.cs index b896046b..6fd2273b 100644 --- a/Assets/Temp/Scripts/Conversionfrequency.cs +++ b/Assets/Temp/Scripts/Conversionfrequency.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using System; using System.Collections; using System.Collections.Generic; @@ -50,16 +50,6 @@ public class Conversionfrequency : MonoBehaviour { transform.gameObject.SetActive(false); }); - //verify_buttn.onClick.AddListener(() => - //{ - // //Smallfrequency = dropdown.value; - // terrestrialRadioInterferenceManger.InterferingFrequency= dropdown.options[dropdown.value].text; - // Debug.LogError(terrestrialRadioInterferenceManger.InterferingFrequency); - // //terrestrialRadioInterferenceManger.Interference(Smallfrequency); - // transform.gameObject.SetActive(false); - // string msg = $"send2room EditorDevice,{terrestrialRadioInterferenceManger.equipmentCommon.deviceID},{terrestrialRadioInterferenceManger.InterferingFrequency}"; - // _ = SyncCreateRoom.SendMessageAsync(msg); - //}); } diff --git a/Assets/Temp/Scripts/Judgmentstate.cs b/Assets/Temp/Scripts/Judgmentstate.cs index cf6844a6..5e6fcca9 100644 --- a/Assets/Temp/Scripts/Judgmentstate.cs +++ b/Assets/Temp/Scripts/Judgmentstate.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -98,8 +98,6 @@ public class Judgmentstate : MonoBehaviour countdown_text.gameObject.SetActive(false); string msg = $"send2room " + "EndDeduction"; _ = SyncCreateRoom.SendMessageAsync(msg); - //UnityEditor.EditorApplication.isPlaying = false; - //Application.Quit();//在可执行程序中结束运行 a = 5; isp = false; } diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs index 6300212e..88a3b604 100644 --- a/Assets/Temp/Scripts/Microwaveweapon.cs +++ b/Assets/Temp/Scripts/Microwaveweapon.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using AdamThinkDevicesData; using DG.Tweening; using System; @@ -210,7 +210,8 @@ public class Microwaveweapon : MonoBehaviour { micdistance = Vector3.Distance(miceopos.position, transform.position); var newdata = Getmicdata(); - _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata)); + //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata)); + MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata); microblog.MicrowaveDisplay(micdistance / 10+1, 0.5f); Closeattack(miceopos); } @@ -235,7 +236,8 @@ public class Microwaveweapon : MonoBehaviour public IEnumerator Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle) { var newdata = Aeroplane(unmannedAerialVehicle); - DeviceManager.Instance.send2roomStr.Enqueue(newdata); + //DeviceManager.Instance.send2roomStr.Enqueue(newdata); + MQTTManager.instance.SendData(MQTTManager.instance.Planedata, newdata); yield return new WaitForSeconds(0.5f); GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform); game.transform.localPosition = Vector3.zero; @@ -249,7 +251,7 @@ public class Microwaveweapon : MonoBehaviour /// /// /// - public string Aeroplane(UnmannedAerialVehicle unmannedAerialVehicle) + public string Aeroplane(UnmannedAerialVehicle unmannedAerialVehicle) { return string.Format("{0},{1},{2}","Planedata",unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID,unmannedAerialVehicle.serialNumber); } diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs index 14beca3b..ce35c9c8 100644 --- a/Assets/Temp/Scripts/Spectrumdetection.cs +++ b/Assets/Temp/Scripts/Spectrumdetection.cs @@ -1,4 +1,4 @@ -using AdamThinkDevicesData; +using AdamThinkDevicesData; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; @@ -195,7 +195,8 @@ public class Spectrumdetection : MonoBehaviour public void SweepFrequencyBandTo() { string nowData = GetSyncDataThree(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); } public void CameraFrequency(string _frequency) @@ -380,22 +381,11 @@ public class Spectrumdetection : MonoBehaviour unmannedAerialVehicle = colliders[i].GetComponent(); if (unmannedAerialVehicle != null&& unmannedAerialVehicle.unmannedAerialVehicleManage.dataLinkCommunicationFrequency== Frequency) { - Microwaveweapon microwaveweapon = Microwaveweapon.MicrowaveweaponList.Find(x => (x != null && x.ismicow == false)); - - //LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false && x.lasertime <= 0)); - if (microwaveweapon) + foreach(var terrestrialRadioInterferenceManger in TerrestrialRadioInterferenceManger.terrestrialRadioInterferenceMangers) { - microwaveweapon.ismicow = true; - microwaveweapon.miceopos = unmannedAerialVehicle.transform; - microwaveweapon.Orientation(); + Vector3 lookPos =new Vector3(unmannedAerialVehicle.transform.position.x, terrestrialRadioInterferenceManger.transform.position.y, unmannedAerialVehicle.transform.position.z) ; + terrestrialRadioInterferenceManger.transform.LookAt(lookPos); } - //else if (laserFireControlPlatformManger) - //{ - // laserFireControlPlatformManger.lasertime = laserFireControlPlatformManger.storageIntervalTime; - // laserFireControlPlatformManger.isLasing = true; - // laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; - // laserFireControlPlatformManger.Lasing(); - //} } } diff --git a/Assets/Temp/Scripts/Taskpanel.cs b/Assets/Temp/Scripts/Taskpanel.cs index 892dd61f..d0d129f7 100644 --- a/Assets/Temp/Scripts/Taskpanel.cs +++ b/Assets/Temp/Scripts/Taskpanel.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -128,8 +128,8 @@ public class Taskpanel : MonoBehaviour { if (isp == true) { - measure_btn.gameObject.SetActive(false); - punctuation_btn.gameObject.SetActive(false); + //measure_btn.gameObject.SetActive(false); + //punctuation_btn.gameObject.SetActive(false); specific_btn.gameObject.SetActive(false); model_btn.gameObject.SetActive(false); viewpoint_btn.gameObject.SetActive(false); @@ -137,8 +137,8 @@ public class Taskpanel : MonoBehaviour } else { - measure_btn.gameObject.SetActive(true); - punctuation_btn.gameObject.SetActive(true); + //measure_btn.gameObject.SetActive(true); + //punctuation_btn.gameObject.SetActive(true); specific_btn.gameObject.SetActive(true); model_btn.gameObject.SetActive(true); viewpoint_btn.gameObject.SetActive(true); diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 43f4a78e..49023568 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.16232353, g: 0.30599368, b: 0.66842777, a: 1} + m_IndirectSpecularColor: {r: 0.16230631, g: 0.30614048, b: 0.6693472, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -5379,7 +5379,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -210, y: 0} + m_AnchoredPosition: {x: -210, y: 110} m_SizeDelta: {x: 65, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &32934856 @@ -6690,7 +6690,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -210, y: 55} + m_AnchoredPosition: {x: -210, y: 165} m_SizeDelta: {x: 65, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &132976236 @@ -47383,7 +47383,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -210, y: -55} + m_AnchoredPosition: {x: -210, y: 55} m_SizeDelta: {x: 65, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &921893238 @@ -53944,6 +53944,7 @@ GameObject: - component: {fileID: 1436809529} - component: {fileID: 1436809534} - component: {fileID: 1436809535} + - component: {fileID: 1436809536} m_Layer: 0 m_Name: Bootstraps m_TagString: Untagged @@ -54116,6 +54117,32 @@ MonoBehaviour: devices: [] isOnlyOne: 1 unmannedAerialVehicleManages: [] +--- !u!114 &1436809536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436809528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 740db79d064790148b2b2fe78986e038, type: 3} + m_Name: + m_EditorClassIdentifier: + UAV_DronePosition: DronePosition + UAV_SingleDronePosition: SingleDronePosition + UAV_WRJExpel: WRJExpel + UAV_DroneWasDestroyed: DroneWasDestroyed + UAV_WRJDitch: WRJDitch + UAV_Planedata: Planedata + LBADW_Lasing: Lasing + LBADW_Micow: Micow + LBADW_SetToBeDestroyed: SetToBeDestroyed + SetToBeDestroyedTwo: SetToBeDestroyedTwo + BandSetting: BandSetting + SweepFrequencyBand: SweepFrequencyBand + KeyTarget: KeyTarget + identification: --- !u!1 &1444599844 GameObject: m_ObjectHideFlags: 0 @@ -66442,7 +66469,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1657643401 RectTransform: m_ObjectHideFlags: 0 @@ -67550,7 +67577,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1712588403 RectTransform: m_ObjectHideFlags: 0 @@ -69758,7 +69785,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 473439734 + randSeed: 28562453 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 3ef4e737..c261397a 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -36,7 +36,7 @@ public class DeviceManager : MonoSingleton // 订阅布尔值变化事件 OnActivationChanged += OnActivationChangedHandler; - SyncCreateRoom.send2roomRequset += GetSend2roomMsg; + //SyncCreateRoom.send2roomRequset += GetSend2roomMsg; } void Start() @@ -168,18 +168,6 @@ public class DeviceManager : MonoSingleton { unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[0].transform); - //for (int j = 0; j < attackColliders.Count; j++) - //{ - // Collider c = null; - // if (attackColliders[i] != null) - // { - // c = attackColliders[i]; - // } - // if (attackColliders[j] != null) - // { - // unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[j].transform); - // } - //} } } @@ -190,15 +178,9 @@ public class DeviceManager : MonoSingleton public void GetSend2roomMsg(string data) { data = data.Replace("send2room", ""); - //Debug.LogError("设备..:" + data); string[] info = data.Split(','); - //foreach (string s in info) - //{ - // Debug.LogError(s); - //} if (info.Length < 2) return; - - EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]); + if (info[0] == "KeyTarget") { Debug.Log("接收处理：KeyTarget...:" + data); @@ -209,8 +191,47 @@ public class DeviceManager : MonoSingleton highPriorityTarget.BeAssaulted(Pos, false, int.Parse(info[2])); } } + else if (info[0] == "BandSetting") + { + if (info[1] == "WRJ") + { + UnmannedAerialVehicleManage unmannedAerialVehicleManage = UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Find(x => x.equipmentCommon.deviceID == info[2]); + if (unmannedAerialVehicleManage) + { + unmannedAerialVehicleManage.FrequencyGamepos(info[3]); + } + } + else if (info[1] == "ZYMB") + { + HighPriorityTarget highPriorityTarget = HighPriorityTarget.HighPriorityTargets.Find(x => x.Number == info[2]); + if (highPriorityTarget) + { + highPriorityTarget.FrequencyGamepos(info[3]); + } + } + } + else if (info[0] == "SweepFrequencyBand") + { + if (info[1] == "WRJ") + { + UnmannedAerialVehicleManage unmannedAerialVehicleManage = UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Find(x => x.equipmentCommon.deviceID == info[2]); + if (unmannedAerialVehicleManage) + { + unmannedAerialVehicleManage.SurveillanceFrequency(info[3]); + } + } + else if (info[1] == "PPTC") + { + Spectrumdetection spectrumdetection = Spectrumdetection.spectrumdetections.Find(x => x.equipmentCommon.deviceID == info[2]); + if (spectrumdetection) + { + spectrumdetection.CameraFrequency(info[3]); + } + } + } else { + EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]); if (equipmentCommon) { equipmentCommon.ReceivingPositionAngle(info); @@ -223,6 +244,6 @@ public class DeviceManager : MonoSingleton public void OnDisalbe() { - SyncCreateRoom.send2roomRequset -= GetSend2roomMsg; + //SyncCreateRoom.send2roomRequset -= GetSend2roomMsg; } } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 462af9a7..14354aac 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using AdamThinkDevicesData; using PData; using RDate; @@ -340,42 +340,6 @@ public class GameManager : MonoSingleton break; case "offline": - break; - case "BandSetting"://设备频段设置 - if (data[1] == "WRJ") - { - UnmannedAerialVehicleManage unmannedAerialVehicleManage = UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Find(x => x.equipmentCommon.deviceID == data[2]); - if (unmannedAerialVehicleManage) - { - unmannedAerialVehicleManage.FrequencyGamepos(data[3]); - } - } - else if (data[1] == "ZYMB") - { - HighPriorityTarget highPriorityTarget = HighPriorityTarget.HighPriorityTargets.Find(x => x.Number == data[2]); - if (highPriorityTarget) - { - highPriorityTarget.FrequencyGamepos(data[3]); - } - } - break; - case "SweepFrequencyBand"://设备探测频段设置 - if (data[1] == "WRJ") - { - UnmannedAerialVehicleManage unmannedAerialVehicleManage = UnmannedAerialVehicleManage.unmannedAerialVehicleManages.Find(x => x.equipmentCommon.deviceID == data[2]); - if (unmannedAerialVehicleManage) - { - unmannedAerialVehicleManage.SurveillanceFrequency(data[3]); - } - } - else if (data[1] == "PPTC") - { - Spectrumdetection spectrumdetection = Spectrumdetection.spectrumdetections.Find(x => x.equipmentCommon.deviceID == data[2]); - if (spectrumdetection) - { - spectrumdetection.CameraFrequency(data[3]); - } - } break; default: break; diff --git a/Assets/Zion/Scripts/Adam/ToolsBootstrap.cs b/Assets/Zion/Scripts/Adam/ToolsBootstrap.cs index 790a97b0..eb69d621 100644 --- a/Assets/Zion/Scripts/Adam/ToolsBootstrap.cs +++ b/Assets/Zion/Scripts/Adam/ToolsBootstrap.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using Assets.Zion.Scripts.Adam; using System.Collections; using System.Collections.Generic; @@ -73,7 +73,7 @@ public class ToolsBootstrap : MonoSingleton recordPosition = mCamera.transform.position; recordeulerAngles = mCamera.transform.eulerAngles; buleInstruct.SetActive(true); - mCamera.transform.position = new Vector3(0, 556f, -10f); + mCamera.transform.position = new Vector3(-480, 556f, 258f); mCamera.transform.eulerAngles = new Vector3(90f, 0f, 0f); mCamera.orthographic = true; Switch2DModel(true); diff --git a/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs b/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs index 0e5eb756..b0223f64 100644 --- a/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs +++ b/Assets/Zion/Scripts/Adam/Utility/Sync/AsyncObjectBase.cs @@ -1,4 +1,4 @@ -using HighlightingSystem; +using HighlightingSystem; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -39,8 +39,6 @@ namespace AdamSync } else { - //string palyerJoinRoom = "joinroom " + ""; - //_ = SyncCreateRoom.SendMessageAsync(palyerJoinRoom); gameObject.tag = "MainCamera"; } } diff --git a/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs b/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs index c3680f30..855d54d1 100644 --- a/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs +++ b/Assets/Zion/Scripts/Adam/Utility/Sync/SyncPlayerTransform.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; @@ -11,15 +11,7 @@ namespace AdamSync private void OnInit() { SyncCreateRoom.playerInfoRequset += ReceivePlayInfo; - if (isPlayer) - { - //StartCoroutine(SendMsg()); - } - else - { - //string msg = string.Format("send2room online," + GlobeFlag.userID + "," + GlobeFlag.userName + "," + GlobeFlag.roomID); - //_ = SyncCreateRoom.SendMessageAsync(msg); - } + } diff --git a/Assets/Zion/Scripts/HighPriorityTarget.cs b/Assets/Zion/Scripts/HighPriorityTarget.cs index 2c2e3f1a..b5c5c8a7 100644 --- a/Assets/Zion/Scripts/HighPriorityTarget.cs +++ b/Assets/Zion/Scripts/HighPriorityTarget.cs @@ -1,4 +1,4 @@ -using AdamSync; +using AdamSync; using AdamThinkDevicesData; using Newtonsoft.Json; using System; @@ -62,6 +62,10 @@ public class HighPriorityTarget : MonoBehaviour /// public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7; /// + /// 频段设置 + /// + public List togFrequencyBands = new List(); + /// /// 接收的字段 /// public string frequency; @@ -77,9 +81,30 @@ public class HighPriorityTarget : MonoBehaviour { regulate.gameObject.SetActive(false); }); - Interferencefrequency(); + //Interferencefrequency(); + //频段设置 + foreach (Toggle toggle in togFrequencyBands) + { + toggle.onValueChanged.AddListener(delegate { FrequencyBandsValueChanged(toggle); }); + } } - + /// + /// 频段设置 + /// + /// + void FrequencyBandsValueChanged(Toggle change) + { + if (change.isOn) + { + frequency = change.transform.name; + int layerValue = LayerMask.NameToLayer(frequency); + gamepos.layer = layerValue; + string nowData = GetSyncDataTwo(); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); + } + } + /* private void Interferencefrequency() { toggle1.onValueChanged.AddListener((ison) => @@ -160,7 +185,7 @@ public class HighPriorityTarget : MonoBehaviour } }); } - + */ public void FrequencyGamepos(string _frequency) { int layerValue = LayerMask.NameToLayer(_frequency); @@ -210,8 +235,8 @@ public class HighPriorityTarget : MonoBehaviour HP -= 10; string nowData = GetSyncDis(Pos); Debug.Log("发送："+nowData); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.KeyTarget, nowData); } else { diff --git a/Assets/Zion/Scripts/MQTT.meta b/Assets/Zion/Scripts/MQTT.meta new file mode 100644 index 00000000..cf6ba422 --- /dev/null +++ b/Assets/Zion/Scripts/MQTT.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df798b23dc69b6746b6e851d1847a381 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Zion/Scripts/MQTT/MQTTInitData.cs b/Assets/Zion/Scripts/MQTT/MQTTInitData.cs new file mode 100644 index 00000000..2917e804 --- /dev/null +++ b/Assets/Zion/Scripts/MQTT/MQTTInitData.cs @@ -0,0 +1,60 @@ +using HslCommunication; +using HslCommunication.MQTT; +using Newtonsoft.Json; +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using UnityEngine; + +public class MQTTInitData +{ + public string ip = "172.16.1.24"; + public int port = 54232; + public string userName = "server1234"; + public string passwd = "123456"; + [NonSerialized] + public string guid = ""; + + public void LoadConfig() + { + try + { + var path = Path.Combine(Application.streamingAssetsPath, "mqttConfig.json"); + if (File.Exists(path)) + { + var jsonStr = File.ReadAllText(path); + var config = JsonConvert.DeserializeObject(jsonStr); + this.ip = config.ip; + this.port = config.port; + this.userName = config.userName; + this.passwd = config.passwd; + } + + } + catch (Exception ex) + { + Debug.LogException(ex); + } + this.guid = Guid.NewGuid().ToString("N"); + } + + public MqttConnectionOptions ToContentOptions() + { + MqttConnectionOptions options = new MqttConnectionOptions() + { + IpAddress = ip, + Port = port, + ClientId = guid, + Credentials = new MqttCredential() + { + UserName = userName, + Password = passwd, + } + }; + + return options; + } +} + + diff --git a/Assets/Zion/Scripts/MQTT/MQTTInitData.cs.meta b/Assets/Zion/Scripts/MQTT/MQTTInitData.cs.meta new file mode 100644 index 00000000..f66fa10c --- /dev/null +++ b/Assets/Zion/Scripts/MQTT/MQTTInitData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c447d5fd82fa67e4eb769f8045c7469e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Zion/Scripts/MQTT/MQTTManager.cs b/Assets/Zion/Scripts/MQTT/MQTTManager.cs new file mode 100644 index 00000000..92ca4ea0 --- /dev/null +++ b/Assets/Zion/Scripts/MQTT/MQTTManager.cs @@ -0,0 +1,249 @@ +using HslCommunication; +using HslCommunication.MQTT; +using System; +using System.Collections.Generic; +using System.Text; +using UnityEngine; + +public class MQTTManager : MonoBehaviour +{ + public static MQTTManager instance; + /// + /// MQTT + /// + MqttClient mqtt_client; + /// + /// 接收到的消息队列 + /// + private Queue reciveDatas = new Queue(); + /// + /// 待发送消息队列 + /// + private Queue willSendDatas = new Queue(); + #region 订阅主题 + //房间/标题 + + /// + /// 无人机位置信息传递 + /// + public string DronePosition; + /// + /// 无人机攻击目标锁定 + /// + public string SingleDronePosition; + /// + /// 驱离无人机 + /// + public string WRJExpel; + /// + /// 单个无人机被销毁 + /// + public string DroneWasDestroyed; + /// + /// 无线电干扰无人机同步 + /// + public string WRJDitch; + /// + /// 无人机被销毁 + /// + public string Planedata; + /// + /// 激光发射位置传递 + /// + public string Lasing; + /// + /// 微波武器发射位置 + /// + public string Micow; + /// + /// 设备被销毁 + /// + public string SetToBeDestroyed; + /// + /// 设备被收回 + /// + public string SetToBeDestroyedTwo; + /// + /// 设备频段设置 + /// + public string BandSetting; + /// + /// 设备探测频段设置 + /// + public string SweepFrequencyBand; + /// + /// 重要用户被攻击 + /// + public string KeyTarget; + /// + /// 标识符 + /// + public string identification; + #endregion + // Start is called before the first frame update + void Start() + { + identification = "/" + GlobalFlag.practiceSubjectID;// + "/" + GlobalFlag.currentUser.user_id; + DronePosition += identification; + SingleDronePosition += identification; + WRJExpel += identification; + DroneWasDestroyed += identification; + WRJDitch += identification; + Planedata += identification; + Lasing += identification; + Micow += identification; + SetToBeDestroyed += identification; + SetToBeDestroyedTwo += identification; + BandSetting += identification; + SweepFrequencyBand += identification; + KeyTarget += identification; + instance = this; + StartContent(); + } + + // Update is called once per frame + void Update() + { + if (reciveDatas.Count > 0) + { + WorkWhthData(reciveDatas.Dequeue()); + } + + if (willSendDatas.Count > 0) + { + SendData(willSendDatas.Dequeue()); + } + + //if (Input.GetKeyDown(KeyCode.P)) + //{ + // SendData(UAV_DronePosition, "数据"); + //} + } + + /// + /// 主连接线程 + /// + private void StartContent() + { + try + { + Debug.Log("开始链接蓝牙网关"); + // 授权示例 调用一次即可 call only once + if (!HslCommunication.Authorization.SetAuthorizationCode("d88d407a-4637-423b-ba06-4ee89b3e01f8")) + { + return; + } + //MQTTInitData.SaveDefault(); + var data = new MQTTInitData(); + data.LoadConfig(); + var options = data.ToContentOptions(); + //options.Credentials = new MqttCredential("admin", "123456"); + mqtt_client = new MqttClient(options); + // 接收到数据的时候进行触发 + mqtt_client.OnMqttMessageReceived += OnMQTTMessageReceived; + // 订阅服务器的主题，在连接成功后就去订阅 + mqtt_client.OnClientConnected += m => + { + Debug.Log("连接成功"); + + OperateResult sub0 = m.SubscribeMessage(DronePosition);//订阅主题 + OperateResult sub1 = m.SubscribeMessage(SingleDronePosition);//订阅主题 + OperateResult sub2 = m.SubscribeMessage(WRJExpel);//订阅主题 + OperateResult sub3 = m.SubscribeMessage(DroneWasDestroyed);//订阅主题 + OperateResult sub4 = m.SubscribeMessage(WRJDitch);//订阅主题 + OperateResult sub5 = m.SubscribeMessage(Planedata);//订阅主题 + OperateResult sub6 = m.SubscribeMessage(Lasing);//订阅主题 + OperateResult sub7 = m.SubscribeMessage(Micow);//订阅主题 + OperateResult sub8 = m.SubscribeMessage(SetToBeDestroyed);//订阅主题 + OperateResult sub9 = m.SubscribeMessage(SetToBeDestroyedTwo);//订阅主题 + OperateResult sub10 = m.SubscribeMessage(BandSetting);//订阅主题 + OperateResult sub11 = m.SubscribeMessage(SweepFrequencyBand);//订阅主题 + OperateResult sub12 = m.SubscribeMessage(KeyTarget);//订阅主题 + if (sub0.IsSuccess && sub1.IsSuccess && sub2.IsSuccess && sub3.IsSuccess && sub4.IsSuccess + && sub5.IsSuccess&& sub6.IsSuccess && sub7.IsSuccess && sub8.IsSuccess && sub9.IsSuccess + && sub10.IsSuccess && sub11.IsSuccess && sub12.IsSuccess) + { + Debug.Log("订阅"+ DronePosition+ SingleDronePosition + WRJExpel + DroneWasDestroyed + WRJDitch + Planedata + Lasing + + Micow + SetToBeDestroyed + SetToBeDestroyedTwo + "成功"); + } + }; + mqtt_client.ConnectServer(); + + } + catch (Exception ex) + { + Debug.LogException(ex); + } + } + /// + /// 接收消息 + /// + /// + /// + /// + private void OnMQTTMessageReceived(MqttClient client, string topic, byte[] payload) + { + var msg = Encoding.UTF8.GetString(payload); + reciveDatas.Enqueue(msg); + } + /// + /// 处理接收到的消息 + /// + /// + void WorkWhthData(string data) + { + Debug.Log($"{$"处理数据{data}"}"); + string[] datas = data.Split('$'); + if (datas[0] != GlobalFlag.currentUser.user_id) + DeviceManager.Instance.GetSend2roomMsg(data); + } + + + + /// + /// 外部调用的数据发送方法 + /// + /// + /// + public void SendData(string cannel, string data) + { + willSendDatas.Enqueue(new MQTTSendData(cannel, GlobalFlag.currentUser.user_id + "$" + data)); + } + /// + /// 发送数据 + /// + /// + private void SendData(MQTTSendData data) + { + try + { + OperateResult send = mqtt_client.PublishMessage(new MqttApplicationMessage() + { + QualityOfServiceLevel = MqttQualityOfServiceLevel.ExactlyOnce, + Topic = data.cannal, + Payload = Encoding.UTF8.GetBytes(data.data), + Retain = false + }); + if (send.IsSuccess) + { + Debug.Log($"{$"发布成功{data.data}"}"); + } + } + catch (Exception ex) + { + Debug.LogException(ex); + } + } + + +} +public class MQTTSendData +{ + public string cannal; + public string data; + public MQTTSendData(string cannal, string data) + { + this.cannal = cannal; + this.data = data; + } +} \ No newline at end of file diff --git a/Assets/Zion/Scripts/MQTT/MQTTManager.cs.meta b/Assets/Zion/Scripts/MQTT/MQTTManager.cs.meta new file mode 100644 index 00000000..cacc5375 --- /dev/null +++ b/Assets/Zion/Scripts/MQTT/MQTTManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 740db79d064790148b2b2fe78986e038 +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 fe025517..0e096de1 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -311,7 +311,7 @@ public class EquipmentCommon : MonoBehaviour } } break; - case "WRJDitch":// + case "WRJDitch"://无线电干扰无人机同步 UnmannedAerialVehicleManage _unmannedAerialVehicleManageDitch = GetComponent(); if (_unmannedAerialVehicleManageDitch) { @@ -322,7 +322,7 @@ public class EquipmentCommon : MonoBehaviour } } break; - case "Planedata": + case "Planedata"://微波武器消灭无人机 UnmannedAerialVehicleManage unmannedAerialVehicleManage1 = GetComponent(); if (unmannedAerialVehicleManage1) { diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index 5f0ecc9c..2843dbe1 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -282,7 +282,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour { Debug.Log("角度合适进行打击"); var nowData = GetSyncData(); - _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + MQTTManager.instance.SendData(MQTTManager.instance.Lasing, nowData); CastRayAndRender(); } else @@ -338,7 +339,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour { string nowData = GetSyncDis(unmannedAerialVehicle); Debug.Log(nowData); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData); string currentTime = System.DateTime.Now.ToString(); string _log = currentTime + " " + equipmentCommon.equipmentType + "(" + equipmentCommon.deviceID + ")" + "攻击了销毁了" + unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 82fa0422..9ca6b9eb 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -27,7 +27,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour public EquipmentCommon equipmentCommon; - + public static List terrestrialRadioInterferenceMangers = new List(); #region 地面无线电干扰数据 /// /// 干扰频率 @@ -123,6 +123,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour public string InterferingFrequency1; void Awake() { + terrestrialRadioInterferenceMangers.Add(this); // 订阅布尔值变化事件 OnActivationChanged += OnActivationChangedHandler; } @@ -313,12 +314,7 @@ public class TerrestrialRadioInterferenceManger : 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) @@ -421,7 +417,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour unmannedAerialVehicleManage.CheckSatellitePositioningFrequency( InterferenceMode); var nowData = GetSyncData(unmannedAerialVehicleManage); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.WRJExpel, nowData); } UnmannedAerialVehicle unmannedAerialVehicle = wrj.GetComponent(); if (unmannedAerialVehicle && unmannedAerialVehicle.transform.localPosition != Vector3.zero) @@ -430,7 +427,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour unmannedAerialVehicle.CheckSatellitePositioningFrequency( InterferenceMode); var nowData = GetSyncData(unmannedAerialVehicle); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.WRJDitch, nowData); } isDo = true; } @@ -528,14 +526,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour })); } - /// - /// 单个无人机被销毁 - /// - /// - protected string GetSyncDis(UnmannedAerialVehicle unmannedAerialVehicle) - { - return string.Format("{0},{1},{2}", "DroneWasDestroyed", unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID, unmannedAerialVehicle.serialNumber); - } + private void OnDestroy() { diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs index c00452cd..fafe60dd 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs @@ -117,7 +117,8 @@ public class UnmannedAerialVehicle : MonoBehaviour string nowData = GetSyncDis(); //Debug.Log(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData); string currentTime = System.DateTime.Now.ToString(); string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" + "编号" + serialNumber + "子无人机" + "自杀式攻击自爆了"; @@ -145,7 +146,8 @@ public class UnmannedAerialVehicle : MonoBehaviour string nowData = string.Format("{0},{1}", "SetToBeDestroyed", _equipmentCommon.deviceID); //Debug.Log(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + // DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyed, nowData); string currentTime = System.DateTime.Now.ToString(); string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" + "编号" + serialNumber + "子无人机" + "攻击摧毁了" + _equipmentCommon.equipmentType + "(" + _equipmentCommon.deviceID + ")"; @@ -262,7 +264,8 @@ public class UnmannedAerialVehicle : MonoBehaviour string nowData = GetSyncData(attackTarget); Debug.Log(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + // DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData); float distance = Vector3.Distance(transform.position, attackTarget.position); transform.DOMove(attackTarget.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() => { diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 5cf468d8..4b03eae9 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -207,7 +207,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency); gamePos.layer = layerValue; string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); } } /// @@ -234,10 +235,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour int layerValue = LayerMask.NameToLayer(electronicReconnaissanceCapability); dzWRJCamera.cullingMask = 1 << layerValue; string nowData = GetSyncDataThree(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); } } - + /// + /// 接受同步消息 + /// + /// public void SurveillanceFrequency(string _frequency) { int layerValue = LayerMask.NameToLayer(_frequency); @@ -276,9 +281,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour if (_unmannedAerialVehicle.Count == 0) { string nowData = string.Format("{0},{1}", "SetToBeDestroyed", equipmentCommon.deviceID); - //Debug.Log(nowData); - //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyed, nowData); UploadLog(equipmentCommon.deviceID); WWWForm headers = new WWWForm(); headers.AddField("id", equipmentCommon.deviceID); @@ -303,7 +307,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour UploadLogMain uploadLogMain = new UploadLogMain(); uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID; uploadLogMain.ThinkId = GlobalFlag.currentThinkId; - string log = currentTime + " " + equipmentCommon.equipmentType + "(" + deviceID + ")" + "被成建制销毁了 "; + string log = currentTime + " " + equipmentCommon.equipmentType + "(" + deviceID + ")" + "被销毁了 "; uploadLogMain.log = log; uploadLogMains.Add(uploadLogMain); string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains); @@ -436,7 +440,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour public void SendMsg(Transform attackTarget) { string nowData = GetSyncData(attackTarget); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); } /// /// 无人机攻击目标传递 @@ -1018,8 +1023,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour isMove = false; Vector3 _positions = positions.Dequeue(); var nowData = GetSyncData(_positions); - //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MQTTManager.instance.SendData(MQTTManager.instance.DronePosition, nowData); StartCoroutine(MoveObjectAlongPath(_positions)); // 启动协程，按规划的路线移动物体 } }