From 4514a7152005ed115fd47e41a281ef6e31ee2a88 Mon Sep 17 00:00:00 2001 From: "r.nikolin" Date: Tue, 31 Oct 2023 11:34:17 +0300 Subject: [PATCH] Fix 3rd monument preview camera position --- Assets/Prefabs/SoundPlayer.prefab | 2 +- Assets/Resources/Monumet_6.asset | 2 +- Assets/SoundPlayer.cs | 1 + .../_Monuments/Prefabs/Big/Monument_1.prefab | 5 ++++ .../_Monuments/Prefabs/Big/Monument_10.prefab | 20 +++++++++++++++ .../_Monuments/Prefabs/Big/Monument_2.prefab | 25 +++++++++++++++++++ .../_Monuments/Prefabs/Big/Monument_3.prefab | 15 +++++++++++ .../_Monuments/Prefabs/Big/Monument_4.prefab | 5 ++++ .../_Monuments/Prefabs/Big/Monument_5.prefab | 10 ++++++++ .../_Monuments/Prefabs/Big/Monument_6.prefab | 14 +++++++++-- .../_Monuments/Prefabs/Big/Monument_7.prefab | 9 +++++-- .../_Monuments/Prefabs/Big/Monument_8.prefab | 14 +++++++++-- .../_Monuments/Prefabs/Big/Monument_9.prefab | 15 +++++++++++ .../Prefabs/Big/Monument_Origin.prefab | 2 +- 14 files changed, 130 insertions(+), 9 deletions(-) diff --git a/Assets/Prefabs/SoundPlayer.prefab b/Assets/Prefabs/SoundPlayer.prefab index 2daed943..681d6d87 100644 --- a/Assets/Prefabs/SoundPlayer.prefab +++ b/Assets/Prefabs/SoundPlayer.prefab @@ -57,4 +57,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 35a35525876b201479282aa3c5fae8d0, type: 3} m_Name: m_EditorClassIdentifier: - DestroySeconds: 20 + DestroySeconds: 25 diff --git a/Assets/Resources/Monumet_6.asset b/Assets/Resources/Monumet_6.asset index 8a75e916..fb6b3b53 100644 --- a/Assets/Resources/Monumet_6.asset +++ b/Assets/Resources/Monumet_6.asset @@ -66,4 +66,4 @@ MonoBehaviour: ShortClip: {fileID: 8300000, guid: b658ce0dd2e326444a9009a3441f9fc5, type: 3} LongClip: {fileID: 8300000, guid: fbfded5ba926ecc448630e7d2797d969, type: 3} ShortDuration: 15 - LongDuration: 20 + LongDuration: 22 diff --git a/Assets/SoundPlayer.cs b/Assets/SoundPlayer.cs index 56fd995a..c13aae75 100644 --- a/Assets/SoundPlayer.cs +++ b/Assets/SoundPlayer.cs @@ -22,6 +22,7 @@ public class SoundPlayer : MonoBehaviour source.spatialBlend = sound.Zone; source.Play(); } + public void Stop() { source.Stop(); diff --git a/Assets/_Monuments/Prefabs/Big/Monument_1.prefab b/Assets/_Monuments/Prefabs/Big/Monument_1.prefab index b0f7d6b4..bdf81a62 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_1.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_1.prefab @@ -247,6 +247,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -433 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 837.55 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_10.prefab b/Assets/_Monuments/Prefabs/Big/Monument_10.prefab index 4129a56d..23d465b1 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_10.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_10.prefab @@ -146,6 +146,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 112 objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.40673664 + objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9135455 + objectReference: {fileID: 0} - target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.x @@ -307,6 +317,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 269 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 339.7 + objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 1938.3 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_2.prefab b/Assets/_Monuments/Prefabs/Big/Monument_2.prefab index 0e86e03f..24ac591d 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_2.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_2.prefab @@ -136,6 +136,26 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -248 objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.x + value: 1134 + objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 468 + objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.31895927 + objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.94776845 + objectReference: {fileID: 0} - target: {fileID: 2559237996015783021, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: lengthInSec @@ -267,6 +287,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -149 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2339.1 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_3.prefab b/Assets/_Monuments/Prefabs/Big/Monument_3.prefab index c9b5ac2e..b1225a67 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_3.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_3.prefab @@ -47,6 +47,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -16 objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.39073122 + objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.92050487 + objectReference: {fileID: 0} - target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.x @@ -188,6 +198,11 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 0 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 332.4 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_4.prefab b/Assets/_Monuments/Prefabs/Big/Monument_4.prefab index 506e3ced..992ffd44 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_4.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_4.prefab @@ -318,6 +318,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -54 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 578.7 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_5.prefab b/Assets/_Monuments/Prefabs/Big/Monument_5.prefab index 15b85479..4e1ef1ed 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_5.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_5.prefab @@ -348,6 +348,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -90 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 905.8 + objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2081.9 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_6.prefab b/Assets/_Monuments/Prefabs/Big/Monument_6.prefab index f6a9b7ae..c3f280a4 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_6.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_6.prefab @@ -214,12 +214,12 @@ PrefabInstance: - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.x - value: 103 + value: 73 objectReference: {fileID: 0} - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.z - value: 599 + value: 571 objectReference: {fileID: 0} - target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} @@ -352,6 +352,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -41 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 796 + objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 1826.1 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_7.prefab b/Assets/_Monuments/Prefabs/Big/Monument_7.prefab index f8003b4f..ce0670c6 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_7.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_7.prefab @@ -30,7 +30,7 @@ PrefabInstance: - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.x - value: -175 + value: -79 objectReference: {fileID: 0} - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} @@ -40,7 +40,7 @@ PrefabInstance: - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.z - value: -5 + value: -24 objectReference: {fileID: 0} - target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} @@ -188,6 +188,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -110 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2152.2 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_8.prefab b/Assets/_Monuments/Prefabs/Big/Monument_8.prefab index bde8f257..979d8687 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_8.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_8.prefab @@ -40,7 +40,7 @@ PrefabInstance: - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.x - value: 113 + value: -9 objectReference: {fileID: 0} - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} @@ -50,7 +50,7 @@ PrefabInstance: - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.z - value: -15 + value: 39 objectReference: {fileID: 0} - target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} @@ -208,6 +208,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -91 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 601 + objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 2627.6 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_9.prefab b/Assets/_Monuments/Prefabs/Big/Monument_9.prefab index f660f810..ad22b2fb 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_9.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_9.prefab @@ -142,6 +142,16 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 265 objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.3106765 + objectReference: {fileID: 0} + - target: {fileID: 1047042480005813509, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.95051575 + objectReference: {fileID: 0} - target: {fileID: 1292573131802250242, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_LocalPosition.x @@ -298,6 +308,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 211 objectReference: {fileID: 0} + - target: {fileID: 7128419452944829996, guid: f7c18ea67fe64514a8e28b62367e16f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 329.6 + objectReference: {fileID: 0} - target: {fileID: 9014324613662600091, guid: f7c18ea67fe64514a8e28b62367e16f7, type: 3} propertyPath: m_IsActive diff --git a/Assets/_Monuments/Prefabs/Big/Monument_Origin.prefab b/Assets/_Monuments/Prefabs/Big/Monument_Origin.prefab index 53238177..bc7c3ff7 100644 --- a/Assets/_Monuments/Prefabs/Big/Monument_Origin.prefab +++ b/Assets/_Monuments/Prefabs/Big/Monument_Origin.prefab @@ -57,7 +57,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2709419054392167652} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: -0.27144036, z: 0, w: 0.9624553} m_LocalPosition: {x: 173.00006, y: 0, z: -534.0002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0