diff --git a/Assets/Ice.mat b/Assets/Ice.mat index d902692..c1e475e 100644 --- a/Assets/Ice.mat +++ b/Assets/Ice.mat @@ -26,8 +26,8 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: f0aff3da13ce87e46b18d08b711994cd, type: 3} + m_Scale: {x: 2.69, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} @@ -50,8 +50,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: f0aff3da13ce87e46b18d08b711994cd, type: 3} + m_Scale: {x: 2.69, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -116,8 +116,8 @@ Material: - _XRMotionVectorsPass: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.37486652, g: 0.8441055, b: 0.9811321, a: 1} - - _Color: {r: 0.3748665, g: 0.8441055, b: 0.9811321, a: 1} + - _BaseColor: {r: 0.5801887, g: 0.9045882, b: 1, a: 1} + - _Color: {r: 0.58018863, g: 0.9045882, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index df3781c..b2d42b3 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -281,6 +281,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1158125513} + - {fileID: 827642025} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1495,6 +1496,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 677195896} m_CullTransparentMesh: 1 +--- !u!1 &827642024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 827642025} + - component: {fileID: 827642027} + - component: {fileID: 827642026} + m_Layer: 5 + m_Name: BearTimer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &827642025 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 827642024} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.46, y: 0.46, z: 0.46} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 84958528} + 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: 41, y: 119} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &827642026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 827642024} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &827642027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 827642024} + m_CullTransparentMesh: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -2620,6 +2696,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::BearIsAwake Penguin: {fileID: 955231359} + bearTimer: {fileID: 827642026} + bearAwareness: {fileID: 1034880021} + penguinReset: {fileID: 955231361} + iceBlockReset: {fileID: 319279599} --- !u!1 &2123298904 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BearIsAwake.cs b/Assets/Scripts/BearIsAwake.cs index 5ae0ffc..b6d02fc 100644 --- a/Assets/Scripts/BearIsAwake.cs +++ b/Assets/Scripts/BearIsAwake.cs @@ -1,19 +1,36 @@ using System; using System.Collections; using UnityEngine; +using UnityEngine.UI; public class BearIsAwake : MonoBehaviour { public Transform Penguin; - + public Image bearTimer; + private float timer = 0f; + private bool wakingUp = false; + public BearAwareness bearAwareness; + + public PositionReset penguinReset; + public PositionReset iceBlockReset; private void Start() { BearAwareness.HasWokenUp += IsAwake; } + private void Update() + { + if (wakingUp) + { + timer += Time.deltaTime; + bearTimer.fillAmount = timer / bearAwareness.timeToWakeUp; + } + } + public void IsAwake(float time) { + wakingUp = true; StartCoroutine(SleepIsOver(time)); } @@ -32,6 +49,8 @@ public class BearIsAwake : MonoBehaviour if (hit.collider.name == "StandUpCollider") { Debug.Log("Your Dead!"); + penguinReset.Reset(); + iceBlockReset.Reset(); } else { @@ -39,7 +58,9 @@ public class BearIsAwake : MonoBehaviour } } - + wakingUp = false; + timer = 0f; + bearTimer.fillAmount = 0; Debug.DrawLine(transform.position, Penguin.position, Color.red, 10f); } } diff --git a/Assets/flooor_texture.png b/Assets/flooor_texture.png new file mode 100644 index 0000000..85f521b Binary files /dev/null and b/Assets/flooor_texture.png differ diff --git a/Assets/flooor_texture.png.meta b/Assets/flooor_texture.png.meta new file mode 100644 index 0000000..15f25d0 --- /dev/null +++ b/Assets/flooor_texture.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: f0aff3da13ce87e46b18d08b711994cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: