diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index ff2d89c7..0e44321d 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -23099,7 +23099,7 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalScale.x - value: 10 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} @@ -23109,7 +23109,7 @@ PrefabInstance: - target: {fileID: 5698306997877693391, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} propertyPath: m_LocalScale.z - value: 10 + value: 15 objectReference: {fileID: 0} - target: {fileID: 8500934962979638684, guid: 91b685a7f0a6f7643b8ae61842f883de, type: 3} diff --git a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab index 80a51868..31c523b3 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab @@ -1848,6 +1848,89 @@ Transform: m_Father: {fileID: 6612153005883064853} m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1767001470430300072 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 459346150931969862} + - component: {fileID: 5637926424441476190} + - component: {fileID: 4602274861213029408} + m_Layer: 12 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &459346150931969862 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767001470430300072} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7615181139496386328} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &5637926424441476190 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767001470430300072} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 10 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32567 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8600000, guid: 87b64dd953ee6a74694031e554275cc6, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &4602274861213029408 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767001470430300072} + m_Enabled: 1 --- !u!1 &1873580956069249748 GameObject: m_ObjectHideFlags: 0 @@ -9933,14 +10016,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7615181139496386322} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -23.85, y: -6.26, z: 21.2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3511568331994086970} + - {fileID: 459346150931969862} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7813639671686261989 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10004,7 +10088,10 @@ MonoBehaviour: CumulativeActionTimeOfDamageTarget: 1 InterferenceDistance: 1 InterferenceAngle: 1 + Receivingdistance: 0 + timepiece: 5 isLasing: 0 + isLasings: 0 LaserModer: {fileID: 7615181138790815506} LaserPoint: {fileID: 7615181139587479128} targetPoint: {fileID: 0} @@ -10017,6 +10104,14 @@ MonoBehaviour: FireSpeed: 20 explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1, type: 3} + Camera: {fileID: 0} + RawImage: {fileID: 5856212116958320595, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + crosshair: {fileID: 0} + Front: 1 + Detection: {fileID: 3494968556799403172, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + Receivingposin: {fileID: 0} --- !u!114 &7615181139496386323 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GameAssets/Renderer/Detection.prefab b/Assets/GameAssets/Renderer/Detection.prefab new file mode 100644 index 00000000..a4ac5170 --- /dev/null +++ b/Assets/GameAssets/Renderer/Detection.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3494968556799403172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3494968556799403173} + - component: {fileID: 3494968556799403168} + - component: {fileID: 3494968556799403175} + - component: {fileID: 3494968556799403174} + m_Layer: 5 + m_Name: Detection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3494968556799403173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3494968556799403172} + 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, 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 &3494968556799403168 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3494968556799403172} + m_CullTransparentMesh: 0 +--- !u!114 &3494968556799403175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3494968556799403172} + 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: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!65 &3494968556799403174 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3494968556799403172} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1920, y: 1080, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/GameAssets/Renderer/Detection.prefab.meta b/Assets/GameAssets/Renderer/Detection.prefab.meta new file mode 100644 index 00000000..dc42d21a --- /dev/null +++ b/Assets/GameAssets/Renderer/Detection.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c20b9fea41a9bce4e8780bab3d0e13f9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Renderer/Lasercamera.asset b/Assets/GameAssets/Renderer/Lasercamera.asset new file mode 100644 index 00000000..6407d9aa --- /dev/null +++ b/Assets/GameAssets/Renderer/Lasercamera.asset @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!86 &8600000 +CustomRenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lasercamera + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 256 + m_Height: 256 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_Material: {fileID: 0} + m_InitSource: 0 + m_InitMaterial: {fileID: 0} + m_InitColor: {r: 1, g: 1, b: 1, a: 1} + m_InitTexture: {fileID: 0} + m_UpdateMode: 0 + m_InitializationMode: 2 + m_UpdateZoneSpace: 0 + m_CurrentUpdateZoneSpace: 0 + m_UpdateZones: [] + m_UpdatePeriod: 0 + m_ShaderPass: 0 + m_CubemapFaceMask: 4294967295 + m_DoubleBuffered: 0 + m_WrapUpdateZones: 0 diff --git a/Assets/GameAssets/Renderer/Lasercamera.asset.meta b/Assets/GameAssets/Renderer/Lasercamera.asset.meta new file mode 100644 index 00000000..08fe54dd --- /dev/null +++ b/Assets/GameAssets/Renderer/Lasercamera.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87b64dd953ee6a74694031e554275cc6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Renderer/Minimap.prefab b/Assets/GameAssets/Renderer/Minimap.prefab index 84bd72e0..48e9c5b9 100644 --- a/Assets/GameAssets/Renderer/Minimap.prefab +++ b/Assets/GameAssets/Renderer/Minimap.prefab @@ -35,7 +35,7 @@ RectTransform: 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: 420, y: 330} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586417954742020053 CanvasRenderer: @@ -108,7 +108,7 @@ RectTransform: 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: 420, y: 330} + m_SizeDelta: {x: 400, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586417954866262514 CanvasRenderer: @@ -131,7 +131,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.14173195, g: 0.6132076, b: 0.15074104, a: 0.65882355} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -171,6 +171,7 @@ GameObject: - component: {fileID: 1586417955185665353} - component: {fileID: 1586417955185665355} - component: {fileID: 1586417955185665352} + - component: {fileID: 5625461230196841852} m_Layer: 5 m_Name: Minimap m_TagString: Untagged @@ -190,6 +191,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1586417954866262513} + - {fileID: 8295591216700450604} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -235,3 +237,168 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!95 &5625461230196841852 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586417955185665358} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1bcafaff71ab94f44b5f493699d1f431, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &2854750051717222595 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1586417955185665353} + m_Modifications: + - target: {fileID: 5792952501764384510, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5719797979667371551, guid: 21f18eeb9c7a8e34aa2c8ac5d1a572ce, + type: 3} + - target: {fileID: 5792952501764384510, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Color.r + value: 0.043878667 + objectReference: {fileID: 0} + - target: {fileID: 5792952501764384510, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Color.g + value: 0.9716981 + objectReference: {fileID: 0} + - target: {fileID: 5792952501764384510, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Color.b + value: 0.03208439 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_SizeDelta.x + value: 390 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_SizeDelta.y + value: 390 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6612989792782812400, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_Name + value: "\u626B\u63CF\u533A\u57DF" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 27b14bebf99279747a2a4c8e57fd66a7, type: 3} +--- !u!224 &8295591216700450604 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6089359614475106287, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + m_PrefabInstance: {fileID: 2854750051717222595} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/GameAssets/Renderer/RawImage.prefab b/Assets/GameAssets/Renderer/RawImage.prefab new file mode 100644 index 00000000..c648e438 --- /dev/null +++ b/Assets/GameAssets/Renderer/RawImage.prefab @@ -0,0 +1,223 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2336890779506905960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8774902749255468303} + - component: {fileID: 5272179926360604587} + - component: {fileID: 8799361039823191695} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8774902749255468303 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2336890779506905960} + 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: 5856212116958320594} + m_RootOrder: 1 + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5272179926360604587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2336890779506905960} + m_CullTransparentMesh: 0 +--- !u!114 &8799361039823191695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2336890779506905960} + 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: 2608088809950894a83e058cc032c1f9, 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!1 &5856212116958320595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5856212116958320594} + - component: {fileID: 5856212116958320592} + - component: {fileID: 5856212116958320593} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5856212116958320594 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856212116958320595} + 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: 5856212118676117259} + - {fileID: 8774902749255468303} + 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: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5856212116958320592 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856212116958320595} + m_CullTransparentMesh: 0 +--- !u!114 &5856212116958320593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856212116958320595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8600000, guid: 87b64dd953ee6a74694031e554275cc6, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!1 &5856212118676117260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5856212118676117259} + - component: {fileID: 5856212118676117257} + - component: {fileID: 5856212118676117258} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5856212118676117259 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856212118676117260} + 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: 5856212116958320594} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5856212118676117257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856212118676117260} + m_CullTransparentMesh: 0 +--- !u!114 &5856212118676117258 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856212118676117260} + 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: 52700825c79ed17488b0abcdce0d5ee6, 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 diff --git a/Assets/GameAssets/Renderer/RawImage.prefab.meta b/Assets/GameAssets/Renderer/RawImage.prefab.meta new file mode 100644 index 00000000..bd0d19a7 --- /dev/null +++ b/Assets/GameAssets/Renderer/RawImage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eed0736c9868e994ebeff87ecef8c23e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Renderer/扫描区域.prefab b/Assets/GameAssets/Renderer/扫描区域.prefab new file mode 100644 index 00000000..da69a9e7 --- /dev/null +++ b/Assets/GameAssets/Renderer/扫描区域.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6612989792782812400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6089359614475106287} + - component: {fileID: 5799351767476459078} + - component: {fileID: 5792952501764384510} + m_Layer: 5 + m_Name: "\u626B\u63CF\u533A\u57DF" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6089359614475106287 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612989792782812400} + 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: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -210, y: -165} + m_SizeDelta: {x: 420, y: 330} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5799351767476459078 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612989792782812400} + m_CullTransparentMesh: 0 +--- !u!114 &5792952501764384510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612989792782812400} + 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.03374872, g: 0.9622642, b: 0.022694906, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -5719797979667371551, guid: 21f18eeb9c7a8e34aa2c8ac5d1a572ce, + 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 diff --git a/Assets/GameAssets/Renderer/扫描区域.prefab.meta b/Assets/GameAssets/Renderer/扫描区域.prefab.meta new file mode 100644 index 00000000..ae72b1b2 --- /dev/null +++ b/Assets/GameAssets/Renderer/扫描区域.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27b14bebf99279747a2a4c8e57fd66a7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/UI/PNG/准星架.png b/Assets/GameAssets/UI/PNG/准星架.png new file mode 100644 index 00000000..dd9ed44f Binary files /dev/null and b/Assets/GameAssets/UI/PNG/准星架.png differ diff --git a/Assets/GameAssets/UI/PNG/准星架.png.meta b/Assets/GameAssets/UI/PNG/准星架.png.meta new file mode 100644 index 00000000..61560b7c --- /dev/null +++ b/Assets/GameAssets/UI/PNG/准星架.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 52700825c79ed17488b0abcdce0d5ee6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/UI/PNG/十字准星 1.png b/Assets/GameAssets/UI/PNG/十字准星 1.png new file mode 100644 index 00000000..5c351b38 Binary files /dev/null and b/Assets/GameAssets/UI/PNG/十字准星 1.png differ diff --git a/Assets/GameAssets/UI/PNG/十字准星 1.png.meta b/Assets/GameAssets/UI/PNG/十字准星 1.png.meta new file mode 100644 index 00000000..5183ecd8 --- /dev/null +++ b/Assets/GameAssets/UI/PNG/十字准星 1.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: b21f6236fe30a9b4a80166a9d3d19eb3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/UI/PNG/十字准星.png b/Assets/GameAssets/UI/PNG/十字准星.png new file mode 100644 index 00000000..82b6e671 Binary files /dev/null and b/Assets/GameAssets/UI/PNG/十字准星.png differ diff --git a/Assets/GameAssets/UI/PNG/十字准星.png.meta b/Assets/GameAssets/UI/PNG/十字准星.png.meta new file mode 100644 index 00000000..bb3a940c --- /dev/null +++ b/Assets/GameAssets/UI/PNG/十字准星.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 56f521d9d9227ca46a4f17e14ea3b4aa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/UI/下载 (1).png b/Assets/GameAssets/UI/下载 (1).png new file mode 100644 index 00000000..423d91c4 Binary files /dev/null and b/Assets/GameAssets/UI/下载 (1).png differ diff --git a/Assets/GameAssets/UI/下载 (1).png.meta b/Assets/GameAssets/UI/下载 (1).png.meta new file mode 100644 index 00000000..25a5f699 --- /dev/null +++ b/Assets/GameAssets/UI/下载 (1).png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 2608088809950894a83e058cc032c1f9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index b2619747..698c48bc 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -1149,7 +1149,7 @@ public class Scenariopage : MonoBehaviour aircraft.think_device_id = strlist[3]; aircraft.para_name = laserlist[i].text; //aircraft.para_type = ""; - aircraft.para_value = laserquantitylist[i].value.ToString("0"); + aircraft.para_value = laserquantitylist[i].value.ToString("f1"); aircraft.para_unit = laserunitlists[i]; aircraft.r1 = Laserunitlist[i].text; //aircraft.r2 = ""; @@ -2189,7 +2189,7 @@ public class Scenariopage : MonoBehaviour { Aircraft aircraft = new Aircraft(); aircraft.para_name = laserlist[i].text; - aircraft.para_value = laserquantitylist[i].value.ToString("0"); + aircraft.para_value = laserquantitylist[i].value.ToString("f1"); aircraft.para_unit = laserunitlists[i]; aircraft.r1 = Laserunitlist[i].text; aircrafts.Add(aircraft); diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 34d397a5..69e4e1d7 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.165218, g: 0.3075422, b: 0.6572481, a: 1} + m_IndirectSpecularColor: {r: 0.16234875, g: 0.30616775, b: 0.6691979, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6755,6 +6755,8 @@ RectTransform: - {fileID: 1719983406} - {fileID: 6596814515507213669} - {fileID: 138577124} + - {fileID: 1637608973} + - {fileID: 986231249} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45090,6 +45092,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 983323891} m_CullTransparentMesh: 1 +--- !u!224 &986231249 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + m_PrefabInstance: {fileID: 3494968556711875956} + m_PrefabAsset: {fileID: 0} --- !u!1 &998821088 GameObject: m_ObjectHideFlags: 0 @@ -60269,6 +60277,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1635676742} m_CullTransparentMesh: 0 +--- !u!224 &1637608973 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + m_PrefabInstance: {fileID: 5856212118578690527} + m_PrefabAsset: {fileID: 0} --- !u!1 &1646249873 GameObject: m_ObjectHideFlags: 0 @@ -63100,7 +63114,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1859322953 + randSeed: 2139429468 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -88057,6 +88071,130 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 +--- !u!1001 &3494968556711875956 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 147647011} + m_Modifications: + - target: {fileID: 3494968556799403172, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_Name + value: Detection + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403172, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3494968556799403173, guid: c20b9fea41a9bce4e8780bab3d0e13f9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c20b9fea41a9bce4e8780bab3d0e13f9, type: 3} --- !u!1 &3514884654155819148 GameObject: m_ObjectHideFlags: 0 @@ -89567,6 +89705,130 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3} +--- !u!1001 &5856212118578690527 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 147647011} + m_Modifications: + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320594, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320595, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_Name + value: RawImage + objectReference: {fileID: 0} + - target: {fileID: 5856212116958320595, guid: eed0736c9868e994ebeff87ecef8c23e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eed0736c9868e994ebeff87ecef8c23e, type: 3} --- !u!1 &5996844938896677616 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 2.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 2.unity index 0a1cfae3..4b974c95 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 2.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 2.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.17217469, g: 0.30394176, b: 0.5942589, a: 1} + m_IndirectSpecularColor: {r: 0.17216772, g: 0.30495983, b: 0.5995586, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6343,6 +6343,7 @@ RectTransform: - {fileID: 1686556792} - {fileID: 1576746877} - {fileID: 126126869} + - {fileID: 2061850617} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -42158,6 +42159,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1340707837} m_CullTransparentMesh: 0 +--- !u!1 &1352569596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1352569597} + - component: {fileID: 1352569599} + - component: {fileID: 1352569598} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1352569597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1352569596} + 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: 2061850617} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1352569598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1352569596} + 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: 56f521d9d9227ca46a4f17e14ea3b4aa, 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!222 &1352569599 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1352569596} + m_CullTransparentMesh: 0 --- !u!1 &1366053241 GameObject: m_ObjectHideFlags: 0 @@ -55536,7 +55611,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1253980750 + randSeed: 1886845203 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 @@ -71412,6 +71487,78 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2060975583} m_PrefabAsset: {fileID: 0} +--- !u!1 &2061850616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2061850617} + - component: {fileID: 2061850619} + - component: {fileID: 2061850618} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2061850617 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061850616} + 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: 1352569597} + m_Father: {fileID: 147647011} + 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: 0, y: 0} + m_SizeDelta: {x: 300, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2061850618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061850616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8600000, guid: 87b64dd953ee6a74694031e554275cc6, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &2061850619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061850616} + m_CullTransparentMesh: 0 --- !u!1001 &2074450252 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index d92533ec..0b83037a 100644 --- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity +++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.165218, g: 0.3075422, b: 0.6572481, a: 1} + m_IndirectSpecularColor: {r: 0.16521391, g: 0.30764452, b: 0.6578343, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -95782,6 +95782,21 @@ PrefabInstance: propertyPath: m_Name value: angle1_text objectReference: {fileID: 0} + - target: {fileID: 4723123646946089641, guid: 2ac9048583d0af747848ea5faaf1843a, + type: 3} + propertyPath: m_MinValue + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4723123646946089641, guid: 2ac9048583d0af747848ea5faaf1843a, + type: 3} + propertyPath: m_WholeNumbers + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4723123646946089641, guid: 2ac9048583d0af747848ea5faaf1843a, + type: 3} + propertyPath: m_Value + value: 0.039 + objectReference: {fileID: 0} - target: {fileID: 4723123647038005820, guid: 2ac9048583d0af747848ea5faaf1843a, type: 3} propertyPath: m_Name @@ -106459,7 +106474,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1860173453 + randSeed: -2003133703 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 8371a136..4c05c095 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -86,6 +86,10 @@ public class DeviceManager : MonoSingleton data = data.Replace("send2room", ""); Debug.LogError("设备..:" + data); string[] info = data.Split(','); + foreach (string s in info) + { + Debug.LogError(s); + } if (info.Length < 2) return; EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]); diff --git a/Assets/Zion/Scripts/InterfaceManager.cs b/Assets/Zion/Scripts/InterfaceManager.cs index 5389dc37..b6a290ad 100644 --- a/Assets/Zion/Scripts/InterfaceManager.cs +++ b/Assets/Zion/Scripts/InterfaceManager.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json.Linq; public static class InterfaceManager { - private static string _IP = "172.16.1.41"; + private static string _IP = "172.16.1.128"; public static string IP { get { return _IP; } diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 2e2b4fc7..bc46ad31 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -64,7 +64,7 @@ public class EquipmentCommon : MonoBehaviour /// public GameObject explodePrefab; - void Start() + void Awake() { equipmentCommon = GetComponent(); DeviceManager.Instance.devices.Add(this); diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index bdac21b4..385c868c 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -6,6 +6,9 @@ using AdamThinkDevicesData; using AdamSync; using Newtonsoft.Json; using static InterfaceManager; +using DG.Tweening.Core.Easing; +using UnityEngine.EventSystems; +using System; /// /// 激光火控平台 @@ -41,6 +44,14 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// /// 协程对象 /// + private Coroutine coroutinetime; + /// + /// 定时器运行状态 + /// + private bool islaser = false; + /// + /// 协程对象 + /// private Coroutine timerCoroutine; /// /// 定时器运行状态 @@ -70,17 +81,28 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// 干扰角度 /// public string InterferenceAngle; - + /// + /// 接收干扰距离 + /// + public float Receivingdistance; + /// + /// 计时器 + /// + public float timepiece = 5; #endregion + + #region 激光 /// /// 是否这在攻击无人机 /// - public bool isLasing = false; + public bool isLasing = false;//判断看向无人机 + public bool isLasings = false;//判断时候需要攻击 public GameObject LaserModer; public GameObject LaserPoint; public Transform targetPoint; // 锁定目标点的Transform组件 + private Transform Receivingposin;//激光武器打击无人机位置 public GameObject InnerLaserlineRendererPrefab; // 用于绘制射线的LineRenderer组件 public GameObject OuterLaserlineRendererPrefab; // 用于绘制射线的LineRenderer组件 public LineRenderer InnerLaserlineRenderer; // 用于绘制射线的LineRenderer组件 @@ -94,11 +116,32 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// 爆炸预制体 /// public GameObject explodePrefab; - // Start is called before the first frame update + /// + /// 十字准星架视角 + /// + public Camera Camera; + /// + /// 十字准星架视角UI显示 + /// + public GameObject RawImage; + /// + /// 接收十字准星生成的界面 + /// + public GameObject crosshair; + /// + /// 显示十字准星开关 + /// + public bool Front = true; + /// + /// 点击空白处碰撞器 + /// + public GameObject Detection; + void Start() { equipmentCommon = GetComponent(); laserFireControlPlatformMangers.Add(this); + Camera = transform.GetChild(1).GetComponent(); //weaponitemones = Newtonsoft.Json.JsonConvert.DeserializeObject(msg); //FillInTheData(weaponitemones);//测试写入 // 订阅布尔值变化事件 @@ -113,8 +156,9 @@ public class LaserFireControlPlatformManger : MonoBehaviour InnerLaserlineRenderer.positionCount = 2; // 设置线段的端点数量为2 InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 InnerLaserlineRenderer.SetPosition(1, LaserPoint.transform.position); // 设置线段终点为目标点 + } - + GameObject _OuterLaserlineRenderer = Instantiate(OuterLaserlineRendererPrefab); _OuterLaserlineRenderer.transform.position = Vector3.zero; @@ -131,25 +175,78 @@ public class LaserFireControlPlatformManger : MonoBehaviour void Update() { + if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0"&&Input.GetMouseButtonDown(0)) + { + if (!EventSystem.current.IsPointerOverGameObject()) + { + Destroy(crosshair.gameObject); + Front = true; + } + } } - + /// - /// 导条变化调用 + /// 开启暂停激光发射武器 /// - /// - void OnActivationChangedHandler(bool newValue) + void OnActivationChangedHandler(bool bos) { - if (newValue) + if (bos) { - Debug.Log("导条开启时调用"); + Debug.LogError("开启协程"); + starttimer(); } else { - Debug.Log("导条暂停时调用"); + Debug.LogError("暂停协程"); + stoptimer(); } } + /// + /// 开启协程 + /// + /// + private void starttimer() + { + if (equipmentCommon.isPlayer && coroutinetime == null) + { + coroutinetime = StartCoroutine(Timer()); + islaser = true; + } + } + /// + /// 关闭协程 + /// + private void stoptimer() + { + if (equipmentCommon.isPlayer && coroutinetime != null) + { + StopCoroutine(coroutinetime); + islaser = false; + } + } + /// + /// 协程 + /// + IEnumerator Timer() + { + while (true) + { + yield return new WaitForSeconds(timepiece); + if (timepiece!=0) + { + Laserattack(); + } + } + } + void LateUpdate() + { + + } + + + #region 创建场景激光发射 /// @@ -164,12 +261,15 @@ public class LaserFireControlPlatformManger : MonoBehaviour { case "储能间隔时间：": StorageIntervalTime = weaponitemone[i].para_value; + timepiece = float.Parse(StorageIntervalTime); break; case "毁伤目标累积作用时间:": CumulativeActionTimeOfDamageTarget = weaponitemone[i].para_value; break; case "干扰距离：": InterferenceDistance = weaponitemone[i].para_value; + + Receivingdistance = float.Parse(InterferenceDistance) * 1000; break; case "干扰角度：": InterferenceAngle = weaponitemone[i].para_value; @@ -181,41 +281,100 @@ public class LaserFireControlPlatformManger : MonoBehaviour } /// - /// 发射激光 + /// 激光发起攻击 + /// + public void Laserattack() + { + if (Receivingdistance > 0 && targetPoint!=null) + { + Collider[] colliders = Physics.OverlapSphere(transform.position, Receivingdistance);//检查是否在打击的范围内 + Debug.LogError("范围打击距离：" + Receivingdistance); + for (int i = 0; i < colliders.Length; i++) + { + if (colliders[i].gameObject.tag == "WRJ") + { + UnmannedAerialVehicle unmannedAerialVehicle = null; + if (colliders[i].GetComponent()) + { + unmannedAerialVehicle = colliders[i].GetComponent(); + } + if (unmannedAerialVehicle != null) + { + Vector3 Angle = unmannedAerialVehicle.transform.position - transform.position; + float Angle1 = Vector3.Angle(Angle, transform.forward); + Debug.LogError("角度大小:" + Angle1); + if (float.Parse(InterferenceAngle) >= Angle1) + { + Debug.LogError("角度没有问题进来了" + InterferenceAngle); + + if (Receivingposin==null) + { + Receivingposin = unmannedAerialVehicle.transform; + Debug.LogError("接收无人机的位置" + Receivingposin.position); + var nowData = GetSyncData(); + _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + isLasings = true; + CastRayAndRender(); + break; + } + } + } + } + } + } + } + + + /// + /// 看向无人机 /// public void Lasing() { - if (targetPoint != null) + if (targetPoint != null) { - LaserModer.transform.DOLookAt(targetPoint.position, 0.1f).OnComplete(()=> { - Debug.Log("目标点位..:"+targetPoint.position); - CastRayAndRender(); + LaserModer.transform.DOLookAt(targetPoint.position, 0.1f).OnComplete(() => + { + + isLasing = false; + //CastRayAndRender(); }); - var nowData = GetSyncData(); - _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); + //var nowData = GetSyncData(); + //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); } else { Debug.LogError("没有目标"); } } + /// + /// 十字准星架视角 + /// + public void Crosshair() + { + if (targetPoint != null) + { + Camera.transform.DOLookAt(targetPoint.position, 0.1f).SetEase(Ease.Linear); + //isLasing = false; + } + } /// /// 激光显示 /// public void CastRayAndRender() { + if (InnerLaserlineRenderer) { InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 - InnerLaserlineRenderer.SetPosition(1, targetPoint.position); // 设置线段终点为目标点 + InnerLaserlineRenderer.SetPosition(1, Receivingposin.position); // 设置线段终点为目标点 } if (OuterLaserlineRenderer) { OuterLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 - OuterLaserlineRenderer.SetPosition(1, targetPoint.position); // 设置线段终点为目标点 + OuterLaserlineRenderer.SetPosition(1, Receivingposin.position); // 设置线段终点为目标点 } - StrikeDrone(targetPoint.transform); + StrikeDrone(Receivingposin); } /// @@ -231,6 +390,46 @@ public class LaserFireControlPlatformManger : MonoBehaviour StartCoroutine(LaserExtinction()); } } + /// + /// 激光打击位置未打中 + /// + public void Lasering() + { + if (targetPoint != null) + { + targetPoint.position = new Vector3(targetPoint.position.x + 5, targetPoint.position.y, transform.position.z); + LaserModer.transform.DOLookAt(targetPoint.position, 0.5f); + CastRayAndRender1(); + } + } + /// + /// 十字准星架为打中视角 + /// + public void Crosshair1() + { + if (targetPoint != null) + { + targetPoint.position = new Vector3(targetPoint.position.x + 5, targetPoint.position.y, transform.position.z); + Camera.transform.DOLookAt(targetPoint.position, 0.1f).SetEase(Ease.Linear); + } + } + /// + /// 激光显示为打中 + /// + public void CastRayAndRender1() + { + if (InnerLaserlineRenderer) + { + InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 + InnerLaserlineRenderer.SetPosition(1, targetPoint.position); // 设置线段终点为目标点 + } + if (OuterLaserlineRenderer) + { + InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 + InnerLaserlineRenderer.SetPosition(1, targetPoint.position); // 设置线段终点为目标点 + } + StartCoroutine(LaserExtinction()); + } /// /// 销毁单体无人机 @@ -269,7 +468,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour WWWForm wWWForm = new WWWForm(); wWWForm.AddField("data", uploadLogMainJson); Debug.Log(uploadLogMainJson); - StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => { + StartCoroutine(PostString(Url_Addpracticelog, wWWForm, data => + { Debug.Log(data); })); } @@ -300,7 +500,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour OuterLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 OuterLaserlineRenderer.SetPosition(1, LaserPoint.transform.position); // 设置线段终点为目标点 } - isLasing = false; + isLasings = false; } #endregion @@ -312,8 +512,11 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// protected string GetSyncData() { - Debug.Log("目标点位..:" + targetPoint.position); - return string.Format("{0},{1},{2},{3},{4}", "Lasing", equipmentCommon.deviceID, targetPoint.position.x, targetPoint.position.y, targetPoint.position.z); + + Debug.Log("目标点位..:" + Receivingposin.position); + return string.Format("{0},{1},{2},{3},{4}", "Lasing", equipmentCommon.deviceID, Receivingposin.position.x, Receivingposin.position.y, Receivingposin.position.z); + + } /// @@ -322,11 +525,13 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// public void NonSelfGeneratedEmissionLaser(string[] data) { + //激光位置下发传递 Vector3 vector3 = new Vector3(float.Parse(data[2]), float.Parse(data[3]), float.Parse(data[4])); - LaserModer.transform.DOLookAt(vector3, 0.1f).OnComplete(() => { + LaserModer.transform.DOLookAt(vector3, 0.1f).OnComplete(() => + { if (InnerLaserlineRenderer) { - InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 + InnerLaserlineRenderer.SetPosition(0, LaserPoint.transform.position); // 设置线段起点为物体位置 InnerLaserlineRenderer.SetPosition(1, vector3); // 设置线段终点为目标点 } if (OuterLaserlineRenderer) @@ -337,9 +542,31 @@ public class LaserFireControlPlatformManger : MonoBehaviour StartCoroutine(LaserExtinction()); }); } - + /// + /// 检查鼠标是否进入物体 + /// + public void OnMouseEnter() + { + if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0") + { + Transform Canvas = GameObject.Find("Canvas").transform; + if (Canvas && Front) + { + crosshair = Instantiate(RawImage, Canvas); + crosshair.transform.position = Camera.main.WorldToScreenPoint(transform.position); + } + } + } + /// + /// 检查鼠标是否离开物体 + /// + public void OnMouseExit() + { + Front = false; + } private void OnDestroy() { + Destroy(crosshair.gameObject); Destroy(InnerLaserlineRenderer.gameObject); Destroy(OuterLaserlineRenderer.gameObject); OnActivationChanged -= OnActivationChangedHandler; diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index cae35ec9..0c7e45e5 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -136,7 +136,7 @@ public class RadarManger : MonoBehaviour // Update is called once per frame void Update() { - + RetrievalUAV();//看向无人机 } #region 启动暂停 /// @@ -164,7 +164,7 @@ public class RadarManger : MonoBehaviour { //Debug.Log("Timer fired at: " + Time.time); yield return new WaitForSeconds(interval); // 等待一段时间后继续执行 - RetrievalUAV(); + //RetrievalUAV(); } } @@ -175,11 +175,11 @@ public class RadarManger : MonoBehaviour { if (equipmentCommon.isPlayer && timerCoroutine == null) { - timerCoroutine = StartCoroutine(Timer()); + //timerCoroutine = StartCoroutine(Timer()); isTimerRunning = true; } } - /// + /// s /// 停止 /// public void StopTimer() @@ -294,35 +294,36 @@ public class RadarManger : MonoBehaviour Mincamera.orthographicSize = detectionRadius; if (colliders2.Count > 0) { - if (Random.value > (1 - float.Parse(DetectionSuccessRate)/100)) + for (int i = 0; i < colliders2.Count; i++) { - for (int i = 0; i < colliders2.Count; i++) + UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent(); + if (unmannedAerialVehicle) { - UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent(); - if (unmannedAerialVehicle) + LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); + if (laserFireControlPlatformManger) { - LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); - if (laserFireControlPlatformManger) - { - laserFireControlPlatformManger.isLasing = true; - Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name); - laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; - laserFireControlPlatformManger.Lasing(); - } - number++; + laserFireControlPlatformManger.isLasing=true; + //Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name); + laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; + laserFireControlPlatformManger.Crosshair(); + laserFireControlPlatformManger.Lasing(); } + number++; } - - } + + } } private void OnMouseEnter() { - Debug.LogError("鼠标进入"); - RadarUi.transform.localScale = Vector3.one; - Mincamera.transform.position = new Vector3(transform.position.x, 350, transform.position.z); + if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0") + { + Debug.LogError("鼠标进入"); + RadarUi.transform.localScale = Vector3.one; + Mincamera.transform.position = new Vector3(transform.position.x, 350, transform.position.z); + } } private void OnMouseExit() diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 8c092982..26e9e95a 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -10,6 +10,7 @@ using System; using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEditor.Experimental.GraphView; +using Random = UnityEngine.Random; /// /// 地面无线电干扰控制 @@ -149,42 +150,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } } - /// - /// 把UI面板上的频率传给无线电 - /// - public void Interference(int nubmer) - { - switch (nubmer) - { - case 0: - InterferingFrequency = "1227.60 MHz"; - Debug.LogError(InterferingFrequency); - break; - case 1: - InterferingFrequency = "1381.05 MHz"; - Debug.LogError(InterferingFrequency); - break; - case 2: - InterferingFrequency = "1575.42 MHz"; - Debug.LogError(InterferingFrequency); - break; - case 3: - InterferingFrequency = "2GHz"; - Debug.LogError(InterferingFrequency); - break; - case 4: - InterferingFrequency = "4GHz"; - Debug.LogError(InterferingFrequency); - break; - case 5: - InterferingFrequency = "5GHz"; - Debug.LogError(InterferingFrequency); - break; - default: - break; - } - - } + #region 启动暂停 /// /// 导条变化调用 @@ -259,13 +225,13 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour switch (weaponitemone[i].para_value) { case "0": - InterferingFrequency = "1227.60 MHz"; + InterferingFrequency = "1227.60MHz"; break; case "1": - InterferingFrequency = "1381.05 MHz"; + InterferingFrequency = "1381.05MHz"; break; case "2": - InterferingFrequency = "1575.42 MHz"; + InterferingFrequency = "1575.42MHz"; break; case "3": InterferingFrequency = "2GHz"; @@ -363,19 +329,11 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour if (InterferenceMode == "驱离" && unmannedAerialVehicleManage != null) { Debug.LogError("驱离"); - //unmannedAerialVehicle.transform.DOKill(); - //Vector3 trans = unmannedAerialVehicleManage.transform.position; - //unmannedAerialVehicleManage.modeSwitch(0); + unmannedAerialVehicleManage.transform.DOKill(); - unmannedAerialVehicleManage.transform.LookAt(new Vector3(-500, 160, 1650)); - unmannedAerialVehicleManage.transform.DOMove(new Vector3(-500, 160, 1650), 60); - //unmannedAerialVehicle.transform.DOKill(); - //Debug.LogError(unmannedAerialVehicle.name); - //unmannedAerialVehicle.transform.parent = null; - //unmannedAerialVehicle.transform.Translate(Vector3.forward * speed * Time.deltaTime); - //unmannedAerialVehicleManage.transform.position = trans; - //unmannedAerialVehicleManage.transform.position = Vector3.Lerp(unmannedAerialVehicleManage.transform.position, new Vector3(-500, 160, 1650), speed * Time.deltaTime); - ////unmannedAerialVehicle.transform.position = Vector3.Lerp(unmannedAerialVehicle.transform.position, new Vector3(-500, 160, 1650), speed * Time.deltaTime); + unmannedAerialVehicleManage.transform.LookAt(new Vector3(-500, 160, 1600)); + unmannedAerialVehicleManage.transform.DOMove(new Vector3(-500, 160, 1600), 60); + } else if (InterferenceMode == "迫降" && unmannedAerialVehicleManage != null) { @@ -389,12 +347,11 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour if (hit.distance > 1f) { Debug.LogError(hit.distance); - //unmannedAerialVehicle.transform.parent = null; - //unmannedAerialVehicleManage.transform.Translate(Vector3.down * speed * Time.deltaTime); + hit.point = new Vector3(hit.point.x, hit.point.y + 3, hit.point.z); - //unmannedAerialVehicleManage.transform.LookAt(hit.point); + unmannedAerialVehicleManage.transform.DOMove(hit.point, 6); - //unmannedAerialVehicleManage.transform.position = Vector3.Lerp(unmannedAerialVehicleManage.transform.position, hit.point, speed * Time.deltaTime); + } else { @@ -414,7 +371,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour if (unmannedAerialVehicleManage != null) { Vector3 one = unmannedAerialVehicleManage.transform.position - transform.position; - float angue = Vector3.Angle(transform.forward, one); + float angue = Vector3.Angle(one, transform.forward); if (float.Parse(InterferenceAngle) >= angue) { //unmannedAerialVehicleManage.transform.DOKill(); @@ -425,9 +382,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } else { - //unmannedAerialVehicle.transform.DOKill(); + Debug.LogError("目标没有出现在范围里面"); + } } } diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 3cf6c873..8c87c4e8 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -247,7 +247,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour List colliders1 = new List(); for (int i = 0; i < colliders.Count; i++) { - if (colliders[i].transform.tag == "AttackTarget" || colliders[i].transform.tag== "AttackTarget1") + if (colliders[i].transform.tag == "AttackTarget") colliders1.Add(colliders[i]); } if (colliders1.Count > 0)