Commit ccc6f93e authored by 杨泽宇's avatar 杨泽宇

更新

parent 1e0ae469
......@@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Zeus.DTC;
using TMPro;
public class AGVDemoV2 : MonoBehaviour
{
......@@ -11,19 +12,19 @@ public class AGVDemoV2 : MonoBehaviour
public FacilityManager facilityManager;
public void Update()
{
UpdateErrorReporting();
}
public string AGVName;
public ReportErrorsUI ReportErrorsUI;
private void Start()
{
StartCoroutine(UpdatePosition());
StartCoroutine(UpdateErrorReporting());
}
private void UpdatePosition1()
{
AGVManager.AddMoveMsg("AGV1", manager.position, manager.angle);
AGVManager.AddMoveMsg(AGVName, manager.position, manager.angle);
}
......@@ -36,7 +37,17 @@ public class AGVDemoV2 : MonoBehaviour
}
}
private void UpdateErrorReporting()
private IEnumerator UpdateErrorReporting()
{
while (true)
{
UpdateErrorReporting1();
yield return new WaitForSeconds(60);
}
}
private void UpdateErrorReporting1()
{
if (manager.Failure.code == 200)
{
......@@ -47,9 +58,26 @@ public class AGVDemoV2 : MonoBehaviour
if (facilityManager.Facilitys[i].FacilityName == faultData.name)
{
facilityManager.OpenHighlighter(facilityManager.Facilitys[i]);
var ReportErrors = Instantiate(ReportErrorsUI, facilityManager.Facilitys[i].highlight.gameObject.transform);
ReportErrors.DeviceName.text = faultData.name;
ReportErrors.ErrorType.text = faultData.faultDesc;
StartCoroutine(DisableHighlightAfterDelay(facilityManager.Facilitys[i], 300, ReportErrors.gameObject));
}
}
}
}
}
private IEnumerator DisableHighlightAfterDelay(Facility facility, float delay, GameObject faultIndicator)
{
yield return new WaitForSeconds(delay);
facilityManager.CloseHighlighter(facility);
// 删除故障指示器
if (faultIndicator != null)
{
Destroy(faultIndicator);
}
}
}
using UnityEngine;
using TMPro;
public class ReportErrorsUI : MonoBehaviour
{
[SerializeField]
public TMP_Text DeviceName;
[SerializeField]
public TMP_Text ErrorType;
}
fileFormatVersion: 2
guid: bb25b1432b8844d479d5aae3c02c9837
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
/// <summary>
/// UI跟踪摄像机(挂载到文字上)
/// </summary>
public class CheckUINavigation : MonoBehaviour
{
private Camera mainCamera;
private void Start()
{
//获取主相机
mainCamera = Camera.main;
}
private void FixedUpdate()
{
if (mainCamera != null)
{
// 获取摄像机到Canvas的方向
Vector3 toCanvasDirection = transform.position - mainCamera.transform.position;
// 获取摄像机的朝向
Vector3 cameraForward = mainCamera.transform.forward;
// 使用 Quaternion.FromToRotation 计算两个向量之间的旋转
Quaternion rotation = Quaternion.FromToRotation(transform.forward, toCanvasDirection.normalized);
// 通过欧拉角的方式获取绕 Y 轴的旋转角度
float angle = rotation.eulerAngles.y;
// 将角度限制在 0 到 360 度之间
angle = (angle > 180f) ? angle - 360f : angle;
// 根据旋转角度判断是否在UI的背后
if (Mathf.Abs(angle) > 90f) // 这里修改为你需要的角度阈值
{
// Canvas背对摄像机
// 翻转 UI
transform.Rotate(Vector3.up, 180f);
}
else
{
// Canvas朝向摄像机
// 可根据需要进行其他操作
}
}
}
}
fileFormatVersion: 2
guid: f8be7e65bbf544647943ca46dbed4655
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -36,14 +36,8 @@ public class TouristModeController : MonoBehaviour
[Header("机器巡检设置")]
public GameObject CameraInspection1;
public GameObject CameraInspection2;
public GameObject AGVInspection1;
public GameObject AGVInspection2;
private bool IsInspection1=true;
public GameObject Inspection1;
public GameObject Inspection2;
private float speeds = 1f;
private bool isPaused = true;
private float pauseTime;
......@@ -94,20 +88,6 @@ public class TouristModeController : MonoBehaviour
public void LinhasComutadoras()
{
if (IsInspection1)
{
Inspection1.SetActive(false);
AGVInspection1.SetActive(false);
Inspection2.SetActive(true);
AGVInspection2.SetActive(true);
}
else
{
Inspection1.SetActive(true);
AGVInspection1.SetActive(true);
Inspection2.SetActive(false);
AGVInspection2.SetActive(false);
}
IsInspection1 = !IsInspection1;
}
......@@ -118,8 +98,14 @@ public class TouristModeController : MonoBehaviour
public void SetArtificial()
{
ExitObserve();
CameraInspection1.SetActive(true);
CameraInspection2.SetActive(true);
if (IsInspection1)
{
CameraInspection1.SetActive(true);
}
else
{
CameraInspection2.SetActive(true);
}
CharacterModeUI.SetActive(false);
ReturnUI.SetActive(true);
}
......
using TMPro;
using UnityEngine;
using Cinemachine;
......@@ -11,6 +11,8 @@ public class TouristModeInitializer : MonoBehaviour
public bool IsRobotInspection1;
public GameObject CameraInspection;
public GameObject ReportErrorsUI;
public Vector3 area1;
public Vector3 area2;
public Vector3 area3;
......@@ -28,13 +30,10 @@ public class TouristModeInitializer : MonoBehaviour
if (IsRobotInspection1)
{
touristModeController.CameraInspection1 = CameraInspection;
touristModeController.AGVInspection1 = this.gameObject;
}
else
{
touristModeController.CameraInspection2 = CameraInspection;
touristModeController.AGVInspection2 = this.gameObject;
this.gameObject.SetActive(false);
}
}
}
......@@ -44,22 +43,18 @@ public class TouristModeInitializer : MonoBehaviour
{
if (other.name == "台体区域1")
{
Debug.Log("1");
CameraInspection.transform.eulerAngles = area1;
}
if (other.name == "台体区域2")
{
Debug.Log("1");
CameraInspection.transform.eulerAngles = area2;
}
if (other.name == "检定区域1")
{
Debug.Log("1");
CameraInspection.transform.eulerAngles = area3;
}
if (other.name == "检定区域2")
{
Debug.Log("1");
CameraInspection.transform.eulerAngles = area4;
}
}
......
This diff is collapsed.
fileFormatVersion: 2
guid: eb42c754784d8b4459f91ef80b658049
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7c3e9cd8b16a67641968ccc177012b4b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
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: 90, y: 212, z: 90, w: 212}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 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
- serializedVersion: 3
buildTarget: Server
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: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b9bd49a934b813b498be925e4dcb2a95
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 22aa624819f397c4fb6cea8adf1c8c22
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
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: 1174, y: 0, z: 142, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 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
- serializedVersion: 3
buildTarget: Server
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: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ef5666c4c53cf0b4696d07111d475b2a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
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
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 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
- serializedVersion: 3
buildTarget: Server
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: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 2a25391e5be82954881b4276687dc048
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -1568,6 +1568,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
IsRobotInspection1: 1
CameraInspection: {fileID: 2831112200708131673}
FaultName: {fileID: 0}
FaultyEquipment: {fileID: 0}
area1: {x: 0, y: 0, z: 0}
area2: {x: 0, y: 180, z: 0}
area3: {x: 0, y: -90, z: 0}
......
......@@ -453,7 +453,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &4756991542252936888
Transform:
m_ObjectHideFlags: 0
......@@ -601,6 +601,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
IsRobotInspection1: 0
CameraInspection: {fileID: 7301166422595926751}
FaultName: {fileID: 0}
FaultyEquipment: {fileID: 0}
area1: {x: 0, y: 180, z: 0}
area2: {x: 0, y: 0, z: 0}
area3: {x: 0, y: -90, z: 0}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment