yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

融合

This commit is contained in:
YangHua 2024-02-06 14:56:34 +08:00
parent 465d55cbe6 5256a1448b
commit 31c8629b05
7 changed files with 3538 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/GameAssets/Prefebs/Models/moder/地面无线电干扰.prefab
View File

@ -208,7 +208,6 @@ MonoBehaviour:
buttonoff: {fileID: 1637704249957273881}
disturb:
InterferingFrequency1:
eventsystem: {fileID: 0}
RaycastInCanvas: {fileID: 2225246166402166303}
--- !u!65 &2497641324939056363
BoxCollider:
@ -3867,7 +3866,8 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 20
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 5839716182141322363, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 38fb1def99b2cd147a96842efe5a355b, type: 3}
--- !u!224 &6753113667049944908 stripped
RectTransform:

3567
Assets/GameAssets/Prefebs/主席台场景.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Resources/UIPanel/Deviceinformation.prefab
View File

@ -612,7 +612,7 @@ MonoBehaviour:
m_LineType: 0
m_HideMobileInput: 0
m_CharacterValidation: 1
m_CharacterLimit: 0
m_CharacterLimit: 2
m_OnEndEdit:
m_PersistentCalls:
m_Calls: []

20
Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1113159741}
m_IndirectSpecularColor: {r: 0.16231087, g: 0.30614385, b: 0.66932905, a: 1}
m_IndirectSpecularColor: {r: 0.066868424, g: 0.12216938, b: 0.2541184, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -6834,7 +6834,7 @@ GameObject:
- component: {fileID: 147647013}
- component: {fileID: 147647014}
m_Layer: 5
m_Name: MianCanvas
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -40107,8 +40107,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 736802595}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -598.6, y: 218, z: -146}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -458, y: 182, z: -38}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 1484806748}
- {fileID: 1878630564}
@ -66171,7 +66171,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1618372686}
m_LocalRotation: {x: 0.0034778442, y: -0.9708267, z: 0.23934188, w: 0.014106949}
m_LocalPosition: {x: 92, y: 355, z: 1593}
m_LocalPosition: {x: -86.4, y: 207.9, z: 1071.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -69483,10 +69483,10 @@ MonoBehaviour:
colorSkyBase: {r: 0.6054902, g: 0.7090196, b: 0.7968628, a: 0.8}
colorSkyBaseLow: {r: 0.75686276, g: 0.88627446, b: 0.9960785, a: 1}
colorHorizon: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
colorHorizonLow: {r: 0.9082354, g: 1.0682354, b: 1.1952941, a: 1.2}
colorHorizonLow: {r: 0.12235295, g: 0.2964706, b: 0.36705884, a: 1.2}
colorSkyAmbient: {r: 1, g: 1, b: 1, a: 1}
colorClouds: {r: 1, g: 1, b: 1, a: 1}
colorHighlightClouds: {r: 1, g: 1, b: 1, a: 1}
colorHighlightClouds: {r: 0, g: 0, b: 0, a: 1}
colorSkyboxGround: {r: 0.1102941, g: 0.08836951, b: 0.06487888, a: 1}
colorSkyboxMie: {r: 1, g: 1, b: 1, a: 1}
displayTime: '[ 10:30:00 AM] [ 3/6/1027 ad]'
@ -69824,7 +69824,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 753053593
randSeed: 25527625
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@ -88679,7 +88679,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083507083}
m_LocalRotation: {x: 0.25164708, y: 0, z: 0, w: 0.9678191}
m_LocalPosition: {x: -500, y: 233.1, z: -128.6}
m_LocalPosition: {x: -399, y: 206, z: 4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -94678,7 +94678,7 @@ Transform:
m_GameObject: {fileID: 392437992739231324}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2518, y: 0, z: 1163}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 8070734335215599506}
- {fileID: 3148711528150840111}

211
Assets/Zion/Scenes/Contingenc_yediting_panl.unity
View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.16789001, g: 0.3080347, b: 0.6423777, a: 1}
m_IndirectSpecularColor: {r: 0.16836107, g: 0.30774397, b: 0.6377696, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -128149,7 +128149,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 250950117}
m_LocalRotation: {x: 0.3390118, y: 0.09510739, z: -0.03447191, w: 0.9353274}
m_LocalRotation: {x: 0.33192864, y: 0.10674155, z: -0.037833728, w: 0.9364819}
m_LocalPosition: {x: -13.70872, y: 9.276348, z: -11.36977}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@ -286582,6 +286582,11 @@ PrefabInstance:
propertyPath: m_Name
value: Deviceinformation (4)
objectReference: {fileID: 0}
- target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317,
type: 3}
propertyPath: m_CharacterLimit
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3}
--- !u!224 &548547111 stripped
@ -338611,6 +338616,11 @@ PrefabInstance:
propertyPath: m_Name
value: Deviceinformation
objectReference: {fileID: 0}
- target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317,
type: 3}
propertyPath: m_CharacterLimit
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3}
--- !u!224 &633298599 stripped
@ -359988,6 +359998,11 @@ PrefabInstance:
propertyPath: m_Name
value: Deviceinformation (5)
objectReference: {fileID: 0}
- target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317,
type: 3}
propertyPath: m_CharacterLimit
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3}
--- !u!224 &678954344 stripped
@ -399422,82 +399437,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 759390340}
m_PrefabAsset: {fileID: 0}
--- !u!1 &759481781
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 759481782}
- component: {fileID: 759481784}
- component: {fileID: 759481783}
m_Layer: 8
m_Name: Terrain
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &759481782
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759481781}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2890, y: -2.8, z: 229}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1754168346}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!154 &759481783
TerrainCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759481781}
m_Material: {fileID: 0}
m_Enabled: 1
m_TerrainData: {fileID: 15600000, guid: ae3baf912bd3a1f46900b5147b8be4c5, type: 2}
m_EnableTreeColliders: 1
--- !u!218 &759481784
Terrain:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 759481781}
m_Enabled: 1
serializedVersion: 6
m_TerrainData: {fileID: 15600000, guid: ae3baf912bd3a1f46900b5147b8be4c5, type: 2}
m_TreeDistance: 5000
m_TreeBillboardDistance: 50
m_TreeCrossFadeLength: 5
m_TreeMaximumFullLODCount: 50
m_DetailObjectDistance: 80
m_DetailObjectDensity: 1
m_HeightmapPixelError: 5
m_SplatMapDistance: 1000
m_HeightmapMaximumLOD: 0
m_ShadowCastingMode: 2
m_DrawHeightmap: 1
m_DrawInstanced: 0
m_DrawTreesAndFoliage: 1
m_ReflectionProbeUsage: 1
m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0}
m_BakeLightProbesForTrees: 1
m_PreserveTreePrototypeLayers: 0
m_DeringLightProbesForTrees: 1
m_ScaleInLightmap: 0.0256
m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
m_GroupingID: 0
m_RenderingLayerMask: 1
m_AllowAutoConnect: 1
--- !u!1001 &759817474
PrefabInstance:
m_ObjectHideFlags: 0
@ -420119,7 +420058,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 804135004}
m_LocalRotation: {x: 0.32357275, y: -0, z: -0, w: 0.9462033}
m_LocalPosition: {x: -488, y: 268, z: -127}
m_LocalPosition: {x: -404.6, y: 199.5, z: 5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -602044,8 +601983,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1179949941}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -598.6, y: 218, z: -146}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -458, y: 182, z: -38}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children:
- {fileID: 4869120020349737}
- {fileID: 4683065327300959}
@ -634003,7 +633942,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1242063470}
m_LocalRotation: {x: -0.59343773, y: -0.0497891, z: -0.7868188, w: -0.1620768}
m_LocalRotation: {x: -0.5844574, y: -0.050303873, z: -0.7914139, w: -0.17188151}
m_LocalPosition: {x: 0.5529245, y: 0, z: 0}
m_LocalScale: {x: 1.1074, y: 1.10745, z: 1.10745}
m_Children: []
@ -731408,7 +731347,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
deviceimages1: []
devices: []
modellist: []
--- !u!4 &1436809530
Transform:
m_ObjectHideFlags: 0
@ -740902,6 +740840,11 @@ PrefabInstance:
propertyPath: m_Name
value: Deviceinformation (1)
objectReference: {fileID: 0}
- target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317,
type: 3}
propertyPath: m_CharacterLimit
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3}
--- !u!224 &1456026332 stripped
@ -774208,26 +774151,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1513991711}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1514573738 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7413945746087729120, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
m_PrefabInstance: {fileID: 1781643437}
m_PrefabAsset: {fileID: 0}
--- !u!64 &1514573742
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1514573738}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -2463317007116204135, guid: 16a6ac691db1632448c10c4b509089fd, type: 3}
--- !u!1001 &1514686180
PrefabInstance:
m_ObjectHideFlags: 0
@ -892215,12 +892138,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1754066378}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1754168346 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
m_PrefabInstance: {fileID: 1781643437}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1754218022
PrefabInstance:
m_ObjectHideFlags: 0
@ -906368,11 +906285,6 @@ PrefabInstance:
propertyPath: m_Name
value: "\u4E3B\u5E2D\u53F0\u573A\u666F"
objectReference: {fileID: 0}
- target: {fileID: 698992079258812567, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 698992079258812568, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_LocalPosition.x
@ -906428,66 +906340,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 698992079431348513, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_BackGroundColor.r
value: 0.39735296
objectReference: {fileID: 0}
- target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_BackGroundColor.g
value: 0.46529412
objectReference: {fileID: 0}
- target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_BackGroundColor.b
value: 0.52294123
objectReference: {fileID: 0}
- target: {fileID: 698992079431348515, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_BackGroundColor.a
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 698992079842674932, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- target: {fileID: 698992079842674932, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 698992079842674935, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_TerrainData
value:
objectReference: {fileID: 0}
- target: {fileID: 698992079842674935, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_ScaleInLightmap
value: 1
objectReference: {fileID: 0}
- target: {fileID: 698992079842674935, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_AllowAutoConnect
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2577195966376579533, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
- target: {fileID: 7413945746087729120, guid: 55335b6cb15262a40b7c18e7a167f904,
type: 3}
propertyPath: m_Layer
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 55335b6cb15262a40b7c18e7a167f904, type: 3}
--- !u!1001 &1782058313
@ -926737,8 +926589,8 @@ MonoBehaviour:
sunlightObject: {fileID: 1242063471}
sunSphereObject: {fileID: 198973213}
moonlightObject: {fileID: 639984703}
moonLightAmt: 0.9859527
moonPhase: 0.5070237
moonLightAmt: 0.9914224
moonPhase: 0.5042888
ambientCol: {r: 1, g: 1, b: 1, a: 1}
colorSun: {r: 1, g: 0.99607843, b: 0.9843137, a: 1}
colorMoon: {r: 0.4392157, g: 0.5921569, b: 0.69803923, a: 1}
@ -927086,7 +926938,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
randSeed: 343539078
randSeed: 448045578
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@ -952091,6 +951943,11 @@ PrefabInstance:
propertyPath: m_Name
value: Deviceinformation (3)
objectReference: {fileID: 0}
- target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317,
type: 3}
propertyPath: m_CharacterLimit
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3}
--- !u!224 &1868450397 stripped

11
Assets/Zion/Scripts/AddConfing.cs
View File

@ -1,4 +1,4 @@
using AdamSync;
using AdamSync;
using System;
using System.Collections;
using System.Collections.Generic;
@ -56,4 +56,13 @@ public class AddConfing : MonoBehaviour
}
}
}
private void OnDestroy()
{
string url = Url_Exit + GlobalFlag.currentUser.login_name;
StartCoroutine(GetString(url, data =>
{
Debug.Log(data);
}));
}
}

5
Assets/Zion/Scripts/MQTT/MQTTManager.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using UnityEngine;
using static InterfaceManager;
public class MQTTManager : MonoBehaviour
{
@ -127,7 +128,7 @@ public class MQTTManager : MonoBehaviour
{
try
{
Debug.Log("开始链接蓝牙网关");
Debug.Log("开始链接MQTT服务");
// 授权示例 调用一次即可 call only once
if (!HslCommunication.Authorization.SetAuthorizationCode("d88d407a-4637-423b-ba06-4ee89b3e01f8"))
{
@ -236,6 +237,8 @@ public class MQTTManager : MonoBehaviour
}
}
public class MQTTSendData
{