diff --git a/3D blobici/Assets/Prefabs/Arena/Arena_1.prefab b/3D blobici/Assets/Prefabs/Arena/Arena_1.prefab index e2f5686..10f0a70 100644 --- a/3D blobici/Assets/Prefabs/Arena/Arena_1.prefab +++ b/3D blobici/Assets/Prefabs/Arena/Arena_1.prefab @@ -2411,6 +2411,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8966129328394384168, guid: 7de66f1652a936749ac28fd445d6a49a, type: 3} + propertyPath: m_ProvidesContacts + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/3D blobici/Assets/Prefabs/Corridors/Corridor_Door.prefab b/3D blobici/Assets/Prefabs/Corridors/Corridor_Door.prefab index c9cc09d..0dee6d5 100644 --- a/3D blobici/Assets/Prefabs/Corridors/Corridor_Door.prefab +++ b/3D blobici/Assets/Prefabs/Corridors/Corridor_Door.prefab @@ -59,11 +59,14 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 3479177569595356638, guid: 1a5d554c0c76caf4195cae47e098b79d, type: 3} insertIndex: -1 - addedObject: {fileID: 4467075920784954077} + addedObject: {fileID: 3659337172890218499} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 8047827979703692770, guid: 1a5d554c0c76caf4195cae47e098b79d, type: 3} insertIndex: -1 addedObject: {fileID: 786145300433680676} + - targetCorrespondingSourceObject: {fileID: 8047827979703692770, guid: 1a5d554c0c76caf4195cae47e098b79d, type: 3} + insertIndex: -1 + addedObject: {fileID: 8421435103350859687} m_SourcePrefab: {fileID: 100100000, guid: 1a5d554c0c76caf4195cae47e098b79d, type: 3} --- !u!4 &1307296323818642418 stripped Transform: @@ -87,9 +90,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 32247197df65c234298196b8068b3344, type: 3} m_Name: m_EditorClassIdentifier: - doorLAnimator: {fileID: 5623347737373064644} - doorRAnimator: {fileID: 7687583384832110078} ---- !u!1001 &4212137359693313334 + doorLAnimator: {fileID: 0} + doorRAnimator: {fileID: 0} +--- !u!114 &8421435103350859687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5603417387143431118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52671dd81cd5334e9cfa7610de4c062, type: 3} + m_Name: + m_EditorClassIdentifier: + door: {fileID: 1436450186822638990} + openSpeed: 2 + closeSpeed: 4 +--- !u!1001 &3837676803061553128 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -97,87 +115,117 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1307296323818642418} m_Modifications: - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalPosition.z - value: -4.5 + value: -3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - target: {fileID: -589411044009936901, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 431377107501119972, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 716731152154580545, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} propertyPath: m_Name - value: Vrata_1 + value: Vrata_2 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8372951991239638139, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + - targetCorrespondingSourceObject: {fileID: 2786990867911985766, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} insertIndex: -1 - addedObject: {fileID: 111606191208914928} - - targetCorrespondingSourceObject: {fileID: 8372951991239638139, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + addedObject: {fileID: 8357340802129143827} + - targetCorrespondingSourceObject: {fileID: 4857723534474613559, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} insertIndex: -1 - addedObject: {fileID: 7687583384832110078} - - targetCorrespondingSourceObject: {fileID: -2569572823894578253, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - insertIndex: -1 - addedObject: {fileID: 6202671834055652329} - - targetCorrespondingSourceObject: {fileID: -2569572823894578253, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - insertIndex: -1 - addedObject: {fileID: 5623347737373064644} - - targetCorrespondingSourceObject: {fileID: 4857723534474613559, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - insertIndex: -1 - addedObject: {fileID: 7383634731900761843} - m_SourcePrefab: {fileID: 100100000, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} ---- !u!4 &4467075920784954077 stripped + addedObject: {fileID: 3046442484881502417} + m_SourcePrefab: {fileID: 100100000, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} +--- !u!1 &1436450186822638990 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2786990867911985766, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} + m_PrefabInstance: {fileID: 3837676803061553128} + m_PrefabAsset: {fileID: 0} +--- !u!64 &8357340802129143827 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1436450186822638990} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 6689747073673672569, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} +--- !u!4 &3659337172890218499 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - m_PrefabInstance: {fileID: 4212137359693313334} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} + m_PrefabInstance: {fileID: 3837676803061553128} m_PrefabAsset: {fileID: 0} ---- !u!1 &5640257044219365709 stripped +--- !u!1 &8514111621748458719 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8372951991239638139, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - m_PrefabInstance: {fileID: 4212137359693313334} + m_CorrespondingSourceObject: {fileID: 4857723534474613559, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} + m_PrefabInstance: {fileID: 3837676803061553128} m_PrefabAsset: {fileID: 0} ---- !u!64 &111606191208914928 +--- !u!64 &3046442484881502417 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5640257044219365709} + m_GameObject: {fileID: 8514111621748458719} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -192,102 +240,4 @@ MeshCollider: serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: -4648275748246507965, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} ---- !u!95 &7687583384832110078 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5640257044219365709} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 9be4946c89bbf8f4b9cb46a8ac8b484b, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 1 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &7359884261772484229 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2569572823894578253, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - m_PrefabInstance: {fileID: 4212137359693313334} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6202671834055652329 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7359884261772484229} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 8773391265936989621, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} ---- !u!95 &5623347737373064644 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7359884261772484229} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: c3727b9a7ba925d49ab1cf439f3213a3, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 1 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &8727586084692813313 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4857723534474613559, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} - m_PrefabInstance: {fileID: 4212137359693313334} - m_PrefabAsset: {fileID: 0} ---- !u!64 &7383634731900761843 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8727586084692813313} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6732535491024111758, guid: c733c68963e9cbf4e991dc50752a6b20, type: 3} + m_Mesh: {fileID: 6732535491024111758, guid: 11ae3c83f9339df4fab96f6d08f57390, type: 3} diff --git a/3D blobici/Assets/Prefabs/Object_Prefabs/Truhla_1.prefab b/3D blobici/Assets/Prefabs/Object_Prefabs/Truhla_1.prefab index ceb7631..574fe59 100644 --- a/3D blobici/Assets/Prefabs/Object_Prefabs/Truhla_1.prefab +++ b/3D blobici/Assets/Prefabs/Object_Prefabs/Truhla_1.prefab @@ -121,6 +121,7 @@ GameObject: - component: {fileID: 264244183541474892} - component: {fileID: 7190282298976339630} - component: {fileID: 8966129328394384168} + - component: {fileID: 7632024884074263262} m_Layer: 0 m_Name: Truhla_1 m_TagString: Untagged @@ -198,8 +199,35 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 5.1036015, y: 3.437481, z: 2.4082344} - m_Center: {x: 0.006062031, y: 1.3749173, z: -0.7041172} + m_Size: {x: 5, y: 3, z: 4} + m_Center: {x: 0, y: 2, z: -1.5} +--- !u!54 &7632024884074263262 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3735711022041751044} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &5978412522907266184 GameObject: m_ObjectHideFlags: 0 diff --git a/3D blobici/Assets/Prefabs/PlayerContainer.prefab b/3D blobici/Assets/Prefabs/PlayerContainer.prefab index 84e6d98..ffa348c 100644 --- a/3D blobici/Assets/Prefabs/PlayerContainer.prefab +++ b/3D blobici/Assets/Prefabs/PlayerContainer.prefab @@ -1,5 +1,107 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1246198998110393468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8807664616337023072} + - component: {fileID: 9192292969203387642} + - component: {fileID: 1030185587407834460} + - component: {fileID: 1542319922315403782} + m_Layer: 0 + m_Name: UI Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8807664616337023072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246198998110393468} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8991658504906099272} + m_Father: {fileID: 1302341320372733696} + 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 &9192292969203387642 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246198998110393468} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 394159207937902131} + m_PlaneDistance: 0 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1030185587407834460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246198998110393468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 3840, y: 2160} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &1542319922315403782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246198998110393468} + 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 &2520153335582361885 GameObject: m_ObjectHideFlags: 0 @@ -225,7 +327,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8807664616337023072} m_Father: {fileID: 7001416999833331379} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &394159207937902131 @@ -307,3 +410,139 @@ MonoBehaviour: maxZoomHeight: 15 zoomZRatio: 0.5 cameraRotation: {x: 60, y: 0, z: 0} +--- !u!1 &7684988679942562137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8991658504906099272} + - component: {fileID: 7527513433228441835} + - component: {fileID: 9201847439608863946} + m_Layer: 0 + m_Name: ChestUIText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8991658504906099272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7684988679942562137} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8807664616337023072} + 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: -400} + m_SizeDelta: {x: 360, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7527513433228441835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7684988679942562137} + m_CullTransparentMesh: 1 +--- !u!114 &9201847439608863946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7684988679942562137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Press E to open chest + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/3D blobici/Assets/Prefabs/Scripts/DoorAnimation.cs b/3D blobici/Assets/Prefabs/Scripts/DoorAnimation.cs new file mode 100644 index 0000000..0c2edfa --- /dev/null +++ b/3D blobici/Assets/Prefabs/Scripts/DoorAnimation.cs @@ -0,0 +1,48 @@ +using UnityEngine; + +public class DoorAnimation : MonoBehaviour +{ + [SerializeField] private GameObject door; + [SerializeField] private float openSpeed = 2.0f; + [SerializeField] private float closeSpeed = 2.0f; + private bool isOpen = false; + private Vector3 closedPosition; + private Vector3 openPosition; + + void Start() + { + closedPosition = door.transform.position; + openPosition = new Vector3(door.transform.position.x, door.transform.position.y - 4.6f, door.transform.position.z); + } + + public void ToggleDoor() + { + if (isOpen) + { + StartCoroutine(CloseDoor()); + } + else + { + StartCoroutine(OpenDoor()); + } + } + private System.Collections.IEnumerator OpenDoor() + { + while (Vector3.Distance(door.transform.position, openPosition) > 0.01f) + { + door.transform.position = Vector3.MoveTowards(door.transform.position, openPosition, openSpeed * Time.deltaTime); + yield return null; + } + isOpen = true; + } + + private System.Collections.IEnumerator CloseDoor() + { + while (Vector3.Distance(door.transform.position, closedPosition) > 0.01f) + { + door.transform.position = Vector3.MoveTowards(door.transform.position, closedPosition, closeSpeed * Time.deltaTime); + yield return null; + } + isOpen = false; + } +} diff --git a/3D blobici/Assets/Prefabs/Scripts/DoorAnimation.cs.meta b/3D blobici/Assets/Prefabs/Scripts/DoorAnimation.cs.meta new file mode 100644 index 0000000..23c989e --- /dev/null +++ b/3D blobici/Assets/Prefabs/Scripts/DoorAnimation.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e52671dd81cd5334e9cfa7610de4c062 \ No newline at end of file diff --git a/3D blobici/Assets/Scenes/GenTest.unity b/3D blobici/Assets/Scenes/GenTest.unity index cc48c48..a2f1a6d 100644 --- a/3D blobici/Assets/Scenes/GenTest.unity +++ b/3D blobici/Assets/Scenes/GenTest.unity @@ -176,98 +176,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &743746583 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 743746586} - - component: {fileID: 743746585} - - component: {fileID: 743746584} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &743746584 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 743746583} - m_Enabled: 1 ---- !u!20 &743746585 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 743746583} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &743746586 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 743746583} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1315219950 GameObject: m_ObjectHideFlags: 0 @@ -369,6 +277,5 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 743746586} - {fileID: 1315219952} - {fileID: 23489964} diff --git a/3D blobici/Assets/Scripts/MapGen/MapGenManager.cs b/3D blobici/Assets/Scripts/MapGen/MapGenManager.cs index 09b6b6d..3eea9eb 100644 --- a/3D blobici/Assets/Scripts/MapGen/MapGenManager.cs +++ b/3D blobici/Assets/Scripts/MapGen/MapGenManager.cs @@ -69,7 +69,16 @@ public class MapGenManager : MonoBehaviour if (Player) { Vector3 playerPos = spawnPos + new Vector3(0, 1, 3); - Instantiate(Player, playerPos, Quaternion.identity, transform); + GameObject playerInstance = Instantiate(Player, playerPos, Quaternion.identity, transform); + Transform controllerObj = playerInstance.transform.Find("Player"); + if (controllerObj != null) + { + controllerObj.tag = "Player"; + } + } + else + { + Debug.LogWarning("Player prefab není přiřazený, hráč nebude umístěn do mapy."); } /* ---------- Build the rest of rooms ---------- */ @@ -231,8 +240,8 @@ public class MapGenManager : MonoBehaviour int count = Mathf.Max(1, Mathf.FloorToInt(dist / step)); Vector3 segPos = start + axis * (step * 0.5f); - var door = Instantiate(CorridorStraight, segPos, rot, transform); - //door.GetComponent()?.OpenDoor(); + var door = Instantiate(DoorCorridor, segPos, rot, transform); + door.GetComponent()?.ToggleDoor(); for (int i = 1; i < count; i++) { diff --git a/3D blobici/Assets/Scripts/Objects/ChestLogic.cs b/3D blobici/Assets/Scripts/Objects/ChestLogic.cs index fc6a077..df8f3e0 100644 --- a/3D blobici/Assets/Scripts/Objects/ChestLogic.cs +++ b/3D blobici/Assets/Scripts/Objects/ChestLogic.cs @@ -5,20 +5,51 @@ public class ChestLogic : MonoBehaviour private Animator animator; private bool isOpen = false; + private bool isPlayerInRange = false; + private GameObject canvas; + // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() { animator = GetComponent(); + canvas = GameObject.Find("UI Canvas"); + if (canvas == null) Debug.LogWarning("ChestUIText GameObject not found in the scene. Please ensure it exists."); + } // Update is called once per frame void Update() { - + if (!isPlayerInRange) + return; + if (Input.GetKeyDown(KeyCode.E)) // Detekce stisku klávesy E + { + Debug.Log("E key pressed"); + if (!isOpen) + { + animator.SetTrigger("Open"); + isOpen = true; + + // Deactivate the ChestUIText when the chest is opened + if (canvas != null) + { + Transform chestTextTransform = canvas.transform.Find("ChestUIText"); + if (chestTextTransform != null) + { + chestTextTransform.gameObject.SetActive(false); + } + } + } + /*else + { + animator.SetTrigger("Close"); + isOpen = false; + }*/ + } } - private void OnMouseDown() + /*private void OnMouseDown() { Debug.Log("Chest clicked"); if (!isOpen) @@ -31,5 +62,51 @@ public class ChestLogic : MonoBehaviour animator.SetTrigger("Close"); isOpen = false; } + }*/ + private void OnTriggerEnter(Collider other) + { + // Check if the chest is not already open + if (!isOpen) + { + if (other.CompareTag("Player")) + { + isPlayerInRange = true; + Debug.Log("Player entered chest range"); + + // Activate the ChestUIText when the player enters the range + if (canvas != null) + { + Transform chestTextTransform = canvas.transform.Find("ChestUIText"); + if (chestTextTransform != null) + { + chestTextTransform.gameObject.SetActive(true); + } + } + } + } } + + private void OnTriggerExit(Collider other) + { + // Check if the chest is already open + if (isOpen) + return; + + if (other.CompareTag("Player")) + { + isPlayerInRange = false; + Debug.Log("Player left chest range"); + + // Deaktivate the ChestUIText when the player leaves the range + if (canvas != null) + { + Transform chestTextTransform = canvas.transform.Find("ChestUIText"); + if (chestTextTransform != null) + { + chestTextTransform.gameObject.SetActive(false); + } + } + } + } + }