From acd961a2a637700728c91f4a4c7607ae9df07eea Mon Sep 17 00:00:00 2001 From: Ali Sharoz Date: Tue, 17 Dec 2024 19:27:28 +0500 Subject: [PATCH] Rotated the building in correct order and added plant --- Assets/Prefabs/Building.prefab | 18 +++++-- Assets/Prefabs/BuildingBlock.prefab | 4 +- Assets/Scenes/Gameplay.unity | 26 ++++++++-- Assets/Starting Timeline.playable | 79 ++++++++--------------------- 4 files changed, 59 insertions(+), 68 deletions(-) diff --git a/Assets/Prefabs/Building.prefab b/Assets/Prefabs/Building.prefab index 521f5492..5616dffc 100644 --- a/Assets/Prefabs/Building.prefab +++ b/Assets/Prefabs/Building.prefab @@ -651,19 +651,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalRotation.x - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0.7071068 objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -671,7 +671,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 3216942071731096649, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -697,6 +697,14 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.9176 objectReference: {fileID: 0} + - target: {fileID: 4401550240361290526, guid: 19ad51df00159154c99252d933e8cf96, type: 3} + propertyPath: m_LocalPosition.x + value: 4.057 + objectReference: {fileID: 0} + - target: {fileID: 4401550240361290526, guid: 19ad51df00159154c99252d933e8cf96, type: 3} + propertyPath: m_LocalPosition.z + value: 0.991 + objectReference: {fileID: 0} - target: {fileID: 9164340931432946198, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_Name value: BuildingBlock diff --git a/Assets/Prefabs/BuildingBlock.prefab b/Assets/Prefabs/BuildingBlock.prefab index 30472b38..1ed0275c 100644 --- a/Assets/Prefabs/BuildingBlock.prefab +++ b/Assets/Prefabs/BuildingBlock.prefab @@ -289,7 +289,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4401550240361290526 Transform: m_ObjectHideFlags: 0 @@ -299,7 +299,7 @@ Transform: m_GameObject: {fileID: 8628251646003310582} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0.83, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 94b6ad76..7965e862 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -3558,6 +3558,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1953952600} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 --- !u!1 &561884352 GameObject: m_ObjectHideFlags: 0 @@ -9293,8 +9305,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1590486986} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: -9.371101, z: 0.0000009536743} + m_LocalRotation: {x: 0.000000028193124, y: 0.32342434, z: -0.000000009636251, w: 0.9462541} + m_LocalPosition: {x: -1.603, y: -2.3711, z: -2.071} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9333,7 +9345,7 @@ Camera: height: 1 near clip plane: 1 far clip plane: 5000 - field of view: 60.000004 + field of view: 75 orthographic: 0 orthographic size: 10 m_Depth: 0 @@ -13067,6 +13079,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 0 objectReference: {fileID: 0} + - target: {fileID: 4401550240361290526, guid: 19ad51df00159154c99252d933e8cf96, type: 3} + propertyPath: m_LocalPosition.x + value: 3.622 + objectReference: {fileID: 0} - target: {fileID: 8481112346711325653, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_LocalScale.x value: 2.3820443 @@ -13091,6 +13107,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 1.5303 objectReference: {fileID: 0} + - target: {fileID: 8628251646003310582, guid: 19ad51df00159154c99252d933e8cf96, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9164340931432946198, guid: 19ad51df00159154c99252d933e8cf96, type: 3} propertyPath: m_Name value: BuildingBlock diff --git a/Assets/Starting Timeline.playable b/Assets/Starting Timeline.playable index b9fd111c..709a5b2a 100644 --- a/Assets/Starting Timeline.playable +++ b/Assets/Starting Timeline.playable @@ -54,7 +54,24 @@ MonoBehaviour: m_Children: [] m_Clips: [] m_Markers: - m_Objects: [] + m_Objects: + - {fileID: -146182426035248838} +--- !u!114 &-146182426035248838 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3} + m_Name: Signal Emitter + m_EditorClassIdentifier: + m_Time: 5.266666666666671 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 6d7cf4981aad2454286d3b88c7f57b42, type: 2} --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -162,49 +179,13 @@ MonoBehaviour: m_BlendOutDuration: 2.1666666666666683 m_MixInCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -237,25 +218,7 @@ MonoBehaviour: m_RotationOrder: 4 m_MixOutCurve: serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4