diff --git a/Assets/Models/Ankh.fbx.meta b/Assets/Models/Ankh.fbx.meta new file mode 100644 index 0000000..9ed299a --- /dev/null +++ b/Assets/Models/Ankh.fbx.meta @@ -0,0 +1,97 @@ +fileFormatVersion: 2 +guid: dbb67ade1acacb046b14f8c82b3d1495 +ModelImporter: + serializedVersion: 19301 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Sign.fbx.meta b/Assets/Models/Sign.fbx.meta new file mode 100644 index 0000000..db420d4 --- /dev/null +++ b/Assets/Models/Sign.fbx.meta @@ -0,0 +1,97 @@ +fileFormatVersion: 2 +guid: 2784c771a437b7e4cb23176a2e7c3ee3 +ModelImporter: + serializedVersion: 19301 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Artifac.prefab b/Assets/Prefabs/Artifac.prefab index 5143ac7..e3b24d3 100644 --- a/Assets/Prefabs/Artifac.prefab +++ b/Assets/Prefabs/Artifac.prefab @@ -29,7 +29,7 @@ Transform: m_LocalPosition: {x: 3.64, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2773067093833738001} + - {fileID: 7981536033805794446} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -62,83 +62,103 @@ MonoBehaviour: powerTime: 5 powerUnit: 10 nextSceneName: Vasek ---- !u!1 &2773067093833738002 -GameObject: +--- !u!1001 &7588184672228875109 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2773067093833738001} - - component: {fileID: 2773067093833737999} - - component: {fileID: 2773067093833738000} - m_Layer: 0 - m_Name: Cylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2773067093833738001 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2773067093461657726} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalScale.z + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + - target: {fileID: 919132149155446097, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + propertyPath: m_Name + value: Ankh + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dbb67ade1acacb046b14f8c82b3d1495, type: 3} +--- !u!4 &7981536033805794446 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dbb67ade1acacb046b14f8c82b3d1495, + type: 3} + m_PrefabInstance: {fileID: 7588184672228875109} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2773067093833738002} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.25, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_Children: [] - m_Father: {fileID: 2773067093461657726} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2773067093833737999 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2773067093833738002} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2773067093833738000 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2773067093833738002} - 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: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {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/Scenes/Filip.unity b/Assets/Scenes/Filip.unity index 8b5a15f..b3ecf68 100644 --- a/Assets/Scenes/Filip.unity +++ b/Assets/Scenes/Filip.unity @@ -444,6 +444,75 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &1313665106 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.64 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2773067093461657727, guid: 712671f8cf5fa684cbcb1159d45b0057, + type: 3} + propertyPath: m_Name + value: Artifac + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} --- !u!1001 &6840056971477016067 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 843232b..7cb47af 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -17,6 +17,7 @@ public class PlayerManager : MonoBehaviour private Animator playerAnimator; private Rigidbody rigidBody; private PowerCubeManager powerCubeManager; + private bool interact = false; public List activeAbility = new List(); //without ability=0 or null, dubleJump = 1, push/pull = 2, dash = 3 private bool dubleJump = true; @@ -62,6 +63,17 @@ public class PlayerManager : MonoBehaviour { playerAnimator.Play("Die"); } + if (interact) + { + if (powerCubeManager.powerType == PowerCubeManager.PowerType.Artefact) + { + if (Input.GetKeyUp(KeyCode.E)) + { + playerAnimator.SetTrigger("Eat"); + interact = false; + } + } + } AbilityAction(); DeactivePowerCube(); Move(); @@ -231,9 +243,15 @@ public class PlayerManager : MonoBehaviour } } - public void ActivePowerCube(float power, float powerTime, PowerCubeManager.PowerType powerType) + public void ActivePowerCube(float power, float powerTime, PowerCubeManager.PowerType powerType, string nextSceneName = "") { - if (actualPowerTimes.Length <= (powerType.GetHashCode()) || actualPowerTimes[powerType.GetHashCode() - 1] < Time.time) { + Debug.Log((powerType.GetHashCode() - 1)); + if ((powerType.GetHashCode() - 1) == 3) + { + SceneManager.LoadScene(nextSceneName); + } + else if (actualPowerTimes.Length <= (powerType.GetHashCode()) || actualPowerTimes[powerType.GetHashCode() - 1] < Time.time) + { actualPowerTimes[powerType.GetHashCode() - 1] = Time.time + powerTime; if (powerType == PowerCubeManager.PowerType.Bigger) { @@ -306,6 +324,11 @@ public class PlayerManager : MonoBehaviour dubleJump = true; dash = false; } + powerCubeManager = other.gameObject.GetComponent(); + if (powerCubeManager != null) + { + interact = true; + } } public void OnTriggerExit(Collider other) @@ -320,6 +343,10 @@ public class PlayerManager : MonoBehaviour onGround = false; dash = false; } + if (other.gameObject.GetComponent() != null) + { + interact = true; + } } public void OnTriggerStay(Collider other) @@ -370,7 +397,7 @@ public class PlayerManager : MonoBehaviour public void EndEatPowerCube() { startEating = false; - ActivePowerCube(powerCubeManager.powerUnit, powerCubeManager.powerTime, powerCubeManager.powerType); + ActivePowerCube(powerCubeManager.powerUnit, powerCubeManager.powerTime, powerCubeManager.powerType, powerCubeManager.nextSceneName); Destroy(powerCubeManager.gameObject); } } diff --git a/Assets/Scripts/PowerCubeManager.cs b/Assets/Scripts/PowerCubeManager.cs index ec40c24..eaa128a 100644 --- a/Assets/Scripts/PowerCubeManager.cs +++ b/Assets/Scripts/PowerCubeManager.cs @@ -37,22 +37,14 @@ public class PowerCubeManager : MonoBehaviour void Update() { - if (interact) { - if (powerType == PowerType.Artefact) - { - if (Input.GetKeyUp(KeyCode.E)) - { - SceneManager.LoadScene(nextSceneName); - } - } - } + } private void OnTriggerEnter(Collider other) { if (other.gameObject.tag == "Player") { - meshRenderer.materials[1].SetFloat("_Outline", 0.01f); + meshRenderer.materials[1].SetFloat("_Outline", 0.4f); interact = true; } }