diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c new file mode 100644 index 0000000..78961aa --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9132b80b553bb3f40b9a29cc65955c79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat index f4e145a..b6c5a54 100644 --- a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat @@ -24,7 +24,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: +<<<<<<< HEAD m_Texture: {fileID: 2800000, guid: 4f66e39be2d476f46bb700a5268dcfb8, type: 3} +======= + m_Texture: {fileID: 2800000, guid: 6ba5faafd9a8ff44b8f96dbe81c4f0f2, type: 3} +>>>>>>> 77db7eb71343ea6a91583afc81271a936526016c m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta index 888a93a..c2a2771 100644 --- a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4cfcd558d1d29fe49a8f2d60afff1640 +======= +guid: ca80fac3bd969f84eaf173691c89d17a +>>>>>>> 77db7eb71343ea6a91583afc81271a936526016c NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta new file mode 100644 index 0000000..3203616 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 59dd813e4bd61114da8ecacf6b2f6061 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..f61feaa --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,473 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4668322654876184655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322654876184626} + - component: {fileID: 4668322654876184653} + - component: {fileID: 4668322654876184652} + - component: {fileID: 4668322654876184627} + - component: {fileID: 4668322654876184630} + - component: {fileID: 4668322654876184625} + - component: {fileID: 4668322654876184624} + - component: {fileID: 4668322654876184631} + - component: {fileID: -4453463038580551382} + m_Layer: 7 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322654876184626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.03, y: -5.21, z: -0.17} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_Children: + - {fileID: 4668322656625073464} + - {fileID: 4668322656710469013} + - {fileID: 4668322655870949457} + - {fileID: 4668322655423990997} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4668322654876184653 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -9095717837082945937, guid: bd3cb4af8406d4436a2ae8c2aafe1f8d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &4668322654876184652 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 6200000, guid: 6c2f9af082941ef45abc8e6a22e1c9ef, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!70 &4668322654876184627 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 1, y: 2} + m_Direction: 0 +--- !u!114 &4668322654876184630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 34d55f77ac416ab45b29345bb7e6a913, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4668322654876184624} + m_TargetAssemblyTypeName: CharacterInputController, Assembly-CSharp + m_MethodName: OnMove + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: d1943f36-92e5-4335-a3f3-dd2e9e553ba6 + m_ActionName: Level/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4668322654876184624} + m_TargetAssemblyTypeName: CharacterInputController, Assembly-CSharp + m_MethodName: OnJump + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: e7ae7276-c64d-43bb-8719-ef3178e194a0 + m_ActionName: Level/Jump[/Keyboard/space,/Keyboard/w] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Level + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &4668322654876184625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 32250bba13a1233448b3ff49db05c141, type: 3} + m_Name: + m_EditorClassIdentifier: + m_JumpForce: 100 + m_WallJumpMultiplier: 3 + m_CrouchSpeed: 0.36 + m_MovementSmoothing: 0.05 + m_AirControl: 1 + m_WhatIsGround: + serializedVersion: 2 + m_Bits: 512 + m_GroundCheck: {fileID: 4668322656625073464} + m_CeilingCheck: {fileID: 4668322656710469013} + m_WallCheck: {fileID: 4668322655870949457} + m_CrouchDisableCollider: {fileID: 0} + OnLandEvent: + m_PersistentCalls: + m_Calls: [] + OnCrouchEvent: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4668322654876184624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0511d3cc433b7e41906b4911f68a962, type: 3} + m_Name: + m_EditorClassIdentifier: + m_characterController: {fileID: 4668322654876184625} + m_playerInput: + Variable: {fileID: 11400000, guid: ae129d59580dbe94fa385299e3dfb47d, type: 2} + m_useLocal: 0 + m_localValue: 0 + m_noInputAllowed: + Variable: {fileID: 11400000, guid: ea1cffffa7e1ed34ca1fe3d3af13777c, type: 2} + m_useLocal: 0 + m_localValue: 0 + m_speed: 2 +--- !u!95 &4668322654876184631 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &-4453463038580551382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49dda9eea2761864e9eac5cdb5c83f57, type: 3} + m_Name: + m_EditorClassIdentifier: + m_isPlayerDead: + Variable: {fileID: 11400000, guid: a1586014535831a4e80b30178ff5ced4, type: 2} + m_useLocal: 0 + m_localValue: 0 +--- !u!1 &4668322655423990996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322655423990997} + - component: {fileID: 4668322655423991003} + - component: {fileID: 4668322655423991002} + m_Layer: 7 + m_Name: char_dude_sheet_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322655423990997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655423990996} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.063, y: 0.383, z: 0} + m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4668322655423991003 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655423990996} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 8758575904115477578, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.23, y: 0.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &4668322655423991002 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655423990996} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 49a569a83db15b14bb24e4093bd3b6de, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4668322655870949456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322655870949457} + m_Layer: 7 + m_Name: Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322655870949457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655870949456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: -0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4668322656625073467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322656625073464} + m_Layer: 7 + m_Name: Feet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322656625073464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322656625073467} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4668322656710469012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322656710469013} + m_Layer: 7 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322656710469013 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322656710469012} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.61, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..86765be --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4a65ba6dfdde8742903c22557f538a1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/spikes_3.prefab b/Assets/Prefabs/spikes_3.prefab new file mode 100644 index 0000000..ad11019 --- /dev/null +++ b/Assets/Prefabs/spikes_3.prefab @@ -0,0 +1,211 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2568405382520894643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8078117592371321287} + - component: {fileID: 1043124044502169818} + - component: {fileID: 1793437425226485100} + - component: {fileID: 5792353894968254291} + m_Layer: 0 + m_Name: spikes_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8078117592371321287 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568405382520894643} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.62, y: -4.87, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6045522938640616061} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1043124044502169818 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568405382520894643} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &1793437425226485100 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568405382520894643} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &5792353894968254291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2568405382520894643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ac34d7ad4f935b4a92bff7901ea1180, type: 3} + m_Name: + m_EditorClassIdentifier: + m_isDead: + Variable: {fileID: 0} + m_useLocal: 1 + m_localValue: 0 +--- !u!1 &2740308402194940216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6045522938640616061} + - component: {fileID: 2090863402335022966} + m_Layer: 0 + m_Name: we + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6045522938640616061 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2740308402194940216} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.47, y: 0.79, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8078117592371321287} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2090863402335022966 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2740308402194940216} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/spikes_3.prefab.meta b/Assets/Prefabs/spikes_3.prefab.meta new file mode 100644 index 0000000..6ff7f94 --- /dev/null +++ b/Assets/Prefabs/spikes_3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bbc251b61efff9b49a4a402c3cdc304c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index c5858af..b43c3e3 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c59a7d1966869da8f59c50bd5a7b25d78e282efb3403c322c7e957423cc6e01 -size 289 +oid sha256:d6977daa994f59ff7bee89a90dbccb0753b93a78048705abf801f666e8fcfac3 +size 285040 diff --git a/Assets/Scenes/WalljumpTest.unity b/Assets/Scenes/WalljumpTest.unity index 6abbb04..98c09f1 100644 --- a/Assets/Scenes/WalljumpTest.unity +++ b/Assets/Scenes/WalljumpTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cad676d600bd9af5447b2280a2a11e71976aeb8ede54c16ee5489740f57eeae -size 276836 +oid sha256:74dadf0e7abae9aa3eb00726859b73a50e45d849720fc434d3a27f6faf54b6b6 +size 1728849 diff --git a/Assets/Scripts/CameraFollower.cs b/Assets/Scripts/CameraFollower.cs new file mode 100644 index 0000000..7472137 --- /dev/null +++ b/Assets/Scripts/CameraFollower.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CameraFollower : MonoBehaviour +{ + public GameObject Player; + + [SerializeField] private float m_FollowStrength = 3f; + [SerializeField] private bool m_FollowX = true; + [SerializeField] private bool m_FollowY = false; + + private Camera m_Camera; + + private void Start() + { + m_Camera = GetComponent(); + } + + private void Update() + { + if(Mathf.Abs(Player.transform.position.x - m_Camera.transform.position.x) > m_FollowStrength) + { + m_Camera.transform.Translate( + m_FollowX ? (m_FollowStrength + Player.transform.position.x - m_Camera.transform.position.x) * Time.deltaTime : 0, + m_FollowY ? (m_FollowStrength + Player.transform.position.y - m_Camera.transform.position.y) * Time.deltaTime : 0, + 0); + } + } +} diff --git a/Assets/Scripts/CameraFollower.cs.meta b/Assets/Scripts/CameraFollower.cs.meta new file mode 100644 index 0000000..d10eab3 --- /dev/null +++ b/Assets/Scripts/CameraFollower.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b7796aef2c9a634e943d7b131c0b13f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Character/CharacterReset.cs b/Assets/Scripts/Character/CharacterReset.cs new file mode 100644 index 0000000..ab56992 --- /dev/null +++ b/Assets/Scripts/Character/CharacterReset.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class CharacterReset : MonoBehaviour, IResettable +{ + + [SerializeField, Header("References")] + Reference m_isPlayerDead; + + + private Vector3 m_startPosition; + private Quaternion m_startRotation; + + + + public void OnLevelLoad() + { + m_startPosition = transform.position; + m_startRotation = transform.rotation; + } + + public void OnResetEnd() + { + + } + + public IEnumerator OnResetStart(float time) + { + transform.position = m_startPosition; + transform.rotation = m_startRotation; + + m_isPlayerDead.Value = false; + yield break; + } +} diff --git a/Assets/Scripts/Character/CharacterReset.cs.meta b/Assets/Scripts/Character/CharacterReset.cs.meta new file mode 100644 index 0000000..4f76547 --- /dev/null +++ b/Assets/Scripts/Character/CharacterReset.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 49dda9eea2761864e9eac5cdb5c83f57 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DarknessController.cs b/Assets/Scripts/DarknessController.cs index 7fa9bff..950af94 100644 --- a/Assets/Scripts/DarknessController.cs +++ b/Assets/Scripts/DarknessController.cs @@ -10,6 +10,9 @@ public class DarknessController : MonoBehaviour [SerializeField, Header("References")] private Material m_darknessMat; + [SerializeField] + private Reference m_lightLevel; + [SerializeField] private Reference m_isInputDown; @@ -23,8 +26,7 @@ public class DarknessController : MonoBehaviour private AnimationCurve m_lightCurve = AnimationCurve.Linear(0,0,1,1); - [ShowNonSerializedField] - private float m_currentDarknessLevel = 1; + [ShowNonSerializedField] private bool m_isDarknessChanging; @@ -32,13 +34,15 @@ public class DarknessController : MonoBehaviour private void OnEnable() { m_isInputDown.OnValueChanged += OnInputChange; - m_darknessMat.SetFloat("_Apply",1); + m_darknessMat.SetFloat("_Apply", 1); + m_lightLevel.Value = 1; } private void OnDisable() { m_isInputDown.OnValueChanged -= OnInputChange; m_darknessMat.SetFloat("_Apply", 1); + m_lightLevel.Value = 1; } @@ -69,24 +73,24 @@ public class DarknessController : MonoBehaviour private IEnumerator ChangeDarkness(float end, float time, AnimationCurve curve) { - float start = m_currentDarknessLevel; + float start = m_lightLevel; float elapsedTime = 0; - time = Mathf.InverseLerp(end, start, m_currentDarknessLevel) * time; + time = Mathf.InverseLerp(end, start, m_lightLevel) * time; m_isDarknessChanging = true; while(elapsedTime < time) { - m_currentDarknessLevel = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time)); - m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel); + m_lightLevel.Value = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time)); + m_darknessMat.SetFloat("_Apply", m_lightLevel); yield return new WaitForEndOfFrame(); elapsedTime += Time.deltaTime; } m_isDarknessChanging = false; - m_currentDarknessLevel = end; - m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel); + m_lightLevel.Value = end; + m_darknessMat.SetFloat("_Apply", m_lightLevel); } diff --git a/Assets/Scripts/IResettable.cs b/Assets/Scripts/IResettable.cs new file mode 100644 index 0000000..cc74654 --- /dev/null +++ b/Assets/Scripts/IResettable.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public interface IResettable +{ + public void OnLevelLoad(); + + public IEnumerator OnResetStart(float time); + + public void OnResetEnd(); + + +} diff --git a/Assets/Scripts/IResettable.cs.meta b/Assets/Scripts/IResettable.cs.meta new file mode 100644 index 0000000..081dd4c --- /dev/null +++ b/Assets/Scripts/IResettable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad996d168724ecc4e88b3854210fcbfc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/KillPlayer.cs b/Assets/Scripts/KillPlayer.cs new file mode 100644 index 0000000..0bf7002 --- /dev/null +++ b/Assets/Scripts/KillPlayer.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class KillPlayer : MonoBehaviour +{ + [SerializeField] + private Reference m_isDead; + + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.CompareTag("Player")) + m_isDead.Value = true; + } + + +} diff --git a/Assets/Scripts/KillPlayer.cs.meta b/Assets/Scripts/KillPlayer.cs.meta new file mode 100644 index 0000000..930173d --- /dev/null +++ b/Assets/Scripts/KillPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ac34d7ad4f935b4a92bff7901ea1180 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs new file mode 100644 index 0000000..e6898ec --- /dev/null +++ b/Assets/Scripts/LevelManager.cs @@ -0,0 +1,113 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using NaughtyAttributes; +using Variables; + +public class LevelManager : MonoBehaviour +{ + [SerializeField, Header("References")] + Reference m_isPlayerDead; + + [SerializeField] + Reference m_freezePlayer; + + [SerializeField] + Reference m_isVictory; + + [SerializeField] + Reference m_timer; + + + [SerializeField, BoxGroup("Level Settings")] + private string m_levelName = "Level 1"; + + [SerializeField, BoxGroup("Level Settings")] + private float m_timeInLevel = 10; + + [SerializeField] + private float m_resetTime = 1; + + [SerializeField] + private string m_nextSceneToLoad = "Level 2"; + + + private IResettable[] m_allResetable; + + private void Start() + { + m_allResetable = FindObjectsOfType().OfType().ToArray(); + m_timer.Value = m_timeInLevel; + + foreach (IResettable resettable in m_allResetable) + { + resettable.OnLevelLoad(); + } + } + + private void Update() + { + if (!m_freezePlayer) + m_timer.Value -= Time.deltaTime; + } + + + + private void OnEnable() + { + m_isPlayerDead.OnValueChanged += OnPlayerDeadChange; + m_isVictory.OnValueChanged += OnPlayerVictoryChange; + } + + private void OnDisable() + { + m_isPlayerDead.OnValueChanged -= OnPlayerDeadChange; + m_isVictory.OnValueChanged -= OnPlayerVictoryChange; + } + + + private IEnumerator DeathRoutine() + { + m_freezePlayer.Value = true; + + + + m_timer.Value = m_timeInLevel; + foreach (IResettable resettable in m_allResetable) + StartCoroutine(resettable.OnResetStart(m_resetTime)); + + yield return new WaitForSeconds(m_resetTime); + + foreach (IResettable resettable in m_allResetable) + resettable.OnResetEnd(); + + + m_freezePlayer.Value = false; + } + + + + + + private void OnPlayerDeadChange(bool value) + { + if (value) + { + StartCoroutine(DeathRoutine()); + } + + + } + + private void OnPlayerVictoryChange(bool value) + { + + } + + + + + + +} diff --git a/Assets/Scripts/LevelManager.cs.meta b/Assets/Scripts/LevelManager.cs.meta new file mode 100644 index 0000000..2af79f6 --- /dev/null +++ b/Assets/Scripts/LevelManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2022aae2eff786945bf401469695230a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SneakyTextController.cs b/Assets/Scripts/SneakyTextController.cs new file mode 100644 index 0000000..25d280f --- /dev/null +++ b/Assets/Scripts/SneakyTextController.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class SneakyTextController : MonoBehaviour +{ + [SerializeField] + private Reference m_lightLevel; + + [SerializeField] + private Reference m_freezePlayer; + + [SerializeField] + private float m_time = 10; + + [SerializeField] + private TMPro.TextMeshProUGUI m_text; + + private bool m_hasTriggered = false; + + private void OnEnable() + { + m_lightLevel.OnValueChanged += OnLightChange; + } + + private void OnDisable() + { + m_lightLevel.OnValueChanged -= OnLightChange; + } + + + private void Start() + { + m_text.gameObject.SetActive(false); + } + + + private void OnLightChange(float value) + { + + Color color = m_text.color; + color.a = 1 - m_lightLevel; + m_text.color = color; + + if (!m_hasTriggered && !m_freezePlayer) + { + m_hasTriggered = true; + StartCoroutine(Timer( m_time)); + } + + } + + private IEnumerator Timer(float time) + { + Debug.Log("here"); + m_text.gameObject.SetActive(true); + yield return new WaitForSeconds(time); + m_text.gameObject.SetActive(false); + } + +} diff --git a/Assets/Scripts/SneakyTextController.cs.meta b/Assets/Scripts/SneakyTextController.cs.meta new file mode 100644 index 0000000..83d3495 --- /dev/null +++ b/Assets/Scripts/SneakyTextController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6f991527b7c3d5419b9f5e0f73d598d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/TextController.cs b/Assets/Scripts/TextController.cs index 06c16e7..63b5746 100644 --- a/Assets/Scripts/TextController.cs +++ b/Assets/Scripts/TextController.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; using TMPro; using NaughtyAttributes; -public class TextController : MonoBehaviour +public class TextController : MonoBehaviour, IResettable { [SerializeField] @@ -139,10 +139,22 @@ public class TextController : MonoBehaviour m_goText.gameObject.SetActive(false); } + public void OnLevelLoad() + { + } + public IEnumerator OnResetStart(float time) + { + yield return new WaitForSeconds(time - gotime); + m_goText.gameObject.SetActive(true); + yield return new WaitForSeconds(gotime); + m_goText.gameObject.SetActive(false); + } - + public void OnResetEnd() + { + } } diff --git a/Assets/Scripts/TimerController.cs b/Assets/Scripts/TimerController.cs new file mode 100644 index 0000000..ec739a6 --- /dev/null +++ b/Assets/Scripts/TimerController.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; +using Variables; + +public class TimerController : MonoBehaviour +{ + + [SerializeField] + private Reference m_time; + + private Color m_defaultColor; + + + private void OnEnable() + { + m_time.OnValueChanged += OnTimeChange; + } + + private void OnDisable() + { + m_time.OnValueChanged -= OnTimeChange; + } + + private void OnTimeChange(float value) + { + + + + } + + +} diff --git a/Assets/Scripts/TimerController.cs.meta b/Assets/Scripts/TimerController.cs.meta new file mode 100644 index 0000000..4974f73 --- /dev/null +++ b/Assets/Scripts/TimerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e65af424b40dd845ae91bb2d24af0c9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/LightAmount.asset b/Assets/Variables/Runtime/LightAmount.asset new file mode 100644 index 0000000..19a0d2a --- /dev/null +++ b/Assets/Variables/Runtime/LightAmount.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:965d4f6151fb166d5495eabf7d7c024ec4ad82b2ae8d08e22684d43e9026122d +size 465 diff --git a/Assets/Variables/Runtime/LightAmount.asset.meta b/Assets/Variables/Runtime/LightAmount.asset.meta new file mode 100644 index 0000000..f15ee1b --- /dev/null +++ b/Assets/Variables/Runtime/LightAmount.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca17925be533f0e488952f6fe4d4563b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/Timer.asset b/Assets/Variables/Runtime/Timer.asset new file mode 100644 index 0000000..e9a135c --- /dev/null +++ b/Assets/Variables/Runtime/Timer.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb84f9102a37896deb5dce6340b78e9027405f1bf3b96e7dc584d86891343fca +size 459 diff --git a/Assets/Variables/Runtime/Timer.asset.meta b/Assets/Variables/Runtime/Timer.asset.meta new file mode 100644 index 0000000..bdbb37e --- /dev/null +++ b/Assets/Variables/Runtime/Timer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a36c9e2ffbc2b20429e4486eba03312a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/freezePlayer.asset b/Assets/Variables/Runtime/freezePlayer.asset new file mode 100644 index 0000000..f616f65 --- /dev/null +++ b/Assets/Variables/Runtime/freezePlayer.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f374dd84929158d72abba2b7081384c232df90b4e44faaabd3958edc540e7783 +size 466 diff --git a/Assets/Variables/Runtime/isNoInput.asset.meta b/Assets/Variables/Runtime/freezePlayer.asset.meta similarity index 100% rename from Assets/Variables/Runtime/isNoInput.asset.meta rename to Assets/Variables/Runtime/freezePlayer.asset.meta diff --git a/Assets/Variables/Runtime/isNoInput.asset b/Assets/Variables/Runtime/isNoInput.asset deleted file mode 100644 index 4d17850..0000000 --- a/Assets/Variables/Runtime/isNoInput.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecb22b8aba55149d6ccaa0fd21d39d0fe679b567bb33be4855bcd3dfc83e5dd3 -size 463 diff --git a/Assets/Variables/Runtime/isPlayerDead.asset b/Assets/Variables/Runtime/isPlayerDead.asset new file mode 100644 index 0000000..9a44f06 --- /dev/null +++ b/Assets/Variables/Runtime/isPlayerDead.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09bd38903b041010fb34210e17c1ea48ae59bb39468dd067f64fba554dfc864a +size 466 diff --git a/Assets/Variables/Runtime/isPlayerDead.asset.meta b/Assets/Variables/Runtime/isPlayerDead.asset.meta new file mode 100644 index 0000000..fd7819f --- /dev/null +++ b/Assets/Variables/Runtime/isPlayerDead.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1586014535831a4e80b30178ff5ced4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: