Commit 8f0e6b11 authored by 杨泽宇's avatar 杨泽宇

更新

parent e3c871d5
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Cinemachine;
public class CollisionRotation : MonoBehaviour
{
public bool IsRobotInspection1;
public string CollisionObjectName;
public GameObject GazeAtTheObject;
private CinemachineVirtualCamera virtualCamera;
private void OnTriggerEnter(Collider other)
{
// 查找带有TouristModeController脚本的对象
TouristModeController touristModeController = FindObjectOfType<TouristModeController>();
// 检查是否找到该对象
if (touristModeController != null)
{
if (IsRobotInspection1)
{
virtualCamera = touristModeController.CameraInspection1.GetComponent<CinemachineVirtualCamera>();
}
else
{
virtualCamera = touristModeController.CameraInspection2.GetComponent<CinemachineVirtualCamera>();
}
}
if (other.name == CollisionObjectName)
{
virtualCamera.LookAt = GazeAtTheObject.transform;
}
}
}
fileFormatVersion: 2
guid: 43ec6524d459f504aa97b4aa1097afa7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -229,6 +229,9 @@ public class TouristModeController : MonoBehaviour
if (CameraInspection1 != null)
{
CameraInspection1.SetActive(false);
}
if(CameraInspection2 != null)
{
CameraInspection2.SetActive(false);
}
CharacterModeUI.SetActive(true);
......
......@@ -11,14 +11,6 @@ public class TouristModeInitializer : MonoBehaviour
public bool IsRobotInspection1;
public GameObject CameraInspection;
public GameObject ReportErrorsUI;
public Vector3 area1;
public Vector3 area2;
public Vector3 area3;
public Vector3 area4;
// Start is called before the first frame update
void Start()
{
......@@ -38,24 +30,4 @@ public class TouristModeInitializer : MonoBehaviour
}
}
private void OnTriggerEnter(Collider other)
{
if (other.name == "台体区域1")
{
CameraInspection.transform.eulerAngles = area1;
}
if (other.name == "台体区域2")
{
CameraInspection.transform.eulerAngles = area2;
}
if (other.name == "检定区域1")
{
CameraInspection.transform.eulerAngles = area3;
}
if (other.name == "检定区域2")
{
CameraInspection.transform.eulerAngles = area4;
}
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
fileFormatVersion: 2
guid: 6d93c4bf1383dc944884c9a40d672ca5
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: 4a5a31ace40449849bfced0ba6d53d93
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-2259469971735534422
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8361141948799143229}
m_Position: {x: 320, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8361141948799143229}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u56FA\u5B9A\u6E38\u89C8\u6444\u50CF\u673A 1"
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -2259469971735534422}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &8361141948799143229
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u4EBA\u5DE5\u5DE1\u68C0"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 4a5a31ace40449849bfced0ba6d53d93, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
fileFormatVersion: 2
guid: 786f5da4600700349970fc24dab09a90
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 23c2c46c325143d419d92073f0c72746
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
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: 16, y: 16, z: 16, w: 16}
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 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
ignorePlatformSupport: 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
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -337,7 +337,7 @@ RectTransform:
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: 4}
m_AnchoredPosition: {x: 0, y: 3.5}
m_SizeDelta: {x: 1920, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &8325663825148103513
......
......@@ -1568,12 +1568,6 @@ 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}
area4: {x: 0, y: 90, z: 0}
--- !u!65 &8413326341674218567
BoxCollider:
m_ObjectHideFlags: 0
......
......@@ -445,8 +445,8 @@ GameObject:
- component: {fileID: 4756991542252936888}
- component: {fileID: 6034790007004104862}
- component: {fileID: 5061384484626961406}
- component: {fileID: 3891877822528981785}
- component: {fileID: -447616435929325467}
- component: {fileID: -3996808868172187454}
m_Layer: 0
m_Name: AGV2
m_TagString: Untagged
......@@ -587,26 +587,6 @@ MonoBehaviour:
IsUnkownFirsAngle: 0
LastMsgKeyPointName:
LastMsgKeyTime: 0
--- !u!114 &3891877822528981785
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2385283153731355844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 195b7d9adb9c43143aa22d4e3ed051f7, type: 3}
m_Name:
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}
area4: {x: 0, y: 90, z: 0}
--- !u!65 &-447616435929325467
BoxCollider:
m_ObjectHideFlags: 0
......@@ -628,6 +608,20 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &-3996808868172187454
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2385283153731355844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 195b7d9adb9c43143aa22d4e3ed051f7, type: 3}
m_Name:
m_EditorClassIdentifier:
IsRobotInspection1: 0
CameraInspection: {fileID: 7301166422595926751}
--- !u!1 &2640166797373785073
GameObject:
m_ObjectHideFlags: 0
......
......@@ -5,9 +5,12 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
- enabled: 0
path: Assets/_Scenes/1_Main.unity
guid: a1193329f89803b4f8a14f6c0b15d2c1
- enabled: 1
path: Assets/_Scenes/2_Main.unity
guid: cd64cb8beb835d140bab25cca6c93dd5
- enabled: 0
path: Assets/_Scenes/2_Factory.unity
guid: ee78c16c9212f21438405d404aa436a3
......
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