diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index d3e36354..6d73c0ed 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -1178,7 +1178,7 @@ RectTransform: - {fileID: 9020723963205404447} - {fileID: 571368241678502618} m_Father: {fileID: 8500453589301871558} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1451,8 +1451,6 @@ Transform: m_Children: - {fileID: 5659378436633015230} - {fileID: 7407999243263411690} - - {fileID: 1525602421726030359} - - {fileID: 5172610439169658982} - {fileID: 7180026123191704634} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2669,9 +2667,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} ---- !u!1 &2701650428095938164 stripped +--- !u!1 &7407999243263411691 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3270411768248797574, guid: 088baeb890d17754287a1161c0b1dceb, + m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + m_PrefabInstance: {fileID: 584595957674063858} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7407999243263411690 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 584595957674063858} m_PrefabAsset: {fileID: 0} @@ -2687,133 +2691,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8d11073938bcdd54589608b4b411b889, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &7407999243263411690 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7985558213978141208, guid: 088baeb890d17754287a1161c0b1dceb, - type: 3} - m_PrefabInstance: {fileID: 584595957674063858} - m_PrefabAsset: {fileID: 0} ---- !u!1 &7407999243263411691 stripped +--- !u!1 &2701650428095938164 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7985558213978141209, guid: 088baeb890d17754287a1161c0b1dceb, + m_CorrespondingSourceObject: {fileID: 3270411768248797574, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} m_PrefabInstance: {fileID: 584595957674063858} m_PrefabAsset: {fileID: 0} ---- !u!1001 &638589549675547561 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8500453589301871558} - m_Modifications: - - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalPosition.y - value: 101.01 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.23 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalScale.x - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalScale.z - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_Name - value: Minimapwrj1 - objectReference: {fileID: 0} - - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_Layer - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} ---- !u!4 &5172610439169658982 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - m_PrefabInstance: {fileID: 638589549675547561} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2706658849591110576 PrefabInstance: m_ObjectHideFlags: 0 @@ -2943,6 +2826,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, type: 3} +--- !u!224 &571368241678502618 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2477564191442231658, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, + type: 3} + m_PrefabInstance: {fileID: 2706658849591110576} + m_PrefabAsset: {fileID: 0} --- !u!114 &6495186528074268745 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9199853869177154553, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, @@ -2961,127 +2850,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2706658849591110576} m_PrefabAsset: {fileID: 0} ---- !u!224 &571368241678502618 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2477564191442231658, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, - type: 3} - m_PrefabInstance: {fileID: 2706658849591110576} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6501072882878902744 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8500453589301871558} - m_Modifications: - - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 302957159522640772, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ad9b6f211aa7f56408a0fc152bd1acde, type: 2} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalPosition.y - value: 101.01 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalPosition.z - value: -4.23 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalScale.x - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_LocalScale.z - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_Name - value: Minimapwrj - objectReference: {fileID: 0} - - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_Layer - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} ---- !u!4 &1525602421726030359 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, - type: 3} - m_PrefabInstance: {fileID: 6501072882878902744} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6738463286047272674 PrefabInstance: m_ObjectHideFlags: 0 @@ -3543,6 +3311,30 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} +--- !u!114 &5372963352097099058 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 6738463286047272674} + 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 &946356274003191237 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 6738463286047272674} + 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 &7739009189435305960 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3555,6 +3347,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &805817557573538235 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 6738463286047272674} + 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 &1189649587738053663 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 6738463286047272674} + 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 &5179907296229891844 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, @@ -3597,54 +3413,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6738463286047272674} m_PrefabAsset: {fileID: 0} ---- !u!114 &1189649587738053663 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 6738463286047272674} - 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 &5372963352097099058 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 6738463286047272674} - 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 &946356274003191237 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 6738463286047272674} - 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 &805817557573538235 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 6738463286047272674} - 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!1001 &7365093489755617725 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab index 741f469e..e9331e2d 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 480111843} - component: {fileID: 480111845} - m_Layer: 12 + m_Layer: 11 m_Name: Camera m_TagString: Untagged m_Icon: {fileID: 0} @@ -62,7 +62,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 8323072 + m_Bits: 0 m_RenderingPath: -1 m_TargetTexture: {fileID: 8400000, guid: 6b626e0708a53914faa12b213dcaa816, type: 2} m_TargetDisplay: 0 @@ -944,6 +944,11 @@ MonoBehaviour: Frequencysuccessrate: Camera1: {fileID: 480111845} rawImage: {fileID: 1115657768} + radarCenter: {fileID: 0} + targets: [] + radarBackground: {fileID: 0} + targetPointPrefab: {fileID: 748507237023375508, guid: 255976aaa04a95c4fb382c39e411b935, + type: 3} colliders: [] attackColliders1: [] --- !u!65 &1537869982341012852 diff --git a/Assets/Resources/DeviceBtn/red.prefab b/Assets/Resources/DeviceBtn/red.prefab new file mode 100644 index 00000000..66f91006 --- /dev/null +++ b/Assets/Resources/DeviceBtn/red.prefab @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &748507237023375508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8255130203188826317} + - component: {fileID: 3747398096165153378} + - component: {fileID: 3705659977826792901} + m_Layer: 11 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8255130203188826317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748507237023375508} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3747398096165153378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748507237023375508} + m_CullTransparentMesh: 0 +--- !u!114 &3705659977826792901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748507237023375508} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9528302, g: 0.06741722, b: 0.06741722, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Resources/DeviceBtn/red.prefab.meta b/Assets/Resources/DeviceBtn/red.prefab.meta new file mode 100644 index 00000000..004c7430 --- /dev/null +++ b/Assets/Resources/DeviceBtn/red.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 255976aaa04a95c4fb382c39e411b935 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/model/重点攻击目标1.prefab b/Assets/Resources/model/重点攻击目标1.prefab index b31e445d..cf4eb566 100644 --- a/Assets/Resources/model/重点攻击目标1.prefab +++ b/Assets/Resources/model/重点攻击目标1.prefab @@ -263,99 +263,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u91CD\u70B9\u76EE\u6807" ---- !u!1 &1001764166187808509 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7654529518488477946} - - component: {fileID: 1313408067558622217} - - component: {fileID: 514593396939008857} - - component: {fileID: 1692094779437141846} - m_Layer: 16 - m_Name: Displaypos - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7654529518488477946 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001764166187808509} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 100, z: 0} - m_LocalScale: {x: 9, y: 1, z: 9} - m_Children: [] - m_Father: {fileID: 8425345772495695667} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1313408067558622217 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001764166187808509} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &514593396939008857 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001764166187808509} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!135 &1692094779437141846 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001764166187808509} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1114478879427009576 GameObject: m_ObjectHideFlags: 0 @@ -391,7 +298,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: 30.8, y: -16.9} + m_AnchoredPosition: {x: 30.8, y: -8} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &64890494959671527 @@ -436,7 +343,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6090663102232659137} toggleTransition: 1 graphic: {fileID: 8394799344054399227} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -629,7 +536,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: -28.6, y: 40} + m_AnchoredPosition: {x: -28.6, y: 48} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &78723881495536872 @@ -674,11 +581,11 @@ MonoBehaviour: m_TargetGraphic: {fileID: 4517469636704732128} toggleTransition: 1 graphic: {fileID: 5536009073977276525} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!1 &2630901018476344866 GameObject: m_ObjectHideFlags: 0 @@ -866,7 +773,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: -28.9, y: -16.9} + m_AnchoredPosition: {x: -28.9, y: -8} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8932471483062020681 @@ -911,7 +818,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1581821402087272437} toggleTransition: 1 graphic: {fileID: 6997563116718696605} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -951,7 +858,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: 31.2, y: 40} + m_AnchoredPosition: {x: 31.2, y: 48} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3463523368336500832 @@ -996,7 +903,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6805732806008258903} toggleTransition: 1 graphic: {fileID: 1364575455896836431} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1087,7 +994,6 @@ GameObject: - component: {fileID: 3717207340520904692} - component: {fileID: 6737036467122037355} - component: {fileID: 8601503221965423155} - - component: {fileID: 8686255655278623726} m_Layer: 5 m_Name: importance m_TagString: Importance @@ -1114,6 +1020,7 @@ RectTransform: - {fileID: 417831844122255817} - {fileID: 2664904005748253655} - {fileID: 1266262885510082053} + - {fileID: 4973203087962839895} m_Father: {fileID: 8367991147839033189} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1159,19 +1066,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8686255655278623726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4820533728664913016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AllowSwitchOff: 0 --- !u!114 &2772751971041288497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1382,7 +1276,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: 31.3, y: 13.2} + m_AnchoredPosition: {x: 31.3, y: 20} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &28412645170237004 @@ -1427,7 +1321,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7136893161808489747} toggleTransition: 1 graphic: {fileID: 2444886286403021267} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1863,7 +1757,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: -29.9, y: -44.4} + m_AnchoredPosition: {x: -29.9, y: -34} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4401106011680143311 @@ -1908,7 +1802,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 4421467539355529218} toggleTransition: 1 graphic: {fileID: 524662526843097385} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -2257,6 +2151,125 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7365770972085009436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4973203087962839895} + - component: {fileID: 6392411475061890312} + - component: {fileID: 6502272004744917443} + - component: {fileID: 8707392654507017459} + m_Layer: 5 + m_Name: queren_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4973203087962839895 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7365770972085009436} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7235838381733599177} + m_Father: {fileID: 3717207340520904692} + m_RootOrder: 8 + 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: 0, y: -60} + m_SizeDelta: {x: 50, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6392411475061890312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7365770972085009436} + m_CullTransparentMesh: 0 +--- !u!114 &6502272004744917443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7365770972085009436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c4d733662388d564a94ca63ea626dd60, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8707392654507017459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7365770972085009436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6502272004744917443} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7545817534970099623 GameObject: m_ObjectHideFlags: 0 @@ -2593,6 +2606,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8363232066905164713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7235838381733599177} + - component: {fileID: 4530946407222343478} + - component: {fileID: 7524660945934943640} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7235838381733599177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8363232066905164713} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4973203087962839895} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4530946407222343478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8363232066905164713} + m_CullTransparentMesh: 0 +--- !u!114 &7524660945934943640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8363232066905164713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9811321, g: 0.9579922, b: 0.9579922, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E\u8BA4" --- !u!1 &8425345772495991571 GameObject: m_ObjectHideFlags: 0 @@ -2630,7 +2721,6 @@ Transform: - {fileID: 404141722055020978} - {fileID: 8104960197897296327} - {fileID: 8367991147839033189} - - {fileID: 7654529518488477946} - {fileID: 3317020928946189029} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2673,6 +2763,7 @@ MonoBehaviour: ModerDamage: {fileID: 2840960697985760213} regulate: {fileID: 4820533728664913016} buttonreg: {fileID: 7363043795831063353} + quren_btn: {fileID: 8707392654507017459} togFrequencyBands: - {fileID: 78723881495536872} - {fileID: 3463523368336500832} @@ -2681,8 +2772,8 @@ MonoBehaviour: - {fileID: 8932471483062020681} - {fileID: 64890494959671527} - {fileID: 4401106011680143311} - frequency: UHF - gamepos: {fileID: 1001764166187808509} + frequency: + gamepos: {fileID: 0} --- !u!54 &-3761067737480147572 Rigidbody: m_ObjectHideFlags: 0 @@ -2951,7 +3042,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: -29.2, y: 13.2} + m_AnchoredPosition: {x: -29.2, y: 20} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3619221509897912575 @@ -2996,7 +3087,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3155304284477037503} toggleTransition: 1 graphic: {fileID: 447640216719643544} - m_Group: {fileID: 8686255655278623726} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -3195,7 +3286,7 @@ PrefabInstance: - target: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} @@ -3583,15 +3674,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dde7214ecd7320c429b349be5ecd3671, type: 3} ---- !u!4 &3181456821252071791 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dde7214ecd7320c429b349be5ecd3671, - type: 3} - m_PrefabInstance: {fileID: 3147021502621435524} - m_PrefabAsset: {fileID: 0} --- !u!1 &2840960697985760213 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: dde7214ecd7320c429b349be5ecd3671, type: 3} m_PrefabInstance: {fileID: 3147021502621435524} m_PrefabAsset: {fileID: 0} +--- !u!4 &3181456821252071791 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dde7214ecd7320c429b349be5ecd3671, + type: 3} + m_PrefabInstance: {fileID: 3147021502621435524} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/model/重点攻击目标2.prefab b/Assets/Resources/model/重点攻击目标2.prefab index 50252922..788cb133 100644 --- a/Assets/Resources/model/重点攻击目标2.prefab +++ b/Assets/Resources/model/重点攻击目标2.prefab @@ -1,5 +1,124 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &443496402003447664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2992260309746960355} + - component: {fileID: 6883624900502136623} + - component: {fileID: 6758639049094242029} + - component: {fileID: 7340857267520301697} + m_Layer: 5 + m_Name: queran_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2992260309746960355 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443496402003447664} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5198258143710259162} + m_Father: {fileID: 3249154455552811412} + m_RootOrder: 8 + 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: 0, y: -60.7} + m_SizeDelta: {x: 50, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6883624900502136623 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443496402003447664} + m_CullTransparentMesh: 0 +--- !u!114 &6758639049094242029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443496402003447664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c4d733662388d564a94ca63ea626dd60, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7340857267520301697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 443496402003447664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6758639049094242029} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &717661387333147055 GameObject: m_ObjectHideFlags: 0 @@ -366,6 +485,84 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &1206228058798827787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5198258143710259162} + - component: {fileID: 105658479636428423} + - component: {fileID: 408115598338360033} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5198258143710259162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228058798827787} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2992260309746960355} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &105658479636428423 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228058798827787} + m_CullTransparentMesh: 0 +--- !u!114 &408115598338360033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1206228058798827787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9811321, g: 0.9579922, b: 0.9579922, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E\u8BA4" --- !u!1 &1487834758259701534 GameObject: m_ObjectHideFlags: 0 @@ -401,7 +598,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: -29.2, y: 13.2} + m_AnchoredPosition: {x: -29.2, y: 20} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6205561511136672778 @@ -446,7 +643,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 530467068480262319} toggleTransition: 1 graphic: {fileID: 8503506245610767714} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -767,7 +964,6 @@ GameObject: - component: {fileID: 3249154455552811412} - component: {fileID: 6928388177063607225} - component: {fileID: 2910088206878832535} - - component: {fileID: 1747500451976562533} m_Layer: 5 m_Name: importance m_TagString: Importance @@ -794,6 +990,7 @@ RectTransform: - {fileID: 1189075051087439035} - {fileID: 5122973371926029238} - {fileID: 1456249701272301162} + - {fileID: 2992260309746960355} m_Father: {fileID: 2454500112044358149} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -839,19 +1036,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1747500451976562533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2445121072340223621} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AllowSwitchOff: 0 --- !u!1 &2793033183553054806 GameObject: m_ObjectHideFlags: 0 @@ -1036,7 +1220,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: 31.3, y: 13.2} + m_AnchoredPosition: {x: 31.3, y: 20} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4866093980683021871 @@ -1081,7 +1265,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6602859691071879836} toggleTransition: 1 graphic: {fileID: 4615795933019623062} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1427,7 +1611,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: -28.6, y: 40} + m_AnchoredPosition: {x: -28.6, y: 48} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6760580611336481383 @@ -1472,11 +1656,11 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1357241704654104943} toggleTransition: 1 graphic: {fileID: 6306956748531836738} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!1 &4536037141069892858 GameObject: m_ObjectHideFlags: 0 @@ -1630,7 +1814,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: -28.9, y: -16.9} + m_AnchoredPosition: {x: -28.9, y: -8} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1595232079232995888 @@ -1675,7 +1859,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3115965571270960296} toggleTransition: 1 graphic: {fileID: 7253712554597080767} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1850,99 +2034,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5062416000507490738 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2688059755449510730} - - component: {fileID: 5088724492985955255} - - component: {fileID: 6811355874594529717} - - component: {fileID: 6875856172300922579} - m_Layer: 16 - m_Name: Reddot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2688059755449510730 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5062416000507490738} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 100, z: 0} - m_LocalScale: {x: 9, y: 1, z: 9} - m_Children: [] - m_Father: {fileID: 8425345772495695667} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5088724492985955255 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5062416000507490738} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &6811355874594529717 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5062416000507490738} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!135 &6875856172300922579 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5062416000507490738} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5097883802883278075 GameObject: m_ObjectHideFlags: 0 @@ -2377,7 +2468,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: 30.8, y: -16.9} + m_AnchoredPosition: {x: 30.8, y: -8} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &848134281435870856 @@ -2422,7 +2513,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1019125252514955092} toggleTransition: 1 graphic: {fileID: 1489224319555059368} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -2462,7 +2553,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: -29.9, y: -44.4} + m_AnchoredPosition: {x: -29.9, y: -35} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6994627430635325071 @@ -2507,7 +2598,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6619838256142327034} toggleTransition: 1 graphic: {fileID: 6238283727006976184} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -2803,7 +2894,6 @@ Transform: - {fileID: 404141722055020978} - {fileID: 8104960197897296327} - {fileID: 2454500112044358149} - - {fileID: 2688059755449510730} - {fileID: 3241550703325107248} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2846,6 +2936,7 @@ MonoBehaviour: ModerDamage: {fileID: 1467464424326605954} regulate: {fileID: 2445121072340223621} buttonreg: {fileID: 1893370117554305087} + quren_btn: {fileID: 7340857267520301697} togFrequencyBands: - {fileID: 6760580611336481383} - {fileID: 2327747177229680297} @@ -2855,7 +2946,7 @@ MonoBehaviour: - {fileID: 848134281435870856} - {fileID: 6994627430635325071} frequency: - gamepos: {fileID: 5062416000507490738} + gamepos: {fileID: 0} --- !u!54 &-5022022242888478449 Rigidbody: m_ObjectHideFlags: 0 @@ -2947,7 +3038,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: 31.2, y: 40} + m_AnchoredPosition: {x: 31.2, y: 48} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2327747177229680297 @@ -2992,7 +3083,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 3081526737150872552} toggleTransition: 1 graphic: {fileID: 8540917023168033111} - m_Group: {fileID: 1747500451976562533} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -3195,7 +3286,7 @@ PrefabInstance: - target: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} @@ -3279,12 +3370,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} ---- !u!1 &4707446253621339941 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5749526470694261375, guid: 7017c7b79d757504f854be4ac64f5fb0, - type: 3} - m_PrefabInstance: {fileID: 1053383480680396122} - m_PrefabAsset: {fileID: 0} --- !u!224 &3241550703325107248 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, @@ -3303,6 +3388,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &4707446253621339941 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5749526470694261375, guid: 7017c7b79d757504f854be4ac64f5fb0, + type: 3} + m_PrefabInstance: {fileID: 1053383480680396122} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1773313035969991123 PrefabInstance: m_ObjectHideFlags: 0 @@ -3437,18 +3528,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d439f16d62adcec43a096eee4799d2f1, type: 3} ---- !u!4 &2240166649652246072 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d439f16d62adcec43a096eee4799d2f1, - type: 3} - m_PrefabInstance: {fileID: 1773313035969991123} - m_PrefabAsset: {fileID: 0} --- !u!1 &1467464424326605954 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d439f16d62adcec43a096eee4799d2f1, type: 3} m_PrefabInstance: {fileID: 1773313035969991123} m_PrefabAsset: {fileID: 0} +--- !u!4 &2240166649652246072 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d439f16d62adcec43a096eee4799d2f1, + type: 3} + m_PrefabInstance: {fileID: 1773313035969991123} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3610473753887713714 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/model/重点攻击目标3.prefab b/Assets/Resources/model/重点攻击目标3.prefab index 724761ba..e9656cb1 100644 --- a/Assets/Resources/model/重点攻击目标3.prefab +++ b/Assets/Resources/model/重点攻击目标3.prefab @@ -188,99 +188,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u91CD\u70B9\u76EE\u6807" ---- !u!1 &1634967572523846151 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2791210617010008803} - - component: {fileID: 1918062767899976586} - - component: {fileID: 1555572023258120696} - - component: {fileID: 306032285193557315} - m_Layer: 16 - m_Name: reddot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2791210617010008803 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634967572523846151} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 100, z: 0} - m_LocalScale: {x: 9, y: 1, z: 9} - m_Children: [] - m_Father: {fileID: 8425345772495695667} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1918062767899976586 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634967572523846151} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1555572023258120696 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634967572523846151} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: fab1af0a71fe5d3449ce6da2d955f1d4, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!135 &306032285193557315 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1634967572523846151} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1649022743403480419 GameObject: m_ObjectHideFlags: 0 @@ -316,7 +223,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: -28.6, y: 40} + m_AnchoredPosition: {x: -28.6, y: 48} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2987344993920604129 @@ -361,11 +268,11 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7804653173302435853} toggleTransition: 1 graphic: {fileID: 1348518547906586088} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 + m_IsOn: 0 --- !u!1 &1761400387808716194 GameObject: m_ObjectHideFlags: 0 @@ -624,7 +531,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: 31.2, y: 40} + m_AnchoredPosition: {x: 31.2, y: 48} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4263437241937524701 @@ -669,7 +576,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 4000701332612194549} toggleTransition: 1 graphic: {fileID: 8565897997177930421} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -983,6 +890,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: C +--- !u!1 &4383107844910143534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6366101719871386028} + - component: {fileID: 2555025193484824584} + - component: {fileID: 5075480212480872876} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6366101719871386028 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4383107844910143534} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4408907311322423597} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2555025193484824584 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4383107844910143534} + m_CullTransparentMesh: 0 +--- !u!114 &5075480212480872876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4383107844910143534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9716981, g: 0.9579477, b: 0.9579477, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E\u8BA4" --- !u!1 &4466397474821710782 GameObject: m_ObjectHideFlags: 0 @@ -1018,7 +1003,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: -29.9, y: -44.4} + m_AnchoredPosition: {x: -29.9, y: -35} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8540854955145205225 @@ -1063,7 +1048,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1292554633747236936} toggleTransition: 1 graphic: {fileID: 40401120179580757} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1103,7 +1088,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: -28.9, y: -16.9} + m_AnchoredPosition: {x: -28.9, y: -8} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3776191318234792201 @@ -1148,7 +1133,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7700457999396978621} toggleTransition: 1 graphic: {fileID: 7814513902557774901} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1262,7 +1247,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: 30.8, y: -16.9} + m_AnchoredPosition: {x: 30.8, y: -8} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6688120530323237334 @@ -1307,7 +1292,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2315190478571655831} toggleTransition: 1 graphic: {fileID: 2523034871711407752} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -1555,7 +1540,6 @@ GameObject: - component: {fileID: 2949388239291875526} - component: {fileID: 8952911664949531136} - component: {fileID: 6653874552460789722} - - component: {fileID: 5969528349560588974} m_Layer: 5 m_Name: importance m_TagString: Importance @@ -1582,6 +1566,7 @@ RectTransform: - {fileID: 1874952852834218643} - {fileID: 8667056753855765841} - {fileID: 1358553990564535373} + - {fileID: 4408907311322423597} m_Father: {fileID: 277068844380751465} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1627,19 +1612,125 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5969528349560588974 +--- !u!1 &5705877846207155145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4408907311322423597} + - component: {fileID: 3434278221076052839} + - component: {fileID: 8275788718724604161} + - component: {fileID: 8683930606292916884} + m_Layer: 5 + m_Name: queren_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4408907311322423597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5705877846207155145} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6366101719871386028} + m_Father: {fileID: 2949388239291875526} + m_RootOrder: 8 + 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: 0, y: -59.9} + m_SizeDelta: {x: 50, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3434278221076052839 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5705877846207155145} + m_CullTransparentMesh: 0 +--- !u!114 &8275788718724604161 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5625621529173534083} + m_GameObject: {fileID: 5705877846207155145} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_AllowSwitchOff: 0 + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c4d733662388d564a94ca63ea626dd60, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8683930606292916884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5705877846207155145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8275788718724604161} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!114 &448324740133226881 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1995,7 +2086,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: 31.3, y: 13.2} + m_AnchoredPosition: {x: 31.3, y: 20} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6045683915690793988 @@ -2040,7 +2131,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7238479776162777075} toggleTransition: 1 graphic: {fileID: 6752814260315054428} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -2803,7 +2894,6 @@ Transform: - {fileID: 404141722055020978} - {fileID: 8104960197897296327} - {fileID: 277068844380751465} - - {fileID: 2791210617010008803} - {fileID: 4440611874404079539} m_Father: {fileID: 0} m_RootOrder: 0 @@ -2846,6 +2936,7 @@ MonoBehaviour: ModerDamage: {fileID: 7378831111228137673} regulate: {fileID: 5625621529173534083} buttonreg: {fileID: 2359957618957220921} + quren_btn: {fileID: 8683930606292916884} togFrequencyBands: - {fileID: 2987344993920604129} - {fileID: 4263437241937524701} @@ -2855,7 +2946,7 @@ MonoBehaviour: - {fileID: 6688120530323237334} - {fileID: 8540854955145205225} frequency: - gamepos: {fileID: 1634967572523846151} + gamepos: {fileID: 0} --- !u!54 &-796140687388611865 Rigidbody: m_ObjectHideFlags: 0 @@ -3100,7 +3191,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: -29.2, y: 13.2} + m_AnchoredPosition: {x: -29.2, y: 20} m_SizeDelta: {x: 60, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2372794671036074061 @@ -3145,7 +3236,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6533844713231314019} toggleTransition: 1 graphic: {fileID: 8844331262134051310} - m_Group: {fileID: 5969528349560588974} + m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -3195,7 +3286,7 @@ PrefabInstance: - target: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2477564191442231658, guid: 7017c7b79d757504f854be4ac64f5fb0, type: 3} diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs index 0f17a4d0..609f9702 100644 --- a/Assets/Temp/Scripts/Spectrumdetection.cs +++ b/Assets/Temp/Scripts/Spectrumdetection.cs @@ -4,6 +4,7 @@ using Newtonsoft.Json.Linq; using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; using static InterfaceManager; @@ -115,8 +116,13 @@ public class Spectrumdetection : MonoBehaviour /// 接收探测范围 /// public static float Radius; + public Transform radarCenter; + public List targets = new List(); + public Image radarBackground; + public GameObject targetPointPrefab; void Start() { + radarCenter=this.transform; Camera1.gameObject.SetActive(false); spectrumdetections.Add(this); @@ -133,12 +139,43 @@ public class Spectrumdetection : MonoBehaviour if (isStartRehearsing) { Camera1.gameObject.SetActive(true); + targets = GameObject.FindGameObjectsWithTag("WRJ").ToList().FindAll(Conformto); + + foreach (Transform child in rawImage.transform) + { + Destroy(child.gameObject); + } + + foreach (GameObject target in targets) + { + Vector3 relativePosition = target.transform.position - radarCenter.position; + Vector2 radarPosition = new Vector2(relativePosition.x, relativePosition.z) * 0.1f; + GameObject point = Instantiate(targetPointPrefab, rawImage.transform); + RectTransform rt = point.GetComponent(); + rt.anchoredPosition = radarPosition; + } Search();//微波武器朝向无人机 } - if (onlyOne && equipmentCommon.deviceID.Length > 10) + //if (onlyOne && equipmentCommon.deviceID.Length > 10) + //{ + // onlyOne = false; + // DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, Camera1, rawImage); + //} + } + /// + /// 判断是否符合位置 + /// + public bool Conformto(GameObject obj) + { + if (obj.GetComponent() + && Frequency.Contains(obj.GetComponent().dataLinkCommunicationFrequency)) { - onlyOne = false; - DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, Camera1, rawImage); + Debug.LogError("频谱找到了"); + return true; + } + else + { + return false; } } private void Microwave() @@ -150,13 +187,23 @@ public class Spectrumdetection : MonoBehaviour queren_btn.onClick.AddListener(() => { Frequencyiamge.gameObject.SetActive(false); - string[] str = Frequency.Split('*'); - for (int i = 0; i < str.Length; i++) - { - int index = i; - int layerValue = LayerMask.NameToLayer(str[index]); - Camera1.cullingMask = (1 << layerValue); - } + //List ints = new List(); + //string[] str = Frequency.Split(';'); + //for (int i = 0; i < str.Length; i++) + //{ + // int index = i; + // if (str[i] != "") + // { + // int layerValue = LayerMask.NameToLayer(str[index]); + // ints.Add(layerValue); + // //Debug.LogError(str[index]); + // //Camera1.cullingMask = 1 << layerValue; + // } + //} + //for (int i = 0; i < ints.Count; i++) + //{ + // Camera1.cullingMask |= 1 << ints[i]; + //} FrequencyBandsValueChanged(); }); //foreach (Toggle toggle in toggles) @@ -172,11 +219,11 @@ public class Spectrumdetection : MonoBehaviour { if (ison == true) { - Frequency += toggles[index].name + "*"; + Frequency += toggles[index].name + ";"; } else { - string str = toggles[index].name + "*"; + string str = toggles[index].name + ";"; Frequency = Frequency.Replace(str, ""); } }); @@ -184,7 +231,7 @@ public class Spectrumdetection : MonoBehaviour } void FrequencyBandsValueChanged() { - + string nowData = GetSyncDataThree(); MyNetMQClient.instance.Send(nowData); equipmentCommon.SetDatabaseInfo("scan_rate", Frequency); @@ -211,7 +258,7 @@ public class Spectrumdetection : MonoBehaviour wWWForm.AddField("data", uploadLogMainJson); StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => { - //Debug.Log(data); + Debug.Log(data); })); } /// @@ -238,15 +285,18 @@ public class Spectrumdetection : MonoBehaviour public void CameraFrequency(string _frequency) { - //string[] str = _frequency.Split('*'); + Frequency = _frequency; + //List ints = new List(); + //string[] str = _frequency.Split(';'); //for (int i = 0; i < str.Length; i++) //{ // int layerValue = LayerMask.NameToLayer(str[i]); - // Camera1.cullingMask = (1 << layerValue); + // ints.Add(layerValue); + //} + //for (int i = 0; i < ints.Count; i++) + //{ + // Camera1.cullingMask |= 1 << ints[i]; //} - int layerValue = LayerMask.NameToLayer(_frequency); - //Frequency = _frequency; - Camera1.cullingMask = (1 << layerValue); } /// /// 设置扫描频段同步 diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 4c72d426..61bc468d 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -206,6 +206,7 @@ public class DeviceManager : MonoSingleton HighPriorityTarget highPriorityTarget = HighPriorityTarget.HighPriorityTargets.Find(x => x.Number == info[2]); if (highPriorityTarget) { + Debug.LogError(info[3]); highPriorityTarget.FrequencyGamepos(info[3]); } } @@ -226,15 +227,18 @@ public class DeviceManager : MonoSingleton if (spectrumdetection) { - string[] str = info[3].Split('*'); - for (int i = 0; i < str.Length; i++) - { - int index = i; - Debug.LogError(str[index]); - spectrumdetection.CameraFrequency(str[index]); - } + //string[] str = info[3].Split(';'); + //for (int i = 0; i < str.Length; i++) + //{ + // int index = i; + // if (str[i]!="") + // { + // Debug.LogError(str[index]); + // spectrumdetection.CameraFrequency(str[index]); + // } + //} //Debug.LogError(info[3]); - //spectrumdetection.CameraFrequency(info[3]); + spectrumdetection.CameraFrequency(info[3]); } } diff --git a/Assets/Zion/Scripts/HighPriorityTarget.cs b/Assets/Zion/Scripts/HighPriorityTarget.cs index 22e3896f..c8619c3a 100644 --- a/Assets/Zion/Scripts/HighPriorityTarget.cs +++ b/Assets/Zion/Scripts/HighPriorityTarget.cs @@ -3,6 +3,7 @@ using AdamThinkDevicesData; using Newtonsoft.Json; using System; using System.Collections.Generic; +using System.Reflection; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -58,6 +59,10 @@ public class HighPriorityTarget : MonoBehaviour /// public Button buttonreg; /// + ///确认按钮 + /// + public Button quren_btn; + /// /// 频率选择 /// //public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7; @@ -72,7 +77,7 @@ public class HighPriorityTarget : MonoBehaviour /// /// 显示地图上的位置 /// - public GameObject gamepos; + //public GameObject gamepos; void Start() { //gamepos.gameObject.SetActive(false); @@ -84,34 +89,97 @@ public class HighPriorityTarget : MonoBehaviour }); //Interferencefrequency(); //频段设置 - foreach (Toggle toggle in togFrequencyBands) + //foreach (Toggle toggle in togFrequencyBands) + //{ + // toggle.onValueChanged.AddListener(delegate { FrequencyBandsValueChanged(toggle); }); + //} + //多频段选择 + for (int i = 0; i < togFrequencyBands.Count; i++) { - toggle.onValueChanged.AddListener(delegate { FrequencyBandsValueChanged(toggle); }); + int index = i; + togFrequencyBands[index].onValueChanged.AddListener((ison) => + { + if (ison == true) + { + frequency += togFrequencyBands[index].name + ";"; + } + else + { + string str = togFrequencyBands[index].name + ";"; + frequency = frequency.Replace(str, ""); + } + }); } + quren_btn.onClick.AddListener(() => + { + regulate.gameObject.SetActive(false); + //string[] str = frequency.Split(';'); + //List ints = new List(); + //for (int i = 0; i < str.Length; i++) + //{ + // int index = i; + // if (str[index] != "") + // { + // Debug.LogError(str[index]); + // int layerValue = LayerMask.NameToLayer(str[index]); + // ints.Add(layerValue); + // } + //} + //for (int i = 0; i < ints.Count; i++) + //{ + // Debug.LogError(ints[i]); + // gamepos.layer |= 1 << ints[i]; + //} + FrequencyBandsValueChanged(); + }); + } + void FrequencyBandsValueChanged() + { + string nowData = GetSyncDataTwo(); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); + } /// /// 频段设置 /// /// - void FrequencyBandsValueChanged(Toggle change) - { - if (change.isOn) - { - frequency = change.transform.name; - int layerValue = LayerMask.NameToLayer(frequency); - gamepos.layer = layerValue; - string nowData = GetSyncDataTwo(); - MyNetMQClient.instance.Send(nowData); - //DeviceManager.Instance.send2roomStr.Enqueue(nowData); - //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); - } - } - + //void FrequencyBandsValueChanged(Toggle change) + //{ + // if (change.isOn) + // { + // frequency = change.transform.name; + // int layerValue = LayerMask.NameToLayer(frequency); + // gamepos.layer = layerValue; + // string nowData = GetSyncDataTwo(); + // MyNetMQClient.instance.Send(nowData); + // //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + // //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); + // } + //} public void FrequencyGamepos(string _frequency) { - int layerValue = LayerMask.NameToLayer(_frequency); frequency = _frequency; - gamepos.layer = layerValue; + //string[] str = _frequency.Split(';'); + //List ints = new List(); + //for (int i = 0; i < str.Length; i++) + //{ + // int index = i; + // if (str[index] != "") + // { + // int layerValue = LayerMask.NameToLayer(str[index]); + // Debug.LogError(layerValue); + // ints.Add(layerValue); + // } + //} + //for (int i = 0; i < ints.Count; i++) + //{ + // gamepos.layer |= 1 << ints[i]; + //} + //int layerValue = LayerMask.NameToLayer(_frequency); + //frequency = _frequency; + //gamepos.layer = layerValue; } @@ -163,7 +231,7 @@ public class HighPriorityTarget : MonoBehaviour // break; // } // } - + //} } diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index bac76f2d..c8780ed9 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -389,35 +389,35 @@ public class UnmannedAerialVehicleManage : MonoBehaviour })); } - if (Spectrumdetection.Radius > 0 && boisp) - { - switch (Spectrumdetection.Radius) - { - case 1: - reveal = 30; - //Mapdisplay(); - break; - case 2: - reveal = 60; - //Mapdisplay(); - break; - case 3: - reveal = 90; - //Mapdisplay(); - break; - case 4: - reveal = 120; - //Mapdisplay(); - break; - case 5: - reveal = 150; - //Mapdisplay(); - break; - default: - break; - } - //} - } + //if (Spectrumdetection.Radius > 0 && boisp) + //{ + // switch (Spectrumdetection.Radius) + // { + // case 1: + // reveal = 30; + // //Mapdisplay(); + // break; + // case 2: + // reveal = 60; + // //Mapdisplay(); + // break; + // case 3: + // reveal = 90; + // //Mapdisplay(); + // break; + // case 4: + // reveal = 120; + // //Mapdisplay(); + // break; + // case 5: + // reveal = 150; + // //Mapdisplay(); + // break; + // default: + // break; + // } + // //} + //} //Judgingdistance(); } @@ -504,7 +504,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour && !obj.isTrigger && !attackColliders1.Contains(obj) && obj.transform.GetComponent() - && obj.transform.GetComponent().frequency == electronicReconnaissanceCapability) + && obj.transform.GetComponent().frequency.Contains(electronicReconnaissanceCapability)) return true; else return false;