From 34b5565b718d0797c3da43f27cca9905053bff36 Mon Sep 17 00:00:00 2001 From: haitem Date: Sat, 30 Jan 2021 23:17:05 +0100 Subject: [PATCH] Add sign for first help --- Assets/Prefabs/Player.prefab | 603 +++++++++++++++++++++++++++++++- Assets/Prefabs/Sign.prefab | 222 ++++++++++++ Assets/Prefabs/Sign.prefab.meta | 7 + Assets/Scenes/Filip.unity | 103 ++++-- Assets/Scripts/ObjectManager.cs | 54 ++- Assets/Scripts/PlayerManager.cs | 4 +- Assets/Shaders/Border.shader | 2 +- 7 files changed, 959 insertions(+), 36 deletions(-) create mode 100644 Assets/Prefabs/Sign.prefab create mode 100644 Assets/Prefabs/Sign.prefab.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index b7c0f73..bb3c636 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,5 +1,326 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &792308148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 792308149} + - component: {fileID: 792308151} + - component: {fileID: 792308150} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &792308149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792308148} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0518} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_Children: [] + m_Father: {fileID: 6441971479791151469} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.27810016} + m_SizeDelta: {x: 200, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &792308151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792308148} + m_CullTransparentMesh: 0 +--- !u!114 &792308150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 792308148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 200 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Advice 1 +--- !u!1 &1318320529 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1318320530} + - component: {fileID: 1318320532} + - component: {fileID: 1318320531} + m_Layer: 0 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1318320530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1318320529} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0518} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_Children: [] + m_Father: {fileID: 6441971479791151469} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.2404} + m_SizeDelta: {x: 200, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1318320532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1318320529} + m_CullTransparentMesh: 0 +--- !u!114 &1318320531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1318320529} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 200 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Some stupid advice! +--- !u!1 &1437810451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437810452} + - component: {fileID: 1437810455} + - component: {fileID: 1437810454} + - component: {fileID: 1437810453} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1437810452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437810451} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 6441971479791151469} + m_Father: {fileID: 7094923891560833917} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &1437810455 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437810451} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 7094923890942819436} + m_PlaneDistance: 0.3 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1437810454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437810451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &1437810453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437810451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &1541222973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1541222974} + - component: {fileID: 1541222976} + - component: {fileID: 1541222975} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1541222974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541222973} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7094923891560833917} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1541222976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541222973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!114 &1541222975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1541222973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 --- !u!1 &1650025558977010888 GameObject: m_ObjectHideFlags: 0 @@ -92,6 +413,84 @@ Light: m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &4869701797812787012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 137593933723264058} + - component: {fileID: 4620469347047786324} + - component: {fileID: 5284267314048906043} + m_Layer: 0 + m_Name: Text (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &137593933723264058 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4869701797812787012} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0518} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_Children: [] + m_Father: {fileID: 6441971479791151469} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.1013, y: 0.131} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4620469347047786324 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4869701797812787012} + m_CullTransparentMesh: 0 +--- !u!114 &5284267314048906043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4869701797812787012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 16 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 200 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Click E or move to go back. --- !u!1 &7094923890942819438 GameObject: m_ObjectHideFlags: 0 @@ -269,6 +668,8 @@ Transform: m_Children: - {fileID: 7094923890942819435} - {fileID: 7552584426519275258} + - {fileID: 1541222974} + - {fileID: 1437810452} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -336,7 +737,10 @@ MonoBehaviour: actualHealth: 100 onGround: 1 activeAbility: 00000000 - PowerPrefabs: [] + PowerPrefabs: + - {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} + - {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} + - {fileID: 7945524436670112111, guid: 2d077f1b027540045b6833e51a067855, type: 3} dashPower: 40 dashTime: 0.2 --- !u!95 &7009705026125325791 @@ -370,6 +774,191 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d6a0240c7e91f1644908b3c8bb8d9c96, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &6840056972152884870 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1437810452} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.x + value: 1000.0002 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.y + value: 1000.00037 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.z + value: 1000.00037 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalPosition.y + value: -251.00008 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalPosition.z + value: 80.00037 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7072302 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7069834 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98 + objectReference: {fileID: 0} + - target: {fileID: -5477749408508380018, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7072302 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.7069834 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98 + objectReference: {fileID: 0} + - target: {fileID: -2484921068739079471, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_Name + value: Sign + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} +--- !u!4 &6441971479791151469 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2784c771a437b7e4cb23176a2e7c3ee3, + type: 3} + m_PrefabInstance: {fileID: 6840056972152884870} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8023887280909926673 PrefabInstance: m_ObjectHideFlags: 0 @@ -454,9 +1043,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 79e5e296c19565d4ab4fc1de8b8d570f, type: 3} ---- !u!1 &7177606588354821184 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 79e5e296c19565d4ab4fc1de8b8d570f, +--- !u!4 &3702002265141173024 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2577548232221058511, guid: 79e5e296c19565d4ab4fc1de8b8d570f, type: 3} m_PrefabInstance: {fileID: 8023887280909926673} m_PrefabAsset: {fileID: 0} @@ -466,9 +1055,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8023887280909926673} m_PrefabAsset: {fileID: 0} ---- !u!4 &3702002265141173024 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -2577548232221058511, guid: 79e5e296c19565d4ab4fc1de8b8d570f, +--- !u!1 &7177606588354821184 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 79e5e296c19565d4ab4fc1de8b8d570f, type: 3} m_PrefabInstance: {fileID: 8023887280909926673} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Sign.prefab b/Assets/Prefabs/Sign.prefab new file mode 100644 index 0000000..64f0caf --- /dev/null +++ b/Assets/Prefabs/Sign.prefab @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4155107550089608892 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1300815627686137182} + - component: {fileID: 8541401974869020574} + - component: {fileID: 3291927773485791029} + m_Layer: 0 + m_Name: Cylinder.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1300815627686137182 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4155107550089608892} + m_LocalRotation: {x: 0, y: 0.7072302, z: 0.7069834, w: 0} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 25, y: 25, z: 25} + m_Children: [] + m_Father: {fileID: 5189304429820737636} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -89.98, y: 180, z: 0} +--- !u!33 &8541401974869020574 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4155107550089608892} + m_Mesh: {fileID: -7387706064836869012, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} +--- !u!23 &3291927773485791029 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4155107550089608892} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 670224309865224971, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &4850319959489979102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5189304429820737636} + - component: {fileID: 5732701482242678666} + - component: {fileID: 5732701482242678669} + m_Layer: 0 + m_Name: Sign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5189304429820737636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4850319959489979102} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.299, y: 0, z: 0.913} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8968279225545941761} + - {fileID: 1300815627686137182} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5732701482242678666 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4850319959489979102} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.8, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: -0.913} +--- !u!114 &5732701482242678669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4850319959489979102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7be605e9d134b742b0269485b577d6a, type: 3} + m_Name: + m_EditorClassIdentifier: + objectType: 2 + detailSign: {fileID: 0} +--- !u!1 &4900697133632204267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8968279225545941761} + - component: {fileID: 398827915274556831} + - component: {fileID: 8110672917134526784} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8968279225545941761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4900697133632204267} + m_LocalRotation: {x: 0, y: 0.7072302, z: 0.7069834, w: 0} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 25, y: 25, z: 25} + m_Children: [] + m_Father: {fileID: 5189304429820737636} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -89.98, y: 180, z: 0} +--- !u!33 &398827915274556831 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4900697133632204267} + m_Mesh: {fileID: -5495902117074765545, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} +--- !u!23 &8110672917134526784 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4900697133632204267} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 670224309865224971, guid: 2784c771a437b7e4cb23176a2e7c3ee3, type: 3} + - {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 diff --git a/Assets/Prefabs/Sign.prefab.meta b/Assets/Prefabs/Sign.prefab.meta new file mode 100644 index 0000000..282a8bc --- /dev/null +++ b/Assets/Prefabs/Sign.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c6f393d12d7dd6b43a2ec2840cb89b97 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Filip.unity b/Assets/Scenes/Filip.unity index cb7da23..de5507d 100644 --- a/Assets/Scenes/Filip.unity +++ b/Assets/Scenes/Filip.unity @@ -352,6 +352,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} +--- !u!1 &952701062 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5921576287932412887, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + m_PrefabInstance: {fileID: 6840056971477016067} + m_PrefabAsset: {fileID: 0} --- !u!1 &964739489 GameObject: m_ObjectHideFlags: 0 @@ -651,6 +657,80 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} +--- !u!1001 &5732701482027561366 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4850319959489979102, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_Name + value: Sign + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.299 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.913 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5732701482242678669, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + type: 3} + propertyPath: detailSign + value: + objectReference: {fileID: 952701062} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c6f393d12d7dd6b43a2ec2840cb89b97, type: 3} --- !u!1001 &6840056971477016067 PrefabInstance: m_ObjectHideFlags: 0 @@ -663,29 +743,6 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: PowerPrefabs.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: PowerPrefabs.Array.data[0] - value: - objectReference: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, - type: 3} - - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: PowerPrefabs.Array.data[1] - value: - objectReference: {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f, - type: 3} - - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: PowerPrefabs.Array.data[2] - value: - objectReference: {fileID: 7945524436670112111, guid: 2d077f1b027540045b6833e51a067855, - type: 3} - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scripts/ObjectManager.cs b/Assets/Scripts/ObjectManager.cs index e6975ab..70fd7b9 100644 --- a/Assets/Scripts/ObjectManager.cs +++ b/Assets/Scripts/ObjectManager.cs @@ -1,21 +1,35 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class ObjectManager : MonoBehaviour { - public enum ObjectType {Nothing, PushPull, Drag}; + public enum ObjectType {Nothing, PushPull, Sign}; public ObjectType objectType = ObjectType.Nothing; private Rigidbody rigidBody; private MeshRenderer meshRenderer; private PlayerManager playerManager; private bool interact = false; - + public GameObject detailSign; // Start is called before the first frame update void Start() { - meshRenderer = GetComponent(); + if (objectType == ObjectType.Sign) { + MeshRenderer[] meshR = GetComponentsInChildren(); + if (meshR[0].materials[1] != null) { + meshRenderer = meshR[0]; + } + else + { + meshRenderer = meshR[1]; + } + } + else + { + meshRenderer = GetComponent(); + } meshRenderer.materials[1].SetFloat ("_Outline", 0.0f); meshRenderer.materials[1].SetColor("_OutlineColor", new Color(0.5276349f, 0.5566038f, 0.118147f)); rigidBody = GetComponent(); @@ -43,6 +57,18 @@ public class ObjectManager : MonoBehaviour } } } + else if (objectType == ObjectType.Sign) + { + if (Input.GetKeyUp(KeyCode.E) && !detailSign.activeSelf) + { + detailSign.SetActive(true); + } + else if (!playerManager.onGround || Input.GetAxisRaw("Horizontal") != 0 || (Input.GetKeyUp(KeyCode.E) && detailSign.activeSelf)) + { + detailSign.SetActive(false); + } + + } } else { @@ -61,6 +87,28 @@ public class ObjectManager : MonoBehaviour } } + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.tag == "Player") + { + if (objectType == ObjectType.Sign) + { + playerManager = other.gameObject.GetComponent(); + meshRenderer.materials[1].SetFloat("_Outline", 2.5f); + interact = true; + } + } + } + + private void OnTriggerExit(Collider other) + { + if (other.gameObject.tag == "Player") + { + meshRenderer.materials[1].SetFloat("_Outline", 0.0f); + interact = false; + } + } + private void OnCollisionStay(Collision collision) { if (collision.gameObject.tag == "Player") diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 2395355..4377f12 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -354,9 +354,9 @@ public class PlayerManager : MonoBehaviour dubleJump = true; dash = false; } - powerCubeManager = other.gameObject.GetComponent(); - if (powerCubeManager != null) + if (other.gameObject.GetComponent() != null) { + powerCubeManager = other.gameObject.GetComponent(); interact = true; } } diff --git a/Assets/Shaders/Border.shader b/Assets/Shaders/Border.shader index bb4df58..07287ed 100644 --- a/Assets/Shaders/Border.shader +++ b/Assets/Shaders/Border.shader @@ -3,7 +3,7 @@ Shader "Outlined/Silhouette Only" { Properties{ _OutlineColor("Outline Color", Color) = (0,0,0,1) - _Outline("Outline width", Range(0.0, 1)) = .005 + _Outline("Outline width", Range(0.0, 10.0)) = .005 } CGINCLUDE