diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 710ed8a0..59c37a4b 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -277,22 +277,22 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Newtonsoft.Json.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/unityplastic.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/PackageCache/com.unity.collab-proxy@1.15.13/Lib/Editor/PlasticSCM/log4netPlastic.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll @@ -643,100 +643,100 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 7b629bdc..deb7d9db 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -228,6 +228,7 @@ + @@ -520,7 +521,7 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Assets/HardLight2D/Scripts/HardLight2D.dll C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll @@ -868,94 +869,94 @@ C:/Program Files/Unity/Hub/Editor/2020.3.32f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/PsdPlugin.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Timeline.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/UnityEditor.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.IK.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll - C:/Users/alicj/OneDrive/Desktop/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + C:/Users/alicj/OneDrive/Desktop/new/Scriptum/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll diff --git a/Assets/Scene Sprites/House - Objects/fireplace.png b/Assets/Scene Sprites/House - Objects/fireplace.png new file mode 100644 index 00000000..d31365a8 Binary files /dev/null and b/Assets/Scene Sprites/House - Objects/fireplace.png differ diff --git a/Assets/Scene Sprites/House - Objects/fireplace.png.meta b/Assets/Scene Sprites/House - Objects/fireplace.png.meta new file mode 100644 index 00000000..a101b3ea --- /dev/null +++ b/Assets/Scene Sprites/House - Objects/fireplace.png.meta @@ -0,0 +1,252 @@ +fileFormatVersion: 2 +guid: e153eb354738d8f4cbe8435acc224c94 +TextureImporter: + internalIDToNameTable: + - first: + 213: 5698017828174702254 + second: fireplace_0 + - first: + 213: 3555795224932194294 + second: fireplace_1 + - first: + 213: 2692201480731268342 + second: fireplace_2 + - first: + 213: 2497313390202381326 + second: fireplace_3 + - first: + 213: -5130110956873843884 + second: fireplace_4 + - first: + 213: -8485822813022745045 + second: fireplace_5 + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: fireplace_0 + rect: + serializedVersion: 2 + x: 0 + y: 86 + width: 48 + height: 58 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea6223c760d631f40800000000000000 + internalID: 5698017828174702254 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fireplace_1 + rect: + serializedVersion: 2 + x: 64 + y: 70 + width: 48 + height: 58 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6f71d1ceae8b85130800000000000000 + internalID: 3555795224932194294 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fireplace_2 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 48 + height: 58 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6f494ca9bfe9c5520800000000000000 + internalID: 2692201480731268342 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fireplace_3 + rect: + serializedVersion: 2 + x: 0 + y: 28 + width: 48 + height: 58 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e04e6db0c4d38a220800000000000000 + internalID: 2497313390202381326 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fireplace_4 + rect: + serializedVersion: 2 + x: 46 + y: 0 + width: 48 + height: 58 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 45bf135e34f2ec8b0800000000000000 + internalID: -5130110956873843884 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fireplace_5 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 48 + height: 58 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b2e8fd28c1d4c3a80800000000000000 + internalID: -8485822813022745045 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index de1899c5..1d2e9ae0 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -24711,8 +24711,10 @@ GameObject: - component: {fileID: 536387126} - component: {fileID: 536387128} - component: {fileID: 536387127} + - component: {fileID: 536387130} + - component: {fileID: 536387129} m_Layer: 0 - m_Name: 9 + m_Name: chimney m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -24814,6 +24816,62 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &536387129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536387125} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa5b04c7bac39de43a8625bf7364749f, type: 3} + m_Name: + m_EditorClassIdentifier: + inRange: 0 + sprites: + - {fileID: 3555795224932194294, guid: e153eb354738d8f4cbe8435acc224c94, type: 3} +--- !u!60 &536387130 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536387125} + 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: 3, y: 3.625} + newSize: {x: 3, y: 3.625} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -1.1503415, y: -0.9352989} + - {x: -1.3829403, y: -0.9686098} + - {x: -1.4200039, y: -0.96778774} + - {x: -1.6785734, y: -0.9671316} + - {x: -1.6076814, y: -0.98531437} + - {x: -1.5727895, y: -1.8488941} + - {x: -1.3866498, y: -2.2773643} + - {x: -0.6431186, y: -2.570743} + - {x: -0.24164486, y: -2.640307} + - {x: 0.35356736, y: -2.6131825} + - {x: 0.85588646, y: -2.5523667} + - {x: 1.2405653, y: -2.4142766} + - {x: 1.5654583, y: -1.9187093} + - {x: 1.5836558, y: -1.9187093} + - {x: 1.6091843, y: -0.9423528} + - {x: 0.5316322, y: -0.971694} --- !u!1 &543241738 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/SwitchSprite.cs b/Assets/SwitchSprite.cs new file mode 100644 index 00000000..b400c9c1 --- /dev/null +++ b/Assets/SwitchSprite.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SwitchSprite : MonoBehaviour +{ + public bool inRange = false; + public Sprite[] sprites; + private List availableSprites = new List(); + + // Start is called before the first frame update + void Start() + { + availableSprites.Add(1); + } + + // Update is called once per frame + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.tag == "Player") + { + inRange = true; + } + } + + private void OnTriggerStay2D(Collider2D collision) + { + if (collision.tag == "Player") + { + inRange = true; + } + } + + private void OnTriggerExit2D(Collider2D collision) + { + inRange = false; + } + + void Update() + { + if(inRange == true) + { + if(Input.GetKeyDown(KeyCode.E)) + { + GetComponent().sprite = sprites[0]; + } + } + } +} diff --git a/Assets/SwitchSprite.cs.meta b/Assets/SwitchSprite.cs.meta new file mode 100644 index 00000000..c92d8338 --- /dev/null +++ b/Assets/SwitchSprite.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa5b04c7bac39de43a8625bf7364749f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: