diff --git a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab index c8644a6..f8a7248 100644 --- a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab @@ -1173,7 +1173,7 @@ MonoBehaviour: animator: {fileID: 0} pStats: {fileID: 0} mSM: {fileID: 0} - driver: {fileID: 0} + driver: {fileID: 5149733669485025623} dashItem: {fileID: 11400000, guid: 3156de54e455b4348b2a6e79383383b0, type: 2} --- !u!114 &1707207228499037412 MonoBehaviour: @@ -1223,7 +1223,7 @@ MonoBehaviour: animator: {fileID: 0} pStats: {fileID: 0} mSM: {fileID: 0} - driver: {fileID: 0} + driver: {fileID: 5149733669485025623} nitroItem: {fileID: 11400000, guid: a1c26807795a7ac4f83567455ce978ce, type: 2} nitroVelBoost: 40 nitroAccBoost: 0.4 diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index c399853..b232cf7 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -5075,7 +5075,7 @@ MonoBehaviour: animator: {fileID: 0} pStats: {fileID: 0} mSM: {fileID: 0} - driver: {fileID: 0} + driver: {fileID: 8643913596794274241} dashItem: {fileID: 11400000, guid: 3156de54e455b4348b2a6e79383383b0, type: 2} --- !u!114 &7688428083034862390 MonoBehaviour: @@ -5093,7 +5093,7 @@ MonoBehaviour: moveController: {fileID: 0} pStats: {fileID: 0} mSM: {fileID: 0} - driver: {fileID: 0} + driver: {fileID: 8643913596794274241} nitroItem: {fileID: 11400000, guid: a1c26807795a7ac4f83567455ce978ce, type: 2} nitroVelBoost: 40 nitroAccBoost: 0.4 diff --git a/Assets/Scenes/Demos/BreakableBlocks.unity b/Assets/Scenes/Demos/BreakableBlocks.unity index 2351903..c7e769f 100644 --- a/Assets/Scenes/Demos/BreakableBlocks.unity +++ b/Assets/Scenes/Demos/BreakableBlocks.unity @@ -162,7 +162,7 @@ Transform: - {fileID: 8200857314457501958} - {fileID: 4801201675622690668} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &45642691 GameObject: @@ -447,7 +447,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 197.763, z: 0} --- !u!1 &310775963 GameObject: @@ -542,7 +542,7 @@ Transform: m_LocalScale: {x: 243.4848, y: 10, z: 100} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &689939137 PrefabInstance: @@ -553,7 +553,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d583fb6b27d23a849b80c1ea7d813943, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d583fb6b27d23a849b80c1ea7d813943, type: 3} propertyPath: m_LocalPosition.x @@ -670,6 +670,10 @@ PrefabInstance: propertyPath: hasGrapple value: 1 objectReference: {fileID: 0} + - target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3} + propertyPath: hasWallrun + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5759777694531189237, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3} propertyPath: m_RootOrder value: 11 @@ -720,6 +724,71 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3} +--- !u!1001 &933633206 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 3c5f77adbd146274281d636352eb5018, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Heck You + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: 49.493553 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: 5.000001 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: -0.5475292 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} --- !u!1 &988955190 GameObject: m_ObjectHideFlags: 0 @@ -753,7 +822,7 @@ Transform: - {fileID: 1364344412} - {fileID: 128722834} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1099726822 GameObject: @@ -849,7 +918,7 @@ Transform: m_LocalScale: {x: 4, y: 4, z: 4} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1364344411 GameObject: @@ -7948,7 +8017,7 @@ Transform: - {fileID: 7166745667220549356} - {fileID: 7674073525341041895} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4717015385984152624 GameObject: @@ -9223,7 +9292,7 @@ Transform: - {fileID: 1238986339987449071} - {fileID: 4381207511937094485} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 353.008, z: 0} --- !u!1 &5464757302679342334 GameObject: @@ -11501,7 +11570,7 @@ Transform: - {fileID: 1695416246655401831} - {fileID: 6083860270965389840} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &7215587182093335156 MeshRenderer: @@ -11912,7 +11981,7 @@ Transform: - {fileID: 5203016803932664549} - {fileID: 3404700905833877519} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!33 &7422091022867816153 MeshFilter: diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 1f2299e..c67857b 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -27606,7 +27606,7 @@ Transform: - {fileID: 439508661} - {fileID: 1374781312} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &398886482 PrefabInstance: @@ -28344,6 +28344,38 @@ Transform: m_CorrespondingSourceObject: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} m_PrefabInstance: {fileID: 413592909} m_PrefabAsset: {fileID: 0} +--- !u!1 &413980865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 413980866} + m_Layer: 0 + m_Name: GliderPopUps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &413980866 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 413980865} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1449328264} + - {fileID: 732219670} + m_Father: {fileID: 1410708662} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &415158819 stripped Transform: m_CorrespondingSourceObject: {fileID: 3751544986284742155, guid: e8587a60857388849be16431170c1c03, type: 3} @@ -40465,6 +40497,96 @@ Transform: m_Father: {fileID: 1783788984} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 22.65, y: 161.317, z: 27.495} +--- !u!1001 &613904377 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 657836624} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 82260a3a76214e04eafa1d267c1480fa, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Move Quickly Against The Red Wall + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -186.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -5.1035995 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: 84.51965 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpTutorial 1 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 8.129308 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.327102 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &613904378 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 613904377} + m_PrefabAsset: {fileID: 0} --- !u!1001 &614546433 PrefabInstance: m_ObjectHideFlags: 0 @@ -43246,7 +43368,41 @@ Transform: - {fileID: 1188861600} - {fileID: 1264280564} m_Father: {fileID: 709008595} - m_RootOrder: 7 + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &657836623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 657836624} + m_Layer: 0 + m_Name: WallRunPopUps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &657836624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 657836623} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 613904378} + - {fileID: 1439383858} + - {fileID: 735576031} + - {fileID: 863781086} + m_Father: {fileID: 1410708662} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &658289159 PrefabInstance: @@ -45656,7 +45812,6 @@ Transform: - {fileID: 928045005} - {fileID: 1425694277} - {fileID: 1390509359} - - {fileID: 1078582483} - {fileID: 1346309750} - {fileID: 655697233} - {fileID: 1371219919} @@ -46905,6 +47060,96 @@ Transform: m_CorrespondingSourceObject: {fileID: 1546123831013515565, guid: f20130cddcc9e7446b86395a7a9a9745, type: 3} m_PrefabInstance: {fileID: 732104894} m_PrefabAsset: {fileID: 0} +--- !u!1001 &732219669 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 413980866} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 8fe830ac457225a4ab1031a499db94fc, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Hold Space To Glide + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -329.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -1.1035995 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: -16.819458 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpTutorial 2 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 4.202961 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.89852 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &732219670 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 732219669} + m_PrefabAsset: {fileID: 0} --- !u!1001 &732632361 PrefabInstance: m_ObjectHideFlags: 0 @@ -47358,6 +47603,104 @@ Transform: m_CorrespondingSourceObject: {fileID: 1546123831013515565, guid: f20130cddcc9e7446b86395a7a9a9745, type: 3} m_PrefabInstance: {fileID: 735145292} m_PrefabAsset: {fileID: 0} +--- !u!1001 &735576030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 657836624} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 82260a3a76214e04eafa1d267c1480fa, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Move Quickly Against The Red Wall + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -957.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -5.1035995 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: -14.480347 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpPlains 2 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.x + value: 60.28 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.y + value: 11.18 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 25.39 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.327102 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &735576031 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 735576030} + m_PrefabAsset: {fileID: 0} --- !u!1001 &736123562 PrefabInstance: m_ObjectHideFlags: 0 @@ -56168,6 +56511,104 @@ PrefabInstance: m_RemovedComponents: - {fileID: 4157419197526158258, guid: 9f637b735149cbf4298fb607ce4580de, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 9f637b735149cbf4298fb607ce4580de, type: 3} +--- !u!1001 &825451011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1768351903} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 3c5f77adbd146274281d636352eb5018, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Move Quickly Against The Red Wall + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -1298.2789 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -30.1036 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: -6.4803467 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpPlains 1 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.x + value: 58.1 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.y + value: 52.7 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 29.7 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.327102 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &825451012 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 825451011} + m_PrefabAsset: {fileID: 0} --- !u!1 &826113454 GameObject: m_ObjectHideFlags: 0 @@ -57816,6 +58257,104 @@ Transform: m_CorrespondingSourceObject: {fileID: 1546123831013515565, guid: f20130cddcc9e7446b86395a7a9a9745, type: 3} m_PrefabInstance: {fileID: 863409513} m_PrefabAsset: {fileID: 0} +--- !u!1001 &863781085 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 657836624} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 82260a3a76214e04eafa1d267c1480fa, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Move Quickly Against The Red Wall + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -904.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -5.1035995 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: -309.48035 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpPlains 3 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.x + value: 80.74 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.y + value: 11.18 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 25.39 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.327102 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &863781086 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 863781085} + m_PrefabAsset: {fileID: 0} --- !u!1 &863915593 GameObject: m_ObjectHideFlags: 0 @@ -69667,8 +70206,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1568477347} - m_Father: {fileID: 709008595} - m_RootOrder: 5 + m_Father: {fileID: 0} + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1079762654 GameObject: @@ -78354,6 +78893,92 @@ Transform: m_Father: {fileID: 1783788984} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 2.729, y: 235.401, z: 20.392} +--- !u!1001 &1243737202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1498929173} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Press Q To Slide Under + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -16.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -5.1035995 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpTutorial + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.x + value: 19.62 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 15.11 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &1243737203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 1243737202} + m_PrefabAsset: {fileID: 0} --- !u!1 &1244800517 GameObject: m_ObjectHideFlags: 0 @@ -84957,7 +85582,7 @@ Transform: - {fileID: 2045429587} - {fileID: 166513088} m_Father: {fileID: 709008595} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1346396436 PrefabInstance: @@ -86685,7 +87310,7 @@ Transform: - {fileID: 1501821779} - {fileID: 732632362} m_Father: {fileID: 709008595} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1373399631 GameObject: @@ -88876,6 +89501,40 @@ Transform: m_CorrespondingSourceObject: {fileID: 1546123831013515565, guid: f20130cddcc9e7446b86395a7a9a9745, type: 3} m_PrefabInstance: {fileID: 1408257857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1410708661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1410708662} + m_Layer: 0 + m_Name: PopUps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1410708662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410708661} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 588.27893, y: 42.1036, z: 492.80927} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1498929173} + - {fileID: 1768351903} + - {fileID: 413980866} + - {fileID: 657836624} + m_Father: {fileID: 0} + m_RootOrder: 25 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1412356620 GameObject: m_ObjectHideFlags: 0 @@ -90535,6 +91194,100 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fc9746e7ef9d4744a05daaa32f9ca8f, type: 3} +--- !u!1001 &1439383857 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 657836624} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 82260a3a76214e04eafa1d267c1480fa, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Move Quickly Against The Red Wall + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -769.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: -5.1035995 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: 316.51965 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpPlains 1 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.x + value: 58.1 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 29.7 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.327102 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &1439383858 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 1439383857} + m_PrefabAsset: {fileID: 0} --- !u!1 &1440881167 GameObject: m_ObjectHideFlags: 0 @@ -91112,6 +91865,96 @@ Transform: m_CorrespondingSourceObject: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} m_PrefabInstance: {fileID: 1449028721} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1449328263 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 413980866} + m_Modifications: + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: item + value: + objectReference: {fileID: 11400000, guid: 8fe830ac457225a4ab1031a499db94fc, type: 2} + - target: {fileID: -7350152320695563460, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: message + value: Hold Space To Glide + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.x + value: 4.1787 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.y + value: 2.2977 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalScale.z + value: 7.5936 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.x + value: -179.27893 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.y + value: 18.8964 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalPosition.z + value: -20.819458 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4887495073678318998, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Name + value: PopUpTutorial 1 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Size.z + value: 4.202961 + objectReference: {fileID: 0} + - target: {fileID: 7386518789294782352, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + propertyPath: m_Center.z + value: 2.89852 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} +--- !u!4 &1449328264 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 729017849394081224, guid: b60c7d344c81e904cb07f52bb99b2afa, type: 3} + m_PrefabInstance: {fileID: 1449328263} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1450430095 PrefabInstance: m_ObjectHideFlags: 0 @@ -98537,6 +99380,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 8778111956603343862, guid: 0e50603b66fe968418894499e023ec03, type: 3} m_PrefabInstance: {fileID: 1498702592} m_PrefabAsset: {fileID: 0} +--- !u!1 &1498929172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1498929173} + m_Layer: 0 + m_Name: SlidePopUps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1498929173 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498929172} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1243737203} + m_Father: {fileID: 1410708662} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1499163893 PrefabInstance: m_ObjectHideFlags: 0 @@ -118420,6 +119294,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1761363110} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1768351902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1768351903} + m_Layer: 0 + m_Name: GrapplePopUps + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1768351903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768351902} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 825451012} + m_Father: {fileID: 1410708662} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1769018267 GameObject: m_ObjectHideFlags: 0 @@ -130739,7 +131644,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6431751770358054813, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 6431751770358054813, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3} propertyPath: m_LocalPosition.x @@ -140573,7 +141478,7 @@ Transform: m_LocalScale: {x: 100, y: 1000, z: 18} m_Children: [] m_Father: {fileID: 709008595} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!1 &1455841435449095223 GameObject: diff --git a/Assets/Scripts/CoolDown.cs b/Assets/Scripts/CoolDown.cs index bea8e7a..639569f 100644 --- a/Assets/Scripts/CoolDown.cs +++ b/Assets/Scripts/CoolDown.cs @@ -31,6 +31,7 @@ public class CoolDown : MonoBehaviour temp.transform.SetParent(this.gameObject.transform); temp.name = nitroItem.name; temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f); + temp.transform.rotation.Set(0f, 0f, 0f, 0f); temp.GetComponent().setCoolDownTime(nitroItem.cooldownM); //set position on canvas //due to low number, gonna hardcode this to be first @@ -38,13 +39,14 @@ public class CoolDown : MonoBehaviour //set icon to ui icon temp.transform.GetComponent().sprite = nitroItem.itemSprite; //set button control (hard coded) - temp.transform.Find("Button Prompt").GetComponent().text = "Shift"; + temp.transform.GetComponentInChildren().text = "Shift"; } if (stats.HasDash == true){ GameObject temp2 = Instantiate(uiPrebab); 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.GetComponent().setCoolDownTime(dashItem.cooldownM); //set image @@ -60,7 +62,7 @@ public class CoolDown : MonoBehaviour temp2.transform.localPosition = new Vector3(-850, 425); } //set button control - temp2.transform.Find("Button Prompt").GetComponent().text = "R"; + temp2.transform.GetComponentInChildren().text = "R"; } ////display guranteed items @@ -72,11 +74,12 @@ 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); //due to low number, gonna hardcode this to be first temp3.transform.localPosition = new Vector3(-100, -100); //set icon to ui icon temp3.transform.GetComponent().sprite = kickItem.itemSprite; - temp3.transform.Find("Button Prompt").GetComponent().text = "F"; + temp3.transform.GetComponentInChildren().text = "F"; //slide GameObject temp4 = Instantiate(uiPrebab); @@ -84,11 +87,12 @@ 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); //due to low number, gonna hardcode this to be first temp4.transform.localPosition = new Vector3(100, -100); //set icon to ui icon //doesn't exists - temp4.transform.Find("Button Prompt").GetComponent().text = "Slide \n Q"; + temp4.transform.GetComponentInChildren().text = "Slide \n Q"; ////check if items are there //grapple @@ -98,12 +102,13 @@ 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); //due to low number, gonna hardcode this to be first temp5.transform.localPosition = new Vector3(100 + posTemp, 100); //set icon to ui icon temp5.transform.GetComponent().sprite = grapple.itemSprite; //doesn't exists - temp5.transform.Find("Button Prompt").GetComponent().text = "E"; + temp5.transform.GetComponentInChildren().text = "E"; //increment counter posTemp -= 200; } @@ -114,12 +119,13 @@ 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); //due to low number, gonna hardcode this to be first temp6.transform.localPosition = new Vector3(100 + posTemp, 100); //set icon to ui icon temp6.transform.GetComponent().sprite = Glide.itemSprite; //doesn't exists - temp6.transform.Find("Button Prompt").GetComponent().text = "Hold Space"; + temp6.transform.GetComponentInChildren().text = "Hold Space"; //increment counter posTemp -= 200; } @@ -130,7 +136,6 @@ public class CoolDown : MonoBehaviour } public void startUICooldown(string name){ - Debug.Log("its me"); this.gameObject.transform.Find(name).GetComponent().startCoolDown(); } // Update is called once per frame diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/dDashStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/dDashStateManager.cs index ed1c639..ccdcab7 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/dDashStateManager.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugDashState/dDashStateManager.cs @@ -39,7 +39,6 @@ public class dDashStateManager : NetworkBehaviour moveController = GetComponent(); // set Character Controller animator = GetComponent(); // set animator animationManager = GetComponent(); - driver = GameObject.Find("PlayerCanvas").GetComponent(); //// ////Initialize Scripts diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroCooldownState.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroCooldownState.cs index b6f0a1f..c164908 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroCooldownState.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/DebugNitro/dNitroCooldownState.cs @@ -36,11 +36,8 @@ public class dNitroCooldownState : dNitroBaseState //cooldown timer private IEnumerator startCoolDown(dNitroStateManager nSM){ - Debug.Log("Hello"); nSM.driver.startUICooldown("Nitro"); - Debug.Log("DE"); yield return new WaitForSeconds(nSM.nitroItem.cooldownM); - Debug.Log("Done"); cooldown = true; } } diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/dNitroStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/dNitroStateManager.cs index 5997421..2fa3383 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/dNitroStateManager.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugNitroState/dNitroStateManager.cs @@ -54,7 +54,7 @@ public class dNitroStateManager : NetworkBehaviour parentObj = transform.parent.gameObject; // set parent object animator = GetComponent(); // set animator animationManager = GetComponent(); - driver = GameObject.Find("PlayerCanvas").GetComponent(); + //// ////Initialize Scripts diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/DashStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/DashStateManager.cs index d1b8d21..ed4997c 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/DashStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/DashState/DashStateManager.cs @@ -38,7 +38,6 @@ public class DashStateManager : NetworkBehaviour ////Initialize Player Components moveController = GetComponent(); // set Character Controller animator = GetComponent(); // set animator - driver = GameObject.Find("PlayerCanvas").GetComponent(); //// ////Initialize Scripts diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs index d492edb..1e846be 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/NitroState/NitroStateManager.cs @@ -53,7 +53,6 @@ public class NitroStateManager : NetworkBehaviour parentObj = transform.parent.gameObject; // set parent object animator = GetComponent(); // set animator animationManager = GetComponent(); - driver = GameObject.Find("PlayerCanvas").GetComponent(); //// ////Initialize Scripts diff --git a/Assets/Scripts/PopUpScript.cs b/Assets/Scripts/PopUpScript.cs index 10a8c61..5a677d0 100644 --- a/Assets/Scripts/PopUpScript.cs +++ b/Assets/Scripts/PopUpScript.cs @@ -13,39 +13,31 @@ public class PopUpScript : MonoBehaviour //for some reason on enter was triggering twice (shouldn't happen but couldn't figure out why private bool isPop = false; private GameObject temp; - private GameObject canvas; - private void Start() - { - canvas = GameObject.Find("Canvas"); - } + private Canvas canvas; + private void OnTriggerEnter(Collider other) { + //if it is the player object, no pop up is active, and they have the required item if (other.gameObject.tag == "ArcherTarget" && isPop == false) { - Debug.Log("enter"); - //if the item is not set or values are null, catch it - try - { + //Debug.Log("enter"); - temp = Instantiate(uiPrebab); - //set parent as highlight - temp.transform.SetParent(canvas.transform); - temp.name = item.name; - 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); - //set icon to ui icon - temp.transform.GetComponent().sprite = item.itemSprite; - //set text - temp.transform.Find("Prompt").GetComponent().text = message; - //no longer allow instnatiation - isPop = true; - Debug.Log("create"); - } - catch (System.Exception e) + //for for cleaner code if this check is done in player or a function in this class + //if the item is not null (item given) check if player has the item and if they do send popup + if(item != null) { - Debug.Log("error with item"); + if ((other.transform.GetComponent().HasDash && item.name == "Dash") || (other.transform.GetComponent().HasGrapple && item.name == "Grapple") || (other.transform.GetComponent().HasWallrun && item.name == "Wall Run") || (other.transform.GetComponent().HasGlider && item.name == "Glider")) + { + setUpItemPopUp(other); + } } + // if item is not set, it assumed that the popup is used for slidding (no item for slidding exists so this + // is necessary) + else if(item == null) + { + setUpSlidePopUp(other); + } + } @@ -53,13 +45,75 @@ public class PopUpScript : MonoBehaviour } private void OnTriggerExit(Collider other) { - //delete ui element when exit - if (other.gameObject.tag == "ArcherTarget") + //delete ui element when exit if it exist + if (other.gameObject.tag == "ArcherTarget" && temp != null) { - Debug.Log("exit"); + //Debug.Log("exit"); + //remove reference to canvas + canvas = null; + //attempt to find Destroy(temp); isPop = false; } } + private void setUpItemPopUp(Collider other) + { + + //if the item is not set or values are null, catch it + try + { + + //try to get canvas from player + canvas = other.transform.root.GetComponentInChildren(); + temp = Instantiate(uiPrebab); + //set parent as highlight + temp.transform.SetParent(canvas.transform); + temp.name = item.name + "PopUp"; + 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); + //set icon to ui icon + temp.transform.GetComponent().sprite = item.itemSprite; + //set text + temp.transform.Find("Prompt").GetComponent().text = message; + //no longer allow instnatiation + isPop = true; + //Debug.Log("create"); + } + catch (System.Exception e) + { + Debug.Log("error with item"); + } + + } + + private void setUpSlidePopUp(Collider other) + { + + //if the item is not set or values are null, catch it + try + { + + //try to get canvas from player + canvas = other.transform.root.GetComponentInChildren(); + temp = Instantiate(uiPrebab); + //set parent as highlight + temp.transform.SetParent(canvas.transform); + temp.name = "SlidePopUp"; + 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); + //set text + temp.transform.Find("Prompt").GetComponent().text = message; + //no longer allow instnatiation + isPop = true; + //Debug.Log("create"); + } + catch (System.Exception e) + { + Debug.Log("error with item"); + } + + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 5dce5a0..b0381a5 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,19 +21,19 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 vcSharedLogLevel: value: 0d5e400f0650