From 8488edaacef47c41d989720b446d57640699f243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=8B=8B?= <3077614386@qq.com>
Date: Tue, 27 Feb 2024 11:13:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4Mqtt=E9=80=9A=E4=BF=A1?=
=?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=8E=9F=E5=A7=8B=E9=80=9A=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Resources/Prefabs/DoublePlay.prefab | 175 +++++-------------
Assets/Resources/UIPanel/generate_panl.prefab | 119 ++++++++++++
Assets/Temp/Scripts/Backpack.cs | 11 +-
Assets/Temp/Scripts/Microwaveweapon.cs | 7 +-
Assets/Temp/Scripts/Spectrumdetection.cs | 4 +-
Assets/Temp/Scripts/View_Panel2.cs | 4 +
Assets/Zion/Scripts/Adam/DeviceManager.cs | 12 +-
Assets/Zion/Scripts/HighPriorityTarget.cs | 8 +-
Assets/Zion/Scripts/MQTT/MQTTManager.cs | 4 +-
.../LaserFireControlPlatformManger.cs | 7 +-
.../TerrestrialRadioInterferenceManger.cs | 8 +-
.../UAV/UnmannedAerialVehicle.cs | 12 +-
.../UAV/UnmannedAerialVehicleManage.cs | 20 +-
13 files changed, 228 insertions(+), 163 deletions(-)
diff --git a/Assets/Resources/Prefabs/DoublePlay.prefab b/Assets/Resources/Prefabs/DoublePlay.prefab
index ef9b7a90..32c4670c 100644
--- a/Assets/Resources/Prefabs/DoublePlay.prefab
+++ b/Assets/Resources/Prefabs/DoublePlay.prefab
@@ -1475,11 +1475,11 @@ RectTransform:
- {fileID: 1480251056309318517}
- {fileID: 1480251056263274235}
m_Father: {fileID: 1480251056369346847}
- m_RootOrder: 5
+ 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: 294.09494, y: -86}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -100, y: -492}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1480251055638496834
@@ -1729,8 +1729,8 @@ 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: -3.9050293, y: -429}
- m_SizeDelta: {x: 676, y: 40}
+ m_AnchoredPosition: {x: 0.4, y: -429}
+ m_SizeDelta: {x: 1850, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1480251055891144165
MonoBehaviour:
@@ -1870,9 +1870,9 @@ RectTransform:
m_Father: {fileID: 1480251056369346847}
m_RootOrder: 3
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: 294.09494, y: 27}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 200, y: -492}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251055914214146
@@ -2000,9 +2000,9 @@ RectTransform:
m_Father: {fileID: 1480251056369346847}
m_RootOrder: 4
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: 294.09494, y: -23}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 300, y: -492}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251055970303633
@@ -2223,8 +2223,7 @@ MonoBehaviour:
_MuteToggle: {fileID: 1480251057023120057}
_location: 2
_folder: Captures/
- _videoFiles:
- -
+ _videoFiles: []
--- !u!1 &1480251056072614864
GameObject:
m_ObjectHideFlags: 0
@@ -2856,7 +2855,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 1.7, y: 0}
+ m_AnchoredPosition: {x: 1.7000122, y: 0}
m_SizeDelta: {x: 3.4, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251056331395138
@@ -2899,7 +2898,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: REWIND
+ m_Text: "\u5F80\u56DE"
--- !u!1 &1480251056369346846
GameObject:
m_ObjectHideFlags: 0
@@ -2934,8 +2933,8 @@ RectTransform:
- {fileID: 1480251056698846951}
- {fileID: 1480251055914214147}
- {fileID: 1480251055970303634}
- - {fileID: 1480251055638496835}
- {fileID: 1480251056625790844}
+ - {fileID: 1480251055638496835}
- {fileID: 1480251056723724231}
- {fileID: 1480251057023120058}
m_Father: {fileID: 6611480634414415942}
@@ -3017,7 +3016,7 @@ RectTransform:
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: -8.5}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251056511995745
@@ -3060,9 +3059,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 'PAUSE
-
-'
+ m_Text: "\u6682\u505C"
--- !u!1 &1480251056529467875
GameObject:
m_ObjectHideFlags: 0
@@ -3091,7 +3088,7 @@ RectTransform:
m_GameObject: {fileID: 1480251056529467875}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.4166666, y: 0.4166666, z: 0.4166666}
+ m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 6611480634414415942}
m_RootOrder: 2
@@ -3305,11 +3302,11 @@ RectTransform:
m_Children:
- {fileID: 1480251057417436395}
m_Father: {fileID: 1480251056369346847}
- m_RootOrder: 6
+ 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: 294.09494, y: 173}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 400, y: -492}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251056625790835
@@ -3437,9 +3434,9 @@ RectTransform:
m_Father: {fileID: 1480251056369346847}
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: -322, y: -492}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 100, y: -492}
m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251056698846950
@@ -3566,9 +3563,9 @@ RectTransform:
m_Father: {fileID: 1480251056369346847}
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: 294.09494, y: 132.99998}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -200, y: -492}
m_SizeDelta: {x: 80, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1480251056723724230
@@ -3628,7 +3625,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_IsOn: 1
+ m_IsOn: 0
--- !u!1 &1480251056740289864
GameObject:
m_ObjectHideFlags: 0
@@ -3737,7 +3734,7 @@ RectTransform:
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: -8.5}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1480251056956545194
@@ -3780,9 +3777,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: 'PLAY
-
-'
+ m_Text: "\u64AD\u653E"
--- !u!1 &1480251057023120056
GameObject:
m_ObjectHideFlags: 0
@@ -3816,9 +3811,9 @@ RectTransform:
m_Father: {fileID: 1480251056369346847}
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: 294.09494, y: -126}
+ m_AnchorMin: {x: 1, y: 0.5}
+ m_AnchorMax: {x: 1, y: 0.5}
+ m_AnchoredPosition: {x: -300, y: -492}
m_SizeDelta: {x: 80, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1480251057023120057
@@ -4510,7 +4505,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: 5.5000343, y: 0}
+ m_AnchoredPosition: {x: 5.500061, y: 0}
m_SizeDelta: {x: 1, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1480251057517918266
@@ -6088,7 +6083,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 1962536.5}
+ m_AnchoredPosition: {x: 0, y: 2073728.1}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7554510022850465655
@@ -9160,8 +9155,7 @@ RectTransform:
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: 6086655064562769761}
+ m_Children: []
m_Father: {fileID: 6611480634414415942}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9249,7 +9243,18 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 6648349032138352632}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 7815219803928858734}
+ m_MethodName: SetActive
+ m_Mode: 6
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &6601200476254135444
GameObject:
m_ObjectHideFlags: 0
@@ -10194,7 +10199,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 3621312707002005256}
m_Direction: 2
m_Value: 1
- m_Size: 0.5669947
+ m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -11937,81 +11942,3 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &9187975505292071909
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6086655064562769761}
- - component: {fileID: 1084389181857095560}
- - component: {fileID: 4294009344855478587}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &6086655064562769761
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9187975505292071909}
- 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: 7464397899082591565}
- 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 &1084389181857095560
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9187975505292071909}
- m_CullTransparentMesh: 0
---- !u!114 &4294009344855478587
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 9187975505292071909}
- 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.19607843, g: 0.19607843, b: 0.19607843, 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: Button
diff --git a/Assets/Resources/UIPanel/generate_panl.prefab b/Assets/Resources/UIPanel/generate_panl.prefab
index 4dec000d..d0dc50b6 100644
--- a/Assets/Resources/UIPanel/generate_panl.prefab
+++ b/Assets/Resources/UIPanel/generate_panl.prefab
@@ -1,5 +1,123 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1291395394220980203
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7826365103677045980}
+ - component: {fileID: 4693166053314096328}
+ - component: {fileID: 9047546602817821890}
+ - component: {fileID: 5735696846502146035}
+ m_Layer: 5
+ m_Name: close_btn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7826365103677045980
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1291395394220980203}
+ 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: 4918099272842381223}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -12.5, y: -13}
+ m_SizeDelta: {x: 18, y: 18}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4693166053314096328
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1291395394220980203}
+ m_CullTransparentMesh: 0
+--- !u!114 &9047546602817821890
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1291395394220980203}
+ 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: 03097fe8f5a5c4e41940f6e6aa6bf74c, 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 &5735696846502146035
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1291395394220980203}
+ 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: 9047546602817821890}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &4918099272237235501
GameObject:
m_ObjectHideFlags: 0
@@ -152,6 +270,7 @@ RectTransform:
- {fileID: 4918099273915608756}
- {fileID: 4918099272237235500}
- {fileID: 4918099273865021774}
+ - {fileID: 7826365103677045980}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Temp/Scripts/Backpack.cs b/Assets/Temp/Scripts/Backpack.cs
index 83fe848d..61b39764 100644
--- a/Assets/Temp/Scripts/Backpack.cs
+++ b/Assets/Temp/Scripts/Backpack.cs
@@ -7,6 +7,9 @@ using UnityEngine.Events;
using UnityEngine.Networking;
using static InterfaceManager;
+///
+/// 回收设备脚本
+///
public class Backpack : MonoBehaviour
{
public UnityEvent oneClickEvent;//unity事件
@@ -111,8 +114,8 @@ public class Backpack : MonoBehaviour
return;
}
string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", Id);
- //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
- MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
+ _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
+ //MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
WWWForm headers = new WWWForm();
headers.AddField("id", Id);
StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data =>
@@ -128,8 +131,8 @@ public class Backpack : MonoBehaviour
return;
}
string nowData = string.Format("{0},{1}", "SetToBeDestroyedTwo", wrjid);
- //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
- MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
+ _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData));
+ //MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyedTwo, nowData);
WWWForm headers = new WWWForm();
headers.AddField("id", wrjid);
StartCoroutine(PostString(Url_Deletepracticedevicedetail, headers, data =>
diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs
index e6b7c53e..cc899b95 100644
--- a/Assets/Temp/Scripts/Microwaveweapon.cs
+++ b/Assets/Temp/Scripts/Microwaveweapon.cs
@@ -213,8 +213,9 @@ public class Microwaveweapon : MonoBehaviour
{
micdistance = Vector3.Distance(miceopos.position, transform.position);
var newdata = Getmicdata();
+ DeviceManager.Instance.send2roomStr.Enqueue(newdata);
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata));
- MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata);
+ //MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata);
microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f);
Closeattack(miceopos);
}
@@ -239,8 +240,8 @@ public class Microwaveweapon : MonoBehaviour
public IEnumerator Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle)
{
var newdata = Aeroplane(unmannedAerialVehicle);
- //DeviceManager.Instance.send2roomStr.Enqueue(newdata);
- MQTTManager.instance.SendData(MQTTManager.instance.Planedata, newdata);
+ DeviceManager.Instance.send2roomStr.Enqueue(newdata);
+ //MQTTManager.instance.SendData(MQTTManager.instance.Planedata, newdata);
yield return new WaitForSeconds(0.5f);
GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform);
game.transform.localPosition = Vector3.zero;
diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs
index 7469ff69..c50abeeb 100644
--- a/Assets/Temp/Scripts/Spectrumdetection.cs
+++ b/Assets/Temp/Scripts/Spectrumdetection.cs
@@ -203,8 +203,8 @@ public class Spectrumdetection : MonoBehaviour
public void SweepFrequencyBandTo()
{
string nowData = GetSyncDataThree();
- //DeviceManager.Instance.send2roomStr.Enqueue(nowData);
- MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData);
+ DeviceManager.Instance.send2roomStr.Enqueue(nowData);
+ //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData);
}
public void CameraFrequency(string _frequency)
diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs
index 2f99901b..d6c99af0 100644
--- a/Assets/Temp/Scripts/View_Panel2.cs
+++ b/Assets/Temp/Scripts/View_Panel2.cs
@@ -553,6 +553,10 @@ public class View_Panel2 : XUIPanel
UIBootstrap.Instance.GetAllDeviceData();
//Debug.Log(" roomItem.nameID==" + roomItem.name);
CreateSubjectItem(currentRoomData.data);
+ });
+ roomItem.transform.Find("close_btn").GetComponent