diff --git a/MuseumGame/Assets/Prefabs/Paint Projectile.png.meta b/MuseumGame/Assets/Prefabs/Paint Projectile.png.meta deleted file mode 100644 index fa8794f..0000000 --- a/MuseumGame/Assets/Prefabs/Paint Projectile.png.meta +++ /dev/null @@ -1,104 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< Updated upstream -<<<<<<< Updated upstream -guid: 91aa6c120a1f8d64d942204b2b6a6952 -======= -guid: 99b222e3befa2bc4397d9c88480e9be8 ->>>>>>> Stashed changes -======= -guid: 99b222e3befa2bc4397d9c88480e9be8 ->>>>>>> Stashed changes -TextureImporter: - internalIDToNameTable: [] - 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: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - 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: 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: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/PaintProjectile.prefab b/MuseumGame/Assets/Prefabs/PaintProjectile.prefab new file mode 100644 index 0000000..da1c109 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/PaintProjectile.prefab @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6903016774713486304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1440791031367222386} + - component: {fileID: -1154021892652630506} + - component: {fileID: 92791003010811416} + - component: {fileID: -1462258026606581137} + m_Layer: 0 + m_Name: PaintProjectile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1440791031367222386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6903016774713486304} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &-1154021892652630506 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6903016774713486304} + 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: -2957126887438287739, guid: b8d21408fef6c0446ab8bea61cae4665, 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.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &92791003010811416 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6903016774713486304} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.069533065, y: 0} + serializedVersion: 2 + m_Radius: 0.09 +--- !u!114 &-1462258026606581137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6903016774713486304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d4d7b53bd6c7264a80ed03bb45e7c07, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} diff --git a/MuseumGame/Assets/Prefabs/PaintProjectile.prefab.meta b/MuseumGame/Assets/Prefabs/PaintProjectile.prefab.meta new file mode 100644 index 0000000..33026ac --- /dev/null +++ b/MuseumGame/Assets/Prefabs/PaintProjectile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 79d37dd00de396e4181a487ca868ba07 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index 0d23548..1e2c72e 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -19,7 +19,6 @@ GameObject: - component: {fileID: 374150667840124768} - component: {fileID: 971613887410275354} - component: {fileID: 4469907059167699923} - - component: {fileID: 5658169444775452094} m_Layer: 0 m_Name: Player m_TagString: Player @@ -342,16 +341,3 @@ MonoBehaviour: minColSize: {x: 0, y: 0} defaultRbSize: {x: 0, y: 0, z: 0} defaultColSize: {x: 0, y: 0} ---- !u!114 &5658169444775452094 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 374150667840124763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d4d7b53bd6c7264a80ed03bb45e7c07, type: 3} - m_Name: - m_EditorClassIdentifier: - paintBlob: {fileID: 0} diff --git a/MuseumGame/Assets/Scripts/paintShoot.cs b/MuseumGame/Assets/Scripts/paintShoot.cs index 1c79b9b..94611c3 100644 --- a/MuseumGame/Assets/Scripts/paintShoot.cs +++ b/MuseumGame/Assets/Scripts/paintShoot.cs @@ -18,6 +18,7 @@ public class paintShoot : MonoBehaviour { if (Input.GetKeyDown(KeyCode.E)) { + Debug.Log("shooting"); Instantiate(paintBlob, player.transform); if (player.GetComponent().faceRight) { diff --git a/MuseumGame/Assets/Prefabs/Paint Projectile.png b/MuseumGame/Assets/Sprites/Paint Projectile.png similarity index 100% rename from MuseumGame/Assets/Prefabs/Paint Projectile.png rename to MuseumGame/Assets/Sprites/Paint Projectile.png diff --git a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta new file mode 100644 index 0000000..072a8e4 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta @@ -0,0 +1,216 @@ +fileFormatVersion: 2 +guid: 91aa6c120a1f8d64d942204b2b6a6952 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8051328491415750467 + second: Paint Projectile_0 + - first: + 213: -6969508442564674092 + second: Paint Projectile_1 + - first: + 213: 5775047741713198415 + second: Paint Projectile_2 + - first: + 213: -7011062189496570857 + second: Paint Projectile_3 + 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: -1 + aniso: -1 + mipBias: -100 + 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: 100 + 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: 1 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Paint Projectile_0 + rect: + serializedVersion: 2 + x: 0 + y: 320 + width: 320 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: db8be23156fe34090800000000000000 + internalID: -8051328491415750467 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Paint Projectile_1 + rect: + serializedVersion: 2 + x: 320 + y: 320 + width: 320 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4ddb8dd5ff4574f90800000000000000 + internalID: -6969508442564674092 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Paint Projectile_2 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 320 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f4dacb5d257152050800000000000000 + internalID: 5775047741713198415 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Paint Projectile_3 + rect: + serializedVersion: 2 + x: 320 + y: 0 + width: 320 + height: 320 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 71c62e8b514b3be90800000000000000 + internalID: -7011062189496570857 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bbc32fe3cda8c2543af7c029ea99a99d + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 87d2ee1..cacf7ca 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a