diff --git a/Assets/Images/HurtyScreen.png b/Assets/Images/HurtyScreen.png new file mode 100644 index 0000000..23c1ed6 Binary files /dev/null and b/Assets/Images/HurtyScreen.png differ diff --git a/Assets/Images/HurtyScreen.png.meta b/Assets/Images/HurtyScreen.png.meta new file mode 100644 index 0000000..72d87be --- /dev/null +++ b/Assets/Images/HurtyScreen.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 9646e64abbfa4094a8921eac54f39b3a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + 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: 3 + 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: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/WorldScene.unity b/Assets/Scenes/WorldScene.unity index 24fe8c0..b12a033 100644 --- a/Assets/Scenes/WorldScene.unity +++ b/Assets/Scenes/WorldScene.unity @@ -1145,6 +1145,12 @@ PrefabInstance: propertyPath: m_Name value: GameCanvas objectReference: {fileID: 0} + - target: {fileID: 2347158115666318496, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9646e64abbfa4094a8921eac54f39b3a, + type: 3} - target: {fileID: 2433458770277224157, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} propertyPath: m_AnchorMax.x @@ -1230,6 +1236,11 @@ PrefabInstance: propertyPath: m_OnDidEndEdit.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 880466090} + - target: {fileID: 6456657860247816393, guid: e29ce1fe47a855c4e907d4312c9e9d6e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6524590693600647859, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3} propertyPath: HittyThingThatSkyDidntWantMeToNameItLikeThisAndInsteadNameItPropely diff --git a/Assets/Scripts/LifeThingTrackerThing.cs b/Assets/Scripts/LifeThingTrackerThing.cs index ffe5080..47539e1 100644 --- a/Assets/Scripts/LifeThingTrackerThing.cs +++ b/Assets/Scripts/LifeThingTrackerThing.cs @@ -74,7 +74,7 @@ namespace InterfaceOff.WorldScene private IEnumerator DisplayHurtOverlay() { HurtOverlay.SetActive(true); - yield return new WaitForSecondsRealtime(time: 0.1f); + yield return new WaitForSecondsRealtime(time: 0.4f); HurtOverlay.SetActive(false); } }