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

更新

parent 802a0c52
...@@ -24,6 +24,7 @@ public class CollisionRotation : MonoBehaviour ...@@ -24,6 +24,7 @@ public class CollisionRotation : MonoBehaviour
if (touristModeController.CameraInspection1!=null) if (touristModeController.CameraInspection1!=null)
{ {
virtualCamera = touristModeController.CameraInspection1.GetComponent<CinemachineVirtualCamera>(); virtualCamera = touristModeController.CameraInspection1.GetComponent<CinemachineVirtualCamera>();
Debug.Log("1");
} }
} }
...@@ -38,6 +39,7 @@ public class CollisionRotation : MonoBehaviour ...@@ -38,6 +39,7 @@ public class CollisionRotation : MonoBehaviour
if (other.name == CollisionObjectName) if (other.name == CollisionObjectName)
{ {
virtualCamera.LookAt = GazeAtTheObject.transform; virtualCamera.LookAt = GazeAtTheObject.transform;
} }
} }
} }
...@@ -7454,7 +7454,7 @@ MonoBehaviour: ...@@ -7454,7 +7454,7 @@ MonoBehaviour:
slider: {fileID: 463015410} slider: {fileID: 463015410}
speedDropdown: {fileID: 427094314} speedDropdown: {fileID: 427094314}
CameraInspection1: {fileID: 0} CameraInspection1: {fileID: 0}
CameraInspection2: {fileID: 0} CameraInspection2: {fileID: 1838515293}
--- !u!1 &136520738 --- !u!1 &136520738
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -29676,7 +29676,7 @@ GameObject: ...@@ -29676,7 +29676,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!4 &478580026 --- !u!4 &478580026
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -35121,11 +35121,16 @@ PrefabInstance: ...@@ -35121,11 +35121,16 @@ PrefabInstance:
propertyPath: m_text propertyPath: m_text
value: "\u200B" value: "\u200B"
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2685396658312707601, guid: ed32f55596f4ce64e96fe9f95c481cc0,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2685396658312707601, guid: ed32f55596f4ce64e96fe9f95c481cc0, - target: {fileID: 2685396658312707601, guid: ed32f55596f4ce64e96fe9f95c481cc0,
type: 3} type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 560685328}
- target: {fileID: 2685396658312707601, guid: ed32f55596f4ce64e96fe9f95c481cc0, - target: {fileID: 2685396658312707601, guid: ed32f55596f4ce64e96fe9f95c481cc0,
type: 3} type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
...@@ -69031,6 +69036,101 @@ MonoBehaviour: ...@@ -69031,6 +69036,101 @@ MonoBehaviour:
hitFxFadeOutDuration: 0.25 hitFxFadeOutDuration: 0.25
hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxColor: {r: 1, g: 1, b: 1, a: 1}
hitFxRadius: 0.5 hitFxRadius: 0.5
--- !u!1 &1165981522
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1165981523}
- component: {fileID: 1165981526}
- component: {fileID: 1165981525}
- component: {fileID: 1165981524}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1165981523
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1165981522}
serializedVersion: 2
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1838515295}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1165981524
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1165981522}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 0, y: 0, z: -10}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
m_AngularDampingMode: 0
m_PitchDamping: 0
m_YawDamping: 0
m_RollDamping: 0
m_AngularDamping: 0
--- !u!114 &1165981525
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1165981522}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0.5
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.8
m_SoftZoneHeight: 0.8
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &1165981526
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1165981522}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1166415444 --- !u!1 &1166415444
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -111158,6 +111258,78 @@ CanvasRenderer: ...@@ -111158,6 +111258,78 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838118682} m_GameObject: {fileID: 1838118682}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1838515293
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1838515295}
- component: {fileID: 1838515294}
m_Layer: 0
m_Name: Virtual Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &1838515294
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838515293}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 60.000004
OrthographicSize: 5
NearClipPlane: 0.2
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
m_SensorSize: {x: 1, y: 1}
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 1165981523}
--- !u!4 &1838515295
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838515293}
serializedVersion: 2
m_LocalRotation: {x: -0.31760296, y: -0.08811754, z: 0.021327218, w: -0.94387966}
m_LocalPosition: {x: 11.885896, y: 7.4825244, z: -11.7188}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1165981523}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1839296098 --- !u!1 &1839296098
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -129271,3 +129443,4 @@ SceneRoots: ...@@ -129271,3 +129443,4 @@ SceneRoots:
- {fileID: 2103672255} - {fileID: 2103672255}
- {fileID: 1686015056} - {fileID: 1686015056}
- {fileID: 756001778} - {fileID: 756001778}
- {fileID: 1838515295}
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