diff --git a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab index a07aa003..25c404e4 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/探测雷达.prefab @@ -10049,8 +10049,6 @@ MonoBehaviour: radarBackground: {fileID: 0} targetPointPrefab: {fileID: 206342759773512327, guid: 91611532a57ff5640a422ee5073cdc5f, type: 3} - colliders: [] - attackColliders1: [] --- !u!54 &916690897 Rigidbody: m_ObjectHideFlags: 0 @@ -22530,12 +22528,12 @@ PrefabInstance: - target: {fileID: 5749526470694261375, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8626782650815872538, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba4a837ca06ca3f4f96d140b7e44a3c5, type: 3} diff --git a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab index c40f2aa1..741f469e 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/频谱探测.prefab @@ -145,6 +145,84 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &1911763553121969223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2045690403733897948} + - component: {fileID: 5712952688562308097} + - component: {fileID: 2754970931261309838} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2045690403733897948 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1911763553121969223} + 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: 5159789197513140657} + 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 &5712952688562308097 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1911763553121969223} + m_CullTransparentMesh: 0 +--- !u!114 &2754970931261309838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1911763553121969223} + 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.9487362, b: 0.9487362, 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 &4039837109867066853 GameObject: m_ObjectHideFlags: 0 @@ -432,6 +510,125 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &5497736291108574093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5159789197513140657} + - component: {fileID: 7702201383836565811} + - component: {fileID: 6708250080310079828} + - component: {fileID: 788139662973485293} + 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 &5159789197513140657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497736291108574093} + 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: 2045690403733897948} + m_Father: {fileID: 6504874221885083784} + m_RootOrder: 2 + 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: -58.9} + m_SizeDelta: {x: 50, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7702201383836565811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497736291108574093} + m_CullTransparentMesh: 0 +--- !u!114 &6708250080310079828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497736291108574093} + 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: abe63c6c7a141e049b4b93716755df46, 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 &788139662973485293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5497736291108574093} + 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: 6708250080310079828} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5876819545808869470 GameObject: m_ObjectHideFlags: 0 @@ -632,19 +829,6 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!114 &2209643061406332762 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8315853553728570698} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AllowSwitchOff: 0 --- !u!114 &7188760697457608321 MonoBehaviour: m_ObjectHideFlags: 0 @@ -747,6 +931,7 @@ MonoBehaviour: SpectrumdetectionUI: {fileID: 4504370092153585706} Frequencyiamge: {fileID: 6504874221885083787} frenbutton: {fileID: 1245349667316659933} + queren_btn: {fileID: 788139662973485293} toggles: - {fileID: 6607821772367089145} - {fileID: 2017904362660357390} @@ -756,6 +941,7 @@ MonoBehaviour: - {fileID: 6251437642903478223} - {fileID: 117463751223528660} Frequency: + Frequencysuccessrate: Camera1: {fileID: 480111845} rawImage: {fileID: 1115657768} colliders: [] @@ -1065,7 +1251,7 @@ PrefabInstance: type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 459800770939100963, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_IsActive @@ -1275,7 +1461,7 @@ PrefabInstance: type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 1762964555520084189, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchorMin.y @@ -1310,7 +1496,7 @@ PrefabInstance: type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 2047453286519514049, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_AnchorMin.y @@ -1355,7 +1541,7 @@ PrefabInstance: type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 4480705353594056196, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_IsActive @@ -1425,17 +1611,17 @@ PrefabInstance: type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 5810196214057519911, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 6245650889842523993, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_Group value: - objectReference: {fileID: 2209643061406332762} + objectReference: {fileID: 0} - target: {fileID: 7145474946587446179, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} propertyPath: m_IsActive @@ -1480,22 +1666,40 @@ PrefabInstance: - {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} - {fileID: 2022963561981901188, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} ---- !u!224 &6504874221885083784 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5521694617346715177} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6504874221885083787 stripped +--- !u!114 &8810536813081833251 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1649737328956898978, guid: 38fb1def99b2cd147a96842efe5a355b, + m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 5521694617346715177} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &117463751223528660 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5521694617346715177} + 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 &6607821772367089145 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5521694617346715177} + 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 &1245349667316659933 stripped @@ -1510,15 +1714,39 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &8315853553728570698 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4595685103321639779, guid: 38fb1def99b2cd147a96842efe5a355b, +--- !u!114 &6504874221885083787 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1649737328956898978, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 5521694617346715177} m_PrefabAsset: {fileID: 0} ---- !u!114 &6607821772367089145 stripped + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &6504874221885083784 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1649737328956898977, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5521694617346715177} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6251437642903478223 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1662757468879152080, guid: 38fb1def99b2cd147a96842efe5a355b, + m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, + type: 3} + m_PrefabInstance: {fileID: 5521694617346715177} + 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 &5382943705491709219 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3} m_PrefabInstance: {fileID: 5521694617346715177} m_PrefabAsset: {fileID: 0} @@ -1552,54 +1780,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5382943705491709219 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 438240288241169162, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5521694617346715177} - 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 &6251437642903478223 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1900922108148937190, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5521694617346715177} - 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 &117463751223528660 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5548909004573041405, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5521694617346715177} - 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 &8810536813081833251 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3955760755921223946, guid: 38fb1def99b2cd147a96842efe5a355b, - type: 3} - m_PrefabInstance: {fileID: 5521694617346715177} - 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 &5527359314712025833 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UIPanel/Training_pilot_panl.prefab b/Assets/Resources/UIPanel/Training_pilot_panl.prefab index 34b5c550..d17d6091 100644 --- a/Assets/Resources/UIPanel/Training_pilot_panl.prefab +++ b/Assets/Resources/UIPanel/Training_pilot_panl.prefab @@ -746,6 +746,125 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7ED3\u675F\u6F14\u7EC3" +--- !u!1 &2602178730647806783 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6004446956045847452} + - component: {fileID: 5569109176832175815} + - component: {fileID: 5436201971426386749} + - component: {fileID: 932264985702432863} + m_Layer: 5 + m_Name: "\u6001\u52BF" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6004446956045847452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2602178730647806783} + 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: 5023455744183058547} + m_Father: {fileID: 5855821741811488939} + m_RootOrder: 7 + 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: 800, y: 400} + m_SizeDelta: {x: 138, y: 41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5569109176832175815 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2602178730647806783} + m_CullTransparentMesh: 0 +--- !u!114 &5436201971426386749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2602178730647806783} + 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: 7a62f982c6b82d0468dbeb46934c7b76, 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 &932264985702432863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2602178730647806783} + 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: 2 + 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: 21300000, guid: 02f4d08c9858d234496c1131127f6df9, type: 3} + 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: 5436201971426386749} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2664863769300752706 GameObject: m_ObjectHideFlags: 0 @@ -938,6 +1057,162 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3528446423698543118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3167849659523605952} + - component: {fileID: 3836707014670237944} + - component: {fileID: 2627494934905031891} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3167849659523605952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3528446423698543118} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 8124937490118142283} + 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.00009918213, y: -0.000047683716} + m_SizeDelta: {x: 322.00043, y: 95.66644} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3836707014670237944 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3528446423698543118} + m_CullTransparentMesh: 0 +--- !u!114 &2627494934905031891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3528446423698543118} + 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.9302243, b: 0.9302243, 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: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 80 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5F00\u59CB\u63A8\u6F14" +--- !u!1 &5589895292110777514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2509213301309598130} + - component: {fileID: 6168778856202899658} + - component: {fileID: 1418584850774711129} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2509213301309598130 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5589895292110777514} + 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: 5855821741811488939} + m_RootOrder: 5 + 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: 500, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6168778856202899658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5589895292110777514} + m_CullTransparentMesh: 0 +--- !u!114 &1418584850774711129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5589895292110777514} + 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: 200 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &5855821740803227380 GameObject: m_ObjectHideFlags: 0 @@ -1992,6 +2267,9 @@ RectTransform: - {fileID: 1695597037} - {fileID: 78139658} - {fileID: 1565322411} + - {fileID: 2509213301309598130} + - {fileID: 8124937490118142283} + - {fileID: 6004446956045847452} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2027,7 +2305,7 @@ MonoBehaviour: modellinkedlistpanl: {fileID: 0} model2_btn: {fileID: 5855821740938569027} initiate_botn: {fileID: 78139659} - finish_bton: {fileID: 0} + finish_bton: {fileID: 2117340063577781519} --- !u!1 &5855821741812748368 GameObject: m_ObjectHideFlags: 0 @@ -2864,6 +3142,7 @@ GameObject: - component: {fileID: 5855821742305114456} - component: {fileID: 5855821742305114459} - component: {fileID: 1395352661} + - component: {fileID: 3259444862321421817} m_Layer: 5 m_Name: "\u65F6\u95F4" m_TagString: Untagged @@ -2932,6 +3211,19 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: --- !u!114 &1395352661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5855821742305114437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7acfba70dcc2e8144997db2bbb3d1318, type: 3} + m_Name: + m_EditorClassIdentifier: + time: {fileID: 5855821742305114459} +--- !u!114 &3259444862321421817 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3380,3 +3672,200 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7494409985008885670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8124937490118142283} + - component: {fileID: 1958230682657817026} + - component: {fileID: 4086470763841674606} + - component: {fileID: 4958548409271537096} + m_Layer: 5 + m_Name: initiate_botn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8124937490118142283 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7494409985008885670} + 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: 3167849659523605952} + m_Father: {fileID: 5855821741811488939} + m_RootOrder: 6 + 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: 800, y: 400} + m_SizeDelta: {x: 138, y: 41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1958230682657817026 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7494409985008885670} + m_CullTransparentMesh: 0 +--- !u!114 &4086470763841674606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7494409985008885670} + 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: 7a62f982c6b82d0468dbeb46934c7b76, 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 &4958548409271537096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7494409985008885670} + 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: 2 + 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: 21300000, guid: 02f4d08c9858d234496c1131127f6df9, type: 3} + 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: 4086470763841674606} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7801122366378610123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5023455744183058547} + - component: {fileID: 4422744379698825382} + - component: {fileID: 6213471855567082455} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5023455744183058547 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7801122366378610123} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 6004446956045847452} + 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.00009918213, y: -0.000047683716} + m_SizeDelta: {x: 322.00043, y: 95.66644} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4422744379698825382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7801122366378610123} + m_CullTransparentMesh: 0 +--- !u!114 &6213471855567082455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7801122366378610123} + 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.9302243, b: 0.9302243, 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: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 80 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8FDB\u5165\u6001\u52BF" diff --git a/Assets/Temp/Scripts/Judgmentstate.cs b/Assets/Temp/Scripts/Judgmentstate.cs index 05de5251..c028d0ab 100644 --- a/Assets/Temp/Scripts/Judgmentstate.cs +++ b/Assets/Temp/Scripts/Judgmentstate.cs @@ -45,7 +45,9 @@ public class Judgmentstate : MonoBehaviour { finish_bton.onClick.AddListener(() => { - + GameMain.tiao = false; + GameMain.visit = true; + OnLeaveRoom1(); }); } @@ -127,4 +129,10 @@ public class Judgmentstate : MonoBehaviour MyNetMQClient.instance._netMqListener.UnSubtopic(GlobalFlag.roomID); _ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg); } + public void OnLeaveRoom1() + { + string _msg = $"send2room " + "leaveroom1"; + _ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg); + OnLeaveRoom(); + } } diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs index 8acc9b69..0f17a4d0 100644 --- a/Assets/Temp/Scripts/Spectrumdetection.cs +++ b/Assets/Temp/Scripts/Spectrumdetection.cs @@ -13,7 +13,7 @@ using static InterfaceManager; public class Spectrumdetection : MonoBehaviour { - public static List spectrumdetections=new List(); + public static List spectrumdetections = new List(); public EquipmentCommon equipmentCommon; #region 频谱探测的参数 @@ -80,6 +80,10 @@ public class Spectrumdetection : MonoBehaviour /// public Button frenbutton; /// + /// 确认按钮 + /// + public Button queren_btn; + /// /// 选择最终的频段 /// //public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7; @@ -92,6 +96,10 @@ public class Spectrumdetection : MonoBehaviour /// public string Frequency; /// + /// 最终选择的波段 + /// + public string Frequencysuccessrate; + /// /// 摄像机显示层数 /// public Camera Camera1; @@ -111,7 +119,7 @@ public class Spectrumdetection : MonoBehaviour { Camera1.gameObject.SetActive(false); spectrumdetections.Add(this); - + equipmentCommon = GetComponent(); // 订阅布尔值变化事件 OnActivationChanged += OnActivationChangedHandler; @@ -119,7 +127,7 @@ public class Spectrumdetection : MonoBehaviour Microwave(); //DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, camera, rawImage); } - + void Update() { if (isStartRehearsing) @@ -139,56 +147,55 @@ public class Spectrumdetection : MonoBehaviour { Frequencyiamge.gameObject.SetActive(false); }); - - foreach (Toggle toggle in toggles) + queren_btn.onClick.AddListener(() => { - toggle.onValueChanged.AddListener(delegate { - FrequencyBandsValueChanged(toggle); + 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); + } + FrequencyBandsValueChanged(); + }); + //foreach (Toggle toggle in toggles) + //{ + // toggle.onValueChanged.AddListener(delegate { + // FrequencyBandsValueChanged(toggle); + // }); + //} + for (int i = 0; i < toggles.Count; i++) + { + int index = i; + toggles[index].onValueChanged.AddListener((ison) => + { + if (ison == true) + { + Frequency += toggles[index].name + "*"; + } + else + { + string str = toggles[index].name + "*"; + Frequency = Frequency.Replace(str, ""); + } }); } } - - /// - /// 频段设置方法 - /// - /// - void FrequencyBandsValueChanged(Toggle change) + void FrequencyBandsValueChanged() { - if (change.isOn) - { - Frequency = change.transform.name; - int layerValue = LayerMask.NameToLayer(Frequency); - Camera1.cullingMask = (1 << layerValue); - string nowData = GetSyncDataThree(); - MyNetMQClient.instance.Send(nowData); - equipmentCommon.SetDatabaseInfo("scan_rate", Frequency); - //DeviceManager.Instance.send2roomStr.Enqueue(nowData); - //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); - } + + string nowData = GetSyncDataThree(); + MyNetMQClient.instance.Send(nowData); + equipmentCommon.SetDatabaseInfo("scan_rate", Frequency); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); } - - - - public void CameraFrequency(string _frequency) - { - int layerValue = LayerMask.NameToLayer(_frequency); - Frequency = _frequency; - Camera1.cullingMask = (1 << layerValue); - } - /// - /// 设置扫描频段同步 - /// - /// - protected string GetSyncDataThree() + string GetSyncDataThree() { UploadLog(); return string.Format("{0},{1},{2},{3}", "SweepFrequencyBand", "PPTC", equipmentCommon.deviceID, Frequency); } - - /// - ///上传日志 - /// - /// public void UploadLog() { string currentTime = System.DateTime.Now.ToString(); @@ -208,6 +215,72 @@ public class Spectrumdetection : MonoBehaviour })); } /// + /// + /// 频段设置方法 + /// + /// + //void FrequencyBandsValueChanged(Toggle change) + //{ + // if (change.isOn) + // { + // Frequency = change.transform.name; + // int layerValue = LayerMask.NameToLayer(Frequency); + // Camera1.cullingMask = (1 << layerValue); + // string nowData = GetSyncDataThree(); + // MyNetMQClient.instance.Send(nowData); + // equipmentCommon.SetDatabaseInfo("scan_rate", Frequency); + // //DeviceManager.Instance.send2roomStr.Enqueue(nowData); + // //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); + // } + //} + + + + public void CameraFrequency(string _frequency) + { + //string[] str = _frequency.Split('*'); + //for (int i = 0; i < str.Length; i++) + //{ + // int layerValue = LayerMask.NameToLayer(str[i]); + // Camera1.cullingMask = (1 << layerValue); + //} + int layerValue = LayerMask.NameToLayer(_frequency); + //Frequency = _frequency; + Camera1.cullingMask = (1 << layerValue); + } + /// + /// 设置扫描频段同步 + /// + /// + //protected string GetSyncDataThree() + //{ + // UploadLog(); + // return string.Format("{0},{1},{2},{3}", "SweepFrequencyBand", "PPTC", equipmentCommon.deviceID, Frequency); + //} + + /// + ///上传日志 + /// + /// + //public void UploadLog() + //{ + // string currentTime = System.DateTime.Now.ToString(); + // List uploadLogMains = new List(); + // UploadLogMain uploadLogMain = new UploadLogMain(); + // uploadLogMain.PracticeId = GlobalFlag.practiceSubjectID; + // uploadLogMain.ThinkId = GlobalFlag.currentThinkId; + // string log = currentTime + " " + transform.name + "(" + equipmentCommon.deviceID + ")频段设置为" + Frequency; + // uploadLogMain.log = log; + // uploadLogMains.Add(uploadLogMain); + // string uploadLogMainJson = JsonConvert.SerializeObject(uploadLogMains); + // WWWForm wWWForm = new WWWForm(); + // wWWForm.AddField("data", uploadLogMainJson); + // StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => + // { + // //Debug.Log(data); + // })); + //} + /// /// 演习是否启动 /// void OnActivationChangedHandler(bool bol) @@ -328,9 +401,9 @@ public class Spectrumdetection : MonoBehaviour { attackColliders1.Add(colliders[i]); unmannedAerialVehicle = colliders[i].GetComponent(); - if (unmannedAerialVehicle != null&& unmannedAerialVehicle.unmannedAerialVehicleManage.dataLinkCommunicationFrequency== Frequency) + if (unmannedAerialVehicle != null && unmannedAerialVehicle.unmannedAerialVehicleManage.dataLinkCommunicationFrequency == Frequency) { - foreach(var terrestrialRadioInterferenceManger in TerrestrialRadioInterferenceManger.terrestrialRadioInterferenceMangers) + foreach (var terrestrialRadioInterferenceManger in TerrestrialRadioInterferenceManger.terrestrialRadioInterferenceMangers) { if (terrestrialRadioInterferenceManger != null) { @@ -365,11 +438,11 @@ public class Spectrumdetection : MonoBehaviour } private void OnDestroy() { - for(int i = 0; i < spectrumdetections.Count; i++) + for (int i = 0; i < spectrumdetections.Count; i++) { if (spectrumdetections[i] == null) { - spectrumdetections.RemoveAt(i); + spectrumdetections.RemoveAt(i); } } Destroy(Frequencyiamge.gameObject); diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity index 7421ae7f..b7de079f 100644 Binary files a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity and b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity differ diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index edd61dbe..4c72d426 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -225,7 +225,17 @@ public class DeviceManager : MonoSingleton Spectrumdetection spectrumdetection = Spectrumdetection.spectrumdetections.Find(x => x.equipmentCommon.deviceID == info[2]); if (spectrumdetection) { - spectrumdetection.CameraFrequency(info[3]); + + string[] str = info[3].Split('*'); + for (int i = 0; i < str.Length; i++) + { + int index = i; + Debug.LogError(str[index]); + spectrumdetection.CameraFrequency(str[index]); + } + //Debug.LogError(info[3]); + //spectrumdetection.CameraFrequency(info[3]); + } } } diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index b5da1f3c..df54f61d 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -358,6 +358,14 @@ public class GameManager : MonoSingleton break; case "offline": + break; + case "leaveroom1": + Debug.Log("关闭所有按钮"); + GameMain.tiao = false; + GameMain.visit = true; + string _msg = "leaveroom "; + MyNetMQClient.instance._netMqListener.UnSubtopic(GlobalFlag.roomID); + _ = AdamSync.SyncCreateRoom.SendMessageAsync(_msg); break; default: break;