From ec231f4110c782d44ea2820a1eaaa7a5711c6f16 Mon Sep 17 00:00:00 2001 From: smchoi <ws5260@naver.com> Date: 수, 24 7월 2024 13:29:47 +0900 Subject: [PATCH] Add : 카메라 줌인& 줌아웃 기능 추가 --- Assets/Korail/Scripts/Control/MoveCamera.cs | 49 ++ Assets/Scenes/Train.unity | 410 ++++++++++++++++++++----- Assets/ChairController.cs | 2 Assets/Korail/Scripts/Action/ActionButton.cs | 77 +--- Assets/Resources/3D Model/fbx/interior_240705.fbx | 0 Assets/Resources/3D Model/prefabs/interior_view_240705.prefab | 415 +++++++++++++++++++++++++ 6 files changed, 788 insertions(+), 165 deletions(-) diff --git a/Assets/ChairController.cs b/Assets/ChairController.cs index 2cc90c1..384c7cb 100644 --- a/Assets/ChairController.cs +++ b/Assets/ChairController.cs @@ -4,7 +4,7 @@ { public float minX = -2f; // 최소 X 위치 public float maxX = 2f; // 최대 X 위치 - [Range(0.01f, 0.1f)] + [Range(0.001f, 0.01f)] public float Sensitivity = 0.1f; private bool isDragging = false; diff --git a/Assets/Korail/Scripts/Action/ActionButton.cs b/Assets/Korail/Scripts/Action/ActionButton.cs index 425c275..9305652 100644 --- a/Assets/Korail/Scripts/Action/ActionButton.cs +++ b/Assets/Korail/Scripts/Action/ActionButton.cs @@ -50,11 +50,9 @@ void Start() { - - targetPos = TargetRot; - initPos = transform.localPosition; - + targetPos = TargetRot; + initPos = transform.localPosition; Initialize(); } @@ -72,35 +70,15 @@ } - - void EndInit() { - if (!isFixed) - { - transform.localRotation = targetRot; - - } - else - { - transform.localPosition = targetPos; - - } + transform.localPosition = targetPos; isEnd = true; } void Init() { - if (!isFixed) - { - transform.localRotation = initRot; - - } - else - { - transform.localPosition = initPos; - - } + transform.localPosition = initPos; isEnd = false; } @@ -128,49 +106,26 @@ if (Run) { t += Speed * Time.deltaTime; - if (!isFixed) - { - if (isEnd) - { - // 초기 회전값까지 애니메이션 - transform.localRotation = Quaternion.Slerp(transform.localRotation, initRot, t); - if (transform.localRotation == initRot) - { - InitValues(false); - } - } - else - { - // 목표 회전값까지 애니메이션 - transform.localRotation = Quaternion.Slerp(transform.localRotation, targetRot, t); - if (transform.localRotation == targetRot) - { - InitValues(true); - } + if (isEnd) + { + // 초기 좌표까지 애니메이션 + transform.localPosition = Vector3.Lerp(transform.localPosition, initPos, t); + if (transform.localPosition == initPos) + { + InitValues(false); } } else { - if (isEnd) + // 목표 좌표까지 애니메이션 + transform.localPosition = Vector3.Lerp(transform.localPosition, targetPos, t); + if (transform.localPosition == targetPos) { - // 초기 좌표까지 애니메이션 - transform.localPosition = Vector3.Lerp(transform.localPosition, initPos, t); - if (transform.localPosition == initPos) - { - InitValues(false); - } - } - else - { - // 목표 좌표까지 애니메이션 - transform.localPosition = Vector3.Lerp(transform.localPosition, targetPos, t); - if (transform.localPosition == targetPos) - { - InitValues(true); - } + InitValues(true); } } + } } } diff --git a/Assets/Korail/Scripts/Control/MoveCamera.cs b/Assets/Korail/Scripts/Control/MoveCamera.cs index 6401128..c89a730 100644 --- a/Assets/Korail/Scripts/Control/MoveCamera.cs +++ b/Assets/Korail/Scripts/Control/MoveCamera.cs @@ -13,24 +13,27 @@ /// 移대찓�씪 �떆�젏 蹂�寃� �냽�룄 /// </summary> public float CameraRotationSpeed = 4; - ///// <summary> - ///// 留덉슦�뒪 �쑀 以� �냽�룄 - ///// </summary> - //public float ZoomSpeewd = 5000.0f; - ///// <summary> - ///// 以� 理쒖넖媛�, �옉�쓣 �닔濡� �솗���븷 �닔 �엳�뒗 �닔移섍� 而ㅼ쭚 - ///// </summary> - //public float MinZoomValue = 10; - ///// <summary> - ///// 以� 理쒕�媛�, �겢 �닔濡� 異뺤냼�븷 �닔 �엳�뒗 �닔移섍� 而ㅼ쭚 - ///// </summary> - //public float MaxZoomValue = 60; + /// <summary> + /// 留덉슦�뒪 �쑀 以� �냽�룄 + /// </summary> + public float ZoomSpeed = 50.0f; + + public float ZoomMoveSpeed = 40f; + /// <summary> + /// 以� 理쒖넖媛�, �옉�쓣 �닔濡� �솗���븷 �닔 �엳�뒗 �닔移섍� 而ㅼ쭚 + /// </summary> + public float MinZoomValue = 10; + /// <summary> + /// 以� 理쒕�媛�, �겢 �닔濡� 異뺤냼�븷 �닔 �엳�뒗 �닔移섍� 而ㅼ쭚 + /// </summary> + public float MaxZoomValue = 90; /// <summary> /// 移대찓�씪 �씠�룞 �냽�룄 /// </summary> [Range(1f, 10f)] public float CameraMoveSpeed = 4; + /// <summary> @@ -58,13 +61,19 @@ /// </summary> private Vector3 m_CameraInitOffset; + private Camera m_Camera; + private float initFieldOfView = 60.0f; + private float targetFieldOfView = 60.0f; public override void Awake() { } void Start() { + + m_Camera = Camera.main; + mouseLeftButton = Mouse.current.leftButton; @@ -97,7 +106,23 @@ } + float scrollValue = Input.GetAxis("Mouse ScrollWheel") * ZoomSpeed; + if(scrollValue < 0 && m_Camera.fieldOfView > MinZoomValue) + { + targetFieldOfView = m_Camera.fieldOfView + scrollValue; + } + else if(scrollValue > 0 && m_Camera.fieldOfView < MaxZoomValue) + { + targetFieldOfView = m_Camera.fieldOfView + scrollValue; + } + + if(Input.GetKeyUp(KeyCode.Mouse2)) + { + targetFieldOfView = initFieldOfView; + } + + m_Camera.fieldOfView = Mathf.Lerp(m_Camera.fieldOfView, targetFieldOfView , Time.deltaTime * ZoomMoveSpeed); } diff --git a/Assets/Resources/3D Model/fbx/interior_240705.fbx b/Assets/Resources/3D Model/fbx/interior_240705.fbx index 6df1474..85d6359 100644 --- a/Assets/Resources/3D Model/fbx/interior_240705.fbx +++ b/Assets/Resources/3D Model/fbx/interior_240705.fbx Binary files differ diff --git a/Assets/Resources/3D Model/prefabs/interior_view_240705.prefab b/Assets/Resources/3D Model/prefabs/interior_view_240705.prefab index 030bfb9..8a51154 100644 --- a/Assets/Resources/3D Model/prefabs/interior_view_240705.prefab +++ b/Assets/Resources/3D Model/prefabs/interior_view_240705.prefab @@ -1,5 +1,111 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &540895861429680989 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1074343610545323915} + - component: {fileID: 6010026995380292311} + - component: {fileID: 9090691240266291245} + - component: {fileID: 6225622362601525924} + m_Layer: 0 + m_Name: Plane (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1074343610545323915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540895861429680989} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 7.8511, y: 3.265, z: 0.974} + m_LocalScale: {x: 0.019038402, y: 0.10000001, z: 0.034878} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 290625502022661295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!33 &6010026995380292311 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540895861429680989} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &9090691240266291245 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540895861429680989} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 24d9b6ee616dbc244a5b04e595b8a032, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &6225622362601525924 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540895861429680989} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1523573451005309521 GameObject: m_ObjectHideFlags: 0 @@ -39,6 +145,112 @@ - {fileID: 4551852682972373587} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5432912234184094026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6019224404128692406} + - component: {fileID: 2906659080552944553} + - component: {fileID: 882592663215892000} + - component: {fileID: 4624022970392907539} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6019224404128692406 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432912234184094026} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 7.8511, y: 3.265, z: -0.974} + m_LocalScale: {x: 0.019038402, y: 0.10000001, z: 0.034878} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 290625502022661295} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} +--- !u!33 &2906659080552944553 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432912234184094026} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &882592663215892000 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432912234184094026} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 24d9b6ee616dbc244a5b04e595b8a032, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &4624022970392907539 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5432912234184094026} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &252829571198980932 PrefabInstance: m_ObjectHideFlags: 0 @@ -1204,7 +1416,13 @@ - {fileID: -8863308077783547404, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -547071416146293073, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 2872194522747678639, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + insertIndex: -1 + addedObject: {fileID: 6019224404128692406} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1074343610545323915} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} --- !u!4 &290625502022661295 stripped @@ -2412,6 +2630,34 @@ - {fileID: -8863308077783547404, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -547071416146293073, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 2872194522747678639, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8144394004440419581, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} @@ -3628,6 +3874,34 @@ - {fileID: -547071416146293073, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 2872194522747678639, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -5117474900800814320, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8144394004440419581, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} @@ -4451,6 +4725,34 @@ - {fileID: -8903654465720141572, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 5232712747918963068, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -4342682337353714659, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8144394004440419581, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} @@ -5641,6 +5943,34 @@ - {fileID: -976134612996628490, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 3924773900694317779, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -5722201913451529053, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8144394004440419581, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} @@ -6213,6 +6543,33 @@ - {fileID: 2872194522747678639, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -5861338702712518021, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 5594875542748740691, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} @@ -7429,6 +7786,34 @@ - {fileID: -8863308077783547404, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -547071416146293073, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 2872194522747678639, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8144394004440419581, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} @@ -8662,6 +9047,34 @@ - {fileID: -8903654465720141572, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: 5232712747918963068, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} - {fileID: -4342682337353714659, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -3383434551837474534, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5900580766023925605, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8997996420856585702, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -7663240305718490884, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8101958180735322565, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4159857446768192803, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 6607155711321882396, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 2479963930276688342, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5400382490814581980, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 9138470465942608978, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5041698395667977444, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3727702626665078733, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8685545951143030272, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -5171811346724223740, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -8298655413967460088, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3731375885797650369, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -4020251554032499107, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 7075132085510286928, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5247326053379892367, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3197745940913388921, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 5063075477494428573, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 455915362887901842, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 1094780498324111698, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 4944805886101295032, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8163335259787129029, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: -663821143271263262, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 3977414071987028062, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} + - {fileID: 8144394004440419581, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index 80d155b..6729958 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -609,7 +609,7 @@ objectReference: {fileID: 0} - target: {fileID: 6090107956825907987, guid: d5f2287525e9e224991742f19389f0f2, type: 3} propertyPath: field of view - value: 60 + value: 60.2 objectReference: {fileID: 0} - target: {fileID: 6090107956825907987, guid: d5f2287525e9e224991742f19389f0f2, type: 3} propertyPath: m_projectionMatrixMode @@ -619,8 +619,28 @@ propertyPath: m_Name value: Screen objectReference: {fileID: 0} + - target: {fileID: 6435140791781825453, guid: d5f2287525e9e224991742f19389f0f2, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7987325077033181303, guid: d5f2287525e9e224991742f19389f0f2, type: 3} + propertyPath: ZoomSpeed + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7987325077033181303, guid: d5f2287525e9e224991742f19389f0f2, type: 3} + propertyPath: MaxZoomValue + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7987325077033181303, guid: d5f2287525e9e224991742f19389f0f2, type: 3} + propertyPath: MinZoomValue + value: 15 + objectReference: {fileID: 0} - target: {fileID: 7987325077033181303, guid: d5f2287525e9e224991742f19389f0f2, type: 3} propertyPath: CameraMoveSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7987325077033181303, guid: d5f2287525e9e224991742f19389f0f2, type: 3} + propertyPath: CameraRotationSpeed value: 2.5 objectReference: {fileID: 0} m_RemovedComponents: @@ -629,7 +649,7 @@ - {fileID: 1113244169550660949, guid: d5f2287525e9e224991742f19389f0f2, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3789773096407670994, guid: d5f2287525e9e224991742f19389f0f2, type: 3} - insertIndex: -1 + insertIndex: 0 addedObject: {fileID: 1780107011} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 8397085696808549502, guid: d5f2287525e9e224991742f19389f0f2, type: 3} @@ -6808,7 +6828,6 @@ - {fileID: 9022874512332784859} - {fileID: 2246144882636548627} - {fileID: 6351589982691331860} - - {fileID: 4686054074543652288} - {fileID: 7864323519727830521} - {fileID: 49574045804433789} - {fileID: 3514264761009619672} @@ -6858,6 +6877,7 @@ - {fileID: 2860185198948005598} - {fileID: 4273025854031048690} - {fileID: 977359857626486282} + - {fileID: 6822278894676836386} m_Father: {fileID: 482405721090899964} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &291380370749524114 @@ -23684,6 +23704,14 @@ m_Children: [] m_Father: {fileID: 4551852682975717494} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1773081034170460271 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016241006497334805} + m_Mesh: {fileID: 3803011116729199205, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} --- !u!33 &1773211772561424095 MeshFilter: m_ObjectHideFlags: 0 @@ -23736,48 +23764,6 @@ m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!23 &1782176489663096820 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3888192209107514290} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d8d7b38951338344cbc11681fd56c92f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1788829129599118644 GameObject: m_ObjectHideFlags: 0 @@ -46677,24 +46663,6 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6766168953057836175} m_Mesh: {fileID: 3853410503209439641, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} ---- !u!1 &3888192209107514290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4686054074543652288} - - component: {fileID: 8892453562825504536} - - component: {fileID: 1782176489663096820} - m_Layer: 0 - m_Name: backWall010_out - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!4 &3888261886590089354 Transform: m_ObjectHideFlags: 0 @@ -47974,6 +47942,24 @@ m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &4016241006497334805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6822278894676836386} + - component: {fileID: 1773081034170460271} + - component: {fileID: 5281142259083687634} + m_Layer: 0 + m_Name: backWall030 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &4018625235905334849 GameObject: m_ObjectHideFlags: 0 @@ -48026,13 +48012,13 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4538507924005739896} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0.000000021073426, z: 0.000000021073426, w: 0.7071068} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 8.377322, y: 2.2949998, z: 1.333269} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1719432506293732881} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!23 &4023978099803567596 MeshRenderer: m_ObjectHideFlags: 0 @@ -53325,6 +53311,10 @@ m_Name: m_EditorClassIdentifier: CameraRotationSpeed: 4 + ZoomSpeed: 5 + ZoomMoveSpeed: 40 + MinZoomValue: 10 + MaxZoomValue: 60 CameraMoveSpeed: 4 mouseY: 0 mouseX: 0 @@ -55713,21 +55703,6 @@ m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!4 &4686054074543652288 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3888192209107514290} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 9.264309, y: 3.3693297, z: 0.00000014727809} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 290625502017617546} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4688537979931340300 MeshFilter: m_ObjectHideFlags: 0 @@ -63067,6 +63042,48 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4882994404357819073} m_Mesh: {fileID: 7177831771344649868, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} +--- !u!23 &5281142259083687634 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016241006497334805} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: feefc1767fc84ae4fb678acc6cf56e83, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!4 &5282820362602033078 Transform: m_ObjectHideFlags: 0 @@ -65681,13 +65698,116 @@ - component: {fileID: 3187376124597509468} - component: {fileID: 1086097575246688032} - component: {fileID: 1027508616874196624} - m_Layer: 0 + - component: {fileID: 5465441124504819363} + - component: {fileID: 5465441124504819362} + - component: {fileID: 5465441124504819361} + - component: {fileID: 5465441124504819360} + m_Layer: 6 m_Name: R_chair01 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!64 &5465441124504819360 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465441124504819359} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 7745161863766780960, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} +--- !u!114 &5465441124504819361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465441124504819359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} + m_Name: + m_EditorClassIdentifier: + outlineMode: 0 + outlineColor: {r: 1, g: 1, b: 1, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] +--- !u!114 &5465441124504819362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465441124504819359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e082c9c2edbc53b42b21f703d3132dc7, type: 3} + m_Name: + m_EditorClassIdentifier: + MyOutline: {fileID: 5465441124504819361} + OnSelect: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5465441124504819363} + m_TargetAssemblyTypeName: ChairController, Assembly-CSharp + m_MethodName: OnDrag + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + OnUnSelect: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5465441124504819363} + m_TargetAssemblyTypeName: ChairController, Assembly-CSharp + m_MethodName: OffDrag + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + selected: 0 +--- !u!114 &5465441124504819363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5465441124504819359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77c79231534037949a0e2631d058b91b, type: 3} + m_Name: + m_EditorClassIdentifier: + minX: 9.483 + maxX: 9.605969 + Sensitivity: 0.01 --- !u!1 &5469843876029160734 GameObject: m_ObjectHideFlags: 0 @@ -75707,7 +75827,11 @@ - component: {fileID: 7244609088157857206} - component: {fileID: 7988184321178164739} - component: {fileID: 1223575342975278890} - m_Layer: 0 + - component: {fileID: 7988184321178164743} + - component: {fileID: 7988184321178164742} + - component: {fileID: 7988184321178164741} + - component: {fileID: 7988184321178164740} + m_Layer: 6 m_Name: L_chair01 m_TagString: Untagged m_Icon: {fileID: 0} @@ -83776,6 +83900,21 @@ m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4551852682975717494} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6822278894676836386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4016241006497334805} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 290625502017617546} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6825348003688546323 MeshRenderer: @@ -95799,6 +95938,105 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6332196432012557596} m_Mesh: {fileID: -8743706597346003264, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} +--- !u!64 &7988184321178164740 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6332196432012557596} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8743706597346003264, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} +--- !u!114 &7988184321178164741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6332196432012557596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3} + m_Name: + m_EditorClassIdentifier: + outlineMode: 0 + outlineColor: {r: 1, g: 1, b: 1, a: 1} + outlineWidth: 2 + precomputeOutline: 0 + bakeKeys: [] + bakeValues: [] +--- !u!114 &7988184321178164742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6332196432012557596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e082c9c2edbc53b42b21f703d3132dc7, type: 3} + m_Name: + m_EditorClassIdentifier: + MyOutline: {fileID: 7988184321178164741} + OnSelect: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7988184321178164743} + m_TargetAssemblyTypeName: ChairController, Assembly-CSharp + m_MethodName: OnDrag + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + OnUnSelect: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7988184321178164743} + m_TargetAssemblyTypeName: ChairController, Assembly-CSharp + m_MethodName: OffDrag + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + selected: 0 +--- !u!114 &7988184321178164743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6332196432012557596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 77c79231534037949a0e2631d058b91b, type: 3} + m_Name: + m_EditorClassIdentifier: + minX: 9.483 + maxX: 9.605969 + Sensitivity: 0.01 --- !u!33 &7990822575464971759 MeshFilter: m_ObjectHideFlags: 0 @@ -105625,14 +105863,6 @@ m_Children: [] m_Father: {fileID: 4898240470252792839} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8892453562825504536 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3888192209107514290} - m_Mesh: {fileID: -8991759445234561403, guid: f749aed721ade2349a9c324b1dd09b9f, type: 3} --- !u!23 &8892706871127723051 MeshRenderer: m_ObjectHideFlags: 0 -- Gitblit v1.8.0