From bc9a6715dafc0ec311bb03709f4921474bd6cad8 Mon Sep 17 00:00:00 2001 From: Evan Nydahl Date: Fri, 11 Mar 2022 15:27:54 -0600 Subject: [PATCH] Fixed playerCanvas issues with ui --- Assets/Scenes/Game-Mountain.unity | 109 ++++++-------------------- Assets/Scripts/CoolDown.cs | 13 +-- Assets/Scripts/PopUpScript.cs | 2 + UserSettings/EditorUserSettings.asset | 2 +- 4 files changed, 34 insertions(+), 92 deletions(-) diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index c67857b..845b6bd 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -1585,7 +1585,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2895109888218125693, guid: 29189dd9c413d634fab6cef95039358d, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2895109888218125693, guid: 29189dd9c413d634fab6cef95039358d, type: 3} propertyPath: m_LocalPosition.x @@ -16012,7 +16012,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &215113614 GameObject: @@ -25127,7 +25127,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -25216,67 +25216,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1546123831013515565, guid: f20130cddcc9e7446b86395a7a9a9745, type: 3} m_PrefabInstance: {fileID: 359001905} m_PrefabAsset: {fileID: 0} ---- !u!1001 &359505519 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalPosition.x - value: -2191.1 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalPosition.y - value: 63 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalPosition.z - value: 461 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 297879044457584256, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3039877022422189067, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_Name - value: DebugPlayerPrefab 1 (1) - objectReference: {fileID: 0} - - target: {fileID: 3039877022422189067, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3} --- !u!1 &360844868 GameObject: m_ObjectHideFlags: 0 @@ -27606,7 +27545,7 @@ Transform: - {fileID: 439508661} - {fileID: 1374781312} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &398886482 PrefabInstance: @@ -30777,7 +30716,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} propertyPath: m_LocalPosition.x @@ -44845,7 +44784,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &692750886 PrefabInstance: @@ -45818,7 +45757,7 @@ Transform: - {fileID: 1443941823051207167} - {fileID: 372819694} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &709033215 PrefabInstance: @@ -54222,7 +54161,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &778195138 PrefabInstance: @@ -60675,7 +60614,7 @@ Transform: - {fileID: 145303802} - {fileID: 694495507} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &905551190 GameObject: @@ -64012,7 +63951,7 @@ Transform: - {fileID: 722906738} - {fileID: 1575524669} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &964025444 PrefabInstance: @@ -65218,7 +65157,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 37, y: 0, z: 0} --- !u!1001 &989825458 PrefabInstance: @@ -70207,7 +70146,7 @@ Transform: m_Children: - {fileID: 1568477347} m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1079762654 GameObject: @@ -87867,7 +87806,7 @@ Transform: - {fileID: 383171419} - {fileID: 271023841} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1384557816 PrefabInstance: @@ -89533,7 +89472,7 @@ Transform: - {fileID: 413980866} - {fileID: 657836624} m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1412356620 GameObject: @@ -97002,7 +96941,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1458586255 GameObject: @@ -110805,7 +110744,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1619367899 PrefabInstance: @@ -126597,7 +126536,7 @@ Transform: m_LocalScale: {x: 25, y: 1, z: 25} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1880272124 GameObject: @@ -131644,7 +131583,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6431751770358054813, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3} propertyPath: m_RootOrder - value: 14 + value: 13 objectReference: {fileID: 0} - target: {fileID: 6431751770358054813, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3} propertyPath: m_LocalPosition.x @@ -141282,7 +141221,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1043847408052489032, guid: 525b7208dd4d16048808fbe0f06d219d, type: 3} propertyPath: m_LocalPosition.x @@ -141512,7 +141451,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1578817158580045979, guid: 4a2a13b757e0fa944a5e05e10b50f380, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: 1578817158580045979, guid: 4a2a13b757e0fa944a5e05e10b50f380, type: 3} propertyPath: m_LocalRotation.w @@ -141877,7 +141816,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2718425332668433510, guid: 7d13147a1bcc3244dad63fb3065981c1, type: 3} propertyPath: m_LocalPosition.x @@ -142832,7 +142771,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6676345594231214399, guid: 297bfc41790ca6e4b820035f34be2df4, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 6676345594231214399, guid: 297bfc41790ca6e4b820035f34be2df4, type: 3} propertyPath: m_LocalPosition.x @@ -142989,7 +142928,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8044612620057779272, guid: 450b6dc6b2c449e4694a00bba05688d8, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 8044612620057779272, guid: 450b6dc6b2c449e4694a00bba05688d8, type: 3} propertyPath: m_LocalRotation.w @@ -143187,7 +143126,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/CoolDown.cs b/Assets/Scripts/CoolDown.cs index 639569f..7abf96a 100644 --- a/Assets/Scripts/CoolDown.cs +++ b/Assets/Scripts/CoolDown.cs @@ -30,8 +30,9 @@ public class CoolDown : MonoBehaviour GameObject temp = Instantiate(uiPrebab); temp.transform.SetParent(this.gameObject.transform); temp.name = nitroItem.name; + temp.transform.localRotation = Quaternion.identity; temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - temp.transform.rotation.Set(0f, 0f, 0f, 0f); + temp.transform.localRotation.Set(0f, 0f, 0f, 0f); temp.GetComponent().setCoolDownTime(nitroItem.cooldownM); //set position on canvas //due to low number, gonna hardcode this to be first @@ -46,7 +47,7 @@ public class CoolDown : MonoBehaviour temp2.transform.SetParent(this.gameObject.transform); temp2.name = dashItem.name; temp2.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - temp2.transform.rotation.Set(0f, 0f, 0f, 0f); + temp2.transform.localRotation = Quaternion.identity; temp2.GetComponent().setCoolDownTime(dashItem.cooldownM); //set image @@ -74,7 +75,7 @@ public class CoolDown : MonoBehaviour temp3.transform.SetParent(boxHighlight.transform); temp3.name = kickItem.name; temp3.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - temp3.transform.rotation.Set(0f, 0f, 0f, 0f); + temp3.transform.localRotation = Quaternion.identity; //due to low number, gonna hardcode this to be first temp3.transform.localPosition = new Vector3(-100, -100); //set icon to ui icon @@ -87,7 +88,7 @@ public class CoolDown : MonoBehaviour temp4.transform.SetParent(boxHighlight.transform); temp4.name = "slide"; temp4.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - temp4.transform.rotation.Set(0f, 0f, 0f, 0f); + temp4.transform.localRotation = Quaternion.identity; //due to low number, gonna hardcode this to be first temp4.transform.localPosition = new Vector3(100, -100); //set icon to ui icon @@ -102,7 +103,7 @@ public class CoolDown : MonoBehaviour temp5.transform.SetParent(boxHighlight.transform); temp5.name = grapple.itemName; temp5.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - temp5.transform.rotation.Set(0f, 0f, 0f, 0f); + temp5.transform.localRotation = Quaternion.identity; //due to low number, gonna hardcode this to be first temp5.transform.localPosition = new Vector3(100 + posTemp, 100); //set icon to ui icon @@ -119,7 +120,7 @@ public class CoolDown : MonoBehaviour temp6.transform.SetParent(boxHighlight.transform); temp6.name = Glide.itemName; temp6.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); - temp6.transform.rotation.Set(0f, 0f, 0f, 0f); + temp6.transform.localRotation = Quaternion.identity; //due to low number, gonna hardcode this to be first temp6.transform.localPosition = new Vector3(100 + posTemp, 100); //set icon to ui icon diff --git a/Assets/Scripts/PopUpScript.cs b/Assets/Scripts/PopUpScript.cs index 5a677d0..9ecf317 100644 --- a/Assets/Scripts/PopUpScript.cs +++ b/Assets/Scripts/PopUpScript.cs @@ -73,6 +73,7 @@ public class PopUpScript : MonoBehaviour temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); //due to low number, gonna hardcode this to be first temp.transform.localPosition = new Vector3(0, 0); + temp.transform.localRotation = Quaternion.identity; //set icon to ui icon temp.transform.GetComponent().sprite = item.itemSprite; //set text @@ -102,6 +103,7 @@ public class PopUpScript : MonoBehaviour temp.transform.SetParent(canvas.transform); temp.name = "SlidePopUp"; temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + temp.transform.localRotation = Quaternion.identity; //due to low number, gonna hardcode this to be first temp.transform.localPosition = new Vector3(0, 0); //set text diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b0381a5..14385ff 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -33,7 +33,7 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 vcSharedLogLevel: value: 0d5e400f0650