diff --git a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
index e6a4b38a..71f9c4d3 100644
--- a/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
+++ b/Assets/GameAssets/Prefebs/Models/moder/激光火控平台.prefab
@@ -9499,6 +9499,105 @@ Transform:
m_Father: {fileID: 6067751846787327398}
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7016168073535447347
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7499703939794768928}
+ - component: {fileID: 1594635995570253555}
+ - component: {fileID: 8412141882255922523}
+ - component: {fileID: 7563247499693704668}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7499703939794768928
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7016168073535447347}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 4184618747902790164}
+ m_Father: {fileID: 7615181139496386328}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!223 &1594635995570253555
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7016168073535447347}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &8412141882255922523
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7016168073535447347}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+--- !u!114 &7563247499693704668
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7016168073535447347}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &7039547760612729080
GameObject:
m_ObjectHideFlags: 0
@@ -10014,6 +10113,7 @@ Transform:
m_Children:
- {fileID: 3511568331994086970}
- {fileID: 5472595293385458456}
+ - {fileID: 7499703939794768928}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10098,8 +10198,8 @@ MonoBehaviour:
explodePrefab: {fileID: 1000013462590818, guid: ecdd96beb7f93494880c052dfccf9dc1,
type: 3}
camera: {fileID: 5637926424441476190}
- RawImage: {fileID: 6102700022742998670, guid: b2cb817bb62743a4194cd9d89f07e27d,
- type: 3}
+ raw: {fileID: 1611564268076268226}
+ rawImageUIObj: {fileID: 5687146061386738041}
crosshair: {fileID: 0}
Front: 1
Detection: {fileID: 3494968556799403172, guid: c20b9fea41a9bce4e8780bab3d0e13f9,
@@ -12570,6 +12670,185 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+--- !u!1001 &1899930118259390455
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 7499703939794768928}
+ m_Modifications:
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 378
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 437
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 2544765348623762013, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2544765348623762013, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 2544765348623762013, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2544765348623762013, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 5687146061386738041}
+ - target: {fileID: 2544765348623762013, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: SetActive
+ objectReference: {fileID: 0}
+ - target: {fileID: 2544765348623762013, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 6102700022742998670, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_Name
+ value: Firecontrol
+ objectReference: {fileID: 0}
+ - target: {fileID: 6102700022742998670, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents:
+ - {fileID: 1076142016709017099, guid: b2cb817bb62743a4194cd9d89f07e27d, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: b2cb817bb62743a4194cd9d89f07e27d, type: 3}
+--- !u!1 &5687146061386738041 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 6102700022742998670, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ m_PrefabInstance: {fileID: 1899930118259390455}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &4184618747902790164 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 2328124564330331619, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ m_PrefabInstance: {fileID: 1899930118259390455}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1611564268076268226 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 864837679308557621, guid: b2cb817bb62743a4194cd9d89f07e27d,
+ type: 3}
+ m_PrefabInstance: {fileID: 1899930118259390455}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1001 &7363793700803679426
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
index 846345d6..204284d7 100644
--- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
+++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
@@ -10,6 +10,7 @@ using DG.Tweening.Core.Easing;
using UnityEngine.EventSystems;
using System;
using Random = UnityEngine.Random;
+using UnityEngine.UI;
///
/// 激光火控平台
@@ -118,10 +119,13 @@ public class LaserFireControlPlatformManger : MonoBehaviour
/// 十字准星架视角
///
public Camera camera;
+
+ public RawImage raw;
+
///
/// 十字准星架视角UI显示
///
- public GameObject RawImage;
+ public GameObject rawImageUIObj;
///
/// 接收十字准星生成的界面
///
@@ -155,7 +159,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour
{
equipmentCommon = GetComponent();
laserFireControlPlatformMangers.Add(this);
-
+ DroneViewDisplay.Instance.CreateUI(equipmentCommon.deviceID, camera, raw);
//生成激光
GameObject _InnerLaserlineRenderer = Instantiate(InnerLaserlineRendererPrefab);
_InnerLaserlineRenderer.transform.position = Vector3.zero;
@@ -184,27 +188,27 @@ public class LaserFireControlPlatformManger : MonoBehaviour
{
lasertime -= Time.deltaTime;
- if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0" && Input.GetMouseButtonDown(0))
- {
- Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
- RaycastHit hit;
- if (Physics.Raycast(ray, out hit))
- {
- if (EventSystem.current.IsPointerOverGameObject())
- {
- return;
- }
- if (hit.transform.gameObject.tag == "AttackTarget" && hit.transform.GetComponent())
- {
- Transform canvas = GameObject.Find("Canvas").transform;
- if (canvas)
- {
- Instantiate(RawImage, canvas);
- }
- }
- }
+ //if (UIBootstrap.Instance.GetRoleByIDPracticeId(GlobalFlag.practiceSeatId) != "0" && Input.GetMouseButtonDown(0))
+ //{
+ // Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+ // RaycastHit hit;
+ // if (Physics.Raycast(ray, out hit))
+ // {
+ // if (EventSystem.current.IsPointerOverGameObject())
+ // {
+ // return;
+ // }
+ // if (hit.transform.gameObject.tag == "AttackTarget" && hit.transform.GetComponent())
+ // {
+ // Transform canvas = GameObject.Find("Canvas").transform;
+ // if (canvas)
+ // {
+ // Instantiate(RawImage, canvas);
+ // }
+ // }
+ // }
- }
+ //}
}
@@ -451,7 +455,16 @@ public class LaserFireControlPlatformManger : MonoBehaviour
StartCoroutine(LaserExtinction());
});
}
-
+ void OnMouseDown()
+ {
+
+ //Transform canvas = GameObject.Find("Canvas").transform;
+ //if (canvas)
+ //{
+ // Instantiate(RawImage, canvas);
+ //}
+ rawImageUIObj.SetActive(true);
+ }
///
/// 检查鼠标是否离开物体
///