From 56bf23aa634f28207d2da1df25ceca235940d61a Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Sun, 26 Sep 2021 14:20:27 +0200 Subject: [PATCH] Updated EventLog --- Assets/Scenes/SampleScene.unity | 189 ++++++++++++++++++++++++++++++++ Assets/Scripts/EventLog.cs | 25 ++--- 2 files changed, 201 insertions(+), 13 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index b557e39..389298c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -379,9 +379,69 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1417065445} + - {fileID: 1667291200} + - {fileID: 1238304666} + - {fileID: 1300620966} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &392314070 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 317073667} + m_Modifications: + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5174565 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.y + value: 19.6 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.z + value: 61.9 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_Name + value: House (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -671,6 +731,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GamerManager: {fileID: 1861247503} +--- !u!4 &1238304666 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + m_PrefabInstance: {fileID: 392314070} + m_PrefabAsset: {fileID: 0} --- !u!1 &1248751118 GameObject: m_ObjectHideFlags: 0 @@ -718,6 +783,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1300620966 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + m_PrefabInstance: {fileID: 1799643402} + m_PrefabAsset: {fileID: 0} --- !u!1 &1417065444 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} @@ -728,6 +798,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} m_PrefabInstance: {fileID: 7029954222161724659} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1440733975 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 317073667} + m_Modifications: + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5174565 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.y + value: 19.6 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.z + value: 24.662142 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_Name + value: House + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} +--- !u!4 &1667291200 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + m_PrefabInstance: {fileID: 1440733975} + m_PrefabAsset: {fileID: 0} --- !u!1 &1690461075 GameObject: m_ObjectHideFlags: 0 @@ -827,6 +959,63 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1001 &1799643402 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 317073667} + m_Modifications: + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.x + value: -2.5174565 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.y + value: 19.6 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalPosition.z + value: -121.7 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} + propertyPath: m_Name + value: House (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} --- !u!1 &1814976973 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/EventLog.cs b/Assets/Scripts/EventLog.cs index 48159ab..e0b30ad 100644 --- a/Assets/Scripts/EventLog.cs +++ b/Assets/Scripts/EventLog.cs @@ -7,7 +7,7 @@ public class EventLog : MonoBehaviour [Header("Event Log")] [SerializeField] private GameObject eventObject; [SerializeField] private Transform parentEventObject; - Vector3 position = new Vector3 (796f, 134f, 0f); + Vector3 position = new Vector3 (Screen.width-200, 134f, 0f); [SerializeField] GameObject[] events; void Start() { @@ -19,8 +19,7 @@ public class EventLog : MonoBehaviour void Update() { events = GameObject.FindGameObjectsWithTag("Event"); - - if(events.Length < 4) + if(events.Length <= 4) { switch (events.Length) { @@ -45,22 +44,22 @@ public class EventLog : MonoBehaviour switch (events.Length) { case 1: - events[0].transform.position = new Vector3(796f, 134f, 0f); + events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); break; case 2: - events[0].transform.position = new Vector3(796f, 134f, 0f); - events[1].transform.position = new Vector3(796f, 174f, 0f); + events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); + events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); break; case 3: - events[0].transform.position = new Vector3(796f, 134f, 0f); - events[1].transform.position = new Vector3(796f, 174f, 0f); - events[2].transform.position = new Vector3(796f, 214f, 0f); + events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); + events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); + events[2].transform.position = new Vector3(Screen.width - 200, 214f, 0f); break; case 4: - events[0].transform.position = new Vector3(796f, 134f, 0f); - events[1].transform.position = new Vector3(796f, 174f, 0f); - events[2].transform.position = new Vector3(796f, 214f, 0f); - events[3].transform.position = new Vector3(796f, 254f, 0f); + events[0].transform.position = new Vector3(Screen.width - 200, 134f, 0f); + events[1].transform.position = new Vector3(Screen.width - 200, 174f, 0f); + events[2].transform.position = new Vector3(Screen.width - 200, 214f, 0f); + events[3].transform.position = new Vector3(Screen.width - 200, 254f, 0f); break; } }